@onlineapps/cookbook-core 2.1.4 → 2.1.7

package/src/parser/cookbookValidatorV2.js

@@ -249,48 +249,53 @@ function validateSemantics(cookbook, version) {
       stepIds.add(stepId);
     }
 
-    // Check nested steps - V2: all nested steps are objects keyed by step_id
-    if (step.steps && typeof step.steps === 'object') {
-      Object.entries(step.steps).forEach(([nestedKey, nested]) =>
-        checkStep(nested, `${path}.steps.${nestedKey}`)
+    // Check nested steps
+    if (step.steps) {
+      step.steps.forEach((nested, idx) =>
+        checkStep(nested, `${path}.steps[${idx}]`)
       );
     }
-    if (step.body && typeof step.body === 'object') {
-      Object.entries(step.body).forEach(([nestedKey, nested]) =>
-        checkStep(nested, `${path}.body.${nestedKey}`)
+    if (step.body) {
+      step.body.forEach((nested, idx) =>
+        checkStep(nested, `${path}.body[${idx}]`)
       );
     }
-    if (step.branches && typeof step.branches === 'object') {
-      Object.entries(step.branches).forEach(([branchKey, branch]) => {
-        checkStep(branch, `${path}.branches.${branchKey}`);
+    if (step.branches) {
+      step.branches.forEach((branch, idx) => {
+        if (branch.steps) {
+          branch.steps.forEach((nested, jdx) =>
+            checkStep(nested, `${path}.branches[${idx}].steps[${jdx}]`)
+          );
+        }
       });
     }
     if (step.cases) {
       Object.keys(step.cases).forEach(caseKey => {
         const caseVal = step.cases[caseKey];
-        checkStep(caseVal, `${path}.cases.${caseKey}`);
+        if (caseVal.steps) {
+          caseVal.steps.forEach((nested, idx) =>
+            checkStep(nested, `${path}.cases.${caseKey}.steps[${idx}]`)
+          );
+        }
       });
     }
   }
 
-  // Check all steps - V2: steps is an OBJECT keyed by step_id, NOT an array
+  // Check all steps
   if (cookbook.steps) {
-    if (Array.isArray(cookbook.steps)) {
-      throw new CookbookValidationError('V1 FORMAT BANNED! steps must be an object keyed by step_id, not an array');
-    }
-    Object.entries(cookbook.steps).forEach(([stepKey, step]) =>
-      checkStep(step, `steps.${stepKey}`)
+    cookbook.steps.forEach((step, idx) =>
+      checkStep(step, `steps[${idx}]`)
     );
   }
 
   // Check dependencies exist
   if (version === '2.0' && cookbook.steps) {
-    Object.entries(cookbook.steps).forEach(([stepKey, step]) => {
+    cookbook.steps.forEach((step, idx) => {
       if (step.depends_on) {
         step.depends_on.forEach(dep => {
           if (!stepIds.has(dep)) {
             throw new CookbookValidationError(
-              `Step '${stepKey}' depends on non-existent step_id '${dep}'`
+              `Step ${idx} depends on non-existent step_id '${dep}'`
             );
           }
         });