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
  // Identify each part of the content
  parts.forEach((section: string) => {
    // match level
    const levelRegex = /^(##\s(?<levelId>L\d+)\s(?<levelTitle>.*)[\n\r]*(>\s*(?<levelSummary>.*))?[\n\r]+(?<levelContent>[^]*))/;
    const levelRegex = /^(#{2}\s(?<levelId>L\d+)\s(?<levelTitle>.*)[\n\r]*(>\s*(?<levelSummary>.*))?[\n\r]+(?<levelContent>[^]*))/;
    const levelMatch: RegExpMatchArray | null = section.match(levelRegex);
    if (levelMatch && levelMatch.groups) {
      const {
      };
    } else {
      // match step
      const stepRegex = /^(###\s(?<stepId>(?<levelId>L\d+)S\d+)\s(?<stepTitle>.*)[\n\r]+(?<stepContent>[^]*))/;
      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(),
        }

        // add level step commits
        level.steps = (level.steps || []).map(
          (step: T.Step, stepIndex: number) => {
            const stepKey = `${levelSetupKey}S${stepIndex + 1}`;
            const stepSetupKey = `${stepKey}Q`;
            if (params.commits[stepSetupKey]) {
              if (!step.setup) {
                step.setup = {
                  commits: [],
                };
        try {
          level.steps = (level.steps || []).map(
            (step: T.Step, stepIndex: number) => {
              const stepKey = `${levelSetupKey}S${stepIndex + 1}`;
              const stepSetupKey = `${stepKey}Q`;
              if (params.commits[stepSetupKey]) {
                if (!step.setup) {
                  step.setup = {
                    commits: [],
                  };
                }
                step.setup.commits = params.commits[stepSetupKey];
              }
              step.setup.commits = params.commits[stepSetupKey];
            }

            const stepSolutionKey = `${stepKey}A`;
            if (params.commits[stepSolutionKey]) {
              if (!step.solution) {
                step.solution = {
                  commits: [],
                };
              const stepSolutionKey = `${stepKey}A`;
              if (params.commits[stepSolutionKey]) {
                if (!step.solution) {
                  step.solution = {
                    commits: [],
                  };
                }
                step.solution.commits = params.commits[stepSolutionKey];
              }
              step.solution.commits = params.commits[stepSolutionKey];
            }

            // add markdown
            const stepMarkdown: Partial<T.Step> = mdContent.steps[step.id];
            if (stepMarkdown) {
              step = { ...step, ...stepMarkdown };
            }
 // add markdown
 const stepMarkdown: Partial<T.Step> = mdContent.steps[step.id];
 if (stepMarkdown) {
 step = { ...step, ...stepMarkdown };
 }

            step.id = `${stepKey}`;
            return step;
          }
        );
              step.id = `${stepKey}`;
              return step;
            }
          );
        } catch (error) {
          console.log(JSON.stringify(level.steps));
          console.error("Error parsing level steps");
          console.error(error.message);
        }

        return level;
      })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,7 +52,7 @@ export function parseMdContent(md: string): TutorialFrame \| never {
		// Identify each part of the content
		parts.forEach((section: string) => {
		// match level
		const levelRegex = /^(##\s(?<levelId>L\d+)\s(?<levelTitle>.)[\n\r](>\s(?<levelSummary>.))?[\n\r]+(?<levelContent>[^]*))/;
		const levelRegex = /^(#{2}\s(?<levelId>L\d+)\s(?<levelTitle>.)[\n\r](>\s(?<levelSummary>.))?[\n\r]+(?<levelContent>[^]*))/;
		const levelMatch: RegExpMatchArray \| null = section.match(levelRegex);
		if (levelMatch && levelMatch.groups) {
		const {
Expand All		@@ -73,10 +73,18 @@ export function parseMdContent(md: string): TutorialFrame \| never {
		};
		} else {
		// match step
		const stepRegex = /^(###\s(?<stepId>(?<levelId>L\d+)S\d+)\s(?<stepTitle>.)[\n\r]+(?<stepContent>[^]))/;
		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(),
Expand DownExpand Up		@@ -135,39 +143,45 @@ export function parse(params: ParseParams): any {
		}

		// add level step commits
		level.steps = (level.steps \|\| []).map(
		(step: T.Step, stepIndex: number) => {
		const stepKey = `${levelSetupKey}S${stepIndex + 1}`;
		const stepSetupKey = `${stepKey}Q`;
		if (params.commits[stepSetupKey]) {
		if (!step.setup) {
		step.setup = {
		commits: [],
		};
		try {
		level.steps = (level.steps \|\| []).map(
		(step: T.Step, stepIndex: number) => {
		const stepKey = `${levelSetupKey}S${stepIndex + 1}`;
		const stepSetupKey = `${stepKey}Q`;
		if (params.commits[stepSetupKey]) {
		if (!step.setup) {
		step.setup = {
		commits: [],
		};
		}
		step.setup.commits = params.commits[stepSetupKey];
		}
		step.setup.commits = params.commits[stepSetupKey];
		}

		const stepSolutionKey = `${stepKey}A`;
		if (params.commits[stepSolutionKey]) {
		if (!step.solution) {
		step.solution = {
		commits: [],
		};
		const stepSolutionKey = `${stepKey}A`;
		if (params.commits[stepSolutionKey]) {
		if (!step.solution) {
		step.solution = {
		commits: [],
		};
		}
		step.solution.commits = params.commits[stepSolutionKey];
		}
		step.solution.commits = params.commits[stepSolutionKey];
		}

		// add markdown
		const stepMarkdown: Partial<T.Step> = mdContent.steps[step.id];
		if (stepMarkdown) {
		step = { ...step, ...stepMarkdown };
		}
		// add markdown
		const stepMarkdown: Partial<T.Step> = mdContent.steps[step.id];
		if (stepMarkdown) {
		step = { ...step, ...stepMarkdown };
		}

		step.id = `${stepKey}`;
		return step;
		}
		);
		step.id = `${stepKey}`;
		return step;
		}
		);
		} catch (error) {
		console.log(JSON.stringify(level.steps));
		console.error("Error parsing level steps");
		console.error(error.message);
		}

		return level;
		})
Expand Down