@onlineapps/conn-orch-cookbook 2.0.9 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-cookbook",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Complete cookbook toolkit for all services - unified wrapper including core, executor, transformer, and router functionality",
   "main": "src/index.js",
   "repository": {
@@ -46,11 +46,11 @@
   },
   "homepage": "https://github.com/onlineapps/connector-cookbook#readme",
   "dependencies": {
-    "@onlineapps/cookbook-core": "2.1.15",
-    "@onlineapps/cookbook-executor": "1.0.0",
-    "@onlineapps/cookbook-router": "1.0.3",
+    "@onlineapps/cookbook-core": "2.1.16",
+    "@onlineapps/cookbook-executor": "1.0.6",
+    "@onlineapps/cookbook-router": "1.0.7",
     "@onlineapps/cookbook-template-helpers": "1.0.3",
-    "@onlineapps/cookbook-transformer": "1.1.1",
+    "@onlineapps/cookbook-transformer": "1.1.5",
     "jsonpath": "1.1.1"
   },
   "devDependencies": {

package/src/index.js

@@ -92,13 +92,82 @@ const templateHelpers = require('@onlineapps/cookbook-template-helpers');
  * const result = await processor.process(cookbook);
  */
 function createProcessor(config = {}) {
-  const executor = new CookbookExecutor(config.executor);
+  if (!config || typeof config !== 'object') {
+    throw new Error('[conn-orch-cookbook:createProcessor] Invalid config - Expected object');
+  }
+
   const router = config.mqClient && config.registryClient
     ? createRouter(config.mqClient, config.registryClient, config.router)
     : null;
   const transformer = createTransformer(config.transformer);
   const mapper = new ResponseMapper(config.transformer);
 
+  /**
+   * NOTE:
+   * cookbook-executor validates the cookbook in its constructor.
+   * This connector therefore creates the executor lazily when a cookbook is provided.
+   *
+   * Also NOTE:
+   * cookbook-executor currently expects `step.id` internally. Our V2.1 format uses `step.step_id`.
+   * We add `id` = `step_id` ONLY for executor execution to keep runtime behavior predictable.
+   */
+  const normalizeStepForExecutor = (step) => {
+    if (!step || typeof step !== 'object') return step;
+
+    const normalized = { ...step };
+    if (normalized.step_id && !normalized.id) {
+      normalized.id = normalized.step_id;
+    }
+
+    switch (normalized.type) {
+      case 'foreach':
+        if (Array.isArray(normalized.body)) {
+          normalized.body = normalized.body.map(normalizeStepForExecutor);
+        }
+        break;
+      case 'fork_join':
+        if (normalized.branches && typeof normalized.branches === 'object' && !Array.isArray(normalized.branches)) {
+          normalized.branches = Object.fromEntries(
+            Object.entries(normalized.branches).map(([k, v]) => [k, normalizeStepForExecutor(v)])
+          );
+        }
+        break;
+      case 'switch':
+        if (normalized.cases && typeof normalized.cases === 'object' && !Array.isArray(normalized.cases)) {
+          normalized.cases = Object.fromEntries(
+            Object.entries(normalized.cases).map(([k, v]) => [k, normalizeStepForExecutor(v)])
+          );
+        }
+        if (normalized.default) {
+          normalized.default = normalizeStepForExecutor(normalized.default);
+        }
+        break;
+      case 'steps':
+        if (Array.isArray(normalized.steps)) {
+          normalized.steps = normalized.steps.map(normalizeStepForExecutor);
+        }
+        break;
+      default:
+        break;
+    }
+
+    return normalized;
+  };
+
+  const normalizeCookbookForExecutor = (cookbook) => {
+    if (!cookbook || typeof cookbook !== 'object') {
+      throw new Error('[conn-orch-cookbook:createProcessor] Invalid cookbook - Expected object');
+    }
+    if (!Array.isArray(cookbook.steps)) {
+      throw new Error('[conn-orch-cookbook:createProcessor] Invalid cookbook - Expected cookbook.steps as array');
+    }
+
+    return {
+      ...cookbook,
+      steps: cookbook.steps.map(normalizeStepForExecutor)
+    };
+  };
+
   return {
     /**
      * Process a cookbook through the full pipeline
@@ -106,7 +175,7 @@ function createProcessor(config = {}) {
      * @param {Object} [context={}] - Execution context
      * @returns {Promise<Object>} Execution result
      */
-    async process(cookbook, context = {}) {
+    async process(cookbook, input = {}) {
       // Parse if string (file path)
       if (typeof cookbook === 'string') {
         cookbook = await parseCookbookFromFile(cookbook);
@@ -118,19 +187,15 @@ function createProcessor(config = {}) {
       // Validate all references
       validateAllReferences(cookbook);
 
-      // Execute with routing and transformation
-      const executionContext = {
-        ...context,
-        router,
-        transformer,
-        mapper
-      };
+      const cookbookForExecutor = normalizeCookbookForExecutor(cookbook);
+      const executor = new CookbookExecutor(cookbookForExecutor, config.executor || {});
 
-      return executor.execute(cookbook, executionContext);
+      // Execute
+      return executor.execute(input);
     },
 
     // Expose components for direct access
-    executor,
+    executor: null,
     router,
     transformer,
     mapper
@@ -156,8 +221,20 @@ function createProcessor(config = {}) {
  * });
  */
 async function executeStep(step, context = {}) {
-  const executor = new CookbookExecutor();
-  return executor.executeStep(step, context);
+  if (!step || typeof step !== 'object') {
+    throw new Error('[conn-orch-cookbook:executeStep] Invalid step - Expected object');
+  }
+  if (!step.step_id) {
+    throw new Error('[conn-orch-cookbook:executeStep] Missing step.step_id - Expected V2.1 step');
+  }
+
+  const cookbook = {
+    version: '2.1.0',
+    steps: [step]
+  };
+
+  const processor = createProcessor();
+  return await processor.process(cookbook, context);
 }
 
 /**
@@ -175,8 +252,8 @@ async function executeStep(step, context = {}) {
  * });
  */
 async function executeWorkflow(cookbook, context = {}) {
-  const executor = new CookbookExecutor();
-  return executor.execute(cookbook, context);
+  const processor = createProcessor();
+  return await processor.process(cookbook, context);
 }
 
 // Export everything as unified interface