@rkmodules/rules 0.0.145 → 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 },
@@ -6805,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;
@@ -6824,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) {
@@ -6877,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 },
                 ]; })));
             }
@@ -6983,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] };
 }
@@ -7017,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)),
     };
 }
 /**