@tramvai/module-child-app 3.33.2 → 3.37.1

package/lib/browser/child/singletonProviders.browser.js

@@ -1,7 +1,6 @@
 import noop from '@tinkoff/utils/function/noop';
-import flatten from '@tinkoff/utils/array/flatten';
 import { provide } from '@tramvai/core';
-import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN } from '@tramvai/tokens-child-app';
+import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, CHILD_APP_PAGE_SERVICE_TOKEN } from '@tramvai/tokens-child-app';
 import { CONTEXT_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
 import { Subscription } from '@tramvai/state';
 import { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
@@ -35,30 +34,32 @@ const getChildProviders = (appDi) => {
         provide({
             provide: commandLineListTokens.clear,
             multi: true,
-            useFactory: ({ actionRunner, actions }) => {
-                return function childAppRunActions() {
-                    return actionRunner.runActions(flatten(actions));
+            useFactory: ({ actionRunner, childAppPageService }) => {
+                return async function childAppRunActions() {
+                    await childAppPageService.resolveComponent();
+                    return actionRunner.runActions(childAppPageService.getActions());
                 };
             },
             deps: {
                 actionRunner: ACTION_PAGE_RUNNER_TOKEN,
-                actions: CHILD_APP_INTERNAL_ACTION_TOKEN,
+                childAppPageService: CHILD_APP_PAGE_SERVICE_TOKEN,
             },
         }),
         provide({
             provide: commandLineListTokens.spaTransition,
             multi: true,
-            useFactory: ({ spaMode, actionRunner, actions }) => {
+            useFactory: ({ spaMode, actionRunner, childAppPageService }) => {
                 if (spaMode !== 'after') {
-                    return function childAppRunActions() {
-                        return actionRunner.runActions(flatten(actions));
+                    return async function childAppRunActions() {
+                        await childAppPageService.resolveComponent();
+                        return actionRunner.runActions(childAppPageService.getActions());
                     };
                 }
                 return noop;
             },
             deps: {
                 actionRunner: ACTION_PAGE_RUNNER_TOKEN,
-                actions: CHILD_APP_INTERNAL_ACTION_TOKEN,
+                childAppPageService: CHILD_APP_PAGE_SERVICE_TOKEN,
                 spaMode: {
                     token: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
                     optional: true,
@@ -68,17 +69,18 @@ const getChildProviders = (appDi) => {
         provide({
             provide: commandLineListTokens.afterSpaTransition,
             multi: true,
-            useFactory: ({ spaMode, actionRunner, actions }) => {
+            useFactory: ({ spaMode, actionRunner, childAppPageService }) => {
                 if (spaMode === 'after') {
-                    return function childAppRunActions() {
-                        return actionRunner.runActions(flatten(actions));
+                    return async function childAppRunActions() {
+                        await childAppPageService.resolveComponent();
+                        return actionRunner.runActions(childAppPageService.getActions());
                     };
                 }
                 return noop;
             },
             deps: {
                 actionRunner: ACTION_PAGE_RUNNER_TOKEN,
-                actions: CHILD_APP_INTERNAL_ACTION_TOKEN,
+                childAppPageService: CHILD_APP_PAGE_SERVICE_TOKEN,
                 spaMode: {
                     token: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
                     optional: true,

package/lib/browser/preload.browser.js

@@ -1,7 +1,9 @@
+import { CHILD_APP_PAGE_SERVICE_TOKEN } from '@tramvai/tokens-child-app';
+import { optional } from '@tinkoff/dippy';
 import { ChildAppStore } from '../shared/store.browser.js';
 
 class PreloadManager {
-    constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, }) {
+    constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, diManager, }) {
         this.pageHasRendered = false;
         this.pageHasLoaded = false;
         this.currentlyPreloaded = new Map();
@@ -13,8 +15,9 @@ class PreloadManager {
         this.store = store;
         this.resolutionConfigManager = resolutionConfigManager;
         this.resolveExternalConfig = resolveExternalConfig;
+        this.diManager = diManager;
     }
-    async preload(request, onlyPrefetch = false) {
+    async preload(request, route, onlyPrefetch = false) {
         await this.init();
         const config = this.resolveExternalConfig(request);
         if (!config) {
@@ -36,6 +39,7 @@ class PreloadManager {
                 const promise = (async () => {
                     try {
                         await this.loader.load(config);
+                        await this.resolveComponent(config, route);
                         if (!onlyPrefetch) {
                             await this.run('customer', config);
                             await this.run('clear', config);
@@ -52,9 +56,13 @@ class PreloadManager {
                 return promise;
             }
         }
+        else {
+            // case for SPA-navigation to another page of same Child App without prefetch
+            await this.resolveComponent(config, route);
+        }
     }
-    async prefetch(request) {
-        return this.preload(request, true);
+    async prefetch(request, route) {
+        return this.preload(request, route, true);
     }
     isPreloaded(request) {
         const config = this.resolveExternalConfig(request);
@@ -69,6 +77,8 @@ class PreloadManager {
         this.currentlyPreloaded.forEach((config) => {
             promises.push((async () => {
                 await this.loader.init(config);
+                // case for client initialization of Child App
+                await this.resolveComponent(config);
                 await this.run('customer', config);
             })());
         });
@@ -119,6 +129,14 @@ class PreloadManager {
         }
         await this.runner.run('client', status, config);
     }
+    // preload child app page component - we need to register page actions before running all child app actions
+    async resolveComponent(config, route) {
+        const di = this.diManager.getChildDi(config);
+        const childAppPageService = di === null || di === void 0 ? void 0 : di.get(optional(CHILD_APP_PAGE_SERVICE_TOKEN));
+        if (childAppPageService) {
+            await childAppPageService.resolveComponent(route);
+        }
+    }
 }
 
 export { PreloadManager };

package/lib/browser/preload.d.ts

@@ -1,26 +1,29 @@
-import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, CHILD_APP_RESOLVE_CONFIG_TOKEN, ChildAppFinalConfig, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+import { type ChildAppCommandLineRunner, type ChildAppRequestConfig, type ChildAppLoader, type ChildAppPreloadManager, type CHILD_APP_RESOLVE_CONFIG_TOKEN, type ChildAppFinalConfig, type CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, type CHILD_APP_DI_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
 import type { STORE_TOKEN } from '@tramvai/tokens-common';
+import type { Route } from '@tinkoff/router';
 export declare class PreloadManager implements ChildAppPreloadManager {
     private loader;
     private runner;
     private store;
     private resolutionConfigManager;
     private resolveExternalConfig;
+    private diManager;
     private pageHasRendered;
     private pageHasLoaded;
     private currentlyPreloaded;
     private hasPreloadBefore;
     private hasInitialized;
     private map;
-    constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, }: {
+    constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, diManager, }: {
         loader: ChildAppLoader;
         runner: ChildAppCommandLineRunner;
         resolutionConfigManager: typeof CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN;
         resolveExternalConfig: typeof CHILD_APP_RESOLVE_CONFIG_TOKEN;
         store: typeof STORE_TOKEN;
+        diManager: typeof CHILD_APP_DI_MANAGER_TOKEN;
     });
-    preload(request: ChildAppRequestConfig, onlyPrefetch?: boolean): Promise<void>;
-    prefetch(request: ChildAppRequestConfig): Promise<void>;
+    preload(request: ChildAppRequestConfig, route?: Route, onlyPrefetch?: boolean): Promise<void>;
+    prefetch(request: ChildAppRequestConfig, route?: Route): Promise<void>;
     isPreloaded(request: ChildAppRequestConfig): boolean;
     runPreloaded(): Promise<void>;
     pageRender(): void;
@@ -29,5 +32,6 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     private initServerPreloaded;
     private init;
     private run;
+    private resolveComponent;
 }
 //# sourceMappingURL=preload.d.ts.map

package/lib/browser/providers.browser.js

@@ -1,8 +1,8 @@
 import { Scope } from '@tinkoff/dippy';
 import { provide, commandLineListTokens } from '@tramvai/core';
-import { CHILD_APP_LOADER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_COMMON_INITIAL_STATE_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_DI_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+import { CHILD_APP_LOADER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMON_INITIAL_STATE_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
 import { LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
-import { ROUTER_TOKEN } from '@tramvai/tokens-router';
+import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import { BrowserLoader } from './loader.browser.js';
 import { PreloadManager } from './preload.browser.js';
 import { RenderManager } from './render.browser.js';
@@ -27,6 +27,7 @@ const browserProviders = [
             resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
             resolveExternalConfig: CHILD_APP_RESOLVE_CONFIG_TOKEN,
             store: STORE_TOKEN,
+            diManager: CHILD_APP_DI_MANAGER_TOKEN,
         },
     }),
     provide({
@@ -77,11 +78,13 @@ const browserProviders = [
     provide({
         provide: commandLineListTokens.spaTransition,
         multi: true,
-        useFactory: ({ preloader, runner }) => {
+        useFactory: ({ preloader, runner, diManager, pageService }) => {
             return async function childAppRunPreloaded() {
                 await runCommand({
                     preloader,
                     runner,
+                    diManager,
+                    pageService,
                     status: 'spa',
                     forcePreload: false,
                 });
@@ -90,16 +93,20 @@ const browserProviders = [
         deps: {
             preloader: CHILD_APP_PRELOAD_MANAGER_TOKEN,
             runner: CHILD_APP_COMMAND_LINE_RUNNER_TOKEN,
+            diManager: CHILD_APP_DI_MANAGER_TOKEN,
+            pageService: PAGE_SERVICE_TOKEN,
         },
     }),
     provide({
         provide: commandLineListTokens.afterSpaTransition,
         multi: true,
-        useFactory: ({ preloader, runner }) => {
+        useFactory: ({ preloader, runner, diManager, pageService }) => {
             return async function childAppRunPreloaded() {
                 await runCommand({
                     preloader,
                     runner,
+                    diManager,
+                    pageService,
                     status: 'afterSpa',
                     forcePreload: true,
                 });
@@ -108,6 +115,8 @@ const browserProviders = [
         deps: {
             preloader: CHILD_APP_PRELOAD_MANAGER_TOKEN,
             runner: CHILD_APP_COMMAND_LINE_RUNNER_TOKEN,
+            diManager: CHILD_APP_DI_MANAGER_TOKEN,
+            pageService: PAGE_SERVICE_TOKEN,
         },
     }),
 ];

package/lib/browser/runCommand.browser.js

@@ -1,9 +1,9 @@
-const runCommand = async ({ status, forcePreload, runner, preloader, }) => {
+const runCommand = async ({ status, forcePreload, runner, preloader, diManager, pageService, }) => {
     const childApps = preloader.getPreloadedList();
     await Promise.all(childApps.map(async (config) => {
         if (forcePreload) {
             // need to wait while actual child-app is loaded in case it wasn't preloaded before
-            await preloader.preload(config);
+            await preloader.preload(config, pageService.getCurrentRoute());
         }
         return runner.run('client', status, config);
     }));

package/lib/browser/runCommand.d.ts

@@ -1,8 +1,12 @@
-import type { CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
-export declare const runCommand: ({ status, forcePreload, runner, preloader, }: {
+import type { CHILD_APP_DI_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+import { type CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, type CHILD_APP_PRELOAD_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+export declare const runCommand: ({ status, forcePreload, runner, preloader, diManager, pageService, }: {
     status: string;
     forcePreload: boolean;
     runner: typeof CHILD_APP_COMMAND_LINE_RUNNER_TOKEN;
     preloader: typeof CHILD_APP_PRELOAD_MANAGER_TOKEN;
+    diManager: typeof CHILD_APP_DI_MANAGER_TOKEN;
+    pageService: typeof PAGE_SERVICE_TOKEN;
 }) => Promise<void>;
 //# sourceMappingURL=runCommand.d.ts.map

package/lib/server/child/singletonProviders.es.js

@@ -1,6 +1,5 @@
-import flatten from '@tinkoff/utils/array/flatten';
 import { provide } from '@tramvai/core';
-import { commandLineListTokens, CHILD_APP_INTERNAL_ACTION_TOKEN } from '@tramvai/tokens-child-app';
+import { commandLineListTokens, CHILD_APP_PAGE_SERVICE_TOKEN } from '@tramvai/tokens-child-app';
 import { ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
 
 const getChildProviders = (appDi) => {
@@ -8,14 +7,15 @@ const getChildProviders = (appDi) => {
         provide({
             provide: commandLineListTokens.resolvePageDeps,
             multi: true,
-            useFactory: ({ actionRunner, actions }) => {
-                return function childAppRunActions() {
-                    return actionRunner.runActions(flatten(actions));
+            useFactory: ({ actionRunner, childAppPageService }) => {
+                return async function childAppRunActions() {
+                    await childAppPageService.resolveComponent();
+                    return actionRunner.runActions(childAppPageService.getActions());
                 };
             },
             deps: {
                 actionRunner: ACTION_PAGE_RUNNER_TOKEN,
-                actions: CHILD_APP_INTERNAL_ACTION_TOKEN,
+                childAppPageService: CHILD_APP_PAGE_SERVICE_TOKEN,
             },
         }),
     ];

package/lib/server/child/singletonProviders.js

@@ -2,28 +2,24 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var flatten = require('@tinkoff/utils/array/flatten');
 var core = require('@tramvai/core');
 var tokensChildApp = require('@tramvai/tokens-child-app');
 var tokensCommon = require('@tramvai/tokens-common');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
-
 const getChildProviders = (appDi) => {
     return [
         core.provide({
             provide: tokensChildApp.commandLineListTokens.resolvePageDeps,
             multi: true,
-            useFactory: ({ actionRunner, actions }) => {
-                return function childAppRunActions() {
-                    return actionRunner.runActions(flatten__default["default"](actions));
+            useFactory: ({ actionRunner, childAppPageService }) => {
+                return async function childAppRunActions() {
+                    await childAppPageService.resolveComponent();
+                    return actionRunner.runActions(childAppPageService.getActions());
                 };
             },
             deps: {
                 actionRunner: tokensCommon.ACTION_PAGE_RUNNER_TOKEN,
-                actions: tokensChildApp.CHILD_APP_INTERNAL_ACTION_TOKEN,
+                childAppPageService: tokensChildApp.CHILD_APP_PAGE_SERVICE_TOKEN,
             },
         }),
     ];

package/lib/server/preload.d.ts

@@ -1,22 +1,25 @@
-import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, ChildAppStateManager, CHILD_APP_RESOLVE_CONFIG_TOKEN, ChildAppFinalConfig, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+import type { Route } from '@tinkoff/router';
+import { type ChildAppCommandLineRunner, type ChildAppRequestConfig, type ChildAppLoader, type ChildAppPreloadManager, type ChildAppStateManager, type CHILD_APP_RESOLVE_CONFIG_TOKEN, type ChildAppFinalConfig, type CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, type CHILD_APP_DI_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
 export declare class PreloadManager implements ChildAppPreloadManager {
     private loader;
     private runner;
     private stateManager;
     private resolutionConfigManager;
     private readonly resolveFullConfig;
+    private diManager;
     private shouldRunImmediately;
     private map;
     private preloadMap;
-    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, }: {
+    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, diManager, }: {
         loader: ChildAppLoader;
         runner: ChildAppCommandLineRunner;
         stateManager: ChildAppStateManager;
         resolutionConfigManager: typeof CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN;
         resolveFullConfig: typeof CHILD_APP_RESOLVE_CONFIG_TOKEN;
+        diManager: typeof CHILD_APP_DI_MANAGER_TOKEN;
     });
-    preload(request: ChildAppRequestConfig): Promise<void>;
-    prefetch(request: ChildAppRequestConfig): Promise<void>;
+    preload(request: ChildAppRequestConfig, route?: Route): Promise<void>;
+    prefetch(request: ChildAppRequestConfig, route?: Route): Promise<void>;
     isPreloaded(request: ChildAppRequestConfig): boolean;
     runPreloaded(): Promise<void>;
     pageRender(): void;

package/lib/server/preload.es.js

@@ -1,5 +1,8 @@
+import { optional } from '@tinkoff/dippy';
+import { CHILD_APP_PAGE_SERVICE_TOKEN } from '@tramvai/tokens-child-app';
+
 class PreloadManager {
-    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, }) {
+    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, diManager, }) {
         this.shouldRunImmediately = false;
         this.map = new Map();
         this.preloadMap = new Map();
@@ -8,8 +11,9 @@ class PreloadManager {
         this.stateManager = stateManager;
         this.resolutionConfigManager = resolutionConfigManager;
         this.resolveFullConfig = resolveFullConfig;
+        this.diManager = diManager;
     }
-    async preload(request) {
+    async preload(request, route) {
         await this.resolutionConfigManager.init();
         const config = this.resolveFullConfig(request);
         if (!config) {
@@ -25,7 +29,13 @@ class PreloadManager {
             .catch(() => {
             // Actual error will be logged by the internals of this.loader
         })
-            .then(() => {
+            .then(async () => {
+            // preload child app page component - we need to register page actions before running all child app actions
+            const di = this.diManager.getChildDi(config);
+            const childAppPageService = di === null || di === void 0 ? void 0 : di.get(optional(CHILD_APP_PAGE_SERVICE_TOKEN));
+            if (childAppPageService) {
+                await childAppPageService.resolveComponent();
+            }
             if (this.shouldRunImmediately) {
                 return this.run('customer', config);
             }
@@ -37,8 +47,8 @@ class PreloadManager {
             await promise;
         }
     }
-    async prefetch(request) {
-        return this.preload(request);
+    async prefetch(request, route) {
+        return this.preload(request, route);
     }
     isPreloaded(request) {
         const config = this.resolveFullConfig(request);

package/lib/server/preload.js

@@ -2,8 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var dippy = require('@tinkoff/dippy');
+var tokensChildApp = require('@tramvai/tokens-child-app');
+
 class PreloadManager {
-    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, }) {
+    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, diManager, }) {
         this.shouldRunImmediately = false;
         this.map = new Map();
         this.preloadMap = new Map();
@@ -12,8 +15,9 @@ class PreloadManager {
         this.stateManager = stateManager;
         this.resolutionConfigManager = resolutionConfigManager;
         this.resolveFullConfig = resolveFullConfig;
+        this.diManager = diManager;
     }
-    async preload(request) {
+    async preload(request, route) {
         await this.resolutionConfigManager.init();
         const config = this.resolveFullConfig(request);
         if (!config) {
@@ -29,7 +33,13 @@ class PreloadManager {
             .catch(() => {
             // Actual error will be logged by the internals of this.loader
         })
-            .then(() => {
+            .then(async () => {
+            // preload child app page component - we need to register page actions before running all child app actions
+            const di = this.diManager.getChildDi(config);
+            const childAppPageService = di === null || di === void 0 ? void 0 : di.get(dippy.optional(tokensChildApp.CHILD_APP_PAGE_SERVICE_TOKEN));
+            if (childAppPageService) {
+                await childAppPageService.resolveComponent();
+            }
             if (this.shouldRunImmediately) {
                 return this.run('customer', config);
             }
@@ -41,8 +51,8 @@ class PreloadManager {
             await promise;
         }
     }
-    async prefetch(request) {
-        return this.preload(request);
+    async prefetch(request, route) {
+        return this.preload(request, route);
     }
     isPreloaded(request) {
         const config = this.resolveFullConfig(request);

package/lib/server/providers.es.js

@@ -53,6 +53,7 @@ const serverProviders = [
             stateManager: CHILD_APP_STATE_MANAGER_TOKEN,
             resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
             resolveFullConfig: CHILD_APP_RESOLVE_CONFIG_TOKEN,
+            diManager: CHILD_APP_DI_MANAGER_TOKEN,
         },
     }),
     provide({

package/lib/server/providers.js

@@ -57,6 +57,7 @@ const serverProviders = [
             stateManager: tokensChildApp.CHILD_APP_STATE_MANAGER_TOKEN,
             resolutionConfigManager: tokensChildApp.CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
             resolveFullConfig: tokensChildApp.CHILD_APP_RESOLVE_CONFIG_TOKEN,
+            diManager: tokensChildApp.CHILD_APP_DI_MANAGER_TOKEN,
         },
     }),
     core.provide({

package/lib/shared/child/providers.browser.js

@@ -1,9 +1,11 @@
 import flatten from '@tinkoff/utils/array/flatten';
-import { provide } from '@tramvai/core';
+import { provide, Scope, optional } from '@tramvai/core';
 import { ChildDispatcherContext } from '@tramvai/state';
-import { CHILD_APP_INTERNAL_ROOT_STATE_ALLOWED_STORE_TOKEN } from '@tramvai/tokens-child-app';
-import { DISPATCHER_CONTEXT_TOKEN, DISPATCHER_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN } from '@tramvai/tokens-common';
+import { CHILD_APP_INTERNAL_ROOT_STATE_ALLOWED_STORE_TOKEN, CHILD_APP_PAGE_SERVICE_TOKEN, CHILD_APP_ACTIONS_REGISTRY_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, CHILD_APP_PAGE_COMPONENTS_TOKEN } from '@tramvai/tokens-child-app';
+import { DISPATCHER_CONTEXT_TOKEN, DISPATCHER_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN, COMPONENT_REGISTRY_TOKEN } from '@tramvai/tokens-common';
+import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import { extractorProviders } from './extractorProviders.browser.browser.js';
+import { ChildAppPageService } from '../pageService.browser.js';
 
 const getChildProviders = (appDi, loadableStats) => {
     const parentDispatcherContext = appDi.get(DISPATCHER_CONTEXT_TOKEN);
@@ -32,6 +34,20 @@ const getChildProviders = (appDi, loadableStats) => {
                 },
             },
         }),
+        provide({
+            provide: CHILD_APP_PAGE_SERVICE_TOKEN,
+            scope: Scope.REQUEST,
+            useFactory: (deps) => {
+                return new ChildAppPageService(deps);
+            },
+            deps: {
+                actionsRegistry: CHILD_APP_ACTIONS_REGISTRY_TOKEN,
+                config: CHILD_APP_INTERNAL_CONFIG_TOKEN,
+                componentRegistry: COMPONENT_REGISTRY_TOKEN,
+                pageService: PAGE_SERVICE_TOKEN,
+                pageComponents: optional(CHILD_APP_PAGE_COMPONENTS_TOKEN),
+            },
+        }),
     ];
 };
 

package/lib/shared/child/providers.es.js

@@ -1,9 +1,11 @@
 import flatten from '@tinkoff/utils/array/flatten';
-import { provide } from '@tramvai/core';
+import { provide, Scope, optional } from '@tramvai/core';
 import { ChildDispatcherContext } from '@tramvai/state';
-import { CHILD_APP_INTERNAL_ROOT_STATE_ALLOWED_STORE_TOKEN } from '@tramvai/tokens-child-app';
-import { DISPATCHER_CONTEXT_TOKEN, DISPATCHER_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN } from '@tramvai/tokens-common';
+import { CHILD_APP_INTERNAL_ROOT_STATE_ALLOWED_STORE_TOKEN, CHILD_APP_PAGE_SERVICE_TOKEN, CHILD_APP_ACTIONS_REGISTRY_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, CHILD_APP_PAGE_COMPONENTS_TOKEN } from '@tramvai/tokens-child-app';
+import { DISPATCHER_CONTEXT_TOKEN, DISPATCHER_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN, COMPONENT_REGISTRY_TOKEN } from '@tramvai/tokens-common';
+import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import { extractorProviders } from './extractorProviders.es.js';
+import { ChildAppPageService } from '../pageService.es.js';
 
 const getChildProviders = (appDi, loadableStats) => {
     const parentDispatcherContext = appDi.get(DISPATCHER_CONTEXT_TOKEN);
@@ -32,6 +34,20 @@ const getChildProviders = (appDi, loadableStats) => {
                 },
             },
         }),
+        provide({
+            provide: CHILD_APP_PAGE_SERVICE_TOKEN,
+            scope: Scope.REQUEST,
+            useFactory: (deps) => {
+                return new ChildAppPageService(deps);
+            },
+            deps: {
+                actionsRegistry: CHILD_APP_ACTIONS_REGISTRY_TOKEN,
+                config: CHILD_APP_INTERNAL_CONFIG_TOKEN,
+                componentRegistry: COMPONENT_REGISTRY_TOKEN,
+                pageService: PAGE_SERVICE_TOKEN,
+                pageComponents: optional(CHILD_APP_PAGE_COMPONENTS_TOKEN),
+            },
+        }),
     ];
 };
 

package/lib/shared/child/providers.js

@@ -7,7 +7,9 @@ var core = require('@tramvai/core');
 var state = require('@tramvai/state');
 var tokensChildApp = require('@tramvai/tokens-child-app');
 var tokensCommon = require('@tramvai/tokens-common');
+var tokensRouter = require('@tramvai/tokens-router');
 var extractorProviders = require('./extractorProviders.js');
+var pageService = require('../pageService.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -40,6 +42,20 @@ const getChildProviders = (appDi, loadableStats) => {
                 },
             },
         }),
+        core.provide({
+            provide: tokensChildApp.CHILD_APP_PAGE_SERVICE_TOKEN,
+            scope: core.Scope.REQUEST,
+            useFactory: (deps) => {
+                return new pageService.ChildAppPageService(deps);
+            },
+            deps: {
+                actionsRegistry: tokensChildApp.CHILD_APP_ACTIONS_REGISTRY_TOKEN,
+                config: tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN,
+                componentRegistry: tokensCommon.COMPONENT_REGISTRY_TOKEN,
+                pageService: tokensRouter.PAGE_SERVICE_TOKEN,
+                pageComponents: core.optional(tokensChildApp.CHILD_APP_PAGE_COMPONENTS_TOKEN),
+            },
+        }),
     ];
 };
 

package/lib/shared/child/singletonProviders.browser.js

@@ -1,6 +1,9 @@
-import { provide } from '@tramvai/core';
+import flatten from '@tinkoff/utils/array/flatten';
+import { provide, Scope } from '@tramvai/core';
+import { ActionRegistry } from '@tramvai/module-common';
 import { LOGGER_TOKEN } from '@tramvai/tokens-common';
 import { RENDER_SLOTS } from '@tramvai/tokens-render';
+import { CHILD_APP_ACTIONS_REGISTRY_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN } from '@tramvai/tokens-child-app';
 import { getChildProviders as getChildProviders$1 } from '../../browser/child/singletonProviders.browser.js';
 
 const getChildProviders = (appDi) => {
@@ -17,6 +20,16 @@ const getChildProviders = (appDi) => {
             multi: true,
             useValue: [],
         }),
+        provide({
+            provide: CHILD_APP_ACTIONS_REGISTRY_TOKEN,
+            scope: Scope.SINGLETON,
+            useFactory: ({ actionsList }) => {
+                return new ActionRegistry({ actionsList: flatten(actionsList) });
+            },
+            deps: {
+                actionsList: CHILD_APP_INTERNAL_ACTION_TOKEN,
+            },
+        }),
         ...getChildProviders$1(appDi),
     ];
 };

package/lib/shared/child/singletonProviders.es.js

@@ -1,6 +1,9 @@
-import { provide } from '@tramvai/core';
+import flatten from '@tinkoff/utils/array/flatten';
+import { provide, Scope } from '@tramvai/core';
+import { ActionRegistry } from '@tramvai/module-common';
 import { LOGGER_TOKEN } from '@tramvai/tokens-common';
 import { RENDER_SLOTS } from '@tramvai/tokens-render';
+import { CHILD_APP_ACTIONS_REGISTRY_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN } from '@tramvai/tokens-child-app';
 import { getChildProviders as getChildProviders$1 } from '../../server/child/singletonProviders.es.js';
 
 const getChildProviders = (appDi) => {
@@ -17,6 +20,16 @@ const getChildProviders = (appDi) => {
             multi: true,
             useValue: [],
         }),
+        provide({
+            provide: CHILD_APP_ACTIONS_REGISTRY_TOKEN,
+            scope: Scope.SINGLETON,
+            useFactory: ({ actionsList }) => {
+                return new ActionRegistry({ actionsList: flatten(actionsList) });
+            },
+            deps: {
+                actionsList: CHILD_APP_INTERNAL_ACTION_TOKEN,
+            },
+        }),
         ...getChildProviders$1(),
     ];
 };

package/lib/shared/child/singletonProviders.js

@@ -2,11 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var flatten = require('@tinkoff/utils/array/flatten');
 var core = require('@tramvai/core');
+var moduleCommon = require('@tramvai/module-common');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensRender = require('@tramvai/tokens-render');
+var tokensChildApp = require('@tramvai/tokens-child-app');
 var singletonProviders = require('../../server/child/singletonProviders.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
+
 const getChildProviders = (appDi) => {
     const logger = appDi.get(tokensCommon.LOGGER_TOKEN);
     return [
@@ -21,6 +28,16 @@ const getChildProviders = (appDi) => {
             multi: true,
             useValue: [],
         }),
+        core.provide({
+            provide: tokensChildApp.CHILD_APP_ACTIONS_REGISTRY_TOKEN,
+            scope: core.Scope.SINGLETON,
+            useFactory: ({ actionsList }) => {
+                return new moduleCommon.ActionRegistry({ actionsList: flatten__default["default"](actionsList) });
+            },
+            deps: {
+                actionsList: tokensChildApp.CHILD_APP_INTERNAL_ACTION_TOKEN,
+            },
+        }),
         ...singletonProviders.getChildProviders(),
     ];
 };

package/lib/shared/pagePreload.browser.js

@@ -11,7 +11,7 @@ const pagePreload = async ({ pageService, preloadManager, }, route) => {
     ]);
     await Promise.all(components.map(async (component) => {
         if (component === null || component === void 0 ? void 0 : component.childApps) {
-            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request).catch(() => {
+            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request, route).catch(() => {
                 // actual error will be logged internally
             })));
         }

package/lib/shared/pagePreload.es.js

@@ -11,7 +11,7 @@ const pagePreload = async ({ pageService, preloadManager, }, route) => {
     ]);
     await Promise.all(components.map(async (component) => {
         if (component === null || component === void 0 ? void 0 : component.childApps) {
-            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request).catch(() => {
+            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request, route).catch(() => {
                 // actual error will be logged internally
             })));
         }

package/lib/shared/pagePreload.js

@@ -15,7 +15,7 @@ const pagePreload = async ({ pageService, preloadManager, }, route) => {
     ]);
     await Promise.all(components.map(async (component) => {
         if (component === null || component === void 0 ? void 0 : component.childApps) {
-            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request).catch(() => {
+            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request, route).catch(() => {
                 // actual error will be logged internally
             })));
         }

package/lib/shared/pageService.browser.js

@@ -0,0 +1,62 @@
+import isArray from '@tinkoff/utils/is/array';
+import { resolveLazyComponent } from '@tramvai/react';
+
+class ChildAppPageService {
+    constructor({ actionsRegistry, config, componentRegistry, pageService, pageComponents, }) {
+        this.actionsRegistry = actionsRegistry;
+        this.config = config;
+        this.componentRegistry = componentRegistry;
+        this.pageService = pageService;
+        const componentsGroupName = this.getComponentsGroupName();
+        (pageComponents || []).forEach((record) => {
+            Object.keys(record).forEach((pageComponentName) => {
+                const pageComponent = record[pageComponentName];
+                if (!this.componentRegistry.get(pageComponentName, componentsGroupName)) {
+                    this.componentRegistry.add(pageComponentName, pageComponent, componentsGroupName);
+                }
+            });
+        });
+    }
+    async resolveComponent(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        const componentsGroupName = this.getComponentsGroupName();
+        if (!pageComponentName) {
+            return;
+        }
+        const pageComponent = this.componentRegistry.get(pageComponentName, componentsGroupName);
+        if (pageComponent) {
+            if ('load' in pageComponent) {
+                await resolveLazyComponent(pageComponent);
+            }
+            if ('actions' in pageComponent && isArray(pageComponent.actions)) {
+                this.actionsRegistry.add(pageComponentName, pageComponent.actions);
+            }
+        }
+    }
+    getComponent(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        const componentsGroupName = this.getComponentsGroupName();
+        return this.componentRegistry.get(pageComponentName, componentsGroupName);
+    }
+    getComponentName(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        return pageComponentName;
+    }
+    getActions(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        return [
+            ...(this.actionsRegistry.getGlobal() || []),
+            ...(this.actionsRegistry.get(pageComponentName) || []),
+        ];
+    }
+    getPageComponentName(route) {
+        var _a;
+        const config = (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : this.pageService.getConfig();
+        return config === null || config === void 0 ? void 0 : config.unstable_childAppPageComponent;
+    }
+    getComponentsGroupName() {
+        return `${this.config.name}@${this.config.version}`;
+    }
+}
+
+export { ChildAppPageService };

package/lib/shared/pageService.d.ts

@@ -0,0 +1,31 @@
+import type { Route } from '@tinkoff/router';
+import type { ExtractDependencyType, PageAction } from '@tramvai/core';
+import type { CHILD_APP_ACTIONS_REGISTRY_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, CHILD_APP_PAGE_COMPONENTS_TOKEN, ChildAppPageComponent, ChildAppPageService as IChildAppPageService } from '@tramvai/tokens-child-app';
+import type { COMPONENT_REGISTRY_TOKEN } from '@tramvai/tokens-common';
+import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+type ActionsRegistry = ExtractDependencyType<typeof CHILD_APP_ACTIONS_REGISTRY_TOKEN>;
+type Config = ExtractDependencyType<typeof CHILD_APP_INTERNAL_CONFIG_TOKEN>;
+type ComponentRegistry = ExtractDependencyType<typeof COMPONENT_REGISTRY_TOKEN>;
+type PageService = ExtractDependencyType<typeof PAGE_SERVICE_TOKEN>;
+type PageComponents = ExtractDependencyType<typeof CHILD_APP_PAGE_COMPONENTS_TOKEN>;
+export declare class ChildAppPageService implements IChildAppPageService {
+    private actionsRegistry;
+    private config;
+    private componentRegistry;
+    private pageService;
+    constructor({ actionsRegistry, config, componentRegistry, pageService, pageComponents, }: {
+        actionsRegistry: ActionsRegistry;
+        config: Config;
+        componentRegistry: ComponentRegistry;
+        pageService: PageService;
+        pageComponents: PageComponents | null;
+    });
+    resolveComponent(route?: Route): Promise<void>;
+    getComponent(route?: Route): ChildAppPageComponent | void;
+    getComponentName(route?: Route): string | void;
+    getActions(route?: Route): PageAction[];
+    private getPageComponentName;
+    private getComponentsGroupName;
+}
+export {};
+//# sourceMappingURL=pageService.d.ts.map

package/lib/shared/pageService.es.js

@@ -0,0 +1,62 @@
+import isArray from '@tinkoff/utils/is/array';
+import { resolveLazyComponent } from '@tramvai/react';
+
+class ChildAppPageService {
+    constructor({ actionsRegistry, config, componentRegistry, pageService, pageComponents, }) {
+        this.actionsRegistry = actionsRegistry;
+        this.config = config;
+        this.componentRegistry = componentRegistry;
+        this.pageService = pageService;
+        const componentsGroupName = this.getComponentsGroupName();
+        (pageComponents || []).forEach((record) => {
+            Object.keys(record).forEach((pageComponentName) => {
+                const pageComponent = record[pageComponentName];
+                if (!this.componentRegistry.get(pageComponentName, componentsGroupName)) {
+                    this.componentRegistry.add(pageComponentName, pageComponent, componentsGroupName);
+                }
+            });
+        });
+    }
+    async resolveComponent(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        const componentsGroupName = this.getComponentsGroupName();
+        if (!pageComponentName) {
+            return;
+        }
+        const pageComponent = this.componentRegistry.get(pageComponentName, componentsGroupName);
+        if (pageComponent) {
+            if ('load' in pageComponent) {
+                await resolveLazyComponent(pageComponent);
+            }
+            if ('actions' in pageComponent && isArray(pageComponent.actions)) {
+                this.actionsRegistry.add(pageComponentName, pageComponent.actions);
+            }
+        }
+    }
+    getComponent(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        const componentsGroupName = this.getComponentsGroupName();
+        return this.componentRegistry.get(pageComponentName, componentsGroupName);
+    }
+    getComponentName(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        return pageComponentName;
+    }
+    getActions(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        return [
+            ...(this.actionsRegistry.getGlobal() || []),
+            ...(this.actionsRegistry.get(pageComponentName) || []),
+        ];
+    }
+    getPageComponentName(route) {
+        var _a;
+        const config = (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : this.pageService.getConfig();
+        return config === null || config === void 0 ? void 0 : config.unstable_childAppPageComponent;
+    }
+    getComponentsGroupName() {
+        return `${this.config.name}@${this.config.version}`;
+    }
+}
+
+export { ChildAppPageService };

package/lib/shared/pageService.js

@@ -0,0 +1,70 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var isArray = require('@tinkoff/utils/is/array');
+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);
+
+class ChildAppPageService {
+    constructor({ actionsRegistry, config, componentRegistry, pageService, pageComponents, }) {
+        this.actionsRegistry = actionsRegistry;
+        this.config = config;
+        this.componentRegistry = componentRegistry;
+        this.pageService = pageService;
+        const componentsGroupName = this.getComponentsGroupName();
+        (pageComponents || []).forEach((record) => {
+            Object.keys(record).forEach((pageComponentName) => {
+                const pageComponent = record[pageComponentName];
+                if (!this.componentRegistry.get(pageComponentName, componentsGroupName)) {
+                    this.componentRegistry.add(pageComponentName, pageComponent, componentsGroupName);
+                }
+            });
+        });
+    }
+    async resolveComponent(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        const componentsGroupName = this.getComponentsGroupName();
+        if (!pageComponentName) {
+            return;
+        }
+        const pageComponent = this.componentRegistry.get(pageComponentName, componentsGroupName);
+        if (pageComponent) {
+            if ('load' in pageComponent) {
+                await react.resolveLazyComponent(pageComponent);
+            }
+            if ('actions' in pageComponent && isArray__default["default"](pageComponent.actions)) {
+                this.actionsRegistry.add(pageComponentName, pageComponent.actions);
+            }
+        }
+    }
+    getComponent(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        const componentsGroupName = this.getComponentsGroupName();
+        return this.componentRegistry.get(pageComponentName, componentsGroupName);
+    }
+    getComponentName(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        return pageComponentName;
+    }
+    getActions(route) {
+        const pageComponentName = this.getPageComponentName(route);
+        return [
+            ...(this.actionsRegistry.getGlobal() || []),
+            ...(this.actionsRegistry.get(pageComponentName) || []),
+        ];
+    }
+    getPageComponentName(route) {
+        var _a;
+        const config = (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : this.pageService.getConfig();
+        return config === null || config === void 0 ? void 0 : config.unstable_childAppPageComponent;
+    }
+    getComponentsGroupName() {
+        return `${this.config.name}@${this.config.version}`;
+    }
+}
+
+exports.ChildAppPageService = ChildAppPageService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "3.33.2",
+  "version": "3.37.1",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -33,22 +33,23 @@
     "@tinkoff/env-validators": "0.2.1",
     "@tinkoff/module-loader-client": "0.5.1",
     "@tinkoff/module-loader-server": "0.6.3",
+    "@tramvai/module-common": "3.37.1",
     "@tinkoff/url": "0.9.2",
-    "@tramvai/child-app-core": "3.33.2",
+    "@tramvai/child-app-core": "3.37.1",
     "@tramvai/safe-strings": "0.6.2",
-    "@tramvai/tokens-child-app": "3.33.2"
+    "@tramvai/tokens-child-app": "3.37.1"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.9.2",
-    "@tinkoff/router": "0.3.67",
+    "@tinkoff/router": "0.3.73",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "3.33.2",
-    "@tramvai/state": "3.33.2",
-    "@tramvai/react": "3.33.2",
-    "@tramvai/tokens-common": "3.33.2",
-    "@tramvai/tokens-render": "3.33.2",
-    "@tramvai/tokens-router": "3.33.2",
+    "@tramvai/core": "3.37.1",
+    "@tramvai/state": "3.37.1",
+    "@tramvai/react": "3.37.1",
+    "@tramvai/tokens-common": "3.37.1",
+    "@tramvai/tokens-render": "3.37.1",
+    "@tramvai/tokens-router": "3.37.1",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",