@rkmodules/rules 0.0.160 → 0.0.162

package/dist/index.cjs.css

@@ -114,8 +114,9 @@
     --ln: var(--node-line);
     --bg: var(--node-background);
     border: 1px solid var(--ln);
-    border-radius: 4px;
-    background-color: var(--bg);
+    border-radius: var(--node-radius, 4px);
+    background: var(--bg);
+    box-shadow: var(--node-shadow);
     min-width: 200px;
     cursor: default;
 }

package/dist/index.cjs.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var mathjs = require('mathjs');
+var stringtemplate = require('@rkmodules/stringtemplate');
 var React = require('react');
 var react = require('@xyflow/react');
 var katex = require('katex');
@@ -1492,29 +1493,38 @@ var stringEqualTo = {
 var stringTemplate = {
     name: "stringTemplate",
     label: "String Template",
-    description: "Assembles a string from inputs",
-    nodeType: "DynamicInput",
+    description: "Assembles a string from inputs, use ${...} to interpolate inputs",
+    nodeType: { name: "NamedInput", props: { fixed: ["template"] } },
     inputs: {
         template: { type: "string", default: "" },
     },
+    params: {
+        fillout: { type: "boolean", default: false },
+    },
     outputs: {
         tree: { type: "string", label: "string" },
     },
-    impl: function (_a, params) { return __awaiter(void 0, void 0, void 0, function () {
-        var trees;
-        var _b = _a.template, template = _b === void 0 ? {} : _b, inputs = __rest(_a, ["template"]);
-        return __generator(this, function (_c) {
-            trees = __spreadArray([template], __read(Object.values(inputs)), false);
-            return [2 /*return*/, {
-                    tree: nAryOnTree(trees, function (_a) {
-                        var _b = __read(_a), template = _b[0], values = _b.slice(1);
-                        return template.replace(/{D(\d+)}/g, function (match, number) {
-                            return typeof values[number - 1] !== "undefined"
-                                ? values[number - 1]
-                                : match;
-                        });
-                    }, true),
-                }];
+    impl: function (_a, params, engine, context, name) { return __awaiter(void 0, void 0, void 0, function () {
+        var inputKeys, inputDefs, labels, inputTrees, value;
+        var _b;
+        var _c = _a.template, template = _c === void 0 ? {} : _c, inputs = __rest(_a, ["template"]);
+        return __generator(this, function (_d) {
+            inputKeys = Object.keys(inputs);
+            inputDefs = ((_b = context === null || context === void 0 ? void 0 : context.calls[name]) === null || _b === void 0 ? void 0 : _b.inputDefs) || {};
+            labels = inputKeys.map(function (key) { var _a; return ((_a = normalizeVarDef(inputDefs[key])) === null || _a === void 0 ? void 0 : _a.label) || key; });
+            inputTrees = Object.values(inputs);
+            if (!inputTrees.length) {
+                inputTrees = [{ 0: [""] }];
+            }
+            __spreadArray([template], __read(Object.values(inputs)), false);
+            value = nAryOnTree(__spreadArray([template], __read(inputTrees), false), function (_a) {
+                var _b = __read(_a), template = _b[0], values = _b.slice(1);
+                if (!template)
+                    return DISCARD;
+                var context = Object.fromEntries(values.map(function (value, index) { return [labels[index], value]; }));
+                return stringtemplate.interpolate(template, context);
+            }, params.fillout || false);
+            return [2 /*return*/, { tree: value }];
         });
     }); },
 };
@@ -2938,6 +2948,7 @@ var duration = {
     label: "Duration",
     description: "Creates a duration",
     inputs: {
+        weeks: { type: "number", default: 0 },
         days: { type: "number", default: 0 },
         hours: { type: "number", default: 0 },
         minutes: { type: "number", default: 0 },
@@ -2951,14 +2962,16 @@ var duration = {
         return __generator(this, function (_a) {
             return [2 /*return*/, {
                     duration: nAryOnTree([
+                        inputs.weeks || {},
                         inputs.days || {},
                         inputs.hours || {},
                         inputs.minutes || {},
                         inputs.seconds || {},
                         inputs.milliseconds || {},
                     ], function (_a) {
-                        var _b = __read(_a, 5), _c = _b[0], days = _c === void 0 ? 0 : _c, _d = _b[1], hours = _d === void 0 ? 0 : _d, _e = _b[2], minutes = _e === void 0 ? 0 : _e, _f = _b[3], seconds = _f === void 0 ? 0 : _f, _g = _b[4], milliseconds = _g === void 0 ? 0 : _g;
-                        var totalMilliseconds = days * 24 * 60 * 60 * 1000 +
+                        var _b = __read(_a, 6), _c = _b[0], weeks = _c === void 0 ? 0 : _c, _d = _b[1], days = _d === void 0 ? 0 : _d, _e = _b[2], hours = _e === void 0 ? 0 : _e, _f = _b[3], minutes = _f === void 0 ? 0 : _f, _g = _b[4], seconds = _g === void 0 ? 0 : _g, _h = _b[5], milliseconds = _h === void 0 ? 0 : _h;
+                        var totalMilliseconds = weeks * 7 * 24 * 60 * 60 * 1000 +
+                            days * 24 * 60 * 60 * 1000 +
                             hours * 60 * 60 * 1000 +
                             minutes * 60 * 1000 +
                             seconds * 1000 +
@@ -7065,18 +7078,19 @@ DynamicOutput.displayName = "DynamicOutputNode";
 
 var NamedInput = function (_a) {
     var _b;
-    var _c;
+    var _c, _d;
     var id = _a.id, data = _a.data, selected = _a.selected;
     var engine = useEngine();
     // let fn = useGraphedFunction();
     var prompt = usePrompts().prompt;
+    var fixedInputs = new Set(((_c = data.nodeProps) === null || _c === void 0 ? void 0 : _c.fixed) || []);
     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.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 _e = __read(React.useState({}), 2), result = _e[0], setResult = _e[1];
+    var _f = __read(React.useState(null), 2), duration = _f[0], setDuration = _f[1];
+    var _g = __read(useInner.useInner(((_d = outputEntries[0]) === null || _d === void 0 ? void 0 : _d[0]) || null, [data.outputDefs]), 2), focus = _g[0], setFocus = _g[1];
+    var _h = __read(React.useState(false), 2), showPreview = _h[0], setShowPreview = _h[1];
     var previewValue = focus ? result[focus] : Object.values(result)[0];
     React.useEffect(function () {
         return engine.subscribe("functionResult", function (event) {
@@ -7135,7 +7149,8 @@ var NamedInput = function (_a) {
             }),
             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 }));
+                var menu = !fixedInputs.has(name);
+                return (React.createElement(Input, { key: "".concat(name, "_").concat(index), name: name, varDef: varDef, id: id, data: data, onRename: menu ? onRename : undefined, onDelete: menu ? onDelete : undefined }));
             }),
             React.createElement("div", { className: styles.Body },
                 React.createElement("button", { onClick: function () { return onAdd(); } }, "+")),
@@ -7260,6 +7275,17 @@ function deRefEdgeHandle(handle) {
 function createNode(engine, id, fncall, options) {
     var _a, _b;
     var calledFn = engine.getFunction(fncall.name);
+    var nodeType = "Default";
+    var nodeProps = {};
+    if (calledFn === null || calledFn === void 0 ? void 0 : calledFn.nodeType) {
+        if (typeof calledFn.nodeType === "string") {
+            nodeType = calledFn.nodeType;
+        }
+        else {
+            nodeType = calledFn.nodeType.name;
+            nodeProps = calledFn.nodeType.props || {};
+        }
+    }
     // create a node for each function call
     return {
         id: id,
@@ -7274,10 +7300,11 @@ function createNode(engine, id, fncall, options) {
             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 () { }),
             onIOChange: options.onIOChange || (function (fn) { return fn; }),
+            nodeProps: nodeProps,
         },
         position: ((_b = options.positions) === null || _b === void 0 ? void 0 : _b[id]) || { x: 0, y: 0 },
         dragHandle: options.dragHandle,
-        type: (calledFn === null || calledFn === void 0 ? void 0 : calledFn.nodeType) || "Default",
+        type: nodeType,
     };
 }
 function createEdge(nodeId, ref) {
@@ -7464,7 +7491,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, 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, 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);
@@ -7576,6 +7603,15 @@ function FlowInner(_a) {
             onClick === null || onClick === void 0 ? void 0 : onClick(e, position);
         }
     };
+    var handleContextMenu = function (e) {
+        if (instance) {
+            var position = instance.screenToFlowPosition({
+                x: e.clientX,
+                y: e.clientY,
+            });
+            onContextMenu === null || onContextMenu === void 0 ? void 0 : onContextMenu(e, position);
+        }
+    };
     var onNodesChange = React.useCallback(function (changes) {
         changes = changes.filter(function (change) {
             if (change.id === "output" && change.type === "remove")
@@ -7596,7 +7632,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, 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, fitView: center || fitView, fitViewOptions: {
             minZoom: fitView ? undefined : 1,
             maxZoom: fitView ? undefined : 1,
         },