@hexabot-ai/agentic 3.1.2-beta.1 → 3.1.2

package/dist/cjs/workflow-values.js

@@ -12,6 +12,30 @@ exports.mergeSettings = exports.evaluateMapping = exports.evaluateValue = export
 const jsonata_1 = __importDefault(require("jsonata"));
 /** Basic object guard that rejects arrays and null. */
 const isPlainObject = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+const resolveNestedExpressions = async (value, scope, seen = new WeakSet()) => {
+    if (typeof value === 'string' && value.startsWith('=')) {
+        return (0, exports.evaluateValue)((0, exports.compileValue)(value), scope);
+    }
+    if (Array.isArray(value)) {
+        if (seen.has(value)) {
+            return value;
+        }
+        seen.add(value);
+        return Promise.all(value.map((entry) => resolveNestedExpressions(entry, scope, seen)));
+    }
+    if (isPlainObject(value)) {
+        if (seen.has(value)) {
+            return value;
+        }
+        seen.add(value);
+        const entries = await Promise.all(Object.entries(value).map(async ([key, entry]) => [
+            key,
+            await resolveNestedExpressions(entry, scope, seen),
+        ]));
+        return Object.fromEntries(entries);
+    }
+    return value;
+};
 const registerJsonataFunctions = (expression, registry) => {
     if (!registry) {
         return;
@@ -68,10 +92,11 @@ const evaluateMapping = async (mapping, scope) => {
     if (!mapping) {
         return {};
     }
-    const result = {};
-    for (const [key, compiled] of Object.entries(mapping)) {
-        result[key] = await (0, exports.evaluateValue)(compiled, scope);
-    }
+    const entries = await Promise.all(Object.entries(mapping).map(async ([key, compiled]) => [
+        key,
+        await resolveNestedExpressions(await (0, exports.evaluateValue)(compiled, scope), scope),
+    ]));
+    const result = Object.fromEntries(entries);
     return result;
 };
 exports.evaluateMapping = evaluateMapping;

package/dist/esm/workflow-values.js

@@ -6,6 +6,30 @@
 import jsonata from 'jsonata';
 /** Basic object guard that rejects arrays and null. */
 const isPlainObject = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+const resolveNestedExpressions = async (value, scope, seen = new WeakSet()) => {
+    if (typeof value === 'string' && value.startsWith('=')) {
+        return evaluateValue(compileValue(value), scope);
+    }
+    if (Array.isArray(value)) {
+        if (seen.has(value)) {
+            return value;
+        }
+        seen.add(value);
+        return Promise.all(value.map((entry) => resolveNestedExpressions(entry, scope, seen)));
+    }
+    if (isPlainObject(value)) {
+        if (seen.has(value)) {
+            return value;
+        }
+        seen.add(value);
+        const entries = await Promise.all(Object.entries(value).map(async ([key, entry]) => [
+            key,
+            await resolveNestedExpressions(entry, scope, seen),
+        ]));
+        return Object.fromEntries(entries);
+    }
+    return value;
+};
 const registerJsonataFunctions = (expression, registry) => {
     if (!registry) {
         return;
@@ -60,10 +84,11 @@ export const evaluateMapping = async (mapping, scope) => {
     if (!mapping) {
         return {};
     }
-    const result = {};
-    for (const [key, compiled] of Object.entries(mapping)) {
-        result[key] = await evaluateValue(compiled, scope);
-    }
+    const entries = await Promise.all(Object.entries(mapping).map(async ([key, compiled]) => [
+        key,
+        await resolveNestedExpressions(await evaluateValue(compiled, scope), scope),
+    ]));
+    const result = Object.fromEntries(entries);
     return result;
 };
 /**

package/dist/types/workflow-values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-values.d.ts","sourceRoot":"","sources":["../../src/workflow-values.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAc,KAAK,EAAE,MAAM,SAAS,CAAC;AAGjD,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,6BAA6B,GAAG,CAC1C,IAAI,EAAE,KAAK,EACX,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,OAAO,CAAC;AAEb,MAAM,MAAM,qBAAqB,GAC7B,6BAA6B,GAC7B;IACE,cAAc,EAAE,6BAA6B,CAAC;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AAE5E,MAAM,MAAM,mBAAmB,GAAG;IAChC,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;CAC5C,CAAC;AAgCF;;;GAGG;AACH,eAAO,MAAM,YAAY,GACvB,OAAO,OAAO,EACd,UAAU,mBAAmB,KAC5B,aASF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GACxB,UAAU,aAAa,EACvB,OAAO,eAAe,KACrB,OAAO,CAAC,OAAO,CAgBjB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,SAAS,eAAe,GAAG,SAAS,EACpC,OAAO,eAAe,KACrB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAYjC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,OAAO,OAAO,CAAC,QAAQ,CAAC,EACxB,WAAW,OAAO,CAAC,QAAQ,CAAC,KAC3B,OAAO,CAAC,QAAQ,CAsBlB,CAAC"}
+{"version":3,"file":"workflow-values.d.ts","sourceRoot":"","sources":["../../src/workflow-values.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAc,KAAK,EAAE,MAAM,SAAS,CAAC;AAGjD,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,6BAA6B,GAAG,CAC1C,IAAI,EAAE,KAAK,EACX,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,OAAO,CAAC;AAEb,MAAM,MAAM,qBAAqB,GAC7B,6BAA6B,GAC7B;IACE,cAAc,EAAE,6BAA6B,CAAC;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AAE5E,MAAM,MAAM,mBAAmB,GAAG;IAChC,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;CAC5C,CAAC;AAsEF;;;GAGG;AACH,eAAO,MAAM,YAAY,GACvB,OAAO,OAAO,EACd,UAAU,mBAAmB,KAC5B,aASF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GACxB,UAAU,aAAa,EACvB,OAAO,eAAe,KACrB,OAAO,CAAC,OAAO,CAgBjB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,SAAS,eAAe,GAAG,SAAS,EACpC,OAAO,eAAe,KACrB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBjC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,OAAO,OAAO,CAAC,QAAQ,CAAC,EACxB,WAAW,OAAO,CAAC,QAAQ,CAAC,KAC3B,OAAO,CAAC,QAAQ,CAsBlB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hexabot-ai/agentic",
-  "version": "3.1.2-beta.1",
+  "version": "3.1.2",
   "description": "Schemas and utilities for the Hexabot agentic workflow DSL.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/__tests__/workflow-values.test.ts

@@ -73,6 +73,25 @@ describe('workflow values', () => {
     });
   });
 
+  it('evaluates nested expressions inside literal objects', async () => {
+    const mapping = {
+      headers: compileValue({
+        nestedFiled: '=$input.headerValue',
+      }),
+    };
+    const values = await evaluateMapping(mapping, {
+      input: { headerValue: 'Bearer token-value' },
+      context: new TestContext().state,
+      output: {},
+    });
+
+    expect(values).toEqual({
+      headers: {
+        nestedFiled: 'Bearer token-value',
+      },
+    });
+  });
+
   it('handles missing mappings and deep merges settings', async () => {
     await expect(
       evaluateMapping(undefined, {

package/src/workflow-values.ts

@@ -35,6 +35,44 @@ export type CompileValueOptions = {
 /** Basic object guard that rejects arrays and null. */
 const isPlainObject = (value: unknown): value is Record<string, unknown> =>
   typeof value === 'object' && value !== null && !Array.isArray(value);
+const resolveNestedExpressions = async (
+  value: unknown,
+  scope: EvaluationScope,
+  seen: WeakSet<object> = new WeakSet(),
+): Promise<unknown> => {
+  if (typeof value === 'string' && value.startsWith('=')) {
+    return evaluateValue(compileValue(value), scope);
+  }
+
+  if (Array.isArray(value)) {
+    if (seen.has(value)) {
+      return value;
+    }
+    seen.add(value);
+
+    return Promise.all(
+      value.map((entry) => resolveNestedExpressions(entry, scope, seen)),
+    );
+  }
+
+  if (isPlainObject(value)) {
+    if (seen.has(value)) {
+      return value;
+    }
+    seen.add(value);
+
+    const entries = await Promise.all(
+      Object.entries(value).map(async ([key, entry]) => [
+        key,
+        await resolveNestedExpressions(entry, scope, seen),
+      ]),
+    );
+
+    return Object.fromEntries(entries);
+  }
+
+  return value;
+};
 const registerJsonataFunctions = (
   expression: Expression,
   registry?: JsonataFunctionRegistry,
@@ -118,11 +156,16 @@ export const evaluateMapping = async (
     return {};
   }
 
-  const result: Record<string, unknown> = {};
-
-  for (const [key, compiled] of Object.entries(mapping)) {
-    result[key] = await evaluateValue(compiled, scope);
-  }
+  const entries = await Promise.all(
+    Object.entries(mapping).map(async ([key, compiled]) => [
+      key,
+      await resolveNestedExpressions(
+        await evaluateValue(compiled, scope),
+        scope,
+      ),
+    ]),
+  );
+  const result: Record<string, unknown> = Object.fromEntries(entries);
 
   return result;
 };