@rkmodules/rules 0.0.162 → 0.0.164

package/dist/index.cjs.js

@@ -589,6 +589,30 @@ function mergeTrees() {
     return out;
 }
 
+function mergeWithOrder() {
+    var objects = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        objects[_i] = arguments[_i];
+    }
+    var merged = {};
+    var keys = [];
+    objects.forEach(function (obj) {
+        Object.keys(obj).forEach(function (key) {
+            if (!keys.includes(key)) {
+                keys.push(key);
+            }
+        });
+    });
+    keys.forEach(function (key) {
+        for (var i = objects.length - 1; i >= 0; i--) {
+            if (key in objects[i]) {
+                merged[key] = objects[i][key];
+                break;
+            }
+        }
+    });
+    return merged;
+}
 function isReference(value) {
     return (typeof value === "string" && !!value.match(/^<([\w\.]+)>$/)
     // value.startsWith("<") &&
@@ -7059,16 +7083,22 @@ OutputNode.displayName = "OutputNode";
 
 var DynamicOutput = React.memo(function (_a) {
     var id = _a.id, data = _a.data, selected = _a.selected;
-    var _b = __read(React.useState({}), 2), outputs = _b[0], setOutputs = _b[1];
+    var outputDefs = data.outputDefs || {};
+    Object.keys(data.outputs || {}).forEach(function (key) {
+        if (!outputDefs[key]) {
+            outputDefs[key] = { type: "any", label: key };
+        }
+    });
+    var _b = __read(React.useState(outputDefs), 2), outputs = _b[0], setOutputs = _b[1];
     var engine = useEngine();
     React.useEffect(function () {
         return engine.subscribe("functionResult", function (event) {
             if (event.name === id) {
                 var result = event.result || {};
-                setOutputs(Object.fromEntries(Object.keys(result).map(function (name, i) { return [
+                setOutputs(mergeWithOrder(Object.fromEntries(Object.keys(result).map(function (name, i) { return [
                     name,
                     { type: "any", label: name },
-                ]; })));
+                ]; })), outputs));
             }
         });
     }, []);
@@ -7295,6 +7325,7 @@ function createNode(engine, id, fncall, options) {
             description: calledFn === null || calledFn === void 0 ? void 0 : calledFn.description,
             inputs: fncall.inputs,
             params: fncall.params,
+            outputs: {},
             inputDefs: __assign(__assign({}, fncall.inputDefs), calledFn === null || calledFn === void 0 ? void 0 : calledFn.inputs),
             paramDefs: (calledFn === null || calledFn === void 0 ? void 0 : calledFn.params) || {},
             outputDefs: (calledFn === null || calledFn === void 0 ? void 0 : calledFn.outputs) || {},
@@ -7316,6 +7347,16 @@ function createEdge(nodeId, ref) {
         targetHandle: "".concat(nodeId, "-").concat(safeName(ref.name)),
     };
 }
+function addOutputToNode(nodes, ref, targetId) {
+    var _a;
+    var node = nodes[ref.refNode];
+    if (!node) {
+        console.warn("Node not found: " + ref.refNode);
+        console.log(nodes, ref, targetId);
+        return;
+    }
+    node.data.outputs = __assign(__assign({}, node.data.outputs), (_a = {}, _a[ref.refField] = "".concat(targetId, ".").concat(ref.name), _a));
+}
 /**
  * flow state stores nodes and edges for the flow graph these can be updated when the function changes
  * using setFn
@@ -7346,6 +7387,7 @@ var useFlowState = zustand.create(function (set, get) { return ({
         }
         var oldKeys = Object.keys((oldFn === null || oldFn === void 0 ? void 0 : oldFn.body) || {});
         var newKeys = Object.keys(fn.body || {});
+        var edgesToAdd = [];
         // remove all the nodes that were removed
         Object.keys(nodes).forEach(function (key) {
             if (!newKeys.includes(key)) {
@@ -7377,7 +7419,7 @@ var useFlowState = zustand.create(function (set, get) { return ({
             // add edges
             var refs = getReferences(fncall.inputs || {});
             refs.forEach(function (ref) {
-                edges.push(createEdge(key_1, ref));
+                edgesToAdd.push([key_1, ref]);
             });
         }
         // make sure there is an input node if inputs are defined
@@ -7402,7 +7444,7 @@ var useFlowState = zustand.create(function (set, get) { return ({
             // add edges
             var refs = getReferences(fncall.inputs || {});
             refs.forEach(function (ref) {
-                edges.push(createEdge(key, ref));
+                edgesToAdd.push([key, ref]);
             });
         });
         // update the changed nodes
@@ -7424,9 +7466,14 @@ var useFlowState = zustand.create(function (set, get) { return ({
             edges = edges === null || edges === void 0 ? void 0 : edges.filter(function (e) { return e.target !== key; });
             // add the edge
             refs.forEach(function (ref) {
-                edges.push(createEdge(key, ref));
+                edgesToAdd.push([key, ref]);
             });
         });
+        edgesToAdd.forEach(function (_a) {
+            var _b = __read(_a, 2), nodeId = _b[0], ref = _b[1];
+            edges.push(createEdge(nodeId, ref));
+            addOutputToNode(nodes, ref, nodeId);
+        });
         // console.log("final graph", nodes, edges);
         // update the function, nodes and edges
         set({ fn: fn, nodes: nodes, edges: edges });
@@ -7491,7 +7538,7 @@ var ConnectionLine = (function (_a) {
  */
 var emptyObject = {};
 function FlowInner(_a) {
-    var fn = _a.function, _b = _a.positions, defaultPositions = _b === void 0 ? emptyObject : _b, engine = _a.engine, _c = _a.center, center = _c === void 0 ? true : _c, fitView = _a.fitView, _d = _a.customNodes, customNodes = _d === void 0 ? {} : _d, onChange = _a.onChange, onClick = _a.onClick, onContextMenu = _a.onContextMenu, onSelect = _a.onSelect, onInit = _a.onInit;
+    var fn = _a.function, _b = _a.positions, defaultPositions = _b === void 0 ? emptyObject : _b, engine = _a.engine, _c = _a.center, center = _c === void 0 ? true : _c, fitView = _a.fitView, _d = _a.customNodes, customNodes = _d === void 0 ? {} : _d, onChange = _a.onChange, onClick = _a.onClick, onContextMenu = _a.onContextMenu, onMouseMove = _a.onMouseMove, onSelect = _a.onSelect, onInit = _a.onInit;
     var _e = __read(React.useState(null), 2), instance = _e[0], setInstance = _e[1];
     var handleInit = function (instance) {
         setInstance(instance);
@@ -7595,21 +7642,30 @@ function FlowInner(_a) {
     }, [onChange, fn]);
     // handle canvas clicks to be able to place nodes
     var handleClick = function (e) {
-        if (instance) {
+        if (instance && onClick) {
             var position = instance.screenToFlowPosition({
                 x: e.clientX,
                 y: e.clientY,
             });
-            onClick === null || onClick === void 0 ? void 0 : onClick(e, position);
+            onClick(e, position);
         }
     };
     var handleContextMenu = function (e) {
-        if (instance) {
+        if (instance && onContextMenu) {
+            var position = instance.screenToFlowPosition({
+                x: e.clientX,
+                y: e.clientY,
+            });
+            onContextMenu(e, position);
+        }
+    };
+    var handleMouseMove = function (e) {
+        if (instance && onMouseMove) {
             var position = instance.screenToFlowPosition({
                 x: e.clientX,
                 y: e.clientY,
             });
-            onContextMenu === null || onContextMenu === void 0 ? void 0 : onContextMenu(e, position);
+            onMouseMove(e, position);
         }
     };
     var onNodesChange = React.useCallback(function (changes) {
@@ -7632,7 +7688,7 @@ function FlowInner(_a) {
             return react.applyEdgeChanges(changes, edgesSnapshot);
         });
     }, []);
-    return (React.createElement(react.ReactFlow, { ref: drop, nodes: nodes, edges: edges, nodeTypes: __assign(__assign({}, nodeTypes), customNodes), onNodesChange: onNodesChange, onEdgesChange: onEdgesChange, onNodesDelete: onNodesDelete, onEdgesDelete: onEdgesDelete, onNodeDragStop: function (e, n) { return updatePosition(n.id, n.position); }, onConnect: onConnect, onInit: handleInit, onPaneClick: handleClick, onPaneContextMenu: handleContextMenu, fitView: center || fitView, fitViewOptions: {
+    return (React.createElement(react.ReactFlow, { ref: drop, nodes: nodes, edges: edges, nodeTypes: __assign(__assign({}, nodeTypes), customNodes), onNodesChange: onNodesChange, onEdgesChange: onEdgesChange, onNodesDelete: onNodesDelete, onEdgesDelete: onEdgesDelete, onNodeDragStop: function (e, n) { return updatePosition(n.id, n.position); }, onConnect: onConnect, onInit: handleInit, onPaneClick: handleClick, onPaneContextMenu: handleContextMenu, onPaneMouseMove: handleMouseMove, fitView: center || fitView, fitViewOptions: {
             minZoom: fitView ? undefined : 1,
             maxZoom: fitView ? undefined : 1,
         }, 
@@ -8729,6 +8785,7 @@ exports.isSingleTon = isSingleTon;
 exports.isTree = isTree;
 exports.mapTree = mapTree;
 exports.mapTreeBranch = mapTreeBranch;
+exports.mergeWithOrder = mergeWithOrder;
 exports.nAryOnTree = nAryOnTree;
 exports.nAryOnTreeBranch = nAryOnTreeBranch;
 exports.normalizePaths = normalizePaths;