@next-core/brick-utils 2.45.16 → 2.45.18

package/dist/index.esm.js

@@ -18145,6 +18145,7 @@ function collectBricksByCustomTemplates(customTemplates) {
   return collectionByTpl;
 }
 
+var widgetRegExp = /\.tpl-/;
 function getDllAndDepsOfStoryboard(storyboard, brickPackages, options) {
   var _storyboard$meta;
   var {
@@ -18153,11 +18154,13 @@ function getDllAndDepsOfStoryboard(storyboard, brickPackages, options) {
   } = scanStoryboard(storyboard, options);
   var customTemplates = (_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.customTemplates;
   var processors = scanProcessorsInAny([storyboard.routes, options !== null && options !== void 0 && options.ignoreBricksInUnusedCustomTemplates ? customTemplates === null || customTemplates === void 0 ? void 0 : customTemplates.filter(tpl => usedTemplates.includes(tpl.name)) : customTemplates]);
+  var widgets = bricks.filter(brick => widgetRegExp.test(brick));
   return _objectSpread(_objectSpread({}, getDllAndDepsByResource({
     bricks,
     processors
   }, brickPackages)), {}, {
-    byProcessors: getDllAndDepsByResource({
+    eager: getDllAndDepsByResource({
+      bricks: widgets,
       processors
     }, brickPackages),
     bricks
@@ -19558,7 +19561,13 @@ function collectContextUsage(data, variableName) {
 function deferResolveContextConcurrently(contextConfs, resolveContext) {
   var keyword = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "CTX";
   var dependencyMap = getDependencyMapOfContext(contextConfs, keyword);
-  var pendingDeps = new Set(Array.from(dependencyMap.keys()).map(contextConf => contextConf.name));
+  // There maybe multiple context confs for a specific name, since there are conditional contexts.
+  // This is a map of how many pending context confs for each context name.
+  var pendingDeps = new Map();
+  for (var contextName of Array.from(dependencyMap.keys()).map(contextConf => contextConf.name)) {
+    var _pendingDeps$get;
+    pendingDeps.set(contextName, ((_pendingDeps$get = pendingDeps.get(contextName)) !== null && _pendingDeps$get !== void 0 ? _pendingDeps$get : 0) + 1);
+  }
   var includesComputed = Array.from(dependencyMap.values()).some(stats => stats.includesComputed);
   var processed = new WeakSet();
   var deferredContexts = new Map();
@@ -19570,14 +19579,25 @@ function deferResolveContextConcurrently(contextConfs, resolveContext) {
   })]));
   var wrapResolve = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (contextConf) {
+      var _pendingDeps$get2;
       processed.add(contextConf);
       var resolved = yield resolveContext(contextConf);
       dependencyMap.delete(contextConf);
+      var left = (_pendingDeps$get2 = pendingDeps.get(contextConf.name)) !== null && _pendingDeps$get2 !== void 0 ? _pendingDeps$get2 : 0;
       if (resolved) {
         deferredContexts.get(contextConf.name).resolve();
-        if (!pendingDeps.delete(contextConf.name)) {
+        pendingDeps.delete(contextConf.name);
+        if (left === 0) {
           throw new Error("Duplicated context defined: ".concat(contextConf.name));
         }
+      } else {
+        // Assert: left >= 1
+        if (left === 1) {
+          deferredContexts.get(contextConf.name).resolve();
+          pendingDeps.delete(contextConf.name);
+        } else {
+          pendingDeps.set(contextConf.name, left - 1);
+        }
       }
       yield scheduleNext();
     });
@@ -19634,18 +19654,32 @@ function _resolveContextConcurrently() {
   _resolveContextConcurrently = _asyncToGenerator(function* (contextConfs, resolveContext) {
     var keyword = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "CTX";
     var dependencyMap = getDependencyMapOfContext(contextConfs, keyword);
-    var pendingDeps = new Set(Array.from(dependencyMap.keys()).map(contextConf => contextConf.name));
+    var pendingDeps = new Map();
+    for (var contextName of Array.from(dependencyMap.keys()).map(contextConf => contextConf.name)) {
+      var _pendingDeps$get5;
+      pendingDeps.set(contextName, ((_pendingDeps$get5 = pendingDeps.get(contextName)) !== null && _pendingDeps$get5 !== void 0 ? _pendingDeps$get5 : 0) + 1);
+    }
     var includesComputed = Array.from(dependencyMap.values()).some(stats => stats.includesComputed);
     var processed = new WeakSet();
     var wrapResolve = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(function* (contextConf) {
+        var _pendingDeps$get6;
         processed.add(contextConf);
         var resolved = yield resolveContext(contextConf);
         dependencyMap.delete(contextConf);
+        var left = (_pendingDeps$get6 = pendingDeps.get(contextConf.name)) !== null && _pendingDeps$get6 !== void 0 ? _pendingDeps$get6 : 0;
         if (resolved) {
-          if (!pendingDeps.delete(contextConf.name)) {
+          pendingDeps.delete(contextConf.name);
+          if (left === 0) {
             throw new Error("Duplicated context defined: ".concat(contextConf.name));
           }
+        } else {
+          // Assert: left >= 1
+          if (left === 1) {
+            pendingDeps.delete(contextConf.name);
+          } else {
+            pendingDeps.set(contextConf.name, left - 1);
+          }
         }
         yield scheduleNext();
       });
@@ -19684,19 +19718,33 @@ function _resolveContextConcurrently() {
 function syncResolveContextConcurrently(contextConfs, resolveContext) {
   var keyword = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "CTX";
   var dependencyMap = getDependencyMapOfContext(contextConfs, keyword);
-  var pendingDeps = new Set(Array.from(dependencyMap.keys()).map(contextConf => contextConf.name));
+  var pendingDeps = new Map();
+  for (var contextName of Array.from(dependencyMap.keys()).map(contextConf => contextConf.name)) {
+    var _pendingDeps$get3;
+    pendingDeps.set(contextName, ((_pendingDeps$get3 = pendingDeps.get(contextName)) !== null && _pendingDeps$get3 !== void 0 ? _pendingDeps$get3 : 0) + 1);
+  }
   var includesComputed = Array.from(dependencyMap.values()).some(stats => stats.includesComputed);
   var scheduleAsSerial = includesComputed;
   function scheduleNext() {
     var dep = Array.from(dependencyMap.entries()).find(predicateNextResolveFactory(pendingDeps, scheduleAsSerial));
     if (dep) {
+      var _pendingDeps$get4;
       var [_contextConf] = dep;
       var resolved = resolveContext(_contextConf);
       dependencyMap.delete(_contextConf);
+      var left = (_pendingDeps$get4 = pendingDeps.get(_contextConf.name)) !== null && _pendingDeps$get4 !== void 0 ? _pendingDeps$get4 : 0;
       if (resolved) {
-        if (!pendingDeps.delete(_contextConf.name)) {
+        pendingDeps.delete(_contextConf.name);
+        if (left === 0) {
           throw new Error("Duplicated context defined: ".concat(_contextConf.name));
         }
+      } else {
+        // Assert: left >= 1
+        if (left === 1) {
+          pendingDeps.delete(_contextConf.name);
+        } else {
+          pendingDeps.set(_contextConf.name, left - 1);
+        }
       }
       scheduleNext();
     }