@receptron/graphai_vue_cytoscape 0.0.4 → 0.0.6

package/lib/cytoscape.d.ts

@@ -1,7 +1,10 @@
 import { Ref, ComputedRef } from "vue";
 import { GraphData, NodeState } from "graphai";
+import { DataSource } from "graphai/lib/type";
+export declare const inputs2dataSources: (inputs: any) => string[];
+export declare const dataSourceNodeIds: (sources: DataSource[]) => string[];
 export declare const useCytoscape: (selectedGraph: ComputedRef<GraphData> | Ref<GraphData>) => {
-    cytoscapeRef: Ref<any>;
+    cytoscapeRef: Ref<any, any>;
     updateCytoscape: (nodeId: string, state: NodeState) => Promise<void>;
     resetCytoscape: () => void;
 };

package/lib/cytoscape.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -40,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useCytoscape = void 0;
+exports.useCytoscape = exports.dataSourceNodeIds = exports.inputs2dataSources = void 0;
 var vue_1 = require("vue");
 var graphai_1 = require("graphai");
 var cytoscape_1 = __importDefault(require("cytoscape"));
@@ -114,11 +114,34 @@ var colorMap = (_a = {},
     _a);
 var parseInput = function (input) {
     // WARNING: Assuming the first character is always ":"
+    console.log(input);
     var ids = input.slice(1).split(".");
     var source = ids.shift() || "";
     var label = ids.length ? ids.join(".") : undefined;
     return { source: source, label: label };
 };
+var inputs2dataSources = function (inputs) {
+    if (Array.isArray(inputs)) {
+        return inputs.map(function (inp) { return (0, exports.inputs2dataSources)(inp); }).flat();
+    }
+    if ((0, graphai_1.isObject)(inputs)) {
+        return Object.values(inputs)
+            .map(function (input) { return (0, exports.inputs2dataSources)(input); })
+            .flat();
+    }
+    if (typeof inputs === "string") {
+        var templateMatch = Array.from(inputs.matchAll(/\${(:[^}]+)}/g)).map(function (m) { return m[1]; });
+        if (templateMatch.length > 0) {
+            return (0, exports.inputs2dataSources)(templateMatch);
+        }
+    }
+    return inputs;
+};
+exports.inputs2dataSources = inputs2dataSources;
+var dataSourceNodeIds = function (sources) {
+    return sources.filter(function (source) { return source.nodeId; }).map(function (source) { return source.nodeId; });
+};
+exports.dataSourceNodeIds = dataSourceNodeIds;
 var cytoscapeFromGraph = function (graph_data) {
     var elements = Object.keys(graph_data.nodes || {}).reduce(function (tmp, nodeId) {
         var node = graph_data.nodes[nodeId];
@@ -134,8 +157,7 @@ var cytoscapeFromGraph = function (graph_data) {
         tmp.map[nodeId] = cyNode;
         if ("inputs" in node) {
             // computed node
-            var inputs = Array.isArray(node.inputs) ? node.inputs : Object.values(node.inputs || {});
-            (inputs !== null && inputs !== void 0 ? inputs : []).forEach(function (input) {
+            (0, exports.inputs2dataSources)(node.inputs).forEach(function (input) {
                 var _a = parseInput(input), source = _a.source, label = _a.label;
                 tmp.edges.push({
                     data: {
@@ -173,7 +195,7 @@ var useCytoscape = function (selectedGraph) {
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
-                    if (!(state === graphai_1.NodeState.Completed || state === graphai_1.NodeState.Waiting)) return [3 /*break*/, 2];
+                    if (![graphai_1.NodeState.Completed, graphai_1.NodeState.Waiting].includes(state)) return [3 /*break*/, 2];
                     return [4 /*yield*/, (0, graphai_1.sleep)(100)];
                 case 1:
                     _d.sent();
@@ -187,11 +209,9 @@ var useCytoscape = function (selectedGraph) {
                         // computed node
                         elements.map[nodeId].data.color = colorPriority;
                     }
-                    else {
-                        if ("value" in nodeData && state === graphai_1.NodeState.Waiting) {
-                            // static node
-                            elements.map[nodeId].data.color = colorStatic;
-                        }
+                    else if ("value" in nodeData && state === graphai_1.NodeState.Waiting) {
+                        // static node
+                        elements.map[nodeId].data.color = colorStatic;
                     }
                     cytoscapeData.value = { elements: elements };
                     if (!(state === graphai_1.NodeState.Injected)) return [3 /*break*/, 4];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@receptron/graphai_vue_cytoscape",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "main": "lib/cytoscape.js",
   "files": [
     "./lib"
@@ -12,7 +12,8 @@
     "preview": "vite preview",
     "build-only": "vite build",
     "type-check": "vue-tsc --build --force",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "echo nothing",
+    "eslint": "eslint src",
     "format": "prettier --write src/"
   },
   "repository": {
@@ -26,31 +27,22 @@
   },
   "homepage": "https://github.com/receptron/graphai_utils/tree/main/packages/vue-cytoscape#readme",
   "dependencies": {
-    "cytoscape": "^3.29.2",
+    "cytoscape": "^3.30.3",
     "cytoscape-klay": "^3.1.4"
   },
   "devDependencies": {
-    "graphai": "^0.5.1",
-    "vue": "^3.4.21",
-    "@graphai/vanilla": "^0.0.3",
-    "@babel/types": "^7.24.7",
+    "@babel/types": "^7.26.0",
     "@rushstack/eslint-patch": "^1.8.0",
     "@tsconfig/node20": "^20.1.4",
-    "@types/node": "^20.12.5",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "@vue/eslint-config-prettier": "^9.0.0",
-    "@vue/eslint-config-typescript": "^13.0.0",
+    "@vitejs/plugin-vue": "^5.1.4",
     "@vue/tsconfig": "^0.5.1",
     "autoprefixer": "^10.4.19",
-    "eslint": "^8.57.0",
-    "eslint-plugin-vue": "^9.23.0",
-    "npm-run-all2": "^6.1.2",
-    "postcss": "^8.4.38",
-    "prettier": "^3.2.5",
-    "tailwindcss": "^3.4.4",
-    "typescript": "~5.4.0",
-    "vite": "^5.2.13",
-    "vue-tsc": "^2.0.11"
+    "npm-run-all2": "^7.0.1",
+    "postcss": "^8.4.47",
+    "tailwindcss": "^3.4.13",
+    "vite": "^5.4.10",
+    "vue": "^3.5.12",
+    "vue-tsc": "^2.1.10"
   },
   "types": "./lib/cytoscape.d.ts",
   "directories": {