@digipair/skill-basic 0.104.0 → 0.105.2

package/index.esm.js

@@ -23899,14 +23899,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -23925,7 +23925,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23944,9 +23944,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
-        return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
+        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -24810,7 +24810,7 @@ var parser = LRParser.deserialize({
         2
     ],
     repeatNodeCount: 14,
-    tokenData: ".Z~RvXY#iYZ$^Z[#i]^$^pq#iqr$crs$nwx&fxy&kyz&pz{&u{|'S|}'X}!O'^!O!P'k!P!Q(u!Q![*p![!]+X!]!^+^!^!_+c!_!`$i!`!a+r!b!c+|!}#O,R#P#Q,W#Q#R&}#S#T,]#o#p.P#q#r.U$f$g#i#BY#BZ#i$IS$I_#i$I|$I}$^$I}$JO$^$JT$JU#i$KV$KW#i&FU&FV#i?HT?HU#i~#nY#r~XY#iZ[#ipq#i$f$g#i#BY#BZ#i$IS$I_#i$JT$JU#i$KV$KW#i&FU&FV#i?HT?HU#i~$cO#s~~$fP!_!`$i~$nOr~~$sW$j~OY$nZr$nrs%]s#O$n#O#P%b#P;'S$n;'S;=`&`<%lO$n~%bO$j~~%eRO;'S$n;'S;=`%n;=`O$n~%sX$j~OY$nZr$nrs%]s#O$n#O#P%b#P;'S$n;'S;=`&`;=`<%l$n<%lO$n~&cP;=`<%l$n~&kO#{~~&pOv~~&uOx~~&zP^~z{&}~'SO_~~'XO[~~'^O$O~R'cPZP!`!a'fQ'kO$_Q~'pQ#z~!O!P'v!Q!['{~'{O#}~~(QR$i~!Q!['{!g!h(Z#X#Y(Z~(^R{|(g}!O(g!Q![(m~(jP!Q![(m~(rP$i~!Q![(m~(zQ]~z{)Q!P!Q*X~)TTOz)Qz{)d{;'S)Q;'S;=`*R<%lO)Q~)gVOz)Qz{)d{!P)Q!P!Q)|!Q;'S)Q;'S;=`*R<%lO)Q~*ROQ~~*UP;=`<%l)Q~*^SP~OY*XZ;'S*X;'S;=`*j<%lO*X~*mP;=`<%l*X~*uS$i~!O!P+R!Q![*p!g!h(Z#X#Y(Z~+UP!Q!['{~+^O$]~~+cO$s~R+jP!]QsP!_!`+mP+rOsPR+yP!YQsP!_!`+m~,RO$l~~,WO!i~~,]O!g~~,`WOY,]Z#O,]#O#P,x#P#S,]#S#T-t#T;'S,];'S;=`-y<%lO,]~,{RO;'S,];'S;=`-U;=`O,]~-XXOY,]Z#O,]#O#P,x#P#S,]#S#T-t#T;'S,];'S;=`-y;=`<%l,]<%lO,]~-yO$Z~~-|P;=`<%l,]~.UO#S~~.ZO#R~",
+    tokenData: ".V~RvXY#iYZ$^Z[#i]^$^pq#iqr$crs$nwx&bxy&gyz&lz{&q{|'O|}'T}!O'Y!O!P'g!P!Q(q!Q![*l![!]+T!]!^+Y!^!_+_!_!`$i!`!a+n!b!c+x!}#O+}#P#Q,S#Q#R&y#S#T,X#o#p-{#q#r.Q$f$g#i#BY#BZ#i$IS$I_#i$I|$I}$^$I}$JO$^$JT$JU#i$KV$KW#i&FU&FV#i?HT?HU#i~#nY#r~XY#iZ[#ipq#i$f$g#i#BY#BZ#i$IS$I_#i$JT$JU#i$KV$KW#i&FU&FV#i?HT?HU#i~$cO#s~~$fP!_!`$i~$nOr~~$qWOY$nZr$nrs%Zs#O$n#O#P%`#P;'S$n;'S;=`&[<%lO$n~%`O$j~~%cRO;'S$n;'S;=`%l;=`O$n~%oXOY$nZr$nrs%Zs#O$n#O#P%`#P;'S$n;'S;=`&[;=`<%l$n<%lO$n~&_P;=`<%l$n~&gO#{~~&lOv~~&qOx~~&vP^~z{&y~'OO_~~'TO[~~'YO$O~R'_PZP!`!a'bQ'gO$_Q~'lQ#z~!O!P'r!Q!['w~'wO#}~~'|R$i~!Q!['w!g!h(V#X#Y(V~(YR{|(c}!O(c!Q![(i~(fP!Q![(i~(nP$i~!Q![(i~(vQ]~z{(|!P!Q*T~)PTOz(|z{)`{;'S(|;'S;=`)}<%lO(|~)cVOz(|z{)`{!P(|!P!Q)x!Q;'S(|;'S;=`)}<%lO(|~)}OQ~~*QP;=`<%l(|~*YSP~OY*TZ;'S*T;'S;=`*f<%lO*T~*iP;=`<%l*T~*qS$i~!O!P*}!Q![*l!g!h(V#X#Y(V~+QP!Q!['w~+YO$]~~+_O$s~R+fP!]QsP!_!`+iP+nOsPR+uP!YQsP!_!`+i~+}O$l~~,SO!i~~,XO!g~~,[WOY,XZ#O,X#O#P,t#P#S,X#S#T-p#T;'S,X;'S;=`-u<%lO,X~,wRO;'S,X;'S;=`-Q;=`O,X~-TXOY,XZ#O,X#O#P,t#P#S,X#S#T-p#T;'S,X;'S;=`-u;=`<%l,X<%lO,X~-uO$Z~~-xP;=`<%l,X~.QO#S~~.VO#R~",
     tokenizers: [
         propertyIdentifiers,
         identifiers,
@@ -25326,6 +25326,9 @@ function parseParameterNames(fn) {
 function notImplemented(thing) {
     return new Error("not implemented: ".concat(thing));
 }
+function isNotImplemented(err) {
+    return /^not implemented/.test(err.message);
+}
 /**
  * Returns a name from context or undefined if it does not exist.
  *
@@ -25446,6 +25449,9 @@ var builtins = {
             d = from;
         }
         if (year) {
+            if (!isNumber(month) || !isNumber(day)) {
+                return null;
+            }
             d = date().setZone("utc").set({
                 year: year,
                 month: month,
@@ -25500,7 +25506,7 @@ var builtins = {
             from = hour;
             hour = null;
         }
-        if (isString(from)) {
+        if (isString(from) && from) {
             t = date(null, from);
         }
         if (isDateTime(from)) {
@@ -25511,6 +25517,9 @@ var builtins = {
             });
         }
         if (isNumber(hour)) {
+            if (!isNumber(minute) || !isNumber(second)) {
+                return null;
+            }
             // TODO: support offset = days and time duration
             t = date().set({
                 hour: hour,
@@ -25620,7 +25629,8 @@ var builtins = {
         "string"
     ]),
     "replace": fn(function(input, pattern, replacement, flags) {
-        return input.replace(new RegExp(pattern, "ug" + (flags || "").replace(/[x]/g, "")), replacement.replace(/\$0/g, "$$&"));
+        var regexp = createRegexp(pattern, flags || "", "g");
+        return regexp && input.replace(regexp, replacement.replace(/\$0/g, "$$&"));
     }, [
         "string",
         "string",
@@ -25633,9 +25643,9 @@ var builtins = {
         "string",
         "string"
     ]),
-    // eslint-disable-next-line
     "matches": fn(function(input, pattern, flags) {
-        throw notImplemented("matches");
+        var regexp = createRegexp(pattern, flags || "", "");
+        return regexp && regexp.test(input);
     }, [
         "string",
         "string",
@@ -25654,7 +25664,8 @@ var builtins = {
         "string"
     ]),
     "split": fn(function(string, delimiter) {
-        return string.split(new RegExp(delimiter, "u"));
+        var regexp = createRegexp(delimiter, "", "");
+        return regexp && string.split(regexp);
     }, [
         "string",
         "string"
@@ -26570,6 +26581,35 @@ function mode(array) {
 function ifValid(o) {
     return o.isValid ? o : null;
 }
+/**
+ * Concatenates flags for a regular expression.
+ *
+ * Ensures that default flags are included without duplication, even if
+ * user-specified flags overlap with the defaults.
+ */ function buildFlags(flags, defaultFlags) {
+    var unsupportedFlags = flags.replace(/[smix]/g, "");
+    if (unsupportedFlags) {
+        throw new Error("illegal flags: " + unsupportedFlags);
+    }
+    // we don't implement the <x> flag
+    if (/x/.test(flags)) {
+        throw notImplemented("matches <x> flag");
+    }
+    return flags + defaultFlags;
+}
+/**
+ * Creates a regular expression from a given pattern
+ */ function createRegexp(pattern, flags) {
+    var defaultFlags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "";
+    try {
+        return new RegExp(pattern, "u" + buildFlags(flags, defaultFlags));
+    } catch (_err) {
+        if (isNotImplemented(_err)) {
+            throw _err;
+        }
+    }
+    return null;
+}
 function parseExpression(expression) {
     var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, dialect = arguments.length > 2 ? arguments[2] : void 0;
     return parser.configure({
@@ -27024,27 +27064,59 @@ function evalNode(node, input, args) {
             };
         case "Type":
             return args[0];
+        // (x in [ [1,2], [3,4] ]), (y in x)
         case "InExpressions":
             return function(context) {
-                var iterationContexts = args.map(function(ctx) {
-                    return ctx(context);
-                });
-                if (iterationContexts.some(function(ctx) {
-                    return getType(ctx) !== "list";
-                })) {
-                    return null;
-                }
-                return cartesianProduct(iterationContexts).map(function(ctx) {
-                    var _Object;
-                    if (!isArray(ctx)) {
-                        ctx = [
-                            ctx
-                        ];
+                // we build up evaluation contexts from left to right,
+                // ending up with the cartesian product over all available contexts
+                //
+                // previous context is provided to later context providers
+                // producing <null> as a context during evaluation causes the
+                // whole result to turn <null>
+                var isValidContexts = function(contexts) {
+                    if (contexts === null || contexts.some(function(arr) {
+                        return getType(arr) === "nil";
+                    })) {
+                        return false;
+                    }
+                    return true;
+                };
+                var join = function(aContexts, bContextProducer) {
+                    var _instance;
+                    return (_instance = []).concat.apply(_instance, _to_consumable_array(aContexts.map(function(aContext) {
+                        var bContexts = bContextProducer(Object.assign(Object.assign({}, context), aContext));
+                        if (!isValidContexts(bContexts)) {
+                            return null;
+                        }
+                        return bContexts.map(function(bContext) {
+                            return Object.assign(Object.assign({}, aContext), bContext);
+                        });
+                    })));
+                };
+                var cartesian = function(aContexts, bContextProducer) {
+                    for(var _len = arguments.length, otherContextProducers = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++){
+                        otherContextProducers[_key - 2] = arguments[_key];
+                    }
+                    if (!isValidContexts(aContexts)) {
+                        return null;
+                    }
+                    if (!bContextProducer) {
+                        return aContexts;
                     }
-                    return (_Object = Object).assign.apply(_Object, [
-                        {},
-                        context
-                    ].concat(_to_consumable_array(ctx)));
+                    return cartesian.apply(void 0, [
+                        join(aContexts, bContextProducer)
+                    ].concat(_to_consumable_array(otherContextProducers)));
+                };
+                var cartesianProduct = function(contextProducers) {
+                    var _contextProducers = _to_array(contextProducers), aContextProducer = _contextProducers[0], otherContextProducers = _contextProducers.slice(1);
+                    var aContexts = aContextProducer(context);
+                    return cartesian.apply(void 0, [
+                        aContexts
+                    ].concat(_to_consumable_array(otherContextProducers)));
+                };
+                var product = cartesianProduct(args);
+                return product && product.map(function(p) {
+                    return Object.assign(Object.assign({}, context), p);
                 });
             };
         // Name kw<"in"> Expr
@@ -27674,31 +27746,6 @@ function createDateTimeRange(start, end, startIncluded, endIncluded) {
         includes: includes
     });
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function cartesianProduct(arrays) {
-    var _instance;
-    if (arrays.some(function(arr) {
-        return getType(arr) === "nil";
-    })) {
-        return null;
-    }
-    var f = function(a, b) {
-        return (_instance = []).concat.apply(_instance, _to_consumable_array(a.map(function(d) {
-            return b.map(function(e) {
-                return [].concat(d, e);
-            });
-        })));
-    };
-    var cartesian = function(a, b) {
-        for(var _len = arguments.length, c = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++){
-            c[_key - 2] = arguments[_key];
-        }
-        return b ? cartesian.apply(void 0, [
-            f(a, b)
-        ].concat(_to_consumable_array(c))) : a || [];
-    };
-    return cartesian.apply(void 0, _to_consumable_array(arrays));
-}
 function coalecenseTypes(a, b) {
     if (!b) {
         return a.type;
@@ -27760,15 +27807,24 @@ function parseString(str) {
     if (str.endsWith('"')) {
         str = str.slice(0, -1);
     }
-    return str.replace(/(\\")|(\\\\)|(\\u[a-fA-F0-9]{5,6})|((?:\\u[a-fA-F0-9]{1,4})+)/ig, function(substring) {
+    return str.replace(/(\\")|(\\\\)|(\\n)|(\\r)|(\\t)|(\\u[a-fA-F0-9]{5,6})|((?:\\u[a-fA-F0-9]{1,4})+)/ig, function(substring) {
         for(var _len = arguments.length, groups = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
             groups[_key - 1] = arguments[_key];
         }
-        var _groups = _sliced_to_array(groups, 4), quotes = _groups[0], escape = _groups[1], codePoint = _groups[2], charCodes = _groups[3];
+        var _groups = _sliced_to_array(groups, 7), quotes = _groups[0], backslash = _groups[1], newline = _groups[2], carriageReturn = _groups[3], tab = _groups[4], codePoint = _groups[5], charCodes = _groups[6];
         if (quotes) {
             return '"';
         }
-        if (escape) {
+        if (newline) {
+            return "\n";
+        }
+        if (carriageReturn) {
+            return "\r";
+        }
+        if (tab) {
+            return "	";
+        }
+        if (backslash) {
             return "\\";
         }
         var escapePattern = /\\u([a-fA-F0-9]+)/ig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-basic",
-  "version": "0.104.0",
+  "version": "0.105.2",
   "keywords": [
     "digipair",
     "web",