@rkmodules/rules 0.0.106 → 0.0.108

package/dist/index.esm.js

@@ -2048,6 +2048,14 @@ function topSort(fn) {
     var orderedBody = Object.fromEntries(ordered.map(function (id) { return [id, fn.body[id]]; }));
     return __assign(__assign({}, fn), { body: orderedBody });
 }
+function getDefault(varDef, inputs) {
+    if (inputs === void 0) { inputs = {}; }
+    var normDef = normalizeVarDef(varDef);
+    if (typeof normDef.default === "function") {
+        return normDef.default(inputs);
+    }
+    return normDef.default;
+}
 var Engine = /** @class */ (function () {
     function Engine(morePrimitives, env) {
         if (morePrimitives === void 0) { morePrimitives = {}; }
@@ -2078,12 +2086,13 @@ var Engine = /** @class */ (function () {
                         Object.entries(node.inputs || {}).forEach(function (_a) {
                             var _b = __read(_a, 2), name = _b[0], def = _b[1];
                             var normDef = normalizeVarDef(def);
-                            if (!inputs[name] && normDef.default !== undefined) {
-                                inputs[name] = normDef.default;
+                            if (inputs[name] === undefined && normDef.default !== undefined) {
+                                inputs[name] = getDefault(normDef, inputs);
                             }
                         });
                         context = {
                             scope: { inputs: inputs },
+                            inputs: { inputs: inputs },
                             timings: {},
                             activations: {},
                         };
@@ -2107,6 +2116,7 @@ var Engine = /** @class */ (function () {
                         inputs_1 = interpolate(fnCall.inputs || {}, context.scope);
                         params_1 = fnCall.params || {};
                         result_1 = {};
+                        context.inputs[name_1] = inputs_1;
                         cacheResult = this.checkCache(name_1, inputs_1);
                         if (!(cacheResult !== this.cacheMiss)) return [3 /*break*/, 2];
                         // use as result
@@ -2375,7 +2385,7 @@ var Engine = /** @class */ (function () {
             if ((_a = fn.inputs) === null || _a === void 0 ? void 0 : _a[toField]) {
                 var normDef = normalizeVarDef(fn.inputs[toField]);
                 if (normDef.default !== undefined) {
-                    to.inputs[toField] = normDef.default;
+                    to.inputs[toField] = getDefault(normDef, to.inputs);
                 }
             }
         }
@@ -2406,7 +2416,7 @@ var Engine = /** @class */ (function () {
             var _b = __read(_a, 2), key = _b[0], def = _b[1];
             var normDef = normalizeVarDef(def);
             if (normDef.default !== undefined) {
-                inputs[key] = normDef.default;
+                inputs[key] = getDefault(normDef, inputs);
             }
         });
         // get params defaults
@@ -2415,7 +2425,7 @@ var Engine = /** @class */ (function () {
             var _b = __read(_a, 2), key = _b[0], def = _b[1];
             var normDef = normalizeVarDef(def);
             if (normDef.default !== undefined) {
-                params[key] = normDef.default;
+                params[key] = getDefault(normDef, params);
             }
         });
         var newCall = {