@next-core/brick-playground 1.0.6 → 1.0.7

package/dist/{core.46e619ee.js → core.b4bb9092.js}

@@ -6,7 +6,7 @@
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_helpers_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4795);
-/* harmony import */ var _next_core_loader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9800);
+/* harmony import */ var _next_core_loader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7754);
 /* harmony import */ var _next_core_loader__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_next_core_loader__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _next_core_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1181);
 /* harmony import */ var _next_core_runtime__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_next_core_runtime__WEBPACK_IMPORTED_MODULE_1__);
@@ -3684,85 +3684,114 @@ function loadProcessorsImperatively(processors, brickPackages) {
   return promise;
 }
 var v2AdapterPromise;
-function enqueueStableLoad(_x, _x2, _x3) {
+var V2_ADAPTER_LOAD_BRICKS = "v2-adapter.load-bricks";
+
+// Get brick/processor items including their dependencies
+function getItemsByPkg(type, list, brickPackagesMap) {
+  var itemsByPkg = new Map();
+  var listToLoad = new Set();
+  var add = item => {
+    var _pkg$dependencies;
+    if (listToLoad.has(item)) {
+      return;
+    }
+    listToLoad.add(item);
+    var [namespace, itemName] = item.split(".");
+    var pkgId = "bricks/".concat(type === "processors" ? getProcessorPackageName(namespace) : namespace);
+    var pkg = brickPackagesMap.get(pkgId);
+    if (!pkg) {
+      throw new Error("Package ".concat(pkgId, " not found."));
+    }
+    var groupItems = itemsByPkg.get(pkg);
+    if (!groupItems) {
+      groupItems = [];
+      itemsByPkg.set(pkg, groupItems);
+    }
+    groupItems.push(itemName);
+
+    // Load their dependencies too
+    var deps = (_pkg$dependencies = pkg.dependencies) === null || _pkg$dependencies === void 0 ? void 0 : _pkg$dependencies[item];
+    if (deps) {
+      for (var dep of deps) {
+        add(dep);
+      }
+    }
+  };
+  for (var item of list) {
+    add(item);
+  }
+  return itemsByPkg;
+}
+function loadBrickModule(_x, _x2, _x3) {
+  return _loadBrickModule.apply(this, arguments);
+}
+function _loadBrickModule() {
+  _loadBrickModule = (0,asyncToGenerator/* default */.Z)(function* (type, pkgId, itemName) {
+    var moduleName = "".concat(type === "processors" ? "./processors/" : "./").concat(itemName);
+    try {
+      yield loadSharedModule(pkgId, moduleName);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(error);
+      throw new Error("Load ".concat(type, " of \"").concat(pkgId.split("/").pop(), ".").concat(moduleName.split("/").pop(), "\" failed"));
+    }
+  });
+  return _loadBrickModule.apply(this, arguments);
+}
+function loadRestBricks(type, pkgs, itemsMap) {
+  return pkgs.map( /*#__PURE__*/function () {
+    var _ref = (0,asyncToGenerator/* default */.Z)(function* (pkg) {
+      var _window$PUBLIC_ROOT;
+      yield loadScript(pkg.filePath, (_window$PUBLIC_ROOT = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT !== void 0 ? _window$PUBLIC_ROOT : "");
+      yield waitBasicPkg;
+      return Promise.all(
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      itemsMap.get(pkg).map(itemName => loadBrickModule(type, pkg.id, itemName)));
+    });
+    return function (_x4) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+}
+function enqueueStableLoad(_x5, _x6, _x7) {
   return _enqueueStableLoad.apply(this, arguments);
 }
 function _enqueueStableLoad() {
   _enqueueStableLoad = (0,asyncToGenerator/* default */.Z)(function* (type, list, brickPackages) {
-    var moduleDir = type === "processors" ? "./processors/" : "./";
-    var itemsByPkg = new Map();
-    var listToLoad = new Set();
-    var add = item => {
-      var _pkg$dependencies;
-      if (listToLoad.has(item)) {
-        return;
-      }
-      listToLoad.add(item);
-      var [namespace, itemName] = item.split(".");
-      var pkgId = "bricks/".concat(type === "processors" ? getProcessorPackageName(namespace) : namespace);
-      var groupItems = itemsByPkg.get(pkgId);
-      if (!groupItems) {
-        groupItems = [];
-        itemsByPkg.set(pkgId, groupItems);
-      }
-      groupItems.push(itemName);
-
-      // Load their dependencies too
-      var pkg = brickPackages.find(p => p.id === pkgId);
-      var deps = pkg === null || pkg === void 0 ? void 0 : (_pkg$dependencies = pkg.dependencies) === null || _pkg$dependencies === void 0 ? void 0 : _pkg$dependencies[item];
-      if (deps) {
-        for (var dep of deps) {
-          add(dep);
-        }
-      }
-    };
-    for (var item of list) {
-      add(item);
+    var brickPackagesMap = new Map();
+    for (var pkg of brickPackages) {
+      var _pkg$id;
+      var pkgId = (_pkg$id = pkg.id) !== null && _pkg$id !== void 0 ? _pkg$id : getPkgIdByFilePath(pkg.filePath);
+      brickPackagesMap.set(pkgId, pkg);
     }
+    var itemsByPkg = getItemsByPkg(type, list, brickPackagesMap);
     var foundBasicPkg;
     var v2Packages = [];
-    var restPackages = [];
+    var v3PackagesOtherThanBasic = [];
     var maybeV2Adapter;
-    for (var pkg of brickPackages) {
-      if (!pkg.id) {
-        // Brick packages of v2 has no `id`
-        var pkgId = getPkgIdByFilePath(pkg.filePath);
-        if (itemsByPkg.has(pkgId)) {
-          v2Packages.push(pkg);
-          maybeV2Adapter = brickPackages.find(pkg => pkg.id === "bricks/v2-adapter");
-          if (!maybeV2Adapter) {
-            // eslint-disable-next-line no-console
-            console.error("Using v2 bricks, but v2-adapter not found");
-          }
-        }
-      } else if (itemsByPkg.has(pkg.id)) {
-        if (pkg.id === "bricks/basic") {
-          foundBasicPkg = pkg;
+    for (var _pkg of itemsByPkg.keys()) {
+      if (_pkg.id) {
+        if (_pkg.id === "bricks/basic") {
+          foundBasicPkg = _pkg;
         } else {
-          restPackages.push(pkg);
+          v3PackagesOtherThanBasic.push(_pkg);
+        }
+      } else {
+        // Brick packages of v2 has no `id`
+        v2Packages.push(_pkg);
+        maybeV2Adapter = brickPackagesMap.get("bricks/v2-adapter");
+        if (!maybeV2Adapter) {
+          // eslint-disable-next-line no-console
+          console.error("Using v2 bricks, but v2-adapter not found");
         }
       }
     }
     var v2Adapter = maybeV2Adapter;
-    var loadBrickModule = /*#__PURE__*/function () {
-      var _ref = (0,asyncToGenerator/* default */.Z)(function* (pkgId, moduleName) {
-        try {
-          yield loadSharedModule(pkgId, moduleName);
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.error(error);
-          throw new Error("Load ".concat(type, " of \"").concat(pkgId.split("/").pop(), ".").concat(moduleName.split("/").pop(), "\" failed"));
-        }
-      });
-      return function loadBrickModule(_x4, _x5) {
-        return _ref.apply(this, arguments);
-      };
-    }();
     var basicPkgPromise;
     var basicPkg = foundBasicPkg;
     if (basicPkg) {
-      var _window$PUBLIC_ROOT;
-      var tempPromise = loadScript(basicPkg.filePath, (_window$PUBLIC_ROOT = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT !== void 0 ? _window$PUBLIC_ROOT : "");
+      var _window$PUBLIC_ROOT2;
+      var tempPromise = loadScript(basicPkg.filePath, (_window$PUBLIC_ROOT2 = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT2 !== void 0 ? _window$PUBLIC_ROOT2 : "");
       // Packages other than BASIC will wait for an extra micro-task tick.
       if (!basicPkgWillBeResolved) {
         basicPkgWillBeResolved = true;
@@ -3770,33 +3799,21 @@ function _enqueueStableLoad() {
       }
       basicPkgPromise = tempPromise.then(() => Promise.all(
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      itemsByPkg.get(basicPkg.id).map(itemName => loadBrickModule(basicPkg.id, "".concat(moduleDir).concat(itemName)))));
-    }
-    var pkgPromises = [basicPkgPromise].concat(restPackages.map( /*#__PURE__*/function () {
-      var _ref2 = (0,asyncToGenerator/* default */.Z)(function* (pkg) {
-        var _window$PUBLIC_ROOT2;
-        yield loadScript(pkg.filePath, (_window$PUBLIC_ROOT2 = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT2 !== void 0 ? _window$PUBLIC_ROOT2 : "");
-        yield waitBasicPkg;
-        return Promise.all(
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        itemsByPkg.get(pkg.id).map(itemName => loadBrickModule(pkg.id, "".concat(moduleDir).concat(itemName))));
-      });
-      return function (_x6) {
-        return _ref2.apply(this, arguments);
-      };
-    }()));
+      itemsByPkg.get(basicPkg).map(itemName => loadBrickModule(type, basicPkg.id, itemName))));
+    }
+    var pkgPromises = [basicPkgPromise].concat(loadRestBricks(type, v3PackagesOtherThanBasic, itemsByPkg));
     if (v2Adapter && v2Packages.length > 0) {
       if (!v2AdapterPromise) {
+        // Load `v2-adapter.load-bricks` and its dependencies
+        var v2AdapterItemsByPkg = getItemsByPkg("bricks", [V2_ADAPTER_LOAD_BRICKS], brickPackagesMap);
+        var v2AdapterPackages = [...v2AdapterItemsByPkg.keys()];
         var loadV2Adapter = /*#__PURE__*/function () {
-          var _ref3 = (0,asyncToGenerator/* default */.Z)(function* () {
-            var _window$PUBLIC_ROOT3;
-            yield loadScript(v2Adapter.filePath, (_window$PUBLIC_ROOT3 = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT3 !== void 0 ? _window$PUBLIC_ROOT3 : "");
-            yield waitBasicPkg;
-            yield loadBrickModule(v2Adapter.id, "./load-bricks");
-            return document.createElement("v2-adapter.load-bricks");
+          var _ref2 = (0,asyncToGenerator/* default */.Z)(function* () {
+            yield Promise.all(loadRestBricks("bricks", v2AdapterPackages, v2AdapterItemsByPkg));
+            return document.createElement(V2_ADAPTER_LOAD_BRICKS);
           });
           return function loadV2Adapter() {
-            return _ref3.apply(this, arguments);
+            return _ref2.apply(this, arguments);
           };
         }();
         v2AdapterPromise = loadV2Adapter();
@@ -3806,7 +3823,9 @@ function _enqueueStableLoad() {
         var pkgNamespace = pkgId.split("/")[1];
         return adapter.resolve(v2Adapter.filePath, pkg.filePath, type === "bricks" ?
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        itemsByPkg.get(pkgId).map(itemName => "".concat(pkgNamespace, ".").concat(itemName)) : [], pkg.dll, brickPackages);
+        itemsByPkg.get(pkg).map(itemName => "".concat(pkgNamespace, ".").concat(itemName)) : [], pkg.dll,
+        // Todo: remove `brickPackages` as an argument
+        brickPackages);
       }))));
     }
     yield Promise.all(pkgPromises);
@@ -3898,8 +3917,8 @@ var general_index_js_ = __webpack_require__(9686);
 var dist_esm_index_js_ = __webpack_require__(9165);
 // EXTERNAL MODULE: ../../node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js + 1 modules
 var objectWithoutProperties = __webpack_require__(2159);
-// EXTERNAL MODULE: consume shared module (default) @next-core/loader@^1.0.4 (singleton) (fallback: ../loader/dist/esm/index.js)
-var loader_1_0_singleton_fallback_loader_dist_esm_index_js_ = __webpack_require__(9800);
+// EXTERNAL MODULE: consume shared module (default) @next-core/loader@^1.1.0 (singleton) (fallback: ../loader/dist/esm/index.js)
+var loader_1_1_singleton_fallback_loader_dist_esm_index_js_ = __webpack_require__(7754);
 // EXTERNAL MODULE: consume shared module (default) @next-core/supply@^2.0.2 (singleton) (fallback: ../supply/dist/esm/index.js)
 var supply_2_0_singleton_fallback_supply_dist_esm_index_js_ = __webpack_require__(1998);
 // EXTERNAL MODULE: ../../node_modules/@babel/runtime/helpers/esm/classPrivateFieldInitSpec.js
@@ -4892,12 +4911,14 @@ function _getProviderBrick() {
     if (brick) {
       return brick;
     }
-    if (provider === FLOW_API_PROVIDER && !customElements.get(provider)) {
-      registerFlowApiProvider();
-    } else {
-      yield (0,loader_1_0_singleton_fallback_loader_dist_esm_index_js_.loadBricksImperatively)([provider], getBrickPackages());
-      if (!customElements.get(provider)) {
-        throw new Error("Provider not defined: \"".concat(provider, "\"."));
+    if (provider.includes("-") && !customElements.get(provider)) {
+      if (provider === FLOW_API_PROVIDER) {
+        registerFlowApiProvider();
+      } else {
+        yield (0,loader_1_1_singleton_fallback_loader_dist_esm_index_js_.loadBricksImperatively)([provider], getBrickPackages());
+        if (!customElements.get(provider)) {
+          throw new Error("Provider not defined: \"".concat(provider, "\"."));
+        }
       }
     }
     brick = document.createElement(provider);
@@ -7105,7 +7126,7 @@ function _renderBrick() {
 
     // Custom templates need to be defined before rendering.
     if (/\.tpl-/.test(brickName) && !customTemplates.get(brickName)) {
-      yield (0,loader_1_0_singleton_fallback_loader_dist_esm_index_js_.loadBricksImperatively)([brickName], getBrickPackages());
+      yield (0,loader_1_1_singleton_fallback_loader_dist_esm_index_js_.loadBricksImperatively)([brickName], getBrickPackages());
     }
     var tplTagName = getTagNameOfCustomTemplate(brickName, (_runtimeContext$app = runtimeContext.app) === null || _runtimeContext$app === void 0 ? void 0 : _runtimeContext$app.id);
     if (tplTagName) {
@@ -7117,7 +7138,7 @@ function _renderBrick() {
       tplStack.set(tplTagName, tplCount + 1);
     }
     if (brickName.includes(".")) {
-      output.blockingList.push((0,loader_1_0_singleton_fallback_loader_dist_esm_index_js_.enqueueStableLoadBricks)([brickName], getBrickPackages()));
+      output.blockingList.push((0,loader_1_1_singleton_fallback_loader_dist_esm_index_js_.enqueueStableLoadBricks)([brickName], getBrickPackages()));
     }
     var brick = {
       tag: RenderTag.BRICK,
@@ -8695,7 +8716,7 @@ function _render3() {
         }
         // Reset redirect count if no redirect is set.
         (0,classPrivateFieldSet/* default */.Z)(this, _redirectCount, 0);
-        (0,loader_1_0_singleton_fallback_loader_dist_esm_index_js_.flushStableLoadBricks)();
+        (0,loader_1_1_singleton_fallback_loader_dist_esm_index_js_.flushStableLoadBricks)();
         yield Promise.all([...output.blockingList, runtimeContext.ctxStore.waitForAll(), ...[...runtimeContext.tplStateStoreMap.values()].map(store => store.waitForAll()),
         // Todo: load processors only when they would used in current rendering.
         // loadProcessorsImperatively(
@@ -9462,7 +9483,7 @@ runtimeContext) {
     }
     if (attemptToVisitGlobals.has("PROCESSORS")) {
       usedProcessors = (0,index_js_.strictCollectMemberUsage)(raw, "PROCESSORS", 2);
-      isAsync && blockingList.push((0,loader_1_0_singleton_fallback_loader_dist_esm_index_js_.loadProcessorsImperatively)(usedProcessors, getBrickPackages()));
+      isAsync && blockingList.push((0,loader_1_1_singleton_fallback_loader_dist_esm_index_js_.loadProcessorsImperatively)(usedProcessors, getBrickPackages()));
     }
   }
   if (isAsync) {
@@ -9967,7 +9988,7 @@ function _renderUseBrick() {
       createPortal: null
     };
     var output = yield renderBrick(renderRoot, useBrick, runtimeContext, rendererContext);
-    (0,loader_1_0_singleton_fallback_loader_dist_esm_index_js_.flushStableLoadBricks)();
+    (0,loader_1_1_singleton_fallback_loader_dist_esm_index_js_.flushStableLoadBricks)();
     yield Promise.all([...output.blockingList, ...[...runtimeContext.tplStateStoreMap.values()].map(store => store.waitForAll()), ...runtimeContext.pendingPermissionsPreCheck]);
     if ((_output$node = output.node) !== null && _output$node !== void 0 && _output$node.portal) {
       throw new Error("The root brick of useBrick cannot be a portal brick");
@@ -10042,7 +10063,7 @@ function _renderPreviewBricks() {
     try {
       output = yield renderBricks(renderRoot, bricks, runtimeContext, rendererContext);
       output.blockingList.push(...[...runtimeContext.tplStateStoreMap.values()].map(store => store.waitForAll()), ...runtimeContext.pendingPermissionsPreCheck);
-      (0,loader_1_0_singleton_fallback_loader_dist_esm_index_js_.flushStableLoadBricks)();
+      (0,loader_1_1_singleton_fallback_loader_dist_esm_index_js_.flushStableLoadBricks)();
       yield Promise.all(output.blockingList);
     } catch (error) {
       failed = true;
@@ -10300,7 +10321,7 @@ class JsonStorage {
 
 /***/ }),
 
-/***/ 2866:
+/***/ 8096:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -10319,7 +10340,8 @@ __webpack_require__.d(__webpack_exports__, {
   "track": () => (/* reexport */ track),
   "traverseStoryboardExpressions": () => (/* reexport */ traverseStoryboardExpressions),
   "traverseStoryboardFunction": () => (/* reexport */ traverseStoryboardFunction),
-  "traverseStoryboardFunctions": () => (/* reexport */ traverseStoryboardFunctions)
+  "traverseStoryboardFunctions": () => (/* reexport */ traverseStoryboardFunctions),
+  "unwrapProvider": () => (/* reexport */ unwrapProvider)
 });
 
 ;// CONCATENATED MODULE: ../utils/dist/esm/storyboard/createProviderClass.js
@@ -10568,13 +10590,34 @@ function beforeVisitPermissionsFactory(collection) {
     }
   };
 }
+;// CONCATENATED MODULE: ../utils/dist/esm/storyboard/unwrapProvider.js
+var pool = new Map();
+function getProviderBrick(provider) {
+  var brick = pool.get(provider);
+  if (brick) {
+    return brick;
+  }
+  brick = document.createElement(provider);
+  pool.set(provider, brick);
+  return brick;
+}
+function unwrapProvider(provider) {
+  return function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    var brick = getProviderBrick(provider);
+    return brick.resolve(...args);
+  };
+}
 ;// CONCATENATED MODULE: ../utils/dist/esm/storyboard/index.js
 
 
 
 
 
+
 /***/ })
 
 }]);
-//# sourceMappingURL=core.46e619ee.js.map
+//# sourceMappingURL=core.b4bb9092.js.map