@rkmodules/rules 0.0.61 → 0.0.62

package/dist/index.esm.js

@@ -237,6 +237,9 @@ function isSingleTon(value) {
 }
 /**
  * turns a value or array of values into a tree
+ * - a single value becomes a tree with one branch "0" and one item
+ * - an array of values becomes a tree with one branch "0" and the items in the array
+ * - a tree is returned as is
  */
 function broadCast(value) {
     if (Array.isArray(value)) {
@@ -401,30 +404,42 @@ function toArray(a) {
  * @param b
  * @returns
  */
-function mergeTrees(a, b) {
-    var e_1, _a;
-    var _b;
-    var out = __assign({}, a);
-    try {
-        for (var _c = __values(Object.entries(b)), _d = _c.next(); !_d.done; _d = _c.next()) {
-            var _e = __read(_d.value, 2), k = _e[0], arr = _e[1];
-            out[k] = ((_b = out[k]) !== null && _b !== void 0 ? _b : []).concat(arr);
-        }
+function mergeTrees() {
+    var others = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        others[_i] = arguments[_i];
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
+    var a = others.shift() || { 0: [] };
+    var out = __assign({}, a);
+    others.forEach(function (b) {
+        var e_1, _a;
+        var _b;
         try {
-            if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            for (var _c = __values(Object.entries(b)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var _e = __read(_d.value, 2), k = _e[0], arr = _e[1];
+                out[k] = ((_b = out[k]) !== null && _b !== void 0 ? _b : []).concat(arr);
+            }
         }
-        finally { if (e_1) throw e_1.error; }
-    }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    });
     return out;
 }
 
 function isReference(value) {
-    return (typeof value === "string" &&
-        value.startsWith("<") &&
-        value.endsWith(">"));
+    return (typeof value === "string" && !!value.match(/^<([\w\.]+)>$/)
+    // value.startsWith("<") &&
+    // value.endsWith(">")
+    );
+}
+function hasReference(value) {
+    var _a;
+    return typeof value === "string" && !!((_a = value.match) === null || _a === void 0 ? void 0 : _a.call(value, /<(.*?)>/g));
 }
 function parseReference(ref) {
     return ref.slice(1, -1);
@@ -444,29 +459,35 @@ function getValue$1(obj, path) {
     return value;
 }
 function interpolateValue(value, scope) {
+    // interpolating arrays
     if (Array.isArray(value)) {
         if (!value.length)
-            return broadCast([]);
-        if (!value.every(isTree)) {
-            // interpolate to an array of trees
-            var mappedValue_1 = value.map(function (v) { return interpolateValue(v, scope); });
-            if (!mappedValue_1.every(isTree)) {
+            return [];
+        if (value.every(isTree)) {
+            // array of trees: merge the trees into one
+            var tree = mergeTrees.apply(void 0, __spreadArray([], __read(value), false));
+            // then interpolate each value in the tree in case there are references
+            return mapTree(tree, function (v) { return interpolateValue(v, scope); });
+        }
+        else {
+            // array of other values: interpolate to an array of trees
+            var mappedValue = value.map(function (v) {
+                return broadCast(interpolateValue(v, scope));
+            });
+            if (!mappedValue.every(isTree)) {
                 // this is a bit of a hack when the values were all plain values
                 // in that case, just return them, which will result in a single tree
-                return mappedValue_1;
+                return mappedValue;
             }
             // then, for each value, combine the branches with the same index
-            return nAryOnTreeBranch(mappedValue_1, function (branches) { return branches.flat(); });
-        }
-        else {
-            // combine the trees into one
-            var tree = value.reduce(function (acc, t) { return mergeTrees(acc, t); });
-            return mapTree(tree, function (v) { return interpolateValue(v, scope); });
+            return mergeTrees.apply(void 0, __spreadArray([], __read(mappedValue), false));
         }
     }
+    // a tree is mapped over each value
     if (isTree(value)) {
         return mapTree(value, function (v) { return interpolateValue(v, scope); });
     }
+    // an object is interpolated recursively
     if (typeof value === "object" && value !== null) {
         if (Object.keys(value).length === 0) {
             return {};
@@ -481,18 +502,33 @@ function interpolateValue(value, scope) {
             }));
         });
     }
-    if (!isReference(value)) {
-        return value;
-    }
-    var parts = parseReference(value).split(".");
-    var mappedValue = getValue$1(scope, parts.slice(0, 2).join("."));
-    if (parts.length > 2) {
-        // deep interpolate
-        mappedValue = mapTree(mappedValue, function (v) {
-            return getValue$1(v, parts.slice(2).join("."));
-        });
+    if (hasReference(value)) {
+        if (isReference(value)) {
+            // it's a simple reference string
+            var parts_1 = parseReference(value).split(".");
+            var mappedValue = getValue$1(scope, parts_1.slice(0, 2).join("."));
+            if (parts_1.length > 2) {
+                // deep interpolate
+                mappedValue = mapTree(mappedValue, function (v) {
+                    return getValue$1(v, parts_1.slice(2).join("."));
+                });
+            }
+            return mappedValue;
+        }
+        else {
+            // it's a template string, break up as an array of strings and references and interpolate each to a tree
+            var strings = value.split(/(<.*?>)/);
+            var trees = strings.map(function (str) {
+                return broadCast(interpolateValue(str, scope));
+            });
+            // create a combined string for each item, filling in missing items witht the last
+            var combined = nAryOnTree(trees, function (items) {
+                return items.join("");
+            }, true);
+            return combined;
+        }
     }
-    return mappedValue;
+    return value;
 }
 function interpolate(inputs, scope) {
     return Object.fromEntries(Object.entries(inputs).map(function (_a) {
@@ -5111,5 +5147,5 @@ function DDContext(_a) {
     return React.createElement(DndProvider, { backend: HTML5Backend }, children);
 }
 
-export { DDContext, DISCARD, Engine, Flow, Lib, binaryOnTree, binaryOnTreeBranch, broadCast, expandTree, getBranch, getReferences, getValue$1 as getValue, graftTree, interpolate, isReference, isSingleTon, isTree, mapTree, mapTreeBranch, nAryOnTree, nAryOnTreeBranch, normalizeVarDef, parseReference, primitives, sameShape, simplifyTree, toArray, topSort, treeSize, trimTree, uid$1 as uid, useDraggableNode, useFlow, useFunction, usePositions, useUpdatePositions, useVariable };
+export { DDContext, DISCARD, Engine, Flow, Lib, binaryOnTree, binaryOnTreeBranch, broadCast, expandTree, getBranch, getReferences, getValue$1 as getValue, graftTree, hasReference, interpolate, isReference, isSingleTon, isTree, mapTree, mapTreeBranch, nAryOnTree, nAryOnTreeBranch, normalizeVarDef, parseReference, primitives, sameShape, simplifyTree, toArray, topSort, treeSize, trimTree, uid$1 as uid, useDraggableNode, useFlow, useFunction, usePositions, useUpdatePositions, useVariable };
 //# sourceMappingURL=index.esm.js.map