Jun 7, 2020 · Jun 7, 2020 · Jun 7, 2020 · Jun 7, 2020 · Jun 7, 2020 · Jun 7, 2020
diff --git a/src/utils/parse.ts b/src/utils/parse.ts
    mdContent.summary.description = summaryMatch.groups.tutorialDescription.trim();
  }

  let current = { level: "0", step: "0" };
  // Identify each part of the content
  parts.forEach((section: string) => {
    // match level
          : truncate(levelContent.trim(), { length: 80, omission: "..." }),
        content: levelContent.trim(),
      };
      current = { level: levelId, step: "0" };
    } else {
      // match step
      const stepRegex = /^(#{3}\s(?<stepId>(?<levelId>L\d+)S\d+)\s(?<stepTitle>.*)[\n\r]+(?<stepContent>[^]*))/;
      const stepMatch: RegExpMatchArray | null = section.match(stepRegex);
      if (stepMatch && stepMatch.groups) {
        const { stepId, stepContent } = stepMatch.groups;

        // parse hints from stepContent
        // const hintRegex = /^(#{4}\sHINTS[\n\r]+(?<hintContent>[^]*))/g;

        // if (!!stepContent.match(hintRegex)) {
        //   console.log("HAS HINT");
        // }

        mdContent.steps[stepId] = {
          id: stepId,
          content: stepContent.trim(),
        };
        current = { ...current, step: stepId };
      } else {
        // parse hints from stepContent
        const hintDetectRegex = /^(#{4}\sHINTS[\n\r]+(\*\s(?<hintContent>[^]*))[\n\r]+)+/;
        const hintMatch = section.match(hintDetectRegex);
        if (!!hintMatch) {
          const hintItemRegex = /[\n\r]+\*\s/;
          const hints = section
            .split(hintItemRegex)
            .slice(1) // remove #### HINTS
            .map((h) => h.trim());
          if (hints.length) {
            mdContent.steps[current.step].hints = hints;
          }
        }
      }
    }
  });
diff --git a/tests/parse.test.ts b/tests/parse.test.ts
    });
  });

 xdescribe("hints", () => {
 describe("hints", () => {
    it("should parse hints for a step", () => {
      const md = `# Title


 The first step

 ####Hints
 ####HINTS

 * First Hint with \`markdown\`. See **bold**
 * Second Hint has a codeblock

 The first step

 ####Hints
 ####HINTS

 * First Hint with \`markdown\`. See **bold**
 * Second Hint has a codeblock

 And spans multiple lines.

 ###L1S2A
 ###L1S2

 The second uninterrupted step
 `;
                id: "L1S1",
                content: "The first step",
                setup: {
                  commits: ["abcdef1", "123456789"],
                  commits: ["abcdef1"],
                },
                solution: {
                  commits: ["123456789"],
          {},
        ],
      };
      expect(result.levels).toEqual(expected.levels);
      expect(result.levels[0]).toEqual(expected.levels[0]);
    });
  });
 });
diff --git a/typings/tutorial.d.ts b/typings/tutorial.d.ts
  setup: StepActions;
  solution: Maybe<StepActions>;
  subtasks?: { [testName: string]: boolean };
  hints?: string[];
 };

 /** A tutorial for use in VSCode CodeRoad */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,6 +49,7 @@ export function parseMdContent(md: string): TutorialFrame \| never {
		mdContent.summary.description = summaryMatch.groups.tutorialDescription.trim();
		}

		let current = { level: "0", step: "0" };
		// Identify each part of the content
		parts.forEach((section: string) => {
		// match level
Expand All		@@ -71,24 +72,33 @@ export function parseMdContent(md: string): TutorialFrame \| never {
		: truncate(levelContent.trim(), { length: 80, omission: "..." }),
		content: levelContent.trim(),
		};
		current = { level: levelId, step: "0" };
		} else {
		// match step
		const stepRegex = /^(#{3}\s(?<stepId>(?<levelId>L\d+)S\d+)\s(?<stepTitle>.)[\n\r]+(?<stepContent>[^]))/;
		const stepMatch: RegExpMatchArray \| null = section.match(stepRegex);
		if (stepMatch && stepMatch.groups) {
		const { stepId, stepContent } = stepMatch.groups;

		// parse hints from stepContent
		// const hintRegex = /^(#{4}\sHINTS[\n\r]+(?<hintContent>[^]*))/g;

		// if (!!stepContent.match(hintRegex)) {
		// console.log("HAS HINT");
		// }

		mdContent.steps[stepId] = {
		id: stepId,
		content: stepContent.trim(),
		};
		current = { ...current, step: stepId };
		} else {
		// parse hints from stepContent
		const hintDetectRegex = /^(#{4}\sHINTS[\n\r]+(\\s(?<hintContent>[^]))[\n\r]+)+/;
		const hintMatch = section.match(hintDetectRegex);
		if (!!hintMatch) {
		const hintItemRegex = /[\n\r]+\*\s/;
		const hints = section
		.split(hintItemRegex)
		.slice(1) // remove #### HINTS
		.map((h) => h.trim());
		if (hints.length) {
		mdContent.steps[current.step].hints = hints;
		}
		}
		}
		}
		});
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -869,7 +869,7 @@ Description.
		});
		});

		xdescribe("hints", () => {
		describe("hints", () => {
		it("should parse hints for a step", () => {
		const md = `# Title

Expand DownExpand Up		@@ -947,7 +947,7 @@ First level content.

		The first step

		####Hints
		####HINTS

		* First Hint with \`markdown\`. See bold
		* Second Hint has a codeblock
Expand DownExpand Up		@@ -1019,7 +1019,7 @@ First level content.

		The first step

		####Hints
		####HINTS

		* First Hint with \`markdown\`. See bold
		* Second Hint has a codeblock
Expand All		@@ -1030,7 +1030,7 @@ var a = 1;

		And spans multiple lines.

		###L1S2A
		###L1S2

		The second uninterrupted step
		`;
Expand DownExpand Up		@@ -1073,7 +1073,7 @@ The second uninterrupted step
		id: "L1S1",
		content: "The first step",
		setup: {
		commits: ["abcdef1", "123456789"],
		commits: ["abcdef1"],
		},
		solution: {
		commits: ["123456789"],
Expand All		@@ -1095,7 +1095,7 @@ The second uninterrupted step
		{},
		],
		};
		expect(result.levels).toEqual(expected.levels);
		expect(result.levels[0]).toEqual(expected.levels[0]);
		});
		});
		});
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,6 +28,7 @@ export type Step = {
		setup: StepActions;
		solution: Maybe<StepActions>;
		subtasks?: { [testName: string]: boolean };
		hints?: string[];
		};

		/** A tutorial for use in VSCode CodeRoad */
Expand Down