@tramvai/module-child-app 4.18.4 → 4.19.0

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

@@ -1,12 +1,16 @@
 import flatten from '@tinkoff/utils/array/flatten';
-import { provide, Scope } from '@tramvai/core';
+import { provide, Scope, APP_INFO_TOKEN, optional } from '@tramvai/core';
 import { ActionRegistry } from '@tramvai/module-common';
-import { LOGGER_TOKEN } from '@tramvai/tokens-common';
+import { LOGGER_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, ACTION_CONDITIONALS, DEFERRED_ACTIONS_MAP_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, PUBSUB_TOKEN, PUBSUB_FACTORY_TOKEN, DISPATCHER_CONTEXT_TOKEN, ASYNC_LOCAL_STORAGE_TOKEN, DISPATCHER_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_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 { CHILD_APP_ACTIONS_REGISTRY_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_REQUIRED_CONTRACTS, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, CHILD_APP_INTERNAL_ROOT_STATE_ALLOWED_STORE_TOKEN, CHILD_APP_PAGE_SERVICE_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, CHILD_APP_PAGE_COMPONENTS_TOKEN } from '@tramvai/tokens-child-app';
+import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN, LINK_PREFETCH_MANAGER_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
+import { ChildDispatcherContext } from '@tramvai/state';
 import { getChildProviders as getChildProviders$1 } from '../../server/child/singletonProviders.es.js';
+import { extractorProviders } from './extractorProviders.es.js';
+import { ChildAppPageService } from '../pageService.es.js';
 
-const getChildProviders = (appDi) => {
+const getChildProviders = (appDi, loadableStats) => {
     const logger = appDi.get(LOGGER_TOKEN);
     return [
         provide({
@@ -30,7 +34,78 @@ const getChildProviders = (appDi) => {
                 actionsList: CHILD_APP_INTERNAL_ACTION_TOKEN,
             },
         }),
+        provide({
+            provide: CHILD_REQUIRED_CONTRACTS,
+            useValue: [
+                ROUTER_TOKEN,
+                COMPONENT_REGISTRY_TOKEN,
+                PAGE_SERVICE_TOKEN,
+                LINK_PREFETCH_MANAGER_TOKEN,
+                ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+                LIMIT_ACTION_GLOBAL_TIME_RUN,
+            ],
+        }),
+        // for backward compatibility, when:
+        // - host app is modern (with contracts)
+        // - child app is legacy (<= v3.x.x, without contracts)
+        // - DI is isolated
+        // in legacy tramvai versions, this tokens is not borrowed in CommonChildAppModule
+        provide({
+            provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
+            multi: true,
+            useValue: [
+                APP_INFO_TOKEN,
+                ACTION_CONDITIONALS,
+                DEFERRED_ACTIONS_MAP_TOKEN,
+                EXECUTION_CONTEXT_MANAGER_TOKEN,
+                COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
+                PUBSUB_TOKEN,
+                PUBSUB_FACTORY_TOKEN,
+            ],
+        }),
         ...getChildProviders$1(),
+        ...extractorProviders(loadableStats),
+        provide({
+            provide: DISPATCHER_CONTEXT_TOKEN,
+            scope: Scope.REQUEST,
+            useFactory: ({ dispatcher, middlewares, initialState, parentAllowedStores }) => {
+                var _a, _b, _c, _d;
+                const parentDispatcherContext = (_d = (_c = (_b = (_a = appDi
+                    .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))) === null || _a === void 0 ? void 0 : _a.getStore()) === null || _b === void 0 ? void 0 : _b.tramvaiRequestDi) === null || _c === void 0 ? void 0 : _c.get(DISPATCHER_CONTEXT_TOKEN)) !== null && _d !== void 0 ? _d : appDi.get(DISPATCHER_CONTEXT_TOKEN);
+                return new ChildDispatcherContext({
+                    dispatcher,
+                    // context will be set later by the CONTEXT_TOKEN
+                    context: {},
+                    initialState: initialState !== null && initialState !== void 0 ? initialState : { stores: [] },
+                    middlewares: flatten(middlewares || []),
+                    parentDispatcherContext,
+                    parentAllowedStores: flatten(parentAllowedStores || []),
+                });
+            },
+            deps: {
+                dispatcher: DISPATCHER_TOKEN,
+                middlewares: { token: STORE_MIDDLEWARE, optional: true },
+                initialState: { token: INITIAL_APP_STATE_TOKEN, optional: true },
+                parentAllowedStores: {
+                    token: CHILD_APP_INTERNAL_ROOT_STATE_ALLOWED_STORE_TOKEN,
+                    optional: true,
+                },
+            },
+        }),
+        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/singletonProviders.js

@@ -8,13 +8,17 @@ 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 tokensRouter = require('@tramvai/tokens-router');
+var state = require('@tramvai/state');
 var singletonProviders = require('../../server/child/singletonProviders.js');
+var extractorProviders = require('./extractorProviders.js');
+var pageService = require('../pageService.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 getChildProviders = (appDi, loadableStats) => {
     const logger = appDi.get(tokensCommon.LOGGER_TOKEN);
     return [
         core.provide({
@@ -38,7 +42,78 @@ const getChildProviders = (appDi) => {
                 actionsList: tokensChildApp.CHILD_APP_INTERNAL_ACTION_TOKEN,
             },
         }),
+        core.provide({
+            provide: tokensChildApp.CHILD_REQUIRED_CONTRACTS,
+            useValue: [
+                tokensRouter.ROUTER_TOKEN,
+                tokensCommon.COMPONENT_REGISTRY_TOKEN,
+                tokensRouter.PAGE_SERVICE_TOKEN,
+                tokensRouter.LINK_PREFETCH_MANAGER_TOKEN,
+                tokensRouter.ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+                tokensCommon.LIMIT_ACTION_GLOBAL_TIME_RUN,
+            ],
+        }),
+        // for backward compatibility, when:
+        // - host app is modern (with contracts)
+        // - child app is legacy (<= v3.x.x, without contracts)
+        // - DI is isolated
+        // in legacy tramvai versions, this tokens is not borrowed in CommonChildAppModule
+        core.provide({
+            provide: tokensChildApp.CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
+            multi: true,
+            useValue: [
+                core.APP_INFO_TOKEN,
+                tokensCommon.ACTION_CONDITIONALS,
+                tokensCommon.DEFERRED_ACTIONS_MAP_TOKEN,
+                tokensCommon.EXECUTION_CONTEXT_MANAGER_TOKEN,
+                tokensCommon.COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
+                tokensCommon.PUBSUB_TOKEN,
+                tokensCommon.PUBSUB_FACTORY_TOKEN,
+            ],
+        }),
         ...singletonProviders.getChildProviders(),
+        ...extractorProviders.extractorProviders(loadableStats),
+        core.provide({
+            provide: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
+            scope: core.Scope.REQUEST,
+            useFactory: ({ dispatcher, middlewares, initialState, parentAllowedStores }) => {
+                var _a, _b, _c, _d;
+                const parentDispatcherContext = (_d = (_c = (_b = (_a = appDi
+                    .get(core.optional(tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN))) === null || _a === void 0 ? void 0 : _a.getStore()) === null || _b === void 0 ? void 0 : _b.tramvaiRequestDi) === null || _c === void 0 ? void 0 : _c.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN)) !== null && _d !== void 0 ? _d : appDi.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN);
+                return new state.ChildDispatcherContext({
+                    dispatcher,
+                    // context will be set later by the CONTEXT_TOKEN
+                    context: {},
+                    initialState: initialState !== null && initialState !== void 0 ? initialState : { stores: [] },
+                    middlewares: flatten__default["default"](middlewares || []),
+                    parentDispatcherContext,
+                    parentAllowedStores: flatten__default["default"](parentAllowedStores || []),
+                });
+            },
+            deps: {
+                dispatcher: tokensCommon.DISPATCHER_TOKEN,
+                middlewares: { token: tokensCommon.STORE_MIDDLEWARE, optional: true },
+                initialState: { token: tokensCommon.INITIAL_APP_STATE_TOKEN, optional: true },
+                parentAllowedStores: {
+                    token: tokensChildApp.CHILD_APP_INTERNAL_ROOT_STATE_ALLOWED_STORE_TOKEN,
+                    optional: true,
+                },
+            },
+        }),
+        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/di.browser.js

@@ -1,5 +1,4 @@
 import { ChildContainer } from '@tinkoff/dippy';
-import { getChildProviders } from './child/providers.browser.js';
 import { shouldIsolateDi } from './isolatedDi.browser.js';
 
 class DiManager {
@@ -33,6 +32,10 @@ class DiManager {
         if (!singletonDi) {
             return;
         }
+        // everything is Singleton on client-side, provide the same behaviour as for Root DI - only one container per Child App
+        if (typeof window !== 'undefined') {
+            return singletonDi;
+        }
         const isolateDi = this.rootDiAccessMode
             ? shouldIsolateDi(config, this.rootDiAccessMode)
             : false;
@@ -43,12 +46,6 @@ class DiManager {
         else {
             di = new ChildContainer(singletonDi, this.appDi);
         }
-        'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
-        // add providers on the Request Level to make it possible to reuse providers from the root-app ChildContainer
-        const childProviders = getChildProviders(this.appDi);
-        childProviders.forEach((provider) => {
-            di.register(provider);
-        });
         return di;
     }
 }

package/lib/shared/di.d.ts

@@ -1,6 +1,6 @@
 import type { Container, ExtractDependencyType } from '@tinkoff/dippy';
 import { ChildContainer } from '@tinkoff/dippy';
-import type { ChildAppDiManager, ChildAppLoader, ChildAppFinalConfig, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN } from '@tramvai/tokens-child-app';
+import { type ChildAppDiManager, type ChildAppLoader, type ChildAppFinalConfig, type CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN } from '@tramvai/tokens-child-app';
 type RootDiAccessMode = ExtractDependencyType<typeof CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN>;
 export declare class DiManager implements ChildAppDiManager {
     private appDi;

package/lib/shared/di.es.js

@@ -1,5 +1,4 @@
 import { ChildContainer } from '@tinkoff/dippy';
-import { getChildProviders } from './child/providers.es.js';
 import { shouldIsolateDi } from './isolatedDi.es.js';
 
 class DiManager {
@@ -33,6 +32,10 @@ class DiManager {
         if (!singletonDi) {
             return;
         }
+        // everything is Singleton on client-side, provide the same behaviour as for Root DI - only one container per Child App
+        if (typeof window !== 'undefined') {
+            return singletonDi;
+        }
         const isolateDi = this.rootDiAccessMode
             ? shouldIsolateDi(config, this.rootDiAccessMode)
             : false;
@@ -43,12 +46,6 @@ class DiManager {
         else {
             di = new ChildContainer(singletonDi, this.appDi);
         }
-        const statsLoadable = 'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
-        // add providers on the Request Level to make it possible to reuse providers from the root-app ChildContainer
-        const childProviders = getChildProviders(this.appDi, statsLoadable);
-        childProviders.forEach((provider) => {
-            di.register(provider);
-        });
         return di;
     }
 }

package/lib/shared/di.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var dippy = require('@tinkoff/dippy');
-var providers = require('./child/providers.js');
 var isolatedDi = require('./isolatedDi.js');
 
 class DiManager {
@@ -37,6 +36,10 @@ class DiManager {
         if (!singletonDi) {
             return;
         }
+        // everything is Singleton on client-side, provide the same behaviour as for Root DI - only one container per Child App
+        if (typeof window !== 'undefined') {
+            return singletonDi;
+        }
         const isolateDi = this.rootDiAccessMode
             ? isolatedDi.shouldIsolateDi(config, this.rootDiAccessMode)
             : false;
@@ -47,12 +50,6 @@ class DiManager {
         else {
             di = new dippy.ChildContainer(singletonDi, this.appDi);
         }
-        const statsLoadable = 'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
-        // add providers on the Request Level to make it possible to reuse providers from the root-app ChildContainer
-        const childProviders = providers.getChildProviders(this.appDi, statsLoadable);
-        childProviders.forEach((provider) => {
-            di.register(provider);
-        });
         return di;
     }
 }

package/lib/shared/providers.browser.js

@@ -1,8 +1,9 @@
 import { Scope, DI_TOKEN, optional } from '@tinkoff/dippy';
 import { provide, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
-import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
-import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
+import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_CONTRACT_MANAGER, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
+import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN } from '@tramvai/tokens-common';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
+import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN, LINK_PREFETCH_MANAGER_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 import { SingletonDiManager } from './singletonDi.browser.js';
 import { DiManager } from './di.browser.js';
 import { CommandLineRunner } from './command.browser.js';
@@ -118,10 +119,12 @@ const sharedProviders = [
             appDi: DI_TOKEN,
             loader: CHILD_APP_LOADER_TOKEN,
             rootDiAccessMode: optional(CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN),
+            contractManager: CHILD_APP_CONTRACT_MANAGER,
         },
     }),
     provide({
         provide: CHILD_APP_DI_MANAGER_TOKEN,
+        scope: Scope.REQUEST,
         useClass: DiManager,
         deps: {
             appDi: DI_TOKEN,
@@ -208,6 +211,19 @@ const sharedProviders = [
             },
         ],
     }),
+    provide({
+        provide: HOST_PROVIDED_CONTRACTS,
+        useValue: {
+            providedContracts: [
+                ROUTER_TOKEN,
+                COMPONENT_REGISTRY_TOKEN,
+                PAGE_SERVICE_TOKEN,
+                LINK_PREFETCH_MANAGER_TOKEN,
+                ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+                LIMIT_ACTION_GLOBAL_TIME_RUN,
+            ],
+        },
+    }),
 ];
 
 export { sharedProviders };

package/lib/shared/providers.es.js

@@ -1,8 +1,9 @@
 import { Scope, DI_TOKEN, optional } from '@tinkoff/dippy';
 import { provide, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
-import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
-import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
+import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_CONTRACT_MANAGER, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
+import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN } from '@tramvai/tokens-common';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
+import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN, LINK_PREFETCH_MANAGER_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 import { SingletonDiManager } from './singletonDi.es.js';
 import { DiManager } from './di.es.js';
 import { CommandLineRunner } from './command.es.js';
@@ -118,10 +119,12 @@ const sharedProviders = [
             appDi: DI_TOKEN,
             loader: CHILD_APP_LOADER_TOKEN,
             rootDiAccessMode: optional(CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN),
+            contractManager: CHILD_APP_CONTRACT_MANAGER,
         },
     }),
     provide({
         provide: CHILD_APP_DI_MANAGER_TOKEN,
+        scope: Scope.REQUEST,
         useClass: DiManager,
         deps: {
             appDi: DI_TOKEN,
@@ -208,6 +211,19 @@ const sharedProviders = [
             },
         ],
     }),
+    provide({
+        provide: HOST_PROVIDED_CONTRACTS,
+        useValue: {
+            providedContracts: [
+                ROUTER_TOKEN,
+                COMPONENT_REGISTRY_TOKEN,
+                PAGE_SERVICE_TOKEN,
+                LINK_PREFETCH_MANAGER_TOKEN,
+                ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+                LIMIT_ACTION_GLOBAL_TIME_RUN,
+            ],
+        },
+    }),
 ];
 
 export { sharedProviders };

package/lib/shared/providers.js

@@ -7,6 +7,7 @@ var core = require('@tramvai/core');
 var tokensChildApp = require('@tramvai/tokens-child-app');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensRender = require('@tramvai/tokens-render');
+var tokensRouter = require('@tramvai/tokens-router');
 var singletonDi = require('./singletonDi.js');
 var di = require('./di.js');
 var command = require('./command.js');
@@ -122,10 +123,12 @@ const sharedProviders = [
             appDi: dippy.DI_TOKEN,
             loader: tokensChildApp.CHILD_APP_LOADER_TOKEN,
             rootDiAccessMode: dippy.optional(tokensChildApp.CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN),
+            contractManager: tokensChildApp.CHILD_APP_CONTRACT_MANAGER,
         },
     }),
     core.provide({
         provide: tokensChildApp.CHILD_APP_DI_MANAGER_TOKEN,
+        scope: dippy.Scope.REQUEST,
         useClass: di.DiManager,
         deps: {
             appDi: dippy.DI_TOKEN,
@@ -212,6 +215,19 @@ const sharedProviders = [
             },
         ],
     }),
+    core.provide({
+        provide: tokensChildApp.HOST_PROVIDED_CONTRACTS,
+        useValue: {
+            providedContracts: [
+                tokensRouter.ROUTER_TOKEN,
+                tokensCommon.COMPONENT_REGISTRY_TOKEN,
+                tokensRouter.PAGE_SERVICE_TOKEN,
+                tokensRouter.LINK_PREFETCH_MANAGER_TOKEN,
+                tokensRouter.ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+                tokensCommon.LIMIT_ACTION_GLOBAL_TIME_RUN,
+            ],
+        },
+    }),
 ];
 
 exports.sharedProviders = sharedProviders;

package/lib/shared/singletonDi.browser.js

@@ -3,17 +3,17 @@ import { Container } from '@tinkoff/dippy';
 import { walkOfModules, getModuleParameters } from '@tramvai/core';
 import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
 import { getChildProviders } from './child/singletonProviders.browser.js';
-import { commonModuleStubs } from './child/stubs.browser.js';
 import { validateChildAppProvider } from './child/validate.browser.js';
 import { shouldIsolateDi } from './isolatedDi.browser.js';
 
 class SingletonDiManager {
-    constructor({ logger, appDi, loader, rootDiAccessMode, }) {
+    constructor({ logger, appDi, loader, rootDiAccessMode, contractManager, }) {
         this.cache = new Map();
         this.log = logger('child-app:singleton-di-manager');
         this.appDi = appDi;
         this.loader = loader;
         this.rootDiAccessMode = rootDiAccessMode;
+        this.contractManager = contractManager;
     }
     getChildDi(config) {
         const { key, tag } = config;
@@ -74,6 +74,7 @@ class SingletonDiManager {
                 },
             ], this.appDi);
         }
+        'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
         // add providers on the Singleton Level to make it possible to reuse providers from the root-app Container
         const childProviders = getChildProviders(this.appDi);
         childProviders.forEach((provider) => {
@@ -97,17 +98,15 @@ class SingletonDiManager {
             multi: true,
             useValue: actions,
         });
+        if (isolateDi) {
+            this.contractManager.registerChildContracts(di);
+        }
         const borrowTokens = di.get({ token: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, optional: true });
         if (borrowTokens) {
             flatten(borrowTokens).forEach((token) => {
                 di.borrowToken(this.appDi, token);
             });
         }
-        commonModuleStubs.forEach((stub) => {
-            if (!di.has(stub.provide)) {
-                di.register(stub);
-            }
-        });
         return di;
     }
 }

package/lib/shared/singletonDi.d.ts

@@ -1,19 +1,22 @@
 import type { ExtractDependencyType } from '@tinkoff/dippy';
 import { Container } from '@tinkoff/dippy';
-import type { CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, ChildAppDiManager, ChildAppFinalConfig, ChildAppLoader } from '@tramvai/tokens-child-app';
+import type { CHILD_APP_CONTRACT_MANAGER, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, ChildAppDiManager, ChildAppFinalConfig, ChildAppLoader } from '@tramvai/tokens-child-app';
 import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
 type RootDiAccessMode = ExtractDependencyType<typeof CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN>;
+type ContractManager = ExtractDependencyType<typeof CHILD_APP_CONTRACT_MANAGER>;
 export declare class SingletonDiManager implements ChildAppDiManager {
     private readonly log;
     private appDi;
     private loader;
     private rootDiAccessMode?;
+    private contractManager;
     private cache;
-    constructor({ logger, appDi, loader, rootDiAccessMode, }: {
+    constructor({ logger, appDi, loader, rootDiAccessMode, contractManager, }: {
         logger: typeof LOGGER_TOKEN;
         appDi: Container;
         loader: ChildAppLoader;
         rootDiAccessMode?: RootDiAccessMode | null;
+        contractManager: ContractManager;
     });
     getChildDi(config: ChildAppFinalConfig): Container | undefined;
     forEachChildDi(cb: (di: Container) => void): void;

package/lib/shared/singletonDi.es.js

@@ -3,17 +3,17 @@ import { Container } from '@tinkoff/dippy';
 import { walkOfModules, getModuleParameters } from '@tramvai/core';
 import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
 import { getChildProviders } from './child/singletonProviders.es.js';
-import { commonModuleStubs } from './child/stubs.es.js';
 import { validateChildAppProvider } from './child/validate.es.js';
 import { shouldIsolateDi } from './isolatedDi.es.js';
 
 class SingletonDiManager {
-    constructor({ logger, appDi, loader, rootDiAccessMode, }) {
+    constructor({ logger, appDi, loader, rootDiAccessMode, contractManager, }) {
         this.cache = new Map();
         this.log = logger('child-app:singleton-di-manager');
         this.appDi = appDi;
         this.loader = loader;
         this.rootDiAccessMode = rootDiAccessMode;
+        this.contractManager = contractManager;
     }
     getChildDi(config) {
         const { key, tag } = config;
@@ -74,8 +74,9 @@ class SingletonDiManager {
                 },
             ], this.appDi);
         }
+        const statsLoadable = 'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
         // add providers on the Singleton Level to make it possible to reuse providers from the root-app Container
-        const childProviders = getChildProviders(this.appDi);
+        const childProviders = getChildProviders(this.appDi, statsLoadable);
         childProviders.forEach((provider) => {
             di.register(provider);
         });
@@ -97,17 +98,15 @@ class SingletonDiManager {
             multi: true,
             useValue: actions,
         });
+        if (isolateDi) {
+            this.contractManager.registerChildContracts(di);
+        }
         const borrowTokens = di.get({ token: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, optional: true });
         if (borrowTokens) {
             flatten(borrowTokens).forEach((token) => {
                 di.borrowToken(this.appDi, token);
             });
         }
-        commonModuleStubs.forEach((stub) => {
-            if (!di.has(stub.provide)) {
-                di.register(stub);
-            }
-        });
         return di;
     }
 }

package/lib/shared/singletonDi.js

@@ -7,7 +7,6 @@ var dippy = require('@tinkoff/dippy');
 var core = require('@tramvai/core');
 var tokensChildApp = require('@tramvai/tokens-child-app');
 var singletonProviders = require('./child/singletonProviders.js');
-var stubs = require('./child/stubs.js');
 var validate = require('./child/validate.js');
 var isolatedDi = require('./isolatedDi.js');
 
@@ -16,12 +15,13 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 
 class SingletonDiManager {
-    constructor({ logger, appDi, loader, rootDiAccessMode, }) {
+    constructor({ logger, appDi, loader, rootDiAccessMode, contractManager, }) {
         this.cache = new Map();
         this.log = logger('child-app:singleton-di-manager');
         this.appDi = appDi;
         this.loader = loader;
         this.rootDiAccessMode = rootDiAccessMode;
+        this.contractManager = contractManager;
     }
     getChildDi(config) {
         const { key, tag } = config;
@@ -82,8 +82,9 @@ class SingletonDiManager {
                 },
             ], this.appDi);
         }
+        const statsLoadable = 'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
         // add providers on the Singleton Level to make it possible to reuse providers from the root-app Container
-        const childProviders = singletonProviders.getChildProviders(this.appDi);
+        const childProviders = singletonProviders.getChildProviders(this.appDi, statsLoadable);
         childProviders.forEach((provider) => {
             di.register(provider);
         });
@@ -105,17 +106,15 @@ class SingletonDiManager {
             multi: true,
             useValue: actions,
         });
+        if (isolateDi) {
+            this.contractManager.registerChildContracts(di);
+        }
         const borrowTokens = di.get({ token: tokensChildApp.CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, optional: true });
         if (borrowTokens) {
             flatten__default["default"](borrowTokens).forEach((token) => {
                 di.borrowToken(this.appDi, token);
             });
         }
-        stubs.commonModuleStubs.forEach((stub) => {
-            if (!di.has(stub.provide)) {
-                di.register(stub);
-            }
-        });
         return di;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "4.18.4",
+  "version": "4.19.0",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -33,23 +33,23 @@
     "@tinkoff/env-validators": "0.3.1",
     "@tinkoff/module-loader-client": "0.6.3",
     "@tinkoff/module-loader-server": "0.7.1",
-    "@tramvai/module-common": "4.18.4",
+    "@tramvai/module-common": "4.19.0",
     "@tinkoff/url": "0.10.1",
-    "@tramvai/child-app-core": "4.18.4",
+    "@tramvai/child-app-core": "4.19.0",
     "@tramvai/safe-strings": "0.7.1",
-    "@tramvai/tokens-child-app": "4.18.4"
+    "@tramvai/tokens-child-app": "4.19.0"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@tinkoff/dippy": "0.10.6",
-    "@tinkoff/router": "0.4.56",
+    "@tinkoff/dippy": "0.10.7",
+    "@tinkoff/router": "0.4.58",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "4.18.4",
-    "@tramvai/state": "4.18.4",
-    "@tramvai/react": "4.18.4",
-    "@tramvai/tokens-common": "4.18.4",
-    "@tramvai/tokens-render": "4.18.4",
-    "@tramvai/tokens-router": "4.18.4",
+    "@tramvai/core": "4.19.0",
+    "@tramvai/state": "4.19.0",
+    "@tramvai/react": "4.19.0",
+    "@tramvai/tokens-common": "4.19.0",
+    "@tramvai/tokens-render": "4.19.0",
+    "@tramvai/tokens-router": "4.19.0",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",