@next-core/brick-utils 2.37.13 → 2.37.16

package/dist/index.esm.js

@@ -2,8 +2,8 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import { uniq, get, cloneDeep, set, isEmpty, escapeRegExp } from 'lodash';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _taggedTemplateLiteral from '@babel/runtime/helpers/taggedTemplateLiteral';
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { processPipes, utils } from '@next-core/pipes';
 export { pipes } from '@next-core/pipes';
 import yaml from 'js-yaml';
@@ -21022,7 +21022,7 @@ function lexer(str) {
         break;
       }
 
-      if (!name) throw new TypeError("Missing parameter name at " + i);
+      if (!name) throw new TypeError("Missing parameter name at ".concat(i));
       tokens.push({
         type: "NAME",
         index: i,
@@ -21038,7 +21038,7 @@ function lexer(str) {
       var j = i + 1;
 
       if (str[j] === "?") {
-        throw new TypeError("Pattern cannot start with \"?\" at " + j);
+        throw new TypeError("Pattern cannot start with \"?\" at ".concat(j));
       }
 
       while (j < str.length) {
@@ -21058,15 +21058,15 @@ function lexer(str) {
           count++;
 
           if (str[j + 1] !== "?") {
-            throw new TypeError("Capturing groups are not allowed at " + j);
+            throw new TypeError("Capturing groups are not allowed at ".concat(j));
           }
         }
 
         pattern += str[j++];
       }
 
-      if (count) throw new TypeError("Unbalanced pattern at " + i);
-      if (!pattern) throw new TypeError("Missing pattern at " + i);
+      if (count) throw new TypeError("Unbalanced pattern at ".concat(i));
+      if (!pattern) throw new TypeError("Missing pattern at ".concat(i));
       tokens.push({
         type: "PATTERN",
         index: i,
@@ -21103,7 +21103,7 @@ function parse(str, options) {
   var tokens = lexer(str);
   var _a = options.prefixes,
       prefixes = _a === void 0 ? "./" : _a;
-  var defaultPattern = "[^" + escapeString(options.delimiter || "/#?") + "]+?";
+  var defaultPattern = "[^".concat(escapeString(options.delimiter || "/#?"), "]+?");
   var result = [];
   var key = 0;
   var i = 0;
@@ -21119,12 +21119,12 @@ function parse(str, options) {
     var _a = tokens[i],
         nextType = _a.type,
         index = _a.index;
-    throw new TypeError("Unexpected " + nextType + " at " + index + ", expected " + type);
+    throw new TypeError("Unexpected ".concat(nextType, " at ").concat(index, ", expected ").concat(type));
   };
 
   var consumeText = function () {
     var result = "";
-    var value; // tslint:disable-next-line
+    var value;
 
     while (value = tryConsume("CHAR") || tryConsume("ESCAPED_CHAR")) {
       result += value;
@@ -21222,7 +21222,7 @@ function tokensToFunction(tokens, options) {
 
   var matches = tokens.map(function (token) {
     if (typeof token === "object") {
-      return new RegExp("^(?:" + token.pattern + ")$", reFlags);
+      return new RegExp("^(?:".concat(token.pattern, ")$"), reFlags);
     }
   });
   return function (data) {
@@ -21242,19 +21242,19 @@ function tokensToFunction(tokens, options) {
 
       if (Array.isArray(value)) {
         if (!repeat) {
-          throw new TypeError("Expected \"" + token.name + "\" to not repeat, but got an array");
+          throw new TypeError("Expected \"".concat(token.name, "\" to not repeat, but got an array"));
         }
 
         if (value.length === 0) {
           if (optional) continue;
-          throw new TypeError("Expected \"" + token.name + "\" to not be empty");
+          throw new TypeError("Expected \"".concat(token.name, "\" to not be empty"));
         }
 
         for (var j = 0; j < value.length; j++) {
           var segment = encode(value[j], token);
 
           if (validate && !matches[i].test(segment)) {
-            throw new TypeError("Expected all \"" + token.name + "\" to match \"" + token.pattern + "\", but got \"" + segment + "\"");
+            throw new TypeError("Expected all \"".concat(token.name, "\" to match \"").concat(token.pattern, "\", but got \"").concat(segment, "\""));
           }
 
           path += token.prefix + segment + token.suffix;
@@ -21267,7 +21267,7 @@ function tokensToFunction(tokens, options) {
         var segment = encode(String(value), token);
 
         if (validate && !matches[i].test(segment)) {
-          throw new TypeError("Expected \"" + token.name + "\" to match \"" + token.pattern + "\", but got \"" + segment + "\"");
+          throw new TypeError("Expected \"".concat(token.name, "\" to match \"").concat(token.pattern, "\", but got \"").concat(segment, "\""));
         }
 
         path += token.prefix + segment + token.suffix;
@@ -21276,7 +21276,7 @@ function tokensToFunction(tokens, options) {
 
       if (optional) continue;
       var typeOfMessage = repeat ? "an array" : "a string";
-      throw new TypeError("Expected \"" + token.name + "\" to be " + typeOfMessage);
+      throw new TypeError("Expected \"".concat(token.name, "\" to be ").concat(typeOfMessage));
     }
 
     return path;
@@ -21331,7 +21331,7 @@ function arrayToRegexp(paths, keys, options) {
   var parts = paths.map(function (path) {
     return pathToRegexp(path, keys, options).source;
   });
-  return new RegExp("(?:" + parts.join("|") + ")", flags(options));
+  return new RegExp("(?:".concat(parts.join("|"), ")"), flags(options));
 }
 /**
  * Create a path regexp from string input.
@@ -21360,9 +21360,13 @@ function tokensToRegexp(tokens, keys, options) {
       _d = options.encode,
       encode = _d === void 0 ? function (x) {
     return x;
-  } : _d;
-  var endsWith = "[" + escapeString(options.endsWith || "") + "]|$";
-  var delimiter = "[" + escapeString(options.delimiter || "/#?") + "]";
+  } : _d,
+      _e = options.delimiter,
+      delimiter = _e === void 0 ? "/#?" : _e,
+      _f = options.endsWith,
+      endsWith = _f === void 0 ? "" : _f;
+  var endsWithRe = "[".concat(escapeString(endsWith), "]|$");
+  var delimiterRe = "[".concat(escapeString(delimiter), "]");
   var route = start ? "^" : ""; // Iterate over the tokens and create our regexp string.
 
   for (var _i = 0, tokens_1 = tokens; _i < tokens_1.length; _i++) {
@@ -21380,33 +21384,36 @@ function tokensToRegexp(tokens, keys, options) {
         if (prefix || suffix) {
           if (token.modifier === "+" || token.modifier === "*") {
             var mod = token.modifier === "*" ? "?" : "";
-            route += "(?:" + prefix + "((?:" + token.pattern + ")(?:" + suffix + prefix + "(?:" + token.pattern + "))*)" + suffix + ")" + mod;
+            route += "(?:".concat(prefix, "((?:").concat(token.pattern, ")(?:").concat(suffix).concat(prefix, "(?:").concat(token.pattern, "))*)").concat(suffix, ")").concat(mod);
           } else {
-            route += "(?:" + prefix + "(" + token.pattern + ")" + suffix + ")" + token.modifier;
+            route += "(?:".concat(prefix, "(").concat(token.pattern, ")").concat(suffix, ")").concat(token.modifier);
           }
         } else {
-          route += "(" + token.pattern + ")" + token.modifier;
+          if (token.modifier === "+" || token.modifier === "*") {
+            route += "((?:".concat(token.pattern, ")").concat(token.modifier, ")");
+          } else {
+            route += "(".concat(token.pattern, ")").concat(token.modifier);
+          }
         }
       } else {
-        route += "(?:" + prefix + suffix + ")" + token.modifier;
+        route += "(?:".concat(prefix).concat(suffix, ")").concat(token.modifier);
       }
     }
   }
 
   if (end) {
-    if (!strict) route += delimiter + "?";
-    route += !options.endsWith ? "$" : "(?=" + endsWith + ")";
+    if (!strict) route += "".concat(delimiterRe, "?");
+    route += !options.endsWith ? "$" : "(?=".concat(endsWithRe, ")");
   } else {
     var endToken = tokens[tokens.length - 1];
-    var isEndDelimited = typeof endToken === "string" ? delimiter.indexOf(endToken[endToken.length - 1]) > -1 : // tslint:disable-next-line
-    endToken === undefined;
+    var isEndDelimited = typeof endToken === "string" ? delimiterRe.indexOf(endToken[endToken.length - 1]) > -1 : endToken === undefined;
 
     if (!strict) {
-      route += "(?:" + delimiter + "(?=" + endsWith + "))?";
+      route += "(?:".concat(delimiterRe, "(?=").concat(endsWithRe, "))?");
     }
 
     if (!isEndDelimited) {
-      route += "(?=" + delimiter + "|" + endsWith + ")";
+      route += "(?=".concat(delimiterRe, "|").concat(endsWithRe, ")");
     }
   }