@next-core/brick-utils 2.37.13 → 2.37.14

package/CHANGELOG.md

@@ -3,165 +3,96 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.37.13](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.12...@next-core/brick-utils@2.37.13) (2022-05-07)
+## [2.37.14](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.13...@next-core/brick-utils@2.37.14) (2022-05-09)
 
+**Note:** Version bump only for package @next-core/brick-utils
 
-### Bug Fixes
 
-* ignore screenshot in builder nodes ([1e59600](https://github.com/easyops-cn/next-core/commit/1e59600e13bb95ffdf8d3440b60d77b39efa075b))
 
 
 
+## [2.37.13](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.12...@next-core/brick-utils@2.37.13) (2022-05-07)
+
+### Bug Fixes
 
+- ignore screenshot in builder nodes ([1e59600](https://github.com/easyops-cn/next-core/commit/1e59600e13bb95ffdf8d3440b60d77b39efa075b))
 
 ## [2.37.12](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.11...@next-core/brick-utils@2.37.12) (2022-05-06)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.11](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.10...@next-core/brick-utils@2.37.11) (2022-04-26)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.10](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.9...@next-core/brick-utils@2.37.10) (2022-04-22)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.9](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.8...@next-core/brick-utils@2.37.9) (2022-04-21)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.8](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.7...@next-core/brick-utils@2.37.8) (2022-04-19)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.7](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.6...@next-core/brick-utils@2.37.7) (2022-04-14)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.6](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.5...@next-core/brick-utils@2.37.6) (2022-04-07)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.5](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.4...@next-core/brick-utils@2.37.5) (2022-04-06)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.4](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.3...@next-core/brick-utils@2.37.4) (2022-03-29)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.2...@next-core/brick-utils@2.37.3) (2022-03-29)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.1...@next-core/brick-utils@2.37.2) (2022-03-28)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.37.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.37.0...@next-core/brick-utils@2.37.1) (2022-03-24)
 
-
 ### Bug Fixes
 
-* ignore `previewSettings` when building route node ([8cffb40](https://github.com/easyops-cn/next-core/commit/8cffb40b0c583a989c29518a1ed3ef2c8b24ad62))
-
-
-
-
+- ignore `previewSettings` when building route node ([8cffb40](https://github.com/easyops-cn/next-core/commit/8cffb40b0c583a989c29518a1ed3ef2c8b24ad62))
 
 # [2.37.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.36.0...@next-core/brick-utils@2.37.0) (2022-03-24)
 
-
 ### Features
 
-* support APP.getMenu ([#1651](https://github.com/easyops-cn/next-core/issues/1651)) ([5b9f53a](https://github.com/easyops-cn/next-core/commit/5b9f53a3367087a062f415dd68070f15b98bf966))
-
-
-
-
+- support APP.getMenu ([#1651](https://github.com/easyops-cn/next-core/issues/1651)) ([5b9f53a](https://github.com/easyops-cn/next-core/commit/5b9f53a3367087a062f415dd68070f15b98bf966))
 
 # [2.36.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.35.3...@next-core/brick-utils@2.36.0) (2022-03-18)
 
-
 ### Features
 
-* new util function: debounceByAnimationFrame ([d47d032](https://github.com/easyops-cn/next-core/commit/d47d032dea4f9a55e8b642b0d2af926e808c716f))
-
-
-
-
+- new util function: debounceByAnimationFrame ([d47d032](https://github.com/easyops-cn/next-core/commit/d47d032dea4f9a55e8b642b0d2af926e808c716f))
 
 ## [2.35.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.35.2...@next-core/brick-utils@2.35.3) (2022-03-15)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 ## [2.35.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.35.1...@next-core/brick-utils@2.35.2) (2022-03-07)
 
-
 ### Bug Fixes
 
-* fix get deps when brick package has no editors ([833739d](https://github.com/easyops-cn/next-core/commit/833739de875706666a8555d1becb35043f88efc6))
-
-
-
-
+- fix get deps when brick package has no editors ([833739d](https://github.com/easyops-cn/next-core/commit/833739de875706666a8555d1becb35043f88efc6))
 
 ## [2.35.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.35.0...@next-core/brick-utils@2.35.1) (2022-02-28)
 
 **Note:** Version bump only for package @next-core/brick-utils
 
-
-
-
-
 # [2.35.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.34.2...@next-core/brick-utils@2.35.0) (2022-02-21)
 
 ### Features

package/dist/index.bundle.js

@@ -1,16 +1,16 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/asyncToGenerator'), require('lodash'), require('@babel/runtime/helpers/defineProperty'), require('@babel/runtime/helpers/objectSpread2'), require('@babel/runtime/helpers/objectWithoutProperties'), require('@babel/runtime/helpers/taggedTemplateLiteral'), require('@next-core/pipes'), require('js-yaml')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/asyncToGenerator', 'lodash', '@babel/runtime/helpers/defineProperty', '@babel/runtime/helpers/objectSpread2', '@babel/runtime/helpers/objectWithoutProperties', '@babel/runtime/helpers/taggedTemplateLiteral', '@next-core/pipes', 'js-yaml'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BrickUtils = {}, global._asyncToGenerator, global.lodash, global._defineProperty, global._objectSpread, global._objectWithoutProperties, global._taggedTemplateLiteral, global.pipes, global.yaml));
-})(this, (function (exports, _asyncToGenerator, lodash, _defineProperty, _objectSpread, _objectWithoutProperties, _taggedTemplateLiteral, pipes, yaml) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/asyncToGenerator'), require('lodash'), require('@babel/runtime/helpers/defineProperty'), require('@babel/runtime/helpers/objectSpread2'), require('@babel/runtime/helpers/taggedTemplateLiteral'), require('@babel/runtime/helpers/objectWithoutProperties'), require('@next-core/pipes'), require('js-yaml')) :
+  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/asyncToGenerator', 'lodash', '@babel/runtime/helpers/defineProperty', '@babel/runtime/helpers/objectSpread2', '@babel/runtime/helpers/taggedTemplateLiteral', '@babel/runtime/helpers/objectWithoutProperties', '@next-core/pipes', 'js-yaml'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BrickUtils = {}, global._asyncToGenerator, global.lodash, global._defineProperty, global._objectSpread, global._taggedTemplateLiteral, global._objectWithoutProperties, global.pipes, global.yaml));
+})(this, (function (exports, _asyncToGenerator, lodash, _defineProperty, _objectSpread, _taggedTemplateLiteral, _objectWithoutProperties, pipes, yaml) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
   var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
   var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
   var _objectSpread__default = /*#__PURE__*/_interopDefaultLegacy(_objectSpread);
-  var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
   var _taggedTemplateLiteral__default = /*#__PURE__*/_interopDefaultLegacy(_taggedTemplateLiteral);
+  var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
   var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
 
   var cache$1 = new Map();
@@ -21027,7 +21027,7 @@
           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,
@@ -21043,7 +21043,7 @@
         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) {
@@ -21063,15 +21063,15 @@
             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,
@@ -21108,7 +21108,7 @@
     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;
@@ -21124,12 +21124,12 @@
       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;
@@ -21227,7 +21227,7 @@
 
     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) {
@@ -21247,19 +21247,19 @@
 
         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;
@@ -21272,7 +21272,7 @@
           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;
@@ -21281,7 +21281,7 @@
 
         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;
@@ -21336,7 +21336,7 @@
     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.
@@ -21365,9 +21365,13 @@
         _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++) {
@@ -21385,33 +21389,36 @@
           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, ")");
       }
     }