@onlineapps/conn-orch-orchestrator 1.0.33 → 1.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.33",
+  "version": "1.0.39",
   "description": "Workflow orchestration connector for OA Drive - handles message routing and workflow execution",
   "main": "src/index.js",
   "scripts": {
@@ -21,14 +21,14 @@
   "license": "MIT",
   "dependencies": {
     "@onlineapps/conn-base-monitoring": "^1.0.0",
-    "@onlineapps/conn-infra-mq": "^1.1.0",
-    "@onlineapps/conn-orch-registry": "^1.1.4",
+    "@onlineapps/conn-infra-mq": "1.1.53",
+    "@onlineapps/conn-orch-api-mapper": "^1.0.0",
     "@onlineapps/conn-orch-cookbook": "^2.0.0",
-    "@onlineapps/conn-orch-api-mapper": "^1.0.0"
+    "@onlineapps/conn-orch-registry": "^1.1.4"
   },
   "devDependencies": {
-    "jest": "^29.5.0",
     "eslint": "^8.30.0",
+    "jest": "^29.5.0",
     "jsdoc-to-markdown": "^8.0.0"
   },
   "jest": {

package/src/WorkflowOrchestrator.js

@@ -61,6 +61,25 @@ class WorkflowOrchestrator {
     return step?.step_id || step?.id;
   }
 
+  /**
+   * Get steps as array (supports both V1 array and V2 object formats)
+   * V2 FORMAT: steps is an object keyed by step_id
+   * V1 FORMAT (deprecated): steps is an array
+   * @private
+   * @param {Object} cookbookDef - Cookbook definition
+   * @returns {Array} Array of step objects
+   */
+  _getStepsArray(cookbookDef) {
+    if (!cookbookDef?.steps) return [];
+    if (Array.isArray(cookbookDef.steps)) {
+      // V1 format (deprecated) - steps is already an array
+      this.logger.warn('Using deprecated V1 cookbook format (steps as array). Please migrate to V2 (steps as object).');
+      return cookbookDef.steps;
+    }
+    // V2 format - steps is an object keyed by step_id
+    return Object.values(cookbookDef.steps);
+  }
+
   /**
    * Process a workflow message
    * @async
@@ -97,7 +116,9 @@ class WorkflowOrchestrator {
       };
 
       // Find current step (supports both V1 'id' and V2 'step_id')
-      const step = cookbookDef.steps.find(s => this._getStepId(s) === current_step);
+      // V2 FORMAT: steps is an object keyed by step_id
+      const stepsArray = this._getStepsArray(cookbookDef);
+      const step = stepsArray.find(s => this._getStepId(s) === current_step);
       if (!step) {
         throw new Error(`Step not found: ${current_step}`);
       }
@@ -135,13 +156,14 @@ class WorkflowOrchestrator {
 
       // Update context with result - steps as ARRAY (consistent with cookbook.steps)
       // Each step preserves its definition (id/step_id, type, service, operation, input) and adds output
-      const currentIndex = cookbookDef.steps.findIndex(s => this._getStepId(s) === current_step);
-      const stepDefinition = cookbookDef.steps[currentIndex];
+      // stepsArray is already defined above via _getStepsArray()
+      const currentIndex = stepsArray.findIndex(s => this._getStepId(s) === current_step);
+      const stepDefinition = stepsArray[currentIndex];
       
       // Initialize steps array from cookbook if not present
       const existingSteps = Array.isArray(enrichedContext.steps) 
         ? [...enrichedContext.steps] 
-        : cookbookDef.steps.map(s => ({ ...s }));  // Deep copy of step definitions
+        : stepsArray.map(s => ({ ...s }));  // Deep copy of step definitions
       
       // Update the current step with output (preserve id, type, service, operation, input)
       existingSteps[currentIndex] = {
@@ -182,8 +204,8 @@ class WorkflowOrchestrator {
         });
       }
 
-      // Find next step (currentIndex already defined above)
-      const nextStep = cookbookDef.steps[currentIndex + 1];
+      // Find next step (currentIndex and stepsArray already defined above)
+      const nextStep = stepsArray[currentIndex + 1];
 
       if (nextStep) {
         // Route to next step
@@ -304,7 +326,7 @@ class WorkflowOrchestrator {
   
   /**
    * Resolve variable references in input object
-   * Supports ${steps[N].output.field}, ${api_input.field}, ${context.field}
+   * Supports {{steps.step_id.output.field}}, {{api_input.field}}, {{context.field}}
    * @private
    * @param {Object} input - Input object with potential references
    * @param {Object} context - Current context with steps, api_input, etc
@@ -314,11 +336,24 @@ class WorkflowOrchestrator {
     if (!input) return input;
     
     const resolveValue = (value) => {
-      if (typeof value === 'string' && value.includes('${')) {
-        // Replace ${...} references
-        return value.replace(/\$\{([^}]+)\}/g, (match, path) => {
+      if (typeof value === 'string' && value.includes('{{')) {
+        // Check if the ENTIRE string is a single template reference
+        // e.g. "{{steps.greeting.output}}" should return the object directly
+        const singleRefMatch = value.match(/^\{\{([^}]+)\}\}$/);
+        if (singleRefMatch) {
+          // Entire value is a single reference - return the resolved value directly (preserves objects)
+          const resolved = this._getValueFromPath(singleRefMatch[1].trim(), context);
+          return resolved !== undefined ? resolved : value;
+        }
+        
+        // Multiple references or mixed with text - use string replacement
+        // e.g. "Hello {{name}}, your order {{orderId}}" becomes "Hello John, your order 123"
+        return value.replace(/\{\{([^}]+)\}\}/g, (match, path) => {
           const resolved = this._getValueFromPath(path.trim(), context);
-          return resolved !== undefined ? resolved : match;
+          if (resolved === undefined) return match;
+          // For string concatenation, convert objects to JSON string
+          if (typeof resolved === 'object') return JSON.stringify(resolved);
+          return String(resolved);
         });
       }
       if (Array.isArray(value)) {
@@ -338,7 +373,7 @@ class WorkflowOrchestrator {
   /**
    * Get value from dot/bracket notation path
    * @private
-   * @param {string} path - Path like "steps[0].output.message" or "api_input.name"
+   * @param {string} path - Path like "steps.greeting.output.message" or "api_input.name"
    * @param {Object} context - Context object
    * @returns {*} Resolved value or undefined
    */
@@ -356,9 +391,20 @@ class WorkflowOrchestrator {
     const parts = normalized.split('.');
     
     let current = context;
-    for (const part of parts) {
+    for (let i = 0; i < parts.length; i++) {
+      const part = parts[i];
       if (current === undefined || current === null) return undefined;
-      current = current[part];
+      
+      // 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;
+      } else {
+        current = current[part];
+      }
     }
     return current;
   }