@onlineapps/conn-orch-orchestrator 1.0.29 → 1.0.31

package/package.json

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

package/src/WorkflowOrchestrator.js

@@ -75,12 +75,11 @@ class WorkflowOrchestrator {
     const { workflow_id, cookbook: cookbookDef, current_step, context } = message;
 
     try {
-      // FAIL-FAST: Validate V2 format BEFORE anything else
-      // This replaces the old cookbook.validateCookbook() which only supports V1 (array steps)
+      // FAIL-FAST: Validate V2 format
       this._validateV2Format(cookbookDef);
       
-      // NOTE: Skip cookbook.validateCookbook() - it uses V1 schema (steps as array)
-      // V2 validation is done by _validateV2Format() above
+      // Validate against JSON Schema (V2 schema - steps as object)
+      this.cookbook.validateCookbook(cookbookDef);
 
       // Ensure delivery configuration is preserved in context (required by Delivery Dispatcher)
       // Delivery comes from cookbook.delivery (set by Gateway) and must be passed through to workflow.completed
@@ -391,15 +390,36 @@ class WorkflowOrchestrator {
     
     const resolveValue = (value) => {
       if (typeof value === 'string') {
+        // Special case: entire string is a single template reference
+        // Return the resolved value directly (preserves objects, arrays, etc.)
+        const singleRefMatch = value.match(/^\{\{([^}]+)\}\}$/);
+        if (singleRefMatch) {
+          const resolved = this._getValueFromPath(singleRefMatch[1].trim(), context);
+          if (resolved !== undefined) {
+            return resolved;  // Return object/array directly
+          }
+          return value;  // Return original if not resolved
+        }
+        
+        // Legacy syntax: ${...}
+        const singleLegacyMatch = value.match(/^\$\{([^}]+)\}$/);
+        if (singleLegacyMatch) {
+          const resolved = this._getValueFromPath(singleLegacyMatch[1].trim(), context);
+          if (resolved !== undefined) {
+            return resolved;  // Return object/array directly
+          }
+          return value;  // Return original if not resolved
+        }
+        
         let result = value;
         
-        // Replace {{...}} references (V2 preferred syntax)
+        // Replace {{...}} references embedded in strings (V2 preferred syntax)
         if (result.includes('{{')) {
           result = result.replace(/\{\{([^}]+)\}\}/g, (match, path) => {
             const resolved = this._getValueFromPath(path.trim(), context);
             if (resolved !== undefined) {
-              // If resolved value is an object, stringify it for embedding in strings
-              if (typeof resolved === 'object' && result !== match) {
+              // Stringify objects when embedded in larger strings
+              if (typeof resolved === 'object') {
                 return JSON.stringify(resolved);
               }
               return resolved;
@@ -408,12 +428,12 @@ class WorkflowOrchestrator {
           });
         }
         
-        // Replace ${...} references (legacy syntax)
+        // Replace ${...} references embedded in strings (legacy syntax)
         if (result.includes('${')) {
           result = result.replace(/\$\{([^}]+)\}/g, (match, path) => {
             const resolved = this._getValueFromPath(path.trim(), context);
             if (resolved !== undefined) {
-              if (typeof resolved === 'object' && result !== match) {
+              if (typeof resolved === 'object') {
                 return JSON.stringify(resolved);
               }
               return resolved;