@onlineapps/conn-orch-orchestrator 1.0.58 → 1.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "description": "Workflow orchestration connector for OA Drive - handles message routing and workflow execution",
   "main": "src/index.js",
   "scripts": {

package/src/WorkflowOrchestrator.js

@@ -153,8 +153,9 @@ class WorkflowOrchestrator {
       };
 
       // Execute the step (build full context for template resolution)
+      const stepsArrayCtx = this._getStepsArray(cookbookDef);
       const stepsMap = {};
-      this._getStepsArray(cookbookDef).forEach((s) => {
+      stepsArrayCtx.forEach((s) => {
         const id = this._getStepId(s);
         if (id) {
           stepsMap[id] = s;
@@ -162,7 +163,8 @@ class WorkflowOrchestrator {
       });
       const stepContext = {
         api_input: cookbookDef.api_input || {},
-        steps: stepsMap,
+        steps: stepsArrayCtx,       // array (legacy consumers expect .map)
+        steps_by_id: stepsMap,      // fast lookup by step_id for templating
         _system: cookbookDef._system,
         delivery: cookbookDef.delivery
       };
@@ -571,13 +573,20 @@ class WorkflowOrchestrator {
       const part = parts[i];
       if (current === undefined || current === null) return undefined;
       
-      // Special handling for 'steps' array - lookup by step id
-      // context.steps is an array of {id/step_id: "step_id", output: {...}}
-      // Path like "steps.greeting.output" should find step with id="greeting"
-      if (parts[i - 1] === 'steps' && Array.isArray(context.steps)) {
-        // 'part' is the step_id, find the step in the array (support both 'id' and 'step_id')
-        const step = context.steps.find(s => s.id === part || s.step_id === part);
-        current = step;
+      // Special handling for 'steps' - support array (legacy) and map (steps_by_id)
+      if (parts[i - 1] === 'steps') {
+        // Disallow numeric/index access (must reference by step_id)
+        if (/^\\d+$/.test(part)) {
+          return undefined;
+        }
+        if (context.steps_by_id && context.steps_by_id[part]) {
+          current = context.steps_by_id[part];
+        } else if (Array.isArray(context.steps)) {
+          const step = context.steps.find(s => s.id === part || s.step_id === part);
+          current = step;
+        } else {
+          current = undefined;
+        }
       } else {
         current = current[part];
       }