@next-core/brick-kit 2.144.0 → 2.145.1

package/dist/index.esm.js

@@ -10566,31 +10566,49 @@ class LocationContext {
   }
 
   matchRoutes(routes, app) {
-    for (var route of routes) {
+    var _this = this;
+
+    var _loop = function (route) {
       var computedPath = computeRealRoutePath(route.path, app);
 
       if ([].concat(computedPath).includes(undefined)) {
         // eslint-disable-next-line no-console
         console.error("Invalid route with invalid path:", route);
-        return "missed";
+        return {
+          v: "missed"
+        };
       }
 
-      var match = matchPath(this.location.pathname, {
+      var match = matchPath(_this.location.pathname, {
         path: computedPath,
-        exact: route.exact
+        exact: route.exact,
+        checkIf: context => looseCheckIf(route, context),
+        getContext: match => _this.getContext({
+          match
+        })
       });
 
       if (match !== null) {
         if (app.noAuthGuard || route.public || isLoggedIn()) {
-          this.currentMatch = match;
+          _this.currentMatch = match;
           return {
-            match,
-            route
+            v: {
+              match,
+              route
+            }
           };
         }
 
-        return "unauthenticated";
+        return {
+          v: "unauthenticated"
+        };
       }
+    };
+
+    for (var route of routes) {
+      var _ret = _loop(route);
+
+      if (typeof _ret === "object") return _ret.v;
     }
 
     return "missed";
@@ -10636,10 +10654,10 @@ class LocationContext {
   }
 
   mountRoutes(routes, slotId, mountRoutesResult) {
-    var _this = this;
+    var _this2 = this;
 
     return _asyncToGenerator$3(function* () {
-      var matched = _this.matchRoutes(routes, _this.kernel.nextApp);
+      var matched = _this2.matchRoutes(routes, _this2.kernel.nextApp);
 
       var redirect;
       var redirectConf = {};
@@ -10658,22 +10676,22 @@ class LocationContext {
           mountRoutesResult.route = route = matched.route;
 
           if (route.segues) {
-            Object.assign(_this.segues, route.segues);
+            Object.assign(_this2.segues, route.segues);
           }
 
           if (route.hybrid) {
             mountRoutesResult.flags.hybrid = true;
           }
 
-          context = _this.getContext({
+          context = _this2.getContext({
             match: matched.match
           });
 
-          _this.resolver.defineResolves(route.defineResolves, context);
+          _this2.resolver.defineResolves(route.defineResolves, context);
 
-          yield _this.mountProviders(route.providers, matched.match, slotId, mountRoutesResult);
-          yield _this.storyboardContextWrapper.define(route.context, context);
-          yield _this.preCheckPermissions(route, context);
+          yield _this2.mountProviders(route.providers, matched.match, slotId, mountRoutesResult);
+          yield _this2.storyboardContextWrapper.define(route.context, context);
+          yield _this2.preCheckPermissions(route, context);
           redirect = computeRealValue(route.redirect, context, true);
 
           if (redirect) {
@@ -10685,7 +10703,7 @@ class LocationContext {
               break;
             } else {
               // Resolvable redirect.
-              yield _this.resolver.resolveOne("reference", redirect, redirectConf);
+              yield _this2.resolver.resolveOne("reference", redirect, redirectConf);
 
               if (redirectConf.redirect) {
                 mountRoutesResult.flags.redirect = {
@@ -10696,18 +10714,18 @@ class LocationContext {
             }
           }
 
-          yield _this.mountMenu(route.menu, matched.match, mountRoutesResult);
+          yield _this2.mountMenu(route.menu, matched.match, mountRoutesResult);
 
           if (route.documentId) {
             mountRoutesResult.appBar.documentId = route.documentId;
           }
 
           if (isRouteConfOfRoutes(route) && Array.isArray(route.routes)) {
-            yield _this.preFetchMenu(route.context);
-            yield _this.mountRoutes(route.routes, slotId, mountRoutesResult);
+            yield _this2.preFetchMenu(route.context);
+            yield _this2.mountRoutes(route.routes, slotId, mountRoutesResult);
           } else if (isRouteConfOfBricks(route) && Array.isArray(route.bricks)) {
-            yield _this.preFetchMenu(route);
-            yield _this.mountBricks(route.bricks, matched.match, slotId, mountRoutesResult); // analytics data (page_view event)
+            yield _this2.preFetchMenu(route);
+            yield _this2.mountBricks(route.bricks, matched.match, slotId, mountRoutesResult); // analytics data (page_view event)
 
             if (route.analyticsData) {
               mountRoutesResult.analyticsData = computeRealValue(route.analyticsData, context, true);
@@ -10721,7 +10739,7 @@ class LocationContext {
   }
 
   mountMenu(menuConf, match, mountRoutesResult) {
-    var _this2 = this;
+    var _this3 = this;
 
     return _asyncToGenerator$3(function* () {
       if (menuConf === false) {
@@ -10735,7 +10753,7 @@ class LocationContext {
         return;
       }
 
-      var context = _this2.getContext({
+      var context = _this3.getContext({
         match
       });
 
@@ -10754,10 +10772,10 @@ class LocationContext {
           children: []
         };
 
-        _this2.registerHandlersFromLifeCycle(menuConf.lifeCycle, brick, match); // Then, resolve the brick.
+        _this3.registerHandlersFromLifeCycle(menuConf.lifeCycle, brick, match); // Then, resolve the brick.
 
 
-        yield _this2.resolver.resolve(menuConf, brick, context);
+        yield _this3.resolver.resolve(menuConf, brick, context);
         mountRoutesResult.menuInBg.push(brick);
         return;
       }
@@ -10765,7 +10783,7 @@ class LocationContext {
       var injectDeep = menuConf.injectDeep;
 
       if (menuConf.type === "resolve") {
-        yield _this2.resolver.resolveOne("reference", _objectSpread({
+        yield _this3.resolver.resolveOne("reference", _objectSpread({
           transformMapArray: false
         }, menuConf.resolve), menuConf, null, context);
         injectDeep = false;
@@ -10811,12 +10829,12 @@ class LocationContext {
   }
 
   mountProviders(providers, match, slotId, mountRoutesResult) {
-    var _this3 = this;
+    var _this4 = this;
 
     return _asyncToGenerator$3(function* () {
       if (Array.isArray(providers)) {
         for (var providerConf of providers) {
-          yield _this3.mountBrick(_objectSpread(_objectSpread({}, typeof providerConf === "string" ? {
+          yield _this4.mountBrick(_objectSpread(_objectSpread({}, typeof providerConf === "string" ? {
             brick: providerConf
           } : providerConf), {}, {
             bg: true,
@@ -10828,12 +10846,12 @@ class LocationContext {
   }
 
   mountBricks(bricks, match, slotId, mountRoutesResult, tplStack) {
-    var _this4 = this;
+    var _this5 = this;
 
     return _asyncToGenerator$3(function* () {
       for (var brickConf of bricks) {
         try {
-          yield _this4.mountBrick(brickConf, match, slotId, mountRoutesResult, tplStack === null || tplStack === void 0 ? void 0 : tplStack.slice());
+          yield _this5.mountBrick(brickConf, match, slotId, mountRoutesResult, tplStack === null || tplStack === void 0 ? void 0 : tplStack.slice());
         } catch (error) {
           if (error instanceof ResolveRequestError) {
             var errorMessage = httpErrorToString(error.rawError);
@@ -10862,13 +10880,13 @@ class LocationContext {
   }
 
   checkResolvableIf(ifContainer, context) {
-    var _this5 = this;
+    var _this6 = this;
 
     return _asyncToGenerator$3(function* () {
       if (isObject(ifContainer.if)) {
         var ifChecked = computeRealValue(ifContainer.if, context, true);
         var ifConf = {};
-        yield _this5.resolver.resolveOne("reference", ifChecked, ifConf);
+        yield _this6.resolver.resolveOne("reference", ifChecked, ifConf);
         return !hasOwnProperty(ifConf, "if") || !!ifConf.if;
       }
 
@@ -10887,39 +10905,39 @@ class LocationContext {
 
   mountBrick(brickConf, match, slotId, mountRoutesResult) {
     var _arguments = arguments,
-        _this6 = this;
+        _this7 = this;
 
     return _asyncToGenerator$3(function* () {
-      var _this6$kernel$nextApp, _brickConf$lifeCycle, _brick$lifeCycle;
+      var _this7$kernel$nextApp, _brickConf$lifeCycle, _brick$lifeCycle;
 
       var tplStack = _arguments.length > 4 && _arguments[4] !== undefined ? _arguments[4] : [];
       var tplContextId = brickConf[symbolForTplContextId];
       var formContextId = brickConf[symbolForFormContextId];
 
-      var context = _this6.getContext({
+      var context = _this7.getContext({
         match,
         tplContextId,
         formContextId
       }); // First, check whether the brick should be rendered.
 
 
-      if (!(yield _this6.checkResolvableIf(brickConf, context))) {
+      if (!(yield _this7.checkResolvableIf(brickConf, context))) {
         return;
       } // Then, resolve the template to a brick.
 
 
       if (brickConf.template) {
-        yield _this6.resolver.resolve(brickConf, null, context);
+        yield _this7.resolver.resolve(brickConf, null, context);
       } // Check `if` again for dynamic loaded templates.
 
 
-      if (!(yield _this6.checkResolvableIf(brickConf, context))) {
+      if (!(yield _this7.checkResolvableIf(brickConf, context))) {
         return;
       } // If it's a custom template, `tplTagName` is the tag name of the template.
       // Otherwise, `tplTagName` is false.
 
 
-      var tplTagName = getTagNameOfCustomTemplate(brickConf.brick, (_this6$kernel$nextApp = _this6.kernel.nextApp) === null || _this6$kernel$nextApp === void 0 ? void 0 : _this6$kernel$nextApp.id);
+      var tplTagName = getTagNameOfCustomTemplate(brickConf.brick, (_this7$kernel$nextApp = _this7.kernel.nextApp) === null || _this7$kernel$nextApp === void 0 ? void 0 : _this7$kernel$nextApp.id);
 
       if (tplTagName) {
         if (tplStack.includes(tplTagName)) {
@@ -10934,8 +10952,8 @@ class LocationContext {
       }
 
       var brick = {};
-      yield _this6.storyboardContextWrapper.define(brickConf.context, context, brick);
-      yield _this6.preCheckPermissions(brickConf, context);
+      yield _this7.storyboardContextWrapper.define(brickConf.context, context, brick);
+      yield _this7.preCheckPermissions(brickConf, context);
       var trackingContextList = [];
       Object.assign(brick, _objectSpread({
         type: tplTagName || brickConf.brick,
@@ -10967,40 +10985,40 @@ class LocationContext {
         brick.refForProxy.brick = brick;
       }
 
-      _this6.registerHandlersFromLifeCycle(brickConf.lifeCycle, brick, match, tplContextId);
+      _this7.registerHandlersFromLifeCycle(brickConf.lifeCycle, brick, match, tplContextId);
 
       if ((_brick$lifeCycle = brick.lifeCycle) !== null && _brick$lifeCycle !== void 0 && _brick$lifeCycle.onScrollIntoView) {
-        _this6.brickBindObserver(brick);
+        _this7.brickBindObserver(brick);
       } // Then, resolve the brick.
 
 
-      yield _this6.resolver.resolve(brickConf, brick, context);
+      yield _this7.resolver.resolve(brickConf, brick, context);
       var expandedBrickConf = brickConf;
       var isBaseLayout = ["base-layout.tpl-homepage-base-module", "base-layout.tpl-base-page-module", "base-layout.tpl-homepage-base-module-cmdb", "base-layout.tpl-base-page-module-cmdb"].includes(tplTagName);
 
-      if (tplTagName && (!isBaseLayout || _this6.kernel.getFeatureFlags()["support-ui-8.0-base-layout"] && isBaseLayout)) {
+      if (tplTagName && (!isBaseLayout || _this7.kernel.getFeatureFlags()["support-ui-8.0-base-layout"] && isBaseLayout)) {
         var _customTemplateRegist;
 
-        yield _this6.preFetchMenu((_customTemplateRegist = customTemplateRegistry.get(tplTagName)) === null || _customTemplateRegist === void 0 ? void 0 : _customTemplateRegist.bricks);
+        yield _this7.preFetchMenu((_customTemplateRegist = customTemplateRegistry.get(tplTagName)) === null || _customTemplateRegist === void 0 ? void 0 : _customTemplateRegist.bricks);
         expandedBrickConf = yield asyncExpandCustomTemplate(_objectSpread(_objectSpread({}, brickConf), {}, {
           brick: tplTagName,
           // Properties are computed for custom templates.
           properties: brick.properties
         }), brick, context); // Try to load deps for dynamic added bricks.
 
-        yield _this6.kernel.loadDynamicBricksInBrickConf(expandedBrickConf);
+        yield _this7.kernel.loadDynamicBricksInBrickConf(expandedBrickConf);
       }
 
       if (brick.type === formRenderer) {
         var formData = JSON.parse(brick.properties.formData);
         expandedBrickConf = yield ExpandCustomForm(formData, brickConf, brick.properties.isPreview, context);
-        yield _this6.kernel.loadDynamicBricksInBrickConf(expandedBrickConf);
+        yield _this7.kernel.loadDynamicBricksInBrickConf(expandedBrickConf);
       }
 
       if (expandedBrickConf.exports) {
         for (var [prop, ctxName] of Object.entries(expandedBrickConf.exports)) {
           if (typeof ctxName === "string" && ctxName.startsWith("CTX.")) {
-            _this6.storyboardContextWrapper.set(ctxName.substring(4), {
+            _this7.storyboardContextWrapper.set(ctxName.substring(4), {
               type: "brick-property",
               brick,
               prop
@@ -11012,7 +11030,7 @@ class LocationContext {
       if (expandedBrickConf.bg) {
         // A bg brick has no slotId.
         brick.slotId = undefined;
-        appendBrick(brick, _this6.kernel.mountPoints.bg);
+        appendBrick(brick, _this7.kernel.mountPoints.bg);
       } else {
         if (expandedBrickConf.portal) {
           // A portal brick has no slotId.
@@ -11029,9 +11047,9 @@ class LocationContext {
             });
 
             if (slotConf.type === "bricks") {
-              yield _this6.mountBricks(slotConf.bricks, match, _slotId, slottedMountRoutesResult, tplStack);
+              yield _this7.mountBricks(slotConf.bricks, match, _slotId, slottedMountRoutesResult, tplStack);
             } else if (slotConf.type === "routes") {
-              yield _this6.mountRoutes(slotConf.routes, _slotId, slottedMountRoutesResult);
+              yield _this7.mountRoutes(slotConf.routes, _slotId, slottedMountRoutesResult);
             }
           }
         }
@@ -11232,13 +11250,13 @@ class LocationContext {
   }
 
   preFetchMenu(data) {
-    var _this7 = this;
+    var _this8 = this;
 
     return _asyncToGenerator$3(function* () {
       var useMenus = scanAppGetMenuInAny(data);
 
       if (useMenus.length) {
-        yield preConstructMenus(useMenus, _this7.getCurrentContext(), _this7.kernel);
+        yield preConstructMenus(useMenus, _this8.getCurrentContext(), _this8.kernel);
       }
     })();
   }