@tramvai/module-router 2.109.0 → 2.110.0

package/lib/modules/tokens/common/index.browser.js

@@ -1,13 +1,17 @@
-import { ROUTE_TRANSFORM_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
+import { provide } from '@tramvai/core';
+import { ROUTE_TRANSFORM_TOKEN, ROUTER_TOKEN, PAGE_SERVICE_TOKEN, PAGE_REGISTRY_TOKEN } from '@tramvai/tokens-router';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
+import { COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN } from '@tramvai/tokens-common';
 import { routeTransformToken } from '../../tokens.browser.js';
 import { routeTransform } from './routeTransform.browser.js';
 import { routeSetDefaults } from './routeSetDefaults.browser.js';
 import { routeNormalize } from './routeNormalize.browser.js';
 import { provideRouter } from './render.browser.js';
+import { PageService } from './pageService.browser.js';
+import { PageRegistry } from './pageRegistry.browser.js';
 
 const commonTokens = [
-    {
+    provide({
         provide: routeTransformToken,
         useFactory: routeTransform,
         deps: {
@@ -16,25 +20,45 @@ const commonTokens = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    provide({
         provide: ROUTE_TRANSFORM_TOKEN,
         multi: true,
         useValue: routeSetDefaults,
-    },
-    {
+    }),
+    provide({
         provide: ROUTE_TRANSFORM_TOKEN,
         multi: true,
         useValue: routeNormalize,
-    },
-    {
+    }),
+    provide({
         provide: EXTEND_RENDER,
         multi: true,
         useFactory: provideRouter,
         deps: {
             router: ROUTER_TOKEN,
         },
-    },
+    }),
+    provide({
+        provide: PAGE_SERVICE_TOKEN,
+        useClass: PageService,
+        deps: {
+            router: ROUTER_TOKEN,
+            componentRegistry: COMPONENT_REGISTRY_TOKEN,
+        },
+    }),
+    provide({
+        provide: PAGE_REGISTRY_TOKEN,
+        useClass: PageRegistry,
+        deps: {
+            bundleManager: BUNDLE_MANAGER_TOKEN,
+            pageService: PAGE_SERVICE_TOKEN,
+            componentRegistry: COMPONENT_REGISTRY_TOKEN,
+            actionRegistry: ACTION_REGISTRY_TOKEN,
+            dispatcher: DISPATCHER_TOKEN,
+            dispatcherContext: DISPATCHER_CONTEXT_TOKEN,
+        },
+    }),
 ];
 
 export { commonTokens };

package/lib/modules/tokens/common/index.es.js

@@ -1,13 +1,17 @@
-import { ROUTE_TRANSFORM_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
+import { provide } from '@tramvai/core';
+import { ROUTE_TRANSFORM_TOKEN, ROUTER_TOKEN, PAGE_SERVICE_TOKEN, PAGE_REGISTRY_TOKEN } from '@tramvai/tokens-router';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
+import { COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN } from '@tramvai/tokens-common';
 import { routeTransformToken } from '../../tokens.es.js';
 import { routeTransform } from './routeTransform.es.js';
 import { routeSetDefaults } from './routeSetDefaults.es.js';
 import { routeNormalize } from './routeNormalize.es.js';
 import { provideRouter } from './render.es.js';
+import { PageService } from './pageService.es.js';
+import { PageRegistry } from './pageRegistry.es.js';
 
 const commonTokens = [
-    {
+    provide({
         provide: routeTransformToken,
         useFactory: routeTransform,
         deps: {
@@ -16,25 +20,45 @@ const commonTokens = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    provide({
         provide: ROUTE_TRANSFORM_TOKEN,
         multi: true,
         useValue: routeSetDefaults,
-    },
-    {
+    }),
+    provide({
         provide: ROUTE_TRANSFORM_TOKEN,
         multi: true,
         useValue: routeNormalize,
-    },
-    {
+    }),
+    provide({
         provide: EXTEND_RENDER,
         multi: true,
         useFactory: provideRouter,
         deps: {
             router: ROUTER_TOKEN,
         },
-    },
+    }),
+    provide({
+        provide: PAGE_SERVICE_TOKEN,
+        useClass: PageService,
+        deps: {
+            router: ROUTER_TOKEN,
+            componentRegistry: COMPONENT_REGISTRY_TOKEN,
+        },
+    }),
+    provide({
+        provide: PAGE_REGISTRY_TOKEN,
+        useClass: PageRegistry,
+        deps: {
+            bundleManager: BUNDLE_MANAGER_TOKEN,
+            pageService: PAGE_SERVICE_TOKEN,
+            componentRegistry: COMPONENT_REGISTRY_TOKEN,
+            actionRegistry: ACTION_REGISTRY_TOKEN,
+            dispatcher: DISPATCHER_TOKEN,
+            dispatcherContext: DISPATCHER_CONTEXT_TOKEN,
+        },
+    }),
 ];
 
 export { commonTokens };

package/lib/modules/tokens/common/index.js

@@ -2,16 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var core = require('@tramvai/core');
 var tokensRouter = require('@tramvai/tokens-router');
 var tokensRender = require('@tramvai/tokens-render');
+var tokensCommon = require('@tramvai/tokens-common');
 var tokens = require('../../tokens.js');
 var routeTransform = require('./routeTransform.js');
 var routeSetDefaults = require('./routeSetDefaults.js');
 var routeNormalize = require('./routeNormalize.js');
 var render = require('./render.js');
+var pageService = require('./pageService.js');
+var pageRegistry = require('./pageRegistry.js');
 
 const commonTokens = [
-    {
+    core.provide({
         provide: tokens.routeTransformToken,
         useFactory: routeTransform.routeTransform,
         deps: {
@@ -20,25 +24,45 @@ const commonTokens = [
                 optional: true,
             },
         },
-    },
-    {
+    }),
+    core.provide({
         provide: tokensRouter.ROUTE_TRANSFORM_TOKEN,
         multi: true,
         useValue: routeSetDefaults.routeSetDefaults,
-    },
-    {
+    }),
+    core.provide({
         provide: tokensRouter.ROUTE_TRANSFORM_TOKEN,
         multi: true,
         useValue: routeNormalize.routeNormalize,
-    },
-    {
+    }),
+    core.provide({
         provide: tokensRender.EXTEND_RENDER,
         multi: true,
         useFactory: render.provideRouter,
         deps: {
             router: tokensRouter.ROUTER_TOKEN,
         },
-    },
+    }),
+    core.provide({
+        provide: tokensRouter.PAGE_SERVICE_TOKEN,
+        useClass: pageService.PageService,
+        deps: {
+            router: tokensRouter.ROUTER_TOKEN,
+            componentRegistry: tokensCommon.COMPONENT_REGISTRY_TOKEN,
+        },
+    }),
+    core.provide({
+        provide: tokensRouter.PAGE_REGISTRY_TOKEN,
+        useClass: pageRegistry.PageRegistry,
+        deps: {
+            bundleManager: tokensCommon.BUNDLE_MANAGER_TOKEN,
+            pageService: tokensRouter.PAGE_SERVICE_TOKEN,
+            componentRegistry: tokensCommon.COMPONENT_REGISTRY_TOKEN,
+            actionRegistry: tokensCommon.ACTION_REGISTRY_TOKEN,
+            dispatcher: tokensCommon.DISPATCHER_TOKEN,
+            dispatcherContext: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
+        },
+    }),
 ];
 
 exports.commonTokens = commonTokens;

package/lib/modules/tokens/common/pageRegistry.browser.js

@@ -0,0 +1,57 @@
+import isArray from '@tinkoff/utils/is/array';
+import isObject from '@tinkoff/utils/is/object';
+import eachObj from '@tinkoff/utils/object/each';
+import { resolveLazyComponent } from '@tramvai/react';
+
+class PageRegistry {
+    constructor({ bundleManager, pageService, componentRegistry, actionRegistry, dispatcher, dispatcherContext, }) {
+        this.bundleManager = bundleManager;
+        this.pageService = pageService;
+        this.componentRegistry = componentRegistry;
+        this.actionRegistry = actionRegistry;
+        this.dispatcher = dispatcher;
+        this.dispatcherContext = dispatcherContext;
+    }
+    async resolve(route) {
+        var _a;
+        const { bundle, pageComponent } = this.pageService.getConfig(route);
+        const nestedLayoutComponent = this.pageService.resolveComponentFromConfig('nestedLayout', route);
+        const resolvedBundle = await this.bundleManager.get(bundle, pageComponent);
+        // register bundle first to be able to load other components later
+        await this.registerComponent(bundle, resolvedBundle);
+        const resolvedPageComponent = (_a = resolvedBundle.components) === null || _a === void 0 ? void 0 : _a[pageComponent];
+        // for file-system pages bundle is virtual, so it will be loaded in parallel with nested layout
+        // for classic bundles, page component will be loaded after bundle loading
+        const promises = [];
+        if (resolvedPageComponent) {
+            promises.push(this.registerComponent(pageComponent, resolvedPageComponent));
+        }
+        // TODO: maybe add the same logic for layoutComponent etc?
+        if (nestedLayoutComponent) {
+            promises.push(this.registerComponent(pageComponent, this.pageService.resolveComponentFromConfig('nestedLayout')));
+        }
+        await Promise.all(promises);
+    }
+    async registerComponent(group, componentOrBundle) {
+        // hoist static properties from inner component to lazy wrapper if any
+        if ('load' in componentOrBundle) {
+            await resolveLazyComponent(componentOrBundle);
+        }
+        if ('components' in componentOrBundle && isObject(componentOrBundle.components)) {
+            eachObj((cmp, name) => {
+                this.componentRegistry.add(name, cmp, group);
+            }, componentOrBundle.components);
+        }
+        if ('actions' in componentOrBundle && isArray(componentOrBundle.actions)) {
+            this.actionRegistry.add(group, componentOrBundle.actions);
+        }
+        if ('reducers' in componentOrBundle && isArray(componentOrBundle.reducers)) {
+            componentOrBundle.reducers.forEach((reducer) => {
+                this.dispatcher.registerStore(reducer);
+                this.dispatcherContext.getStore(reducer);
+            });
+        }
+    }
+}
+
+export { PageRegistry };

package/lib/modules/tokens/common/pageRegistry.d.ts

@@ -0,0 +1,23 @@
+import type { Route } from '@tinkoff/router';
+import type { PageRegistry as Interface, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import type { COMPONENT_REGISTRY_TOKEN, ACTION_REGISTRY_TOKEN, DISPATCHER_CONTEXT_TOKEN, DISPATCHER_TOKEN, BUNDLE_MANAGER_TOKEN } from '@tramvai/tokens-common';
+interface Deps {
+    bundleManager: typeof BUNDLE_MANAGER_TOKEN;
+    pageService: typeof PAGE_SERVICE_TOKEN;
+    componentRegistry: typeof COMPONENT_REGISTRY_TOKEN;
+    actionRegistry: typeof ACTION_REGISTRY_TOKEN;
+    dispatcher: typeof DISPATCHER_TOKEN;
+    dispatcherContext: typeof DISPATCHER_CONTEXT_TOKEN;
+}
+export declare class PageRegistry implements Interface {
+    private bundleManager;
+    private pageService;
+    private componentRegistry;
+    private actionRegistry;
+    private dispatcher;
+    private dispatcherContext;
+    constructor({ bundleManager, pageService, componentRegistry, actionRegistry, dispatcher, dispatcherContext, }: Deps);
+    resolve(route: Route): Promise<void>;
+    private registerComponent;
+}
+export {};

package/lib/modules/tokens/common/pageRegistry.es.js

@@ -0,0 +1,57 @@
+import isArray from '@tinkoff/utils/is/array';
+import isObject from '@tinkoff/utils/is/object';
+import eachObj from '@tinkoff/utils/object/each';
+import { resolveLazyComponent } from '@tramvai/react';
+
+class PageRegistry {
+    constructor({ bundleManager, pageService, componentRegistry, actionRegistry, dispatcher, dispatcherContext, }) {
+        this.bundleManager = bundleManager;
+        this.pageService = pageService;
+        this.componentRegistry = componentRegistry;
+        this.actionRegistry = actionRegistry;
+        this.dispatcher = dispatcher;
+        this.dispatcherContext = dispatcherContext;
+    }
+    async resolve(route) {
+        var _a;
+        const { bundle, pageComponent } = this.pageService.getConfig(route);
+        const nestedLayoutComponent = this.pageService.resolveComponentFromConfig('nestedLayout', route);
+        const resolvedBundle = await this.bundleManager.get(bundle, pageComponent);
+        // register bundle first to be able to load other components later
+        await this.registerComponent(bundle, resolvedBundle);
+        const resolvedPageComponent = (_a = resolvedBundle.components) === null || _a === void 0 ? void 0 : _a[pageComponent];
+        // for file-system pages bundle is virtual, so it will be loaded in parallel with nested layout
+        // for classic bundles, page component will be loaded after bundle loading
+        const promises = [];
+        if (resolvedPageComponent) {
+            promises.push(this.registerComponent(pageComponent, resolvedPageComponent));
+        }
+        // TODO: maybe add the same logic for layoutComponent etc?
+        if (nestedLayoutComponent) {
+            promises.push(this.registerComponent(pageComponent, this.pageService.resolveComponentFromConfig('nestedLayout')));
+        }
+        await Promise.all(promises);
+    }
+    async registerComponent(group, componentOrBundle) {
+        // hoist static properties from inner component to lazy wrapper if any
+        if ('load' in componentOrBundle) {
+            await resolveLazyComponent(componentOrBundle);
+        }
+        if ('components' in componentOrBundle && isObject(componentOrBundle.components)) {
+            eachObj((cmp, name) => {
+                this.componentRegistry.add(name, cmp, group);
+            }, componentOrBundle.components);
+        }
+        if ('actions' in componentOrBundle && isArray(componentOrBundle.actions)) {
+            this.actionRegistry.add(group, componentOrBundle.actions);
+        }
+        if ('reducers' in componentOrBundle && isArray(componentOrBundle.reducers)) {
+            componentOrBundle.reducers.forEach((reducer) => {
+                this.dispatcher.registerStore(reducer);
+                this.dispatcherContext.getStore(reducer);
+            });
+        }
+    }
+}
+
+export { PageRegistry };

package/lib/modules/tokens/common/pageRegistry.js

@@ -0,0 +1,67 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var isArray = require('@tinkoff/utils/is/array');
+var isObject = require('@tinkoff/utils/is/object');
+var eachObj = require('@tinkoff/utils/object/each');
+var react = require('@tramvai/react');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
+var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
+var eachObj__default = /*#__PURE__*/_interopDefaultLegacy(eachObj);
+
+class PageRegistry {
+    constructor({ bundleManager, pageService, componentRegistry, actionRegistry, dispatcher, dispatcherContext, }) {
+        this.bundleManager = bundleManager;
+        this.pageService = pageService;
+        this.componentRegistry = componentRegistry;
+        this.actionRegistry = actionRegistry;
+        this.dispatcher = dispatcher;
+        this.dispatcherContext = dispatcherContext;
+    }
+    async resolve(route) {
+        var _a;
+        const { bundle, pageComponent } = this.pageService.getConfig(route);
+        const nestedLayoutComponent = this.pageService.resolveComponentFromConfig('nestedLayout', route);
+        const resolvedBundle = await this.bundleManager.get(bundle, pageComponent);
+        // register bundle first to be able to load other components later
+        await this.registerComponent(bundle, resolvedBundle);
+        const resolvedPageComponent = (_a = resolvedBundle.components) === null || _a === void 0 ? void 0 : _a[pageComponent];
+        // for file-system pages bundle is virtual, so it will be loaded in parallel with nested layout
+        // for classic bundles, page component will be loaded after bundle loading
+        const promises = [];
+        if (resolvedPageComponent) {
+            promises.push(this.registerComponent(pageComponent, resolvedPageComponent));
+        }
+        // TODO: maybe add the same logic for layoutComponent etc?
+        if (nestedLayoutComponent) {
+            promises.push(this.registerComponent(pageComponent, this.pageService.resolveComponentFromConfig('nestedLayout')));
+        }
+        await Promise.all(promises);
+    }
+    async registerComponent(group, componentOrBundle) {
+        // hoist static properties from inner component to lazy wrapper if any
+        if ('load' in componentOrBundle) {
+            await react.resolveLazyComponent(componentOrBundle);
+        }
+        if ('components' in componentOrBundle && isObject__default["default"](componentOrBundle.components)) {
+            eachObj__default["default"]((cmp, name) => {
+                this.componentRegistry.add(name, cmp, group);
+            }, componentOrBundle.components);
+        }
+        if ('actions' in componentOrBundle && isArray__default["default"](componentOrBundle.actions)) {
+            this.actionRegistry.add(group, componentOrBundle.actions);
+        }
+        if ('reducers' in componentOrBundle && isArray__default["default"](componentOrBundle.reducers)) {
+            componentOrBundle.reducers.forEach((reducer) => {
+                this.dispatcher.registerStore(reducer);
+                this.dispatcherContext.getStore(reducer);
+            });
+        }
+    }
+}
+
+exports.PageRegistry = PageRegistry;

package/lib/{services/page.browser.js → modules/tokens/common/pageService.browser.js}

@@ -11,17 +11,17 @@ class PageService {
     getCurrentUrl() {
         return this.router.getCurrentUrl();
     }
-    getConfig() {
-        var _a, _b;
-        return (_b = (_a = this.getCurrentRoute()) === null || _a === void 0 ? void 0 : _a.config) !== null && _b !== void 0 ? _b : {};
+    getConfig(route = this.getCurrentRoute()) {
+        var _a;
+        return (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : {};
     }
-    getContent() {
+    getContent(route) {
         var _a;
-        return (_a = this.getConfig().content) !== null && _a !== void 0 ? _a : {};
+        return (_a = this.getConfig(route).content) !== null && _a !== void 0 ? _a : {};
     }
-    getMeta() {
+    getMeta(route) {
         var _a;
-        return (_a = this.getConfig().meta) !== null && _a !== void 0 ? _a : {};
+        return (_a = this.getConfig(route).meta) !== null && _a !== void 0 ? _a : {};
     }
     navigate(options) {
         return this.router.navigate(options);
@@ -38,23 +38,23 @@ class PageService {
     go(to, options) {
         return this.router.go(to, options);
     }
-    addComponent(name, component) {
-        const group = this.getComponentsGroupName();
+    addComponent(name, component, route) {
+        const group = this.getComponentsGroupName(route);
         return this.componentRegistry.add(name, component, group);
     }
-    getComponent(name) {
-        const group = this.getComponentsGroupName();
+    getComponent(name, route) {
+        const group = this.getComponentsGroupName(route);
         return this.componentRegistry.get(name, group);
     }
-    resolveComponentFromConfig(property) {
+    resolveComponentFromConfig(property, route) {
         var _a;
         const configName = `${property}Component`;
         const defaultComponent = `${property}Default`;
-        const componentName = (_a = this.getConfig()[configName]) !== null && _a !== void 0 ? _a : defaultComponent;
-        return this.getComponent(componentName) || this.getComponent(defaultComponent);
+        const componentName = (_a = this.getConfig(route)[configName]) !== null && _a !== void 0 ? _a : defaultComponent;
+        return this.getComponent(componentName, route) || this.getComponent(defaultComponent, route);
     }
-    getComponentsGroupName() {
-        const { bundle, pageComponent } = this.getConfig();
+    getComponentsGroupName(route) {
+        const { bundle, pageComponent } = this.getConfig(route);
         const group = isFileSystemPageComponent(pageComponent) ? pageComponent : bundle;
         return group;
     }

package/lib/{services/page.d.ts → modules/tokens/common/pageService.d.ts}

@@ -1,5 +1,5 @@
 import type { Url } from '@tinkoff/url';
-import type { NavigationRoute, NavigateOptions, UpdateCurrentRouteOptions, HistoryOptions } from '@tinkoff/router';
+import type { NavigationRoute, NavigateOptions, UpdateCurrentRouteOptions, HistoryOptions, Route } from '@tinkoff/router';
 import type { TramvaiComponent } from '@tramvai/react';
 import type { PageServiceComponentType, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 type PageServiceInterface = typeof PAGE_SERVICE_TOKEN;
@@ -12,17 +12,17 @@ export declare class PageService implements PageServiceInterface {
     });
     getCurrentRoute(): NavigationRoute;
     getCurrentUrl(): Url;
-    getConfig(): Record<string, any>;
-    getContent(): Record<string, any>;
-    getMeta(): any;
+    getConfig(route?: Route): Record<string, any>;
+    getContent(route?: Route): Record<string, any>;
+    getMeta(route?: Route): any;
     navigate(options: NavigateOptions | string): Promise<void>;
     updateCurrentRoute(options: UpdateCurrentRouteOptions): Promise<void>;
     back(options?: HistoryOptions): Promise<void>;
     forward(): Promise<void>;
     go(to: number, options?: HistoryOptions): Promise<void>;
-    addComponent(name: string, component: TramvaiComponent): void;
-    getComponent(name: string): TramvaiComponent | undefined;
-    resolveComponentFromConfig(property: PageServiceComponentType): TramvaiComponent;
+    addComponent(name: string, component: TramvaiComponent, route?: Route): void;
+    getComponent(name: string, route?: Route): TramvaiComponent | undefined;
+    resolveComponentFromConfig(property: PageServiceComponentType, route?: Route): TramvaiComponent;
     private getComponentsGroupName;
 }
 export {};

package/lib/{services/page.es.js → modules/tokens/common/pageService.es.js}

@@ -11,17 +11,17 @@ class PageService {
     getCurrentUrl() {
         return this.router.getCurrentUrl();
     }
-    getConfig() {
-        var _a, _b;
-        return (_b = (_a = this.getCurrentRoute()) === null || _a === void 0 ? void 0 : _a.config) !== null && _b !== void 0 ? _b : {};
+    getConfig(route = this.getCurrentRoute()) {
+        var _a;
+        return (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : {};
     }
-    getContent() {
+    getContent(route) {
         var _a;
-        return (_a = this.getConfig().content) !== null && _a !== void 0 ? _a : {};
+        return (_a = this.getConfig(route).content) !== null && _a !== void 0 ? _a : {};
     }
-    getMeta() {
+    getMeta(route) {
         var _a;
-        return (_a = this.getConfig().meta) !== null && _a !== void 0 ? _a : {};
+        return (_a = this.getConfig(route).meta) !== null && _a !== void 0 ? _a : {};
     }
     navigate(options) {
         return this.router.navigate(options);
@@ -38,23 +38,23 @@ class PageService {
     go(to, options) {
         return this.router.go(to, options);
     }
-    addComponent(name, component) {
-        const group = this.getComponentsGroupName();
+    addComponent(name, component, route) {
+        const group = this.getComponentsGroupName(route);
         return this.componentRegistry.add(name, component, group);
     }
-    getComponent(name) {
-        const group = this.getComponentsGroupName();
+    getComponent(name, route) {
+        const group = this.getComponentsGroupName(route);
         return this.componentRegistry.get(name, group);
     }
-    resolveComponentFromConfig(property) {
+    resolveComponentFromConfig(property, route) {
         var _a;
         const configName = `${property}Component`;
         const defaultComponent = `${property}Default`;
-        const componentName = (_a = this.getConfig()[configName]) !== null && _a !== void 0 ? _a : defaultComponent;
-        return this.getComponent(componentName) || this.getComponent(defaultComponent);
+        const componentName = (_a = this.getConfig(route)[configName]) !== null && _a !== void 0 ? _a : defaultComponent;
+        return this.getComponent(componentName, route) || this.getComponent(defaultComponent, route);
     }
-    getComponentsGroupName() {
-        const { bundle, pageComponent } = this.getConfig();
+    getComponentsGroupName(route) {
+        const { bundle, pageComponent } = this.getConfig(route);
         const group = isFileSystemPageComponent(pageComponent) ? pageComponent : bundle;
         return group;
     }

package/lib/{services/page.js → modules/tokens/common/pageService.js}

@@ -15,17 +15,17 @@ class PageService {
     getCurrentUrl() {
         return this.router.getCurrentUrl();
     }
-    getConfig() {
-        var _a, _b;
-        return (_b = (_a = this.getCurrentRoute()) === null || _a === void 0 ? void 0 : _a.config) !== null && _b !== void 0 ? _b : {};
+    getConfig(route = this.getCurrentRoute()) {
+        var _a;
+        return (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : {};
     }
-    getContent() {
+    getContent(route) {
         var _a;
-        return (_a = this.getConfig().content) !== null && _a !== void 0 ? _a : {};
+        return (_a = this.getConfig(route).content) !== null && _a !== void 0 ? _a : {};
     }
-    getMeta() {
+    getMeta(route) {
         var _a;
-        return (_a = this.getConfig().meta) !== null && _a !== void 0 ? _a : {};
+        return (_a = this.getConfig(route).meta) !== null && _a !== void 0 ? _a : {};
     }
     navigate(options) {
         return this.router.navigate(options);
@@ -42,23 +42,23 @@ class PageService {
     go(to, options) {
         return this.router.go(to, options);
     }
-    addComponent(name, component) {
-        const group = this.getComponentsGroupName();
+    addComponent(name, component, route) {
+        const group = this.getComponentsGroupName(route);
         return this.componentRegistry.add(name, component, group);
     }
-    getComponent(name) {
-        const group = this.getComponentsGroupName();
+    getComponent(name, route) {
+        const group = this.getComponentsGroupName(route);
         return this.componentRegistry.get(name, group);
     }
-    resolveComponentFromConfig(property) {
+    resolveComponentFromConfig(property, route) {
         var _a;
         const configName = `${property}Component`;
         const defaultComponent = `${property}Default`;
-        const componentName = (_a = this.getConfig()[configName]) !== null && _a !== void 0 ? _a : defaultComponent;
-        return this.getComponent(componentName) || this.getComponent(defaultComponent);
+        const componentName = (_a = this.getConfig(route)[configName]) !== null && _a !== void 0 ? _a : defaultComponent;
+        return this.getComponent(componentName, route) || this.getComponent(defaultComponent, route);
     }
-    getComponentsGroupName() {
-        const { bundle, pageComponent } = this.getConfig();
+    getComponentsGroupName(route) {
+        const { bundle, pageComponent } = this.getConfig(route);
         const group = experiments.isFileSystemPageComponent(pageComponent) ? pageComponent : bundle;
         return group;
     }