graphai 1.0.13 → 2.0.0

package/lib/bundle.esm.js

@@ -61,10 +61,127 @@ const GraphAILogger = {
     error,
 };
 
+const propFunctionRegex = /^[a-zA-Z]+\([^)]*\)$/;
+const propArrayFunction = (result, propId) => {
+    if (Array.isArray(result)) {
+        if (propId === "length()") {
+            return result.length;
+        }
+        if (propId === "flat()") {
+            return result.flat();
+        }
+        if (propId === "toJSON()") {
+            return JSON.stringify(result, null, 2);
+        }
+        if (propId === "isEmpty()") {
+            return result.length === 0;
+        }
+        // array join
+        const matchJoin = propId.match(/^join\(([,-\s]?)\)$/);
+        if (matchJoin && Array.isArray(matchJoin)) {
+            return result.join(matchJoin[1] ?? "");
+        }
+    }
+    return undefined;
+};
+const propObjectFunction = (result, propId) => {
+    if (isObject(result)) {
+        if (propId === "keys()") {
+            return Object.keys(result);
+        }
+        if (propId === "values()") {
+            return Object.values(result);
+        }
+        if (propId === "toJSON()") {
+            return JSON.stringify(result, null, 2);
+        }
+    }
+    return undefined;
+};
+const propStringFunction = (result, propId) => {
+    if (typeof result === "string") {
+        if (propId === "codeBlock()") {
+            const match = ("\n" + result).match(/\n```[a-zA-z]*([\s\S]*?)\n```/);
+            if (match) {
+                return match[1];
+            }
+        }
+        if (propId === "jsonParse()") {
+            return JSON.parse(result);
+        }
+        if (propId === "toNumber()") {
+            const ret = Number(result);
+            if (!isNaN(ret)) {
+                return ret;
+            }
+        }
+        if (propId === "trim()") {
+            return result.trim();
+        }
+        if (propId === "toLowerCase()") {
+            return result.toLowerCase();
+        }
+        if (propId === "toUpperCase()") {
+            return result.toUpperCase();
+        }
+        const sliceMatch = propId.match(/^slice\((-?\d+)(?:,\s*(-?\d+))?\)/);
+        if (sliceMatch) {
+            if (sliceMatch[2] !== undefined) {
+                return result.slice(Number(sliceMatch[1]), Number(sliceMatch[2]));
+            }
+            if (sliceMatch[1] !== undefined) {
+                return result.slice(Number(sliceMatch[1]));
+            }
+            GraphAILogger.warn("slice is not valid format: " + sliceMatch);
+        }
+        const splitMatch = propId.match(/^split\(([-_:;.,\s\n]+)\)$/);
+        if (splitMatch) {
+            return result.split(splitMatch[1]);
+        }
+    }
+    return undefined;
+};
+const propNumberFunction = (result, propId) => {
+    if (result !== undefined && Number.isFinite(result)) {
+        if (propId === "toString()") {
+            return String(result);
+        }
+        const regex = /^add\((-?\d+)\)$/;
+        const match = propId.match(regex);
+        if (match) {
+            return Number(result) + Number(match[1]);
+        }
+    }
+    return undefined;
+};
+const propBooleanFunction = (result, propId) => {
+    if (typeof result === "boolean") {
+        if (propId === "not()") {
+            return !result;
+        }
+    }
+    return undefined;
+};
+const propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction];
+const utilsFunctions = (input, nodes) => {
+    if (input === "@now" || input === "@now_ms") {
+        return Date.now();
+    }
+    if (input === "@now_s") {
+        return Math.floor(Date.now() / 1000);
+    }
+    if (input === "@loop") {
+        return nodes[loopCounterKey].result;
+    }
+    // If a placeholder does not match any key, replace it with an empty string.
+    GraphAILogger.warn("not match template utility function: ${" + input + "}");
+    return "";
+};
+
 const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
-const parseNodeName = (inputNodeId, isSelfNode = false) => {
+const parseNodeName = (inputNodeId, isSelfNode = false, nodes) => {
     if (isSelfNode) {
         if (typeof inputNodeId === "string" && inputNodeId[0] === ".") {
             const parts = inputNodeId.split(".");
@@ -75,14 +192,19 @@ const parseNodeName = (inputNodeId, isSelfNode = false) => {
     if (typeof inputNodeId === "string") {
         const regex = /^:(.*)$/;
         const match = inputNodeId.match(regex);
-        if (!match) {
-            return { value: inputNodeId }; // string literal
+        if (match) {
+            const parts = match[1].split(/(?<!\()\.(?!\))/);
+            if (parts.length == 1) {
+                return { nodeId: parts[0] };
+            }
+            return { nodeId: parts[0], propIds: parts.slice(1) };
         }
-        const parts = match[1].split(/(?<!\()\.(?!\))/);
-        if (parts.length == 1) {
-            return { nodeId: parts[0] };
+        const regexUtil = /^@(.*)$/;
+        const matchUtil = inputNodeId.match(regexUtil);
+        // Only when just called from resultsOfInner
+        if (nodes && matchUtil) {
+            return { value: utilsFunctions(inputNodeId, nodes) };
         }
-        return { nodeId: parts[0], propIds: parts.slice(1) };
     }
     return { value: inputNodeId }; // non-string literal
 };
@@ -279,123 +401,6 @@ class TransactionLog {
     }
 }
 
-const propFunctionRegex = /^[a-zA-Z]+\([^)]*\)$/;
-const propArrayFunction = (result, propId) => {
-    if (Array.isArray(result)) {
-        if (propId === "length()") {
-            return result.length;
-        }
-        if (propId === "flat()") {
-            return result.flat();
-        }
-        if (propId === "toJSON()") {
-            return JSON.stringify(result, null, 2);
-        }
-        if (propId === "isEmpty()") {
-            return result.length === 0;
-        }
-        // array join
-        const matchJoin = propId.match(/^join\(([,-\s]?)\)$/);
-        if (matchJoin && Array.isArray(matchJoin)) {
-            return result.join(matchJoin[1] ?? "");
-        }
-    }
-    return undefined;
-};
-const propObjectFunction = (result, propId) => {
-    if (isObject(result)) {
-        if (propId === "keys()") {
-            return Object.keys(result);
-        }
-        if (propId === "values()") {
-            return Object.values(result);
-        }
-        if (propId === "toJSON()") {
-            return JSON.stringify(result, null, 2);
-        }
-    }
-    return undefined;
-};
-const propStringFunction = (result, propId) => {
-    if (typeof result === "string") {
-        if (propId === "codeBlock()") {
-            const match = ("\n" + result).match(/\n```[a-zA-z]*([\s\S]*?)\n```/);
-            if (match) {
-                return match[1];
-            }
-        }
-        if (propId === "jsonParse()") {
-            return JSON.parse(result);
-        }
-        if (propId === "toNumber()") {
-            const ret = Number(result);
-            if (!isNaN(ret)) {
-                return ret;
-            }
-        }
-        if (propId === "trim()") {
-            return result.trim();
-        }
-        if (propId === "toLowerCase()") {
-            return result.toLowerCase();
-        }
-        if (propId === "toUpperCase()") {
-            return result.toUpperCase();
-        }
-        const sliceMatch = propId.match(/^slice\((-?\d+)(?:,\s*(-?\d+))?\)/);
-        if (sliceMatch) {
-            if (sliceMatch[2] !== undefined) {
-                return result.slice(Number(sliceMatch[1]), Number(sliceMatch[2]));
-            }
-            if (sliceMatch[1] !== undefined) {
-                return result.slice(Number(sliceMatch[1]));
-            }
-            GraphAILogger.warn("slice is not valid format: " + sliceMatch);
-        }
-        const splitMatch = propId.match(/^split\(([-_:;.,\s\n]+)\)$/);
-        if (splitMatch) {
-            return result.split(splitMatch[1]);
-        }
-    }
-    return undefined;
-};
-const propNumberFunction = (result, propId) => {
-    if (result !== undefined && Number.isFinite(result)) {
-        if (propId === "toString()") {
-            return String(result);
-        }
-        const regex = /^add\((-?\d+)\)$/;
-        const match = propId.match(regex);
-        if (match) {
-            return Number(result) + Number(match[1]);
-        }
-    }
-    return undefined;
-};
-const propBooleanFunction = (result, propId) => {
-    if (typeof result === "boolean") {
-        if (propId === "not()") {
-            return !result;
-        }
-    }
-    return undefined;
-};
-const propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction];
-const utilsFunctions = (input, nodes) => {
-    if (input === "@now" || input === "@now_ms") {
-        return Date.now();
-    }
-    if (input === "@now_s") {
-        return Math.floor(Date.now() / 1000);
-    }
-    if (input === "@loop") {
-        return nodes[loopCounterKey].result;
-    }
-    // If a placeholder does not match any key, replace it with an empty string.
-    GraphAILogger.warn("not match template utility function: ${" + input + "}");
-    return "";
-};
-
 const getNestedData = (result, propId, propFunctions) => {
     const match = propId.match(propFunctionRegex);
     if (match) {
@@ -477,7 +482,8 @@ const resultsOfInner = (input, nodes, propFunctions, isSelfNode = false) => {
             return replaceTemplatePlaceholders(input, templateMatch, nodes, propFunctions, isSelfNode);
         }
     }
-    return resultOf(parseNodeName(input, isSelfNode), nodes, propFunctions);
+    // :node.prod
+    return resultOf(parseNodeName(input, isSelfNode, nodes), nodes, propFunctions);
 };
 const resultsOf = (inputs, nodes, propFunctions, isSelfNode = false) => {
     return Object.keys(inputs).reduce((tmp, key) => {
@@ -587,7 +593,7 @@ class ComputedNode extends Node {
         this.output = data.output;
         this.dataSources = [
             ...(data.inputs ? inputs2dataSources(data.inputs).flat(10) : []),
-            ...(data.params ? inputs2dataSources(data.params).flat(10) : []),
+            // ...(data.params ? inputs2dataSources(data.params).flat(10) : []),
             ...(this.agentId ? [parseNodeName(this.agentId)] : []),
             ...(data.passThrough ? inputs2dataSources(data.passThrough).flat(10) : []),
         ];
@@ -863,7 +869,8 @@ class ComputedNode extends Node {
         // From graphAgent(nested, map), set the instance of graphai, and use abort on the child graphai.
         this.debugInfo = this.getDebugInfo(agentId);
         const context = {
-            params: this.graph.resultsOf(this.params),
+            //params: this.graph.resultsOf(this.params),
+            params: this.params,
             namedInputs: previousResults,
             inputSchema: this.agentFunction ? undefined : this.graph.getAgentFunctionInfo(agentId)?.inputs,
             debugInfo: this.debugInfo,
@@ -1361,9 +1368,9 @@ class GraphAI {
             .join("\n");
     }
     // Public API
-    results(all) {
+    results(all, internalUse = false) {
         return Object.keys(this.nodes)
-            .filter((nodeId) => (all && nodeId !== loopCounterKey) || this.nodes[nodeId].isResult)
+            .filter((nodeId) => (all && (internalUse || nodeId !== loopCounterKey)) || this.nodes[nodeId].isResult)
             .reduce((results, nodeId) => {
             const node = this.nodes[nodeId];
             if (node.result !== undefined) {
@@ -1482,12 +1489,12 @@ class GraphAI {
             return false;
         }
         // We need to update static nodes, before checking the condition
-        const previousResults = this.results(true); // results from previous loop
+        const previousResults = this.results(true, true); // results from previous loop
         this.updateStaticNodes(previousResults);
         if (loop.count === undefined || this.repeatCount < loop.count) {
             if (loop.while) {
                 const source = parseNodeName(loop.while);
-                const value = this.getValueFromResults(source, this.results(true));
+                const value = this.getValueFromResults(source, this.results(true, true));
                 // NOTE: We treat an empty array as false.
                 if (!isLogicallyTrue(value)) {
                     return false; // while condition is not met