handle levels out of order

Signed-off-by: shmck <[email protected]>

Author: ShMcK

src/utils/parse.ts

@@ -45,20 +45,25 @@ export function parseMdContent(md: string): TutorialFrame | never {
     mdContent.summary.description = summaryMatch.groups.tutorialDescription.trim();
   }
 
-  let current = { level: -1, step: -1 };
+  let current = { levelId: "", levelIndex: -1, stepIndex: -1 };
   // Identify each part of the content
   parts.forEach((section: string) => {
     // match level
     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) {
-      current = { level: current.level + 1, step: -1 };
+      const levelId = levelMatch.groups.levelId.replace(".", "");
+      current = {
+        levelId: levelId,
+        levelIndex: current.levelIndex + 1,
+        stepIndex: -1,
+      };
       const { levelTitle, levelSummary, levelContent } = levelMatch.groups;
 
       // @ts-ignore
-      mdContent.levels[current.level] = {
-        id: (current.level + 1).toString(),
+      mdContent.levels[current.levelIndex] = {
+        id: levelId,
         title: levelTitle.trim(),
         summary:
           levelSummary && levelSummary.trim().length
@@ -75,10 +80,14 @@ export function parseMdContent(md: string): TutorialFrame | never {
       const stepRegex = /^(#{3}\s(?<stepTitle>.*)[\n\r]+(?<stepContent>[^]*))/;
       const stepMatch: RegExpMatchArray | null = section.match(stepRegex);
       if (stepMatch && stepMatch.groups) {
-        current = { level: current.level, step: current.step + 1 };
+        current = {
+          levelId: current.levelId,
+          levelIndex: current.levelIndex,
+          stepIndex: current.stepIndex + 1,
+        };
         const { stepId, stepContent } = stepMatch.groups;
-        mdContent.levels[current.level].steps[current.step] = {
-          id: `${current.level + 1}.${current.step + 1}`,
+        mdContent.levels[current.levelIndex].steps[current.stepIndex] = {
+          id: `${current.levelId}.${current.stepIndex + 1}`,
           content: stepContent.trim(),
         };
       } else {
@@ -92,7 +101,9 @@ export function parseMdContent(md: string): TutorialFrame | never {
             .slice(1) // remove #### HINTS
             .map((h) => h.trim());
           if (hints.length) {
-            mdContent.levels[current.level].steps[current.step].hints = hints;
+            mdContent.levels[current.levelIndex].steps[
+              current.stepIndex
+            ].hints = hints;
           }
         }
       }

tests/parse.test.ts

@@ -842,29 +842,29 @@ The first step
   
 Description.
 
-## 100. Title
+## 100. First Title
 
 First line
 
 ### 100.1
 
 The first step
 
-## 200. Title
+## 200. Second Title
 
-First line
+Second line
 
 ### 200.1
 
-The first step
+The second step
 
-## 201. Title
+## 201. Third Title
 
-First line
+Third line
 
 ### 201.1
 
-The first step
+The third step
 `;
     const skeleton = {
       levels: [
@@ -894,6 +894,7 @@ The first step
       levels: [
         {
           id: "100",
+          title: "First Title",
           summary: "First line",
           content: "First line",
           steps: [
@@ -908,6 +909,7 @@ The first step
         },
         {
           id: "200",
+          title: "Second Title",
           summary: "Second line",
           content: "Second line",
           steps: [
@@ -922,6 +924,7 @@ The first step
         },
         {
           id: "201",
+          title: "Third Title",
           summary: "Third line",
           content: "Third line",
           steps: [