@next-core/brick-kit 2.105.0 → 2.106.1

package/CHANGELOG.md

@@ -3,122 +3,90 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [2.105.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.7...@next-core/brick-kit@2.105.0) (2022-02-17)
+## [2.106.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.106.0...@next-core/brick-kit@2.106.1) (2022-02-28)
 
+**Note:** Version bump only for package @next-core/brick-kit
 
-### Features
 
-* 新增`PATH_NAME`常量 ([094fe48](https://github.com/easyops-cn/next-core/commit/094fe4877581b7594ea297a3da5c4ae047d9cc4d))
 
 
 
+# [2.106.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.105.1...@next-core/brick-kit@2.106.0) (2022-02-21)
 
+### Features
 
-## [2.104.7](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.6...@next-core/brick-kit@2.104.7) (2022-02-17)
+- record brick instance id in storyboard for development ([9d1193e](https://github.com/easyops-cn/next-core/commit/9d1193e11cf5cd35d10d36afe4f07a52a7f7841a))
 
+## [2.105.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.105.0...@next-core/brick-kit@2.105.1) (2022-02-17)
 
 ### Bug Fixes
 
-* mark lazy useBrick for tpl property merge ([5794719](https://github.com/easyops-cn/next-core/commit/579471913e569856772e24ccdf024519b6680aaa))
-
-
+- fix useBrick lifeCycle couldn't get TPL ([6bbb1ff](https://github.com/easyops-cn/next-core/commit/6bbb1fff00427af2bfca30074a7a8003118763b3))
+- fix useBrick lifeCycle couldn't get TPL ([af1232f](https://github.com/easyops-cn/next-core/commit/af1232fce2fe425a24d841b05ef4d5f2b284a23e))
 
+# [2.105.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.7...@next-core/brick-kit@2.105.0) (2022-02-17)
 
+### Features
 
-## [2.104.6](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.5...@next-core/brick-kit@2.104.6) (2022-02-15)
+- 新增`PATH_NAME`常量 ([094fe48](https://github.com/easyops-cn/next-core/commit/094fe4877581b7594ea297a3da5c4ae047d9cc4d))
 
-**Note:** Version bump only for package @next-core/brick-kit
+## [2.104.7](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.6...@next-core/brick-kit@2.104.7) (2022-02-17)
 
+### Bug Fixes
 
+- mark lazy useBrick for tpl property merge ([5794719](https://github.com/easyops-cn/next-core/commit/579471913e569856772e24ccdf024519b6680aaa))
 
+## [2.104.6](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.5...@next-core/brick-kit@2.104.6) (2022-02-15)
 
+**Note:** Version bump only for package @next-core/brick-kit
 
 ## [2.104.5](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.4...@next-core/brick-kit@2.104.5) (2022-02-15)
 
-
 ### Bug Fixes
 
-* fix re-render of useBrick of tpl ([7cbd0d8](https://github.com/easyops-cn/next-core/commit/7cbd0d83517afdb1eef9fafb5e803655f3e698b9))
-
-
-
-
+- fix re-render of useBrick of tpl ([7cbd0d8](https://github.com/easyops-cn/next-core/commit/7cbd0d83517afdb1eef9fafb5e803655f3e698b9))
 
 ## [2.104.4](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.3...@next-core/brick-kit@2.104.4) (2022-02-15)
 
-
 ### Bug Fixes
 
-* fix targetRef on working in state.onChange ([bac0003](https://github.com/easyops-cn/next-core/commit/bac000367d82ebd428a2aa08d05193b129718eb7))
-
-
-
-
+- fix targetRef on working in state.onChange ([bac0003](https://github.com/easyops-cn/next-core/commit/bac000367d82ebd428a2aa08d05193b129718eb7))
 
 ## [2.104.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.2...@next-core/brick-kit@2.104.3) (2022-02-15)
 
-
 ### Bug Fixes
 
-* fix missing tpl context when setting properties by callback ([c681dd4](https://github.com/easyops-cn/next-core/commit/c681dd41baec10a9f5eb13ac6bccfa5ae559044c))
-
-
-
-
+- fix missing tpl context when setting properties by callback ([c681dd4](https://github.com/easyops-cn/next-core/commit/c681dd41baec10a9f5eb13ac6bccfa5ae559044c))
 
 ## [2.104.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.1...@next-core/brick-kit@2.104.2) (2022-02-15)
 
-
 ### Bug Fixes
 
-* fix state.onChange ([cfdfbf8](https://github.com/easyops-cn/next-core/commit/cfdfbf80574cbaa38168b42b5c0899a71f28be12))
-
-
-
-
+- fix state.onChange ([cfdfbf8](https://github.com/easyops-cn/next-core/commit/cfdfbf80574cbaa38168b42b5c0899a71f28be12))
 
 ## [2.104.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.0...@next-core/brick-kit@2.104.1) (2022-02-14)
 
-
 ### Bug Fixes
 
-* resume getTplContext for compatibility ([e6c40cf](https://github.com/easyops-cn/next-core/commit/e6c40cfec328776ace36cd917195da526451bad4))
-
-
-
-
+- resume getTplContext for compatibility ([e6c40cf](https://github.com/easyops-cn/next-core/commit/e6c40cfec328776ace36cd917195da526451bad4))
 
 # [2.104.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.103.9...@next-core/brick-kit@2.104.0) (2022-02-14)
 
-
 ### Features
 
-* support template scoped state ([d736f85](https://github.com/easyops-cn/next-core/commit/d736f8550b4b645851e2b0a99bb2f99eee4378a2))
-* support tpl-scoped context ([783b060](https://github.com/easyops-cn/next-core/commit/783b0605d3c74ac653120689d467384a71aaf79a))
-
-
-
-
+- support template scoped state ([d736f85](https://github.com/easyops-cn/next-core/commit/d736f8550b4b645851e2b0a99bb2f99eee4378a2))
+- support tpl-scoped context ([783b060](https://github.com/easyops-cn/next-core/commit/783b0605d3c74ac653120689d467384a71aaf79a))
 
 ## [2.103.9](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.103.8...@next-core/brick-kit@2.103.9) (2022-01-28)
 
-
 ### Bug Fixes
 
-* empty image ([61d1d1e](https://github.com/easyops-cn/next-core/commit/61d1d1e751ea6a07afd6805c950ce740e52642e9))
-
-
-
-
+- empty image ([61d1d1e](https://github.com/easyops-cn/next-core/commit/61d1d1e751ea6a07afd6805c950ce740e52642e9))
 
 ## [2.103.8](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.103.7...@next-core/brick-kit@2.103.8) (2022-01-28)
 
 **Note:** Version bump only for package @next-core/brick-kit
 
-
-
-
-
 ## [2.103.7](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.103.6...@next-core/brick-kit@2.103.7) (2022-01-27)
 
 ### Bug Fixes

package/dist/index.bundle.js

@@ -4144,14 +4144,16 @@
 
   var minimatch_1 = minimatch;
   minimatch.Minimatch = Minimatch;
-  var path = {
+
+  var path = function () {
+    try {
+      return require('path');
+    } catch (e) {}
+  }() || {
     sep: '/'
   };
 
-  try {
-    path = require('path');
-  } catch (er) {}
-
+  minimatch.sep = path.sep;
   var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {};
   var expand = braceExpansion;
   var plTypes = {
@@ -4210,51 +4212,71 @@
   }
 
   function ext(a, b) {
-    a = a || {};
     b = b || {};
     var t = {};
-    Object.keys(b).forEach(function (k) {
-      t[k] = b[k];
-    });
     Object.keys(a).forEach(function (k) {
       t[k] = a[k];
     });
+    Object.keys(b).forEach(function (k) {
+      t[k] = b[k];
+    });
     return t;
   }
 
   minimatch.defaults = function (def) {
-    if (!def || !Object.keys(def).length) return minimatch;
+    if (!def || typeof def !== 'object' || !Object.keys(def).length) {
+      return minimatch;
+    }
+
     var orig = minimatch;
 
     var m = function minimatch(p, pattern, options) {
-      return orig.minimatch(p, pattern, ext(def, options));
+      return orig(p, pattern, ext(def, options));
     };
 
     m.Minimatch = function Minimatch(pattern, options) {
       return new orig.Minimatch(pattern, ext(def, options));
     };
 
+    m.Minimatch.defaults = function defaults(options) {
+      return orig.defaults(ext(def, options)).Minimatch;
+    };
+
+    m.filter = function filter(pattern, options) {
+      return orig.filter(pattern, ext(def, options));
+    };
+
+    m.defaults = function defaults(options) {
+      return orig.defaults(ext(def, options));
+    };
+
+    m.makeRe = function makeRe(pattern, options) {
+      return orig.makeRe(pattern, ext(def, options));
+    };
+
+    m.braceExpand = function braceExpand(pattern, options) {
+      return orig.braceExpand(pattern, ext(def, options));
+    };
+
+    m.match = function (list, pattern, options) {
+      return orig.match(list, pattern, ext(def, options));
+    };
+
     return m;
   };
 
   Minimatch.defaults = function (def) {
-    if (!def || !Object.keys(def).length) return Minimatch;
     return minimatch.defaults(def).Minimatch;
   };
 
   function minimatch(p, pattern, options) {
-    if (typeof pattern !== 'string') {
-      throw new TypeError('glob pattern string required');
-    }
-
+    assertValidPattern(pattern);
     if (!options) options = {}; // shortcut: comments match nothing.
 
     if (!options.nocomment && pattern.charAt(0) === '#') {
       return false;
-    } // "" only matches ""
-
+    }
 
-    if (pattern.trim() === '') return p === '';
     return new Minimatch(pattern, options).match(p);
   }
 
@@ -4263,14 +4285,11 @@
       return new Minimatch(pattern, options);
     }
 
-    if (typeof pattern !== 'string') {
-      throw new TypeError('glob pattern string required');
-    }
-
+    assertValidPattern(pattern);
     if (!options) options = {};
     pattern = pattern.trim(); // windows support: need to use /, not \
 
-    if (path.sep !== '/') {
+    if (!options.allowWindowsEscape && path.sep !== '/') {
       pattern = pattern.split(path.sep).join('/');
     }
 
@@ -4280,7 +4299,8 @@
     this.regexp = null;
     this.negate = false;
     this.comment = false;
-    this.empty = false; // make the set of regexps etc.
+    this.empty = false;
+    this.partial = !!options.partial; // make the set of regexps etc.
 
     this.make();
   }
@@ -4290,8 +4310,6 @@
   Minimatch.prototype.make = make;
 
   function make() {
-    // don't do it more than once.
-    if (this._made) return;
     var pattern = this.pattern;
     var options = this.options; // empty patterns and comments match nothing.
 
@@ -4309,7 +4327,9 @@
     this.parseNegate(); // step 2: expand braces
 
     var set = this.globSet = this.braceExpand();
-    if (options.debug) this.debug = console.error;
+    if (options.debug) this.debug = function debug() {
+      console.error.apply(console, arguments);
+    };
     this.debug(this.pattern, set); // step 3: now we have a set, so turn each one into a series of path-portion
     // matching patterns.
     // These will be regexps, except in the case of "**", which is
@@ -4377,18 +4397,28 @@
     }
 
     pattern = typeof pattern === 'undefined' ? this.pattern : pattern;
+    assertValidPattern(pattern); // Thanks to Yeting Li <https://github.com/yetingli> for
+    // improving this regexp to avoid a ReDOS vulnerability.
 
-    if (typeof pattern === 'undefined') {
-      throw new TypeError('undefined pattern');
-    }
-
-    if (options.nobrace || !pattern.match(/\{.*\}/)) {
+    if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
       // shortcut. no need to expand.
       return [pattern];
     }
 
     return expand(pattern);
-  } // parse a component of the expanded set.
+  }
+
+  var MAX_PATTERN_LENGTH = 1024 * 64;
+
+  var assertValidPattern = function (pattern) {
+    if (typeof pattern !== 'string') {
+      throw new TypeError('invalid pattern');
+    }
+
+    if (pattern.length > MAX_PATTERN_LENGTH) {
+      throw new TypeError('pattern is too long');
+    }
+  }; // parse a component of the expanded set.
   // At this point, no pattern may contain "/" in it
   // so we're going to return a 2d array, where each entry is the full
   // pattern, split on '/', and then turned into a regular expression.
@@ -4405,13 +4435,13 @@
   var SUBPARSE = {};
 
   function parse(pattern, isSub) {
-    if (pattern.length > 1024 * 64) {
-      throw new TypeError('pattern is too long');
-    }
-
+    assertValidPattern(pattern);
     var options = this.options; // shortcuts
 
-    if (!options.noglobstar && pattern === '**') return GLOBSTAR;
+    if (pattern === '**') {
+      if (!options.noglobstar) return GLOBSTAR;else pattern = '*';
+    }
+
     if (pattern === '') return '';
     var re = '';
     var hasMagic = !!options.nocase;
@@ -4465,10 +4495,13 @@
       }
 
       switch (c) {
+        /* istanbul ignore next */
         case '/':
-          // completely not allowed, even escaped.
-          // Should already be path-split by now.
-          return false;
+          {
+            // completely not allowed, even escaped.
+            // Should already be path-split by now.
+            return false;
+          }
 
         case '\\':
           clearStateChar();
@@ -4586,28 +4619,26 @@
             continue;
           } // handle the case where we left a class open.
           // "[z-a]" is valid, equivalent to "\[z-a\]"
+          // split where the last [ was, make sure we don't have
+          // an invalid re. if so, re-walk the contents of the
+          // would-be class to re-translate any characters that
+          // were passed through as-is
+          // TODO: It would probably be faster to determine this
+          // without a try/catch and a new RegExp, but it's tricky
+          // to do safely.  For now, this is safe and works.
 
 
-          if (inClass) {
-            // split where the last [ was, make sure we don't have
-            // an invalid re. if so, re-walk the contents of the
-            // would-be class to re-translate any characters that
-            // were passed through as-is
-            // TODO: It would probably be faster to determine this
-            // without a try/catch and a new RegExp, but it's tricky
-            // to do safely.  For now, this is safe and works.
-            var cs = pattern.substring(classStart + 1, i);
-
-            try {
-              RegExp('[' + cs + ']');
-            } catch (er) {
-              // not a valid class!
-              var sp = this.parse(cs, SUBPARSE);
-              re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]';
-              hasMagic = hasMagic || sp[1];
-              inClass = false;
-              continue;
-            }
+          var cs = pattern.substring(classStart + 1, i);
+
+          try {
+            RegExp('[' + cs + ']');
+          } catch (er) {
+            // not a valid class!
+            var sp = this.parse(cs, SUBPARSE);
+            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]';
+            hasMagic = hasMagic || sp[1];
+            inClass = false;
+            continue;
           } // finish up the class.
 
 
@@ -4689,8 +4720,8 @@
     var addPatternStart = false;
 
     switch (re.charAt(0)) {
-      case '.':
       case '[':
+      case '.':
       case '(':
         addPatternStart = true;
     } // Hack to work around lack of negative lookbehind in JS
@@ -4755,7 +4786,9 @@
 
     try {
       var regExp = new RegExp('^' + re + '$', flags);
-    } catch (er) {
+    } catch (er)
+    /* istanbul ignore next - should be impossible */
+    {
       // If it was an invalid regular expression, then it can't match
       // anything.  This trick looks for a character after the end of
       // the string, which is of course impossible, except in multi-line
@@ -4805,7 +4838,9 @@
 
     try {
       this.regexp = new RegExp(re, flags);
-    } catch (ex) {
+    } catch (ex)
+    /* istanbul ignore next - should be impossible */
+    {
       this.regexp = false;
     }
 
@@ -4826,9 +4861,8 @@
     return list;
   };
 
-  Minimatch.prototype.match = match;
-
-  function match(f, partial) {
+  Minimatch.prototype.match = function match(f, partial) {
+    if (typeof partial === 'undefined') partial = this.partial;
     this.debug('match', f, this.pattern); // short-circuit in the case of busted things.
     // comments, etc.
 
@@ -4879,7 +4913,7 @@
 
     if (options.flipNegate) return false;
     return this.negate;
-  } // set partial to true to test if, for example,
+  }; // set partial to true to test if, for example,
   // "/a/b" matches the start of "/*/b/*/d"
   // Partial means, if you run out of file before you run
   // out of pattern, then that's fine, as long as all
@@ -4902,6 +4936,8 @@
       this.debug(pattern, p, f); // should be impossible.
       // some invalid regexp stuff in the set.
 
+      /* istanbul ignore if */
+
       if (p === false) return false;
 
       if (p === GLOBSTAR) {
@@ -4971,6 +5007,8 @@
         // However, in partial mode, we can't say this is necessarily over.
         // If there's more *pattern* left, then
 
+        /* istanbul ignore if */
+
 
         if (partial) {
           // ran out of file
@@ -4987,12 +5025,7 @@
       var hit;
 
       if (typeof p === 'string') {
-        if (options.nocase) {
-          hit = f.toLowerCase() === p.toLowerCase();
-        } else {
-          hit = f === p;
-        }
-
+        hit = f === p;
         this.debug('string match', p, f, hit);
       } else {
         hit = f.match(p);
@@ -5022,14 +5055,17 @@
       // this is ok if we're doing the match as part of
       // a glob fs traversal.
       return partial;
-    } else if (pi === pl) {
-      // ran out of pattern, still have file left.
-      // this is only acceptable if we're on the very last
-      // empty segment of a file with a trailing slash.
-      // a/* should match a/b/
-      var emptyFileEnd = fi === fl - 1 && file[fi] === '';
-      return emptyFileEnd;
-    } // should be unreachable.
+    } else
+      /* istanbul ignore else */
+      if (pi === pl) {
+        // ran out of pattern, still have file left.
+        // this is only acceptable if we're on the very last
+        // empty segment of a file with a trailing slash.
+        // a/* should match a/b/
+        return fi === fl - 1 && file[fi] === '';
+      } // should be unreachable.
+
+    /* istanbul ignore next */
 
 
     throw new Error('wtf?');
@@ -6320,6 +6356,10 @@
         node.setAttribute("slot", brick.slotId);
       }
 
+      if (brick.iid) {
+        node.dataset.iid = brick.iid;
+      }
+
       setRealProperties(node, brick.properties);
       bindListeners(node, brick.events, brick.context);
 
@@ -8909,7 +8949,8 @@
           children: [],
           slotId,
           refForProxy: brickConf[symbolForRefForProxy],
-          tplContextId
+          tplContextId,
+          iid: brickConf.iid
         });
 
         if (brickConf[symbolForComputedPropsFromProxy]) {
@@ -11305,7 +11346,9 @@
         yield resolver.resolve({
           brick: useBrick.brick,
           lifeCycle: useBrick.lifeCycle
-        }, brick, _internalApiGetCurrentContext());
+        }, brick, _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
+          tplContextId: useBrick[symbolForTplContextId]
+        }));
       }
 
       return brick;
@@ -11332,6 +11375,11 @@
           var {
             [symbolForTplContextId]: tplContextId
           } = useBrick;
+
+          if (useBrick.iid) {
+            element.dataset.iid = useBrick.iid;
+          }
+
           setRealProperties(element, brick.properties);
           unbindListeners(element);
 
@@ -11501,7 +11549,9 @@
         yield resolver.resolve({
           brick: useBrick.brick,
           lifeCycle: useBrick.lifeCycle
-        }, brick, _internalApiGetCurrentContext());
+        }, brick, _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
+          tplContextId: useBrick[symbolForTplContextId]
+        }));
       }
 
       return brick;
@@ -11528,6 +11578,11 @@
           var {
             [symbolForTplContextId]: tplContextId
           } = useBrick;
+
+          if (useBrick.iid) {
+            element.dataset.iid = useBrick.iid;
+          }
+
           setRealProperties(element, brick.properties);
           unbindListeners(element);