graphai 0.5.9 → 0.5.11

package/lib/graphai.js

@@ -228,7 +228,7 @@ class GraphAI {
         this.updateStaticNodes(previousResults);
         if (loop.count === undefined || this.repeatCount < loop.count) {
             if (loop.while) {
-                const source = (0, utils_1.parseNodeName)(loop.while, this.version);
+                const source = (0, utils_1.parseNodeName)(loop.while);
                 const value = this.getValueFromResults(source, this.results(true));
                 // NOTE: We treat an empty array as false.
                 if (!(0, utils_1.isLogicallyTrue)(value)) {
@@ -269,7 +269,7 @@ class GraphAI {
         }
     }
     resultsOf(inputs, anyInput = false) {
-        const results = (0, result_1.resultsOf)(inputs ?? [], this.nodes, this.version);
+        const results = (0, result_1.resultsOf)(inputs ?? [], this.nodes);
         if (anyInput) {
             return (0, result_1.cleanResult)(results);
         }

package/lib/node.js

@@ -51,7 +51,7 @@ class ComputedNode extends Node {
         this.anyInput = data.anyInput ?? false;
         this.inputs = data.inputs;
         this.isNamedInputs = (0, utils_2.isObject)(data.inputs) && !Array.isArray(data.inputs);
-        this.dataSources = data.inputs ? (0, nodeUtils_1.inputs2dataSources)(data.inputs, graph.version).flat(10) : [];
+        this.dataSources = data.inputs ? (0, nodeUtils_1.inputs2dataSources)(data.inputs).flat(10) : [];
         if (data.inputs && !this.isNamedInputs) {
             console.warn(`array inputs have been deprecated. nodeId: ${nodeId}: see https://github.com/receptron/graphai/blob/main/docs/NamedInputs.md`);
         }
@@ -74,7 +74,7 @@ class ComputedNode extends Node {
             this.unlessSource = this.addPendingNode(data.unless);
         }
         this.dynamicParams = Object.keys(this.params).reduce((tmp, key) => {
-            const dataSource = (0, utils_2.parseNodeName)(this.params[key], graph.version < 0.3 ? 0.3 : graph.version);
+            const dataSource = (0, utils_2.parseNodeName)(this.params[key]);
             if (dataSource.nodeId) {
                 (0, utils_2.assert)(!this.anyInput, "Dynamic params are not supported with anyInput");
                 tmp[key] = dataSource;
@@ -88,7 +88,7 @@ class ComputedNode extends Node {
         return this.agentId ?? "__custom__function"; // only for display purpose in the log.
     }
     addPendingNode(nodeId) {
-        const source = (0, utils_2.parseNodeName)(nodeId, this.graph.version);
+        const source = (0, utils_2.parseNodeName)(nodeId);
         (0, utils_2.assert)(!!source.nodeId, `Invalid data source ${nodeId}`);
         this.pendings.add(source.nodeId);
         return source;
@@ -340,7 +340,7 @@ class StaticNode extends Node {
         this.isStaticNode = true;
         this.isComputedNode = false;
         this.value = data.value;
-        this.update = data.update ? (0, utils_2.parseNodeName)(data.update, graph.version) : undefined;
+        this.update = data.update ? (0, utils_2.parseNodeName)(data.update) : undefined;
         this.isResult = data.isResult ?? false;
     }
     injectValue(value, injectFrom) {

package/lib/result.d.ts

@@ -1,6 +1,6 @@
 import { DataSource, ResultData } from "./type";
 import { GraphNodes } from "./node";
-export declare const resultsOf: (inputs: Record<string, any> | Array<string>, nodes: GraphNodes, graphVersion: number) => Record<string, ResultData>;
+export declare const resultsOf: (inputs: Record<string, any> | Array<string>, nodes: GraphNodes) => Record<string, ResultData>;
 export declare const resultOf: (source: DataSource, nodes: GraphNodes) => ResultData;
 export declare const cleanResultInner: (results: ResultData) => ResultData | null;
 export declare const cleanResult: (results: Record<string, ResultData | undefined>) => Record<string, ResultData>;

package/lib/result.js

@@ -2,35 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanResult = exports.cleanResultInner = exports.resultOf = exports.resultsOf = void 0;
 const utils_1 = require("./utils/utils");
-const resultsOfInner = (input, nodes, graphVersion) => {
+const resultsOfInner = (input, nodes) => {
     if (Array.isArray(input)) {
-        return input.map((inp) => resultsOfInner(inp, nodes, graphVersion));
+        return input.map((inp) => resultsOfInner(inp, nodes));
     }
     if ((0, utils_1.isNamedInputs)(input)) {
-        return (0, exports.resultsOf)(input, nodes, graphVersion);
+        return (0, exports.resultsOf)(input, nodes);
     }
     if (typeof input === "string") {
         const templateMatch = [...input.matchAll(/\${(:[^}]+)}/g)].map((m) => m[1]);
         if (templateMatch.length > 0) {
-            const results = resultsOfInner(templateMatch, nodes, graphVersion);
+            const results = resultsOfInner(templateMatch, nodes);
             return Array.from(templateMatch.keys()).reduce((tmp, key) => {
                 return tmp.replaceAll("${" + templateMatch[key] + "}", results[key]);
             }, input);
         }
     }
-    return (0, exports.resultOf)((0, utils_1.parseNodeName)(input, graphVersion), nodes);
+    return (0, exports.resultOf)((0, utils_1.parseNodeName)(input), nodes);
 };
-const resultsOf = (inputs, nodes, graphVersion) => {
+const resultsOf = (inputs, nodes) => {
     // for inputs. TODO remove if array input is not supported
     if (Array.isArray(inputs)) {
         return inputs.reduce((tmp, key) => {
-            tmp[key] = resultsOfInner(key, nodes, graphVersion);
+            tmp[key] = resultsOfInner(key, nodes);
             return tmp;
         }, {});
     }
     return Object.keys(inputs).reduce((tmp, key) => {
         const input = inputs[key];
-        tmp[key] = (0, utils_1.isNamedInputs)(input) ? (0, exports.resultsOf)(input, nodes, graphVersion) : resultsOfInner(input, nodes, graphVersion);
+        tmp[key] = (0, utils_1.isNamedInputs)(input) ? (0, exports.resultsOf)(input, nodes) : resultsOfInner(input, nodes);
         return tmp;
     }, {});
 };

package/lib/utils/nodeUtils.d.ts

@@ -1,3 +1,3 @@
 import { DataSource } from "../type";
-export declare const inputs2dataSources: (inputs: any, graphVersion: number) => DataSource[];
+export declare const inputs2dataSources: (inputs: any) => DataSource[];
 export declare const dataSourceNodeIds: (sources: DataSource[]) => string[];

package/lib/utils/nodeUtils.js

@@ -3,22 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataSourceNodeIds = exports.inputs2dataSources = void 0;
 const utils_1 = require("./utils");
 // for dataSource
-const inputs2dataSources = (inputs, graphVersion) => {
+const inputs2dataSources = (inputs) => {
     if (Array.isArray(inputs)) {
-        return inputs.map((inp) => (0, exports.inputs2dataSources)(inp, graphVersion)).flat();
+        return inputs.map((inp) => (0, exports.inputs2dataSources)(inp)).flat();
     }
     if ((0, utils_1.isObject)(inputs)) {
         return Object.values(inputs)
-            .map((input) => (0, exports.inputs2dataSources)(input, graphVersion))
+            .map((input) => (0, exports.inputs2dataSources)(input))
             .flat();
     }
     if (typeof inputs === "string") {
         const templateMatch = [...inputs.matchAll(/\${(:[^}]+)}/g)].map((m) => m[1]);
         if (templateMatch.length > 0) {
-            return (0, exports.inputs2dataSources)(templateMatch, graphVersion);
+            return (0, exports.inputs2dataSources)(templateMatch);
         }
     }
-    return (0, utils_1.parseNodeName)(inputs, graphVersion);
+    return (0, utils_1.parseNodeName)(inputs);
 };
 exports.inputs2dataSources = inputs2dataSources;
 const dataSourceNodeIds = (sources) => {

package/lib/utils/utils.d.ts

@@ -1,6 +1,6 @@
 import { DataSource, ResultData, AgentFunction, DefaultInputData } from "../type";
 export declare const sleep: (milliseconds: number) => Promise<unknown>;
-export declare const parseNodeName: (inputNodeId: any, version: number) => DataSource;
+export declare const parseNodeName: (inputNodeId: any) => DataSource;
 export declare function assert(condition: boolean, message: string, isWarn?: boolean): asserts condition;
 export declare const isObject: (x: unknown) => x is object;
 export declare const isNull: (data: unknown) => data is null | undefined;

package/lib/utils/utils.js

@@ -6,25 +6,7 @@ const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
 exports.sleep = sleep;
-const parseNodeName_02 = (inputNodeId) => {
-    if (typeof inputNodeId === "string") {
-        const regex = /^"(.*)"$/;
-        const match = inputNodeId.match(regex);
-        if (match) {
-            return { value: match[1] }; // string literal
-        }
-        const parts = inputNodeId.split(".");
-        if (parts.length == 1) {
-            return { nodeId: parts[0] };
-        }
-        return { nodeId: parts[0], propIds: parts.slice(1) };
-    }
-    return { value: inputNodeId }; // non-string literal
-};
-const parseNodeName = (inputNodeId, version) => {
-    if (version === 0.2) {
-        return parseNodeName_02(inputNodeId);
-    }
+const parseNodeName = (inputNodeId) => {
     if (typeof inputNodeId === "string") {
         const regex = /^:(.*)$/;
         const match = inputNodeId.match(regex);
@@ -57,7 +39,9 @@ const isNull = (data) => {
 };
 exports.isNull = isNull;
 const getNestedData = (result, propId) => {
+    // for array.
     if (Array.isArray(result)) {
+        // $0, $1. array value.
         const regex = /^\$(\d+)$/;
         const match = propId.match(regex);
         if (match) {
@@ -73,9 +57,13 @@ const getNestedData = (result, propId) => {
         if (propId === "flat()") {
             return result.flat();
         }
-        const matchJoin = propId.match(/^join\(([,-])\)$/);
+        if (propId === "toJSON()") {
+            return JSON.stringify(result);
+        }
+        // array join
+        const matchJoin = propId.match(/^join\(([,-]?)\)$/);
         if (matchJoin && Array.isArray(matchJoin)) {
-            return result.join(matchJoin[1]);
+            return result.join(matchJoin[1] ?? "");
         }
         // flat, join
     }
@@ -86,12 +74,28 @@ const getNestedData = (result, propId) => {
         if (propId === "values()") {
             return Object.values(result);
         }
-        return result[propId];
+        if (propId === "toJSON()") {
+            return JSON.stringify(result);
+        }
+        if (propId in result) {
+            return result[propId];
+        }
     }
     else if (typeof result === "string") {
         if (propId === "jsonParse()") {
             return JSON.parse(result);
         }
+        if (propId === "toNumber()") {
+            const ret = Number(result);
+            if (!isNaN(ret)) {
+                return ret;
+            }
+        }
+    }
+    else if (Number.isFinite(result)) {
+        if (propId === "toString()") {
+            return String(result);
+        }
     }
     return undefined;
 };
@@ -99,6 +103,9 @@ const innerGetDataFromSource = (result, propIds) => {
     if (result && propIds && propIds.length > 0) {
         const propId = propIds[0];
         const ret = getNestedData(result, propId);
+        if (ret === undefined) {
+            console.error(`prop: ${propIds.join(".")} is not hit`);
+        }
         if (propIds.length > 1) {
             return innerGetDataFromSource(ret, propIds.slice(1));
         }

package/lib/validators/relation_validator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.relationValidator = void 0;
 const utils_1 = require("../utils/utils");
 const common_1 = require("../validators/common");
+const nodeUtils_1 = require("../utils/nodeUtils");
 const relationValidator = (data, staticNodeIds, computedNodeIds) => {
     const nodeIds = new Set(Object.keys(data.nodes));
     const pendings = {};
@@ -11,34 +12,34 @@ const relationValidator = (data, staticNodeIds, computedNodeIds) => {
     computedNodeIds.forEach((computedNodeId) => {
         const nodeData = data.nodes[computedNodeId];
         pendings[computedNodeId] = new Set();
-        if ("inputs" in nodeData && nodeData && nodeData.inputs) {
-            if (Array.isArray(nodeData.inputs)) {
-                nodeData.inputs.forEach((inputNodeId) => {
-                    const sourceNodeId = (0, utils_1.parseNodeName)(inputNodeId, data.version ?? 0.2).nodeId;
-                    if (sourceNodeId) {
-                        if (!nodeIds.has(sourceNodeId)) {
-                            throw new common_1.ValidationError(`Inputs not match: NodeId ${computedNodeId}, Inputs: ${sourceNodeId}`);
-                        }
-                        waitlist[sourceNodeId] === undefined && (waitlist[sourceNodeId] = new Set());
-                        pendings[computedNodeId].add(sourceNodeId);
-                        waitlist[sourceNodeId].add(computedNodeId);
+        const dataSourceValidator = (sourceType, sourceNodeIds) => {
+            sourceNodeIds.forEach((sourceNodeId) => {
+                if (sourceNodeId) {
+                    if (!nodeIds.has(sourceNodeId)) {
+                        throw new common_1.ValidationError(`${sourceType} not match: NodeId ${computedNodeId}, Inputs: ${sourceNodeId}`);
                     }
-                });
+                    waitlist[sourceNodeId] === undefined && (waitlist[sourceNodeId] = new Set());
+                    pendings[computedNodeId].add(sourceNodeId);
+                    waitlist[sourceNodeId].add(computedNodeId);
+                }
+            });
+        };
+        if ("agent" in nodeData && nodeData) {
+            if (nodeData.inputs) {
+                const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)(nodeData.inputs));
+                dataSourceValidator("Inputs", sourceNodeIds);
             }
-            else {
-                const keys = Object.keys(nodeData.inputs);
-                keys.forEach((key) => {
-                    const inputNodeId = nodeData.inputs[key];
-                    const sourceNodeId = (0, utils_1.parseNodeName)(inputNodeId, data.version ?? 0.3).nodeId;
-                    if (sourceNodeId) {
-                        if (!nodeIds.has(sourceNodeId)) {
-                            throw new common_1.ValidationError(`Inputs not match: NodeId ${computedNodeId}, Inputs: ${sourceNodeId}`);
-                        }
-                        waitlist[sourceNodeId] === undefined && (waitlist[sourceNodeId] = new Set());
-                        pendings[computedNodeId].add(sourceNodeId);
-                        waitlist[sourceNodeId].add(computedNodeId);
-                    }
-                });
+            if (nodeData.if) {
+                const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)({ if: nodeData.if }));
+                dataSourceValidator("If", sourceNodeIds);
+            }
+            if (nodeData.unless) {
+                const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)({ unless: nodeData.unless }));
+                dataSourceValidator("Unless", sourceNodeIds);
+            }
+            if (nodeData.graph && typeof nodeData?.graph === "string") {
+                const sourceNodeIds = (0, nodeUtils_1.dataSourceNodeIds)((0, nodeUtils_1.inputs2dataSources)({ graph: nodeData.graph }));
+                dataSourceValidator("Graph", sourceNodeIds);
             }
         }
     });
@@ -47,7 +48,7 @@ const relationValidator = (data, staticNodeIds, computedNodeIds) => {
         const nodeData = data.nodes[staticNodeId];
         if ("value" in nodeData && nodeData.update) {
             const update = nodeData.update;
-            const updateNodeId = (0, utils_1.parseNodeName)(update, data.version ?? 0.2).nodeId;
+            const updateNodeId = (0, utils_1.parseNodeName)(update).nodeId;
             if (!updateNodeId) {
                 throw new common_1.ValidationError("Update it a literal");
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "Asynchronous data flow execution engine for agentic AI apps.",
   "main": "lib/index.js",
   "files": [
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/receptron/graphai#readme",
   "devDependencies": {
-    "typedoc": "^0.26.7"
+    "typedoc": "^0.26.10"
   },
   "types": "./lib/index.d.ts",
   "directories": {