@rkmodules/rules 0.0.144 → 0.0.146

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] = {};
                         }
@@ -6294,13 +6298,14 @@ var Input = function (_a) {
     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 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),
@@ -6329,7 +6334,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 },
@@ -6511,9 +6517,9 @@ function GenericNode(_a) {
                 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: classNames(styles.PreviewHead, (_b = {},
+        !!outputEntries.length && (React.createElement("div", { className: classNames(styles.PreviewHead, (_b = {},
                 _b[styles.expanded] = showPreview,
-                _b)), onClick: function () { return setShowPreview(!showPreview); } }, "Preview"),
+                _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 },
@@ -6738,10 +6744,29 @@ DynamicInput.displayName = "DynamicInputNode";
  * - create input node
  */
 var OutputNode = React.memo(function (_a) {
+    var _b;
+    var _c;
     var id = _a.id, data = _a.data, selected = _a.selected;
     var engine = useEngine();
     var fn = useGraphedFunction();
     var prompt = usePrompts().prompt;
+    // const inputEntries = Object.entries(inputs || 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 inputs = Object.fromEntries(Object.entries(data.inputs || {}).map(function (_a, i) {
         var _b, _c;
         var _d = __read(_a, 2), name = _d[0], ref = _d[1];
@@ -6786,6 +6811,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;
@@ -6805,6 +6832,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) {
@@ -6815,20 +6844,37 @@ var OutputNode = React.memo(function (_a) {
     };
     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 }, Object.entries(inputs || {}).map(function (_a) {
-            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")))));
-        })),
+        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 }));
+            }),
+            Object.entries(inputs || {}).map(function (_a) {
+                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")))));
+            }),
+            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(); } }, "+"))));
+            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"))))));
 });
 OutputNode.displayName = "OutputNode";
 
@@ -6841,7 +6887,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 },
                 ]; })));
             }
@@ -6947,9 +6993,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] };
 }
@@ -6981,8 +7027,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)),
     };
 }
 /**