@rkmodules/rules 0.0.145 → 0.0.147

package/dist/index.cjs.js

@@ -609,9 +609,14 @@ function getValue$1(obj, path) {
         return;
     }
     var parts = path.split(".");
-    var value = obj[parts.shift() || ""];
-    while (parts.length && value) {
-        value = value[parts.shift() || ""];
+    var key = parts.shift() || "";
+    var safeObj = Object.fromEntries(Object.entries(obj).map(function (_a) {
+        var _b = __read(_a, 2), k = _b[0], v = _b[1];
+        return [safeName(k), v];
+    }));
+    var value = safeObj[key];
+    if (parts.length) {
+        return getValue$1(value, parts.join("."));
     }
     return value;
 }
@@ -2577,7 +2582,6 @@ var explodeObject = {
                         var _b = __read(_a, 2), key = _b[0], value = _b[1];
                         if (key[0] === "_")
                             return;
-                        key = safeName(key);
                         if (!outputs[key]) {
                             outputs[key] = {};
                         }
@@ -6288,23 +6292,48 @@ function Control(_a) {
     }
 }
 
+function Menu(_a) {
+    var handle = _a.handle, children = _a.children;
+    var _b = __read(React.useState(false), 2), open = _b[0], setOpen = _b[1];
+    var handleOpen = function () {
+        setOpen(!open);
+    };
+    var handleClose = function () {
+        setOpen(false);
+    };
+    return (React.createElement("div", { className: styles$1.Menu },
+        React.createElement("div", { onClick: handleOpen }, handle),
+        open && (React.createElement("div", { className: styles$1.MenuCanvas, onClick: handleClose }, children))));
+}
+function MenuItem(_a) {
+    var children = _a.children, props = __rest(_a, ["children"]);
+    return (React.createElement("div", __assign({ className: styles$1.MenuItem }, props), children));
+}
+
 var Input = function (_a) {
     var _b;
-    var name = _a.name, varDef = _a.varDef, id = _a.id, data = _a.data, onClick = _a.onClick;
+    var name = _a.name, varDef = _a.varDef, id = _a.id, data = _a.data, onClick = _a.onClick, onRename = _a.onRename, onDelete = _a.onDelete;
     var normalized = normalizeVarDef(varDef);
     var value = (_b = data.inputs) === null || _b === void 0 ? void 0 : _b[name];
     var isRef = isReference(value);
+    var portId = "".concat(id, "-").concat(safeName(name));
+    var showMenu = onRename || onDelete;
     var handleInputChange = function (param) { return function (value) {
         var _a;
         data.onChange({
             inputs: __assign(__assign({}, data.inputs), (_a = {}, _a[param] = value, _a)),
         });
     }; };
-    return (React.createElement(react.Handle, { type: "target", position: react.Position.Left, id: "".concat(id, "-").concat(name), className: classNames(styles$1.Input, styles$1.Port, styles$1["type-".concat(normalized.type)]), style: {
+    return (React.createElement(react.Handle, { type: "target", position: react.Position.Left, id: portId, className: classNames(styles$1.Input, styles$1.Port, styles$1["type-".concat(normalized.type)]), style: {
             "--type-color": "var(--color-".concat(normalized.type, ")"),
         }, onClick: onClick },
         React.createElement("span", { className: styles$1.PortLabel }, normalized.label || name),
-        !isRef && (React.createElement(Control, { vardef: normalized, value: value, onChange: handleInputChange(name), data: data }))));
+        !isRef && !showMenu && (React.createElement(Control, { vardef: normalized, value: value, onChange: handleInputChange(name), data: data })),
+        showMenu && (React.createElement("div", { style: { display: "flex" } },
+            React.createElement("span", { style: { flex: 1 } }),
+            React.createElement(Menu, { handle: React.createElement("button", null, "...") },
+                onRename && (React.createElement(MenuItem, { onClick: function () { return onRename(name, normalized); } }, "Rename")),
+                onDelete && (React.createElement(MenuItem, { onClick: function () { return onDelete(name); } }, "Delete")))))));
 };
 
 var Param = function (_a) {
@@ -6329,7 +6358,8 @@ var Param = function (_a) {
 var Output = function (_a) {
     var name = _a.name, varDef = _a.varDef, id = _a.id, onClick = _a.onClick, focus = _a.focus;
     var normalized = normalizeVarDef(varDef);
-    return (React.createElement(react.Handle, { type: "source", position: react.Position.Right, id: "".concat(id, "-").concat(name), className: classNames(styles$1.Output, styles$1.Port, styles$1["type-".concat(normalized.type)]), style: {
+    var portId = "".concat(id, "-").concat(safeName(name));
+    return (React.createElement(react.Handle, { type: "source", position: react.Position.Right, id: portId, className: classNames(styles$1.Output, styles$1.Port, styles$1["type-".concat(normalized.type)]), style: {
             "--type-color": "var(--color-".concat(normalized.type, ")"),
         }, onClick: onClick },
         React.createElement("span", { className: styles$1.PortLabel },
@@ -6562,24 +6592,6 @@ var Default = React.memo(function (_a) {
 });
 Default.displayName = "DefaultNode";
 
-function Menu(_a) {
-    var handle = _a.handle, children = _a.children;
-    var _b = __read(React.useState(false), 2), open = _b[0], setOpen = _b[1];
-    var handleOpen = function () {
-        setOpen(!open);
-    };
-    var handleClose = function () {
-        setOpen(false);
-    };
-    return (React.createElement("div", { className: styles$1.Menu },
-        React.createElement("div", { onClick: handleOpen }, handle),
-        open && (React.createElement("div", { className: styles$1.MenuCanvas, onClick: handleClose }, children))));
-}
-function MenuItem(_a) {
-    var children = _a.children, props = __rest(_a, ["children"]);
-    return (React.createElement("div", __assign({ className: styles$1.MenuItem }, props), children));
-}
-
 /**
  * todo: get input data from graphed function
  */
@@ -6805,6 +6817,8 @@ var OutputNode = React.memo(function (_a) {
             }
         });
     }); };
+    // TODO: this seems specifically for the output node only, adjusting the main rule IO spec,
+    // we need to change the current function spec instead
     var onAdd = function () { return __awaiter(void 0, void 0, void 0, function () {
         var newName;
         var _a;
@@ -6824,6 +6838,8 @@ var OutputNode = React.memo(function (_a) {
             }
         });
     }); };
+    // TODO: this seems specifically for the output node only, adjusting the main rule IO spec,
+    // we need to change the current function spec instead
     var onDelete = function (name) {
         var _a;
         (_a = data.onIOChange) === null || _a === void 0 ? void 0 : _a.call(data, function (fn) {
@@ -6839,17 +6855,9 @@ var OutputNode = React.memo(function (_a) {
                 var _b = __read(_a, 2), name = _b[0], varDef = _b[1];
                 return (React.createElement(Output, { key: "".concat(name, "_").concat(index), name: name, varDef: varDef, id: id, onClick: function () { return setFocus(name); }, focus: showPreview && focus === name }));
             }),
-            Object.entries(inputs || {}).map(function (_a) {
+            Object.entries(inputs || {}).map(function (_a, index) {
                 var _b = __read(_a, 2), name = _b[0], varDef = _b[1];
-                return (React.createElement(react.Handle, { key: name, type: "target", position: react.Position.Left, id: "".concat(id, "-").concat(name), className: classNames(styles$1.Input, styles$1.Port, styles$1["type-".concat(varDef.type)]), style: {
-                        "--type-color": "var(--color-".concat(varDef.type, ")"),
-                    } },
-                    React.createElement("span", { className: styles$1.PortLabel }, name),
-                    React.createElement("div", { style: { display: "flex" } },
-                        React.createElement("span", { style: { flex: 1 } }),
-                        React.createElement(Menu, { handle: React.createElement("button", null, "...") },
-                            React.createElement(MenuItem, { onClick: function () { return onRename(name); } }, "Rename"),
-                            React.createElement(MenuItem, { onClick: function () { return onDelete(name); } }, "Delete")))));
+                return (React.createElement(Input, { key: "".concat(name, "_").concat(index), name: name, varDef: varDef, id: id, data: data, onRename: onRename, onDelete: onDelete }));
             }),
             paramEntries.map(function (_a, index) {
                 var _b = __read(_a, 2), name = _b[0], varDef = _b[1];
@@ -6877,7 +6885,7 @@ var DynamicOutput = React.memo(function (_a) {
             if (event.name === id) {
                 var result = event.result || {};
                 setOutputs(Object.fromEntries(Object.keys(result).map(function (name, i) { return [
-                    safeName(name),
+                    name,
                     { type: "any", label: name },
                 ]; })));
             }
@@ -6887,12 +6895,104 @@ var DynamicOutput = React.memo(function (_a) {
 });
 DynamicOutput.displayName = "DynamicOutputNode";
 
+var NamedInput = function (_a) {
+    var _b;
+    var _c;
+    var id = _a.id, data = _a.data, selected = _a.selected;
+    var engine = useEngine();
+    // let fn = useGraphedFunction();
+    var prompt = usePrompts().prompt;
+    var inputEntries = Object.entries(data.inputDefs || {});
+    var outputEntries = Object.entries(data.outputDefs || {});
+    var paramEntries = Object.entries(data.paramDefs || {});
+    var _d = __read(React.useState({}), 2), result = _d[0], setResult = _d[1];
+    var _e = __read(React.useState(null), 2), duration = _e[0], setDuration = _e[1];
+    var _f = __read(useInner(((_c = outputEntries[0]) === null || _c === void 0 ? void 0 : _c[0]) || null, [data.outputDefs]), 2), focus = _f[0], setFocus = _f[1];
+    var _g = __read(React.useState(false), 2), showPreview = _g[0], setShowPreview = _g[1];
+    var previewValue = focus ? result[focus] : Object.values(result)[0];
+    React.useEffect(function () {
+        return engine.subscribe("functionResult", function (event) {
+            var _a;
+            if (event.name === id) {
+                setResult(event.result || {});
+                setDuration((_a = event.duration) !== null && _a !== void 0 ? _a : null);
+            }
+        });
+    }, []);
+    var onRename = function (name, def) { return __awaiter(void 0, void 0, void 0, function () {
+        var newLabel, inputDefs;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, prompt("Enter new name", def.label || name)];
+                case 1:
+                    newLabel = _a.sent();
+                    if (newLabel !== null && newLabel !== def.label) {
+                        inputDefs = __assign({}, data.inputDefs);
+                        inputDefs[name] = __assign(__assign({}, def), { label: newLabel });
+                        data.onChange({ inputDefs: inputDefs });
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    var onAdd = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var newName, inputDefs;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, prompt("Enter new name")];
+                case 1:
+                    newName = _b.sent();
+                    if (newName !== null) {
+                        inputDefs = __assign(__assign({}, data.inputDefs), (_a = {}, _a[newName] = { type: "any", label: newName }, _a));
+                        data.onChange({ inputDefs: inputDefs });
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    var onDelete = function (name) {
+        var inputDefs = __assign({}, data.inputDefs);
+        var inputs = __assign({}, data.inputs);
+        delete inputDefs[name];
+        delete inputs[name];
+        data.onChange({ inputs: inputs, inputDefs: inputDefs });
+    };
+    return (React.createElement(NodeContainer, { label: data.label, selected: selected, id: id, noDelete: true },
+        React.createElement("div", { className: styles.Description }, data.description),
+        React.createElement("div", { className: styles.Ports },
+            outputEntries.map(function (_a, index) {
+                var _b = __read(_a, 2), name = _b[0], varDef = _b[1];
+                return (React.createElement(Output, { key: "".concat(name, "_").concat(index), name: name, varDef: varDef, id: id, onClick: function () { return setFocus(name); }, focus: showPreview && focus === name }));
+            }),
+            inputEntries.map(function (_a, index) {
+                var _b = __read(_a, 2), name = _b[0], varDef = _b[1];
+                return (React.createElement(Input, { key: "".concat(name, "_").concat(index), name: name, varDef: varDef, id: id, data: data, onRename: onRename, onDelete: onDelete }));
+            }),
+            paramEntries.map(function (_a, index) {
+                var _b = __read(_a, 2), name = _b[0], varDef = _b[1];
+                return (React.createElement(Param, { key: "".concat(name, "_").concat(index), name: name, varDef: varDef, id: id, data: data }));
+            })),
+        React.createElement("div", { className: styles.Body },
+            React.createElement("button", { onClick: function () { return onAdd(); } }, "+")),
+        !!outputEntries.length && (React.createElement("div", { className: classNames(styles.PreviewHead, (_b = {},
+                _b[styles.expanded] = showPreview,
+                _b)), onClick: function () { return setShowPreview(!showPreview); } }, "Preview")),
+        showPreview && (React.createElement("div", { className: styles.Preview },
+            React.createElement(TreeView, { value: previewValue }),
+            duration !== null && (React.createElement("div", { className: styles.Duration },
+                duration.toFixed(2),
+                " ms"))))));
+};
+NamedInput.displayName = "NamedInput";
+
 var nodeTypes = {
     Default: Default,
     Calc: Calc,
     Log: Log,
     DynamicInput: DynamicInput,
     DynamicOutput: DynamicOutput,
+    NamedInput: NamedInput,
     Input: InputNode,
     Output: OutputNode,
 };
@@ -6974,8 +7074,8 @@ function useUpdatePositions(fn) {
 }
 
 // helpers
-function updateNodeArguments(node, inputs, params) {
-    return __assign(__assign({}, node), { data: __assign(__assign({}, node.data), { inputs: inputs, params: params }) });
+function updateNodeArguments(node, inputs, params, inputDefs, outputDefs) {
+    return __assign(__assign({}, node), { data: __assign(__assign({}, node.data), { inputs: inputs, params: params, inputDefs: inputDefs !== null && inputDefs !== void 0 ? inputDefs : node.data.inputDefs, outputDefs: outputDefs !== null && outputDefs !== void 0 ? outputDefs : node.data.outputDefs }) });
 }
 /**
  * gets the source and target node and field from an edge by de-referencing the handles
@@ -6983,9 +7083,9 @@ function updateNodeArguments(node, inputs, params) {
  * returns an object with the source node id, target node id, source field name and target field name
  */
 function deRefEdgeHandle(handle) {
-    var match = handle.match(/^(.+)-(.+)$/);
+    var match = handle.match(/^(.+?)-(.+)$/);
     if (!match) {
-        throw new Error("Invalid handle format");
+        throw new Error("Invalid handle format" + handle);
     }
     return { node: match[1], field: match[2] };
 }
@@ -7001,7 +7101,7 @@ function createNode(engine, id, fncall, options) {
             description: calledFn === null || calledFn === void 0 ? void 0 : calledFn.description,
             inputs: fncall.inputs,
             params: fncall.params,
-            inputDefs: (calledFn === null || calledFn === void 0 ? void 0 : calledFn.inputs) || {},
+            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) || {},
             onChange: ((_a = options.onDataChange) === null || _a === void 0 ? void 0 : _a.call(options, id)) || (function () { }),
@@ -7017,8 +7117,8 @@ function createEdge(nodeId, ref) {
         id: "".concat(ref.path, "-").concat(nodeId, ".").concat(ref.name),
         source: ref.refNode,
         target: nodeId,
-        sourceHandle: "".concat(ref.refNode, "-").concat(ref.refField),
-        targetHandle: "".concat(nodeId, "-").concat(ref.name),
+        sourceHandle: "".concat(ref.refNode, "-").concat(safeName(ref.refField)),
+        targetHandle: "".concat(nodeId, "-").concat(safeName(ref.name)),
     };
 }
 /**
@@ -7059,8 +7159,15 @@ var useFlowState = zustand.create(function (set, get) { return ({
         });
         // remove all the edges that were removed
         edges = edges === null || edges === void 0 ? void 0 : edges.filter(function (edge) {
-            return ((newKeys.includes(edge.source) || edge.source === "inputs") &&
-                newKeys.includes(edge.target));
+            var _a, _b;
+            var target = deRefEdgeHandle(edge.targetHandle);
+            return (
+            // source node of the edge must be in the document
+            (newKeys.includes(edge.source) || edge.source === "inputs") &&
+                // target node of the edge must be in the document
+                newKeys.includes(edge.target) &&
+                // target field of the edge must be in the target node definition
+                ((_b = (_a = fn.body) === null || _a === void 0 ? void 0 : _a[edge.target].inputs) === null || _b === void 0 ? void 0 : _b[target.field]) !== undefined);
         });
         // make sure there is an output node if outputs are defined
         if (fn.outputs && !nodes["output"]) {
@@ -7109,13 +7216,13 @@ var useFlowState = zustand.create(function (set, get) { return ({
             // shallow comparison
             return ((_a = fn.body) === null || _a === void 0 ? void 0 : _a[key]) !== ((_b = oldFn === null || oldFn === void 0 ? void 0 : oldFn.body) === null || _b === void 0 ? void 0 : _b[key]);
         });
-        // console.log("changed keys", changedKeys);
+        console.log("changed keys", changedKeys);
         changedKeys.forEach(function (key) {
             var _a;
             //  update the nodes that were changed
             var fncall = (_a = fn.body) === null || _a === void 0 ? void 0 : _a[key];
             var node = nodes[key];
-            nodes[key] = updateNodeArguments(node, fncall.inputs, fncall.params);
+            nodes[key] = updateNodeArguments(node, fncall.inputs, fncall.params, fncall.inputDefs, fncall.outputDefs);
             // update incoming edges
             var refs = getReferences(fncall.inputs || {});
             // remove all incoming edges