@tramvai/module-child-app 1.65.1 → 1.66.0

package/lib/browser/preload.d.ts

@@ -1,16 +1,20 @@
-import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, CHILD_APP_RESOLVE_CONFIG_TOKEN } from '@tramvai/tokens-child-app';
+import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
 import type { STORE_TOKEN } from '@tramvai/tokens-common';
 export declare class PreloadManager implements ChildAppPreloadManager {
     private loader;
     private runner;
+    private store;
+    private resolutionConfigManager;
     private resolveExternalConfig;
     private pageHasLoaded;
     private map;
     private serverPreloaded;
     private preloadMap;
-    constructor({ loader, runner, resolveExternalConfig, store, }: {
+    private hasInitialized;
+    constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, }: {
         loader: ChildAppLoader;
         runner: ChildAppCommandLineRunner;
+        resolutionConfigManager: typeof CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN;
         resolveExternalConfig: typeof CHILD_APP_RESOLVE_CONFIG_TOKEN;
         store: typeof STORE_TOKEN;
     });
@@ -19,5 +23,7 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     runPreloaded(): Promise<void>;
     clearPreloaded(): Promise<void>;
     getPreloadedList(): ChildAppRequestConfig[];
+    private initServerPreloaded;
+    private init;
     private run;
 }

package/lib/server/preload.d.ts

@@ -1,20 +1,19 @@
-import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, ChildAppStateManager, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_PRELOAD_EXTERNAL_CONFIG_TOKEN } from '@tramvai/tokens-child-app';
+import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, ChildAppStateManager, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
 export declare class PreloadManager implements ChildAppPreloadManager {
     private loader;
     private runner;
     private stateManager;
-    private preloadExternalConfig;
+    private resolutionConfigManager;
     private readonly resolveFullConfig;
     private shouldRunImmediately;
     private map;
     private preloadMap;
-    private configHasBeenPreloaded;
-    constructor({ loader, runner, stateManager, preloadExternalConfig, resolveFullConfig, }: {
+    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, }: {
         loader: ChildAppLoader;
         runner: ChildAppCommandLineRunner;
         stateManager: ChildAppStateManager;
+        resolutionConfigManager: typeof CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN;
         resolveFullConfig: typeof CHILD_APP_RESOLVE_CONFIG_TOKEN;
-        preloadExternalConfig: typeof CHILD_APP_PRELOAD_EXTERNAL_CONFIG_TOKEN | null;
     });
     preload(request: ChildAppRequestConfig): Promise<void>;
     isPreloaded(request: ChildAppRequestConfig): boolean;

package/lib/server.browser.js

@@ -1,14 +1,15 @@
 import { __decorate } from 'tslib';
 import { provide, COMMAND_LINE_RUNNER_TOKEN, walkOfModules, getModuleParameters, commandLineListTokens as commandLineListTokens$1, Module } from '@tramvai/core';
-import flatten from '@tinkoff/utils/array/flatten';
 import { Container, ChildContainer, Scope, DI_TOKEN } from '@tinkoff/dippy';
-import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, CHILD_APP_GET_RESOLUTION_CONFIG_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_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_COMMON_INITIAL_STATE_TOKEN, CHILD_APP_INTERNAL_RENDER_TOKEN } from '@tramvai/tokens-child-app';
+import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, 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_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_COMMON_INITIAL_STATE_TOKEN, CHILD_APP_INTERNAL_RENDER_TOKEN } from '@tramvai/tokens-child-app';
 export * from '@tramvai/tokens-child-app';
 import { ACTION_PAGE_RUNNER_TOKEN, CONTEXT_TOKEN, LOGGER_TOKEN, DISPATCHER_TOKEN, STORE_TOKEN, COMBINE_REDUCERS, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
 import { RENDER_SLOTS, EXTEND_RENDER } from '@tramvai/tokens-render';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import flatten from '@tinkoff/utils/array/flatten';
 import { Subscription, createEvent, createReducer } from '@tramvai/state';
 import React, { createContext, useContext, useMemo, useState, useEffect, createElement } from 'react';
+import applyOrReturn from '@tinkoff/utils/function/applyOrReturn';
 import { loadModule } from '@tinkoff/module-loader-client';
 import noop from '@tinkoff/utils/function/noop';
 import { useDi } from '@tramvai/react';
@@ -298,6 +299,51 @@ const resolveComponent = async (componentOrLoader) => {
         : componentOrLoader;
 };
 
+class ChildAppResolutionConfigManager {
+    constructor({ configs }) {
+        this.hasInitialized = false;
+        this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
+        this.mapping = new Map();
+    }
+    async init() {
+        if (this.hasInitialized) {
+            return;
+        }
+        if (this.initPromise) {
+            return this.initPromise;
+        }
+        this.initPromise = (async () => {
+            const configs = await Promise.all(this.rawConfigs.map((rawConfig) => {
+                return applyOrReturn([], rawConfig);
+            }));
+            flatten(configs).forEach((config) => {
+                this.mapping.set(config.name, config);
+            });
+            this.hasInitialized = true;
+        })();
+        return this.initPromise;
+    }
+    resolve({ name, version, tag = 'latest' }) {
+        var _a;
+        const fromMapping = this.mapping.get(name);
+        if (!fromMapping) {
+            return null;
+        }
+        const cfg = fromMapping.byTag[tag];
+        if (process.env.NODE_ENV === 'development' && tag === 'debug' && !cfg) {
+            return {
+                baseUrl: 'http://localhost:4040/',
+                version: '0.0.0-stub',
+            };
+        }
+        return {
+            ...cfg,
+            baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
+            version: version !== null && version !== void 0 ? version : cfg.version,
+        };
+    }
+}
+
 const sharedProviders = [
     provide({
         provide: COMBINE_REDUCERS,
@@ -310,38 +356,27 @@ const sharedProviders = [
         useValue: initModuleFederation,
     }),
     provide({
-        provide: CHILD_APP_GET_RESOLUTION_CONFIG_TOKEN,
-        useFactory: ({ configs }) => {
-            const mapping = flatten(configs !== null && configs !== void 0 ? configs : []).reduce((map, config) => {
-                return map.set(config.name, config);
-            }, new Map());
-            return (({ name, version, tag = 'latest' }) => {
-                var _a;
-                const fromMapping = mapping.get(name);
-                if (!fromMapping) {
-                    return null;
-                }
-                const cfg = fromMapping.byTag[tag];
-                if (process.env.NODE_ENV === 'development' && tag === 'debug' && !cfg) {
-                    return {
-                        baseUrl: 'http://localhost:4040/',
-                        version: '0.0.0-stub',
-                    };
-                }
-                return {
-                    ...cfg,
-                    baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
-                    version: version !== null && version !== void 0 ? version : cfg.version,
-                };
-            });
-        },
+        provide: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
+        useClass: ChildAppResolutionConfigManager,
         deps: {
             configs: { token: CHILD_APP_RESOLUTION_CONFIGS_TOKEN, optional: true },
         },
     }),
+    provide({
+        provide: commandLineListTokens$1.resolvePageDeps,
+        multi: true,
+        useFactory: ({ resolutionConfigManager }) => {
+            return async function fallbackResolutionConfigManagerInit() {
+                await resolutionConfigManager.init();
+            };
+        },
+        deps: {
+            resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
+        },
+    }),
     provide({
         provide: CHILD_APP_RESOLVE_CONFIG_TOKEN,
-        useFactory: ({ envManager, rootBaseUrl, getResolutionConfig }) => {
+        useFactory: ({ envManager, rootBaseUrl, resolutionConfigManager }) => {
             const rawEnv = envManager.get('CHILD_APP_DEBUG');
             const debug = new Map();
             rawEnv === null || rawEnv === void 0 ? void 0 : rawEnv.split(';').reduce((acc, entry) => {
@@ -352,7 +387,10 @@ const sharedProviders = [
                 var _a, _b;
                 const { name, tag = debug.has(name) ? 'debug' : 'latest' } = request;
                 const req = { name, tag, version: request.version };
-                const config = getResolutionConfig(req);
+                const config = resolutionConfigManager.resolve(req);
+                if (!config) {
+                    throw new Error(`Child-app "${name}" with tag "${tag}" has not found`);
+                }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;
                 const baseUrl = (_b = (_a = debug.get(name)) !== null && _a !== void 0 ? _a : configBaseUrl) !== null && _b !== void 0 ? _b : rootBaseUrl;
                 if (!baseUrl) {
@@ -384,7 +422,7 @@ const sharedProviders = [
         deps: {
             envManager: ENV_MANAGER_TOKEN,
             rootBaseUrl: CHILD_APP_RESOLVE_BASE_URL_TOKEN,
-            getResolutionConfig: CHILD_APP_GET_RESOLUTION_CONFIG_TOKEN,
+            resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
         },
     }),
     provide({
@@ -568,21 +606,20 @@ class BrowserLoader extends Loader {
 }
 
 class PreloadManager {
-    constructor({ loader, runner, resolveExternalConfig, store, }) {
+    constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, }) {
         this.pageHasLoaded = false;
         this.map = new Map();
         this.serverPreloaded = new Map();
         this.preloadMap = new Map();
+        this.hasInitialized = false;
         this.loader = loader;
         this.runner = runner;
+        this.store = store;
+        this.resolutionConfigManager = resolutionConfigManager;
         this.resolveExternalConfig = resolveExternalConfig;
-        const { preloaded } = store.getState(ChildAppStore);
-        preloaded.forEach((request) => {
-            const config = this.resolveExternalConfig(request);
-            this.serverPreloaded.set(config.key, config);
-        });
     }
     async preload(request) {
+        await this.init();
         const config = this.resolveExternalConfig(request);
         const { key } = config;
         this.preloadMap.set(key, config);
@@ -607,6 +644,7 @@ class PreloadManager {
         return this.map.has(key) || this.serverPreloaded.has(key);
     }
     async runPreloaded() {
+        await this.init();
         const promises = [];
         if (this.pageHasLoaded) {
             this.map.forEach((childAppPromise) => {
@@ -651,6 +689,20 @@ class PreloadManager {
     getPreloadedList() {
         return [...this.preloadMap.values()];
     }
+    initServerPreloaded() {
+        if (!this.hasInitialized) {
+            const { preloaded } = this.store.getState(ChildAppStore);
+            preloaded.forEach((request) => {
+                const config = this.resolveExternalConfig(request);
+                this.serverPreloaded.set(config.key, config);
+            });
+            this.hasInitialized = true;
+        }
+    }
+    async init() {
+        await this.resolutionConfigManager.init();
+        this.initServerPreloaded();
+    }
     async run(status, config) {
         const childApp = this.loader.get(config);
         if (!childApp) {
@@ -706,6 +758,7 @@ const browserProviders = [
         deps: {
             loader: CHILD_APP_LOADER_TOKEN,
             runner: CHILD_APP_COMMAND_LINE_RUNNER_TOKEN,
+            resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
             resolveExternalConfig: CHILD_APP_RESOLVE_CONFIG_TOKEN,
             store: STORE_TOKEN,
         },
@@ -721,6 +774,7 @@ const browserProviders = [
             logger: LOGGER_TOKEN,
             diManager: CHILD_APP_DI_MANAGER_TOKEN,
             preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
             resolveExternalConfig: CHILD_APP_RESOLVE_CONFIG_TOKEN,
         },
     }),

package/lib/server.es.js

@@ -1,14 +1,15 @@
 import { __decorate } from 'tslib';
 import { provide, COMMAND_LINE_RUNNER_TOKEN, walkOfModules, getModuleParameters, commandLineListTokens as commandLineListTokens$1, Module } from '@tramvai/core';
-import flatten from '@tinkoff/utils/array/flatten';
 import { Container, ChildContainer, Scope, DI_TOKEN } from '@tinkoff/dippy';
-import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, CHILD_APP_GET_RESOLUTION_CONFIG_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_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_STATE_MANAGER_TOKEN, CHILD_APP_PRELOAD_EXTERNAL_CONFIG_TOKEN, CHILD_APP_INTERNAL_RENDER_TOKEN } from '@tramvai/tokens-child-app';
+import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, 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_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_STATE_MANAGER_TOKEN, CHILD_APP_INTERNAL_RENDER_TOKEN } from '@tramvai/tokens-child-app';
 export * from '@tramvai/tokens-child-app';
 import { ACTION_PAGE_RUNNER_TOKEN, CONTEXT_TOKEN, LOGGER_TOKEN, DISPATCHER_TOKEN, STORE_TOKEN, COMBINE_REDUCERS, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, CREATE_CACHE_TOKEN } from '@tramvai/tokens-common';
 import { RENDER_SLOTS, EXTEND_RENDER, ResourceType, ResourceSlot, RESOURCES_REGISTRY, CUSTOM_RENDER } from '@tramvai/tokens-render';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import flatten from '@tinkoff/utils/array/flatten';
 import { createEvent, createReducer } from '@tramvai/state';
 import React, { createContext, useContext, useMemo, useState, useEffect, createElement } from 'react';
+import applyOrReturn from '@tinkoff/utils/function/applyOrReturn';
 import { combineValidators, isUrl, endsWith } from '@tinkoff/env-validators';
 import { safeDehydrate } from '@tramvai/safe-strings';
 import { ServerLoader as ServerLoader$1 } from '@tinkoff/module-loader-server';
@@ -296,6 +297,51 @@ const resolveComponent = async (componentOrLoader) => {
         : componentOrLoader;
 };
 
+class ChildAppResolutionConfigManager {
+    constructor({ configs }) {
+        this.hasInitialized = false;
+        this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
+        this.mapping = new Map();
+    }
+    async init() {
+        if (this.hasInitialized) {
+            return;
+        }
+        if (this.initPromise) {
+            return this.initPromise;
+        }
+        this.initPromise = (async () => {
+            const configs = await Promise.all(this.rawConfigs.map((rawConfig) => {
+                return applyOrReturn([], rawConfig);
+            }));
+            flatten(configs).forEach((config) => {
+                this.mapping.set(config.name, config);
+            });
+            this.hasInitialized = true;
+        })();
+        return this.initPromise;
+    }
+    resolve({ name, version, tag = 'latest' }) {
+        var _a;
+        const fromMapping = this.mapping.get(name);
+        if (!fromMapping) {
+            return null;
+        }
+        const cfg = fromMapping.byTag[tag];
+        if (process.env.NODE_ENV === 'development' && tag === 'debug' && !cfg) {
+            return {
+                baseUrl: 'http://localhost:4040/',
+                version: '0.0.0-stub',
+            };
+        }
+        return {
+            ...cfg,
+            baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
+            version: version !== null && version !== void 0 ? version : cfg.version,
+        };
+    }
+}
+
 const sharedProviders = [
     provide({
         provide: COMBINE_REDUCERS,
@@ -308,38 +354,27 @@ const sharedProviders = [
         useValue: initModuleFederation,
     }),
     provide({
-        provide: CHILD_APP_GET_RESOLUTION_CONFIG_TOKEN,
-        useFactory: ({ configs }) => {
-            const mapping = flatten(configs !== null && configs !== void 0 ? configs : []).reduce((map, config) => {
-                return map.set(config.name, config);
-            }, new Map());
-            return (({ name, version, tag = 'latest' }) => {
-                var _a;
-                const fromMapping = mapping.get(name);
-                if (!fromMapping) {
-                    return null;
-                }
-                const cfg = fromMapping.byTag[tag];
-                if (process.env.NODE_ENV === 'development' && tag === 'debug' && !cfg) {
-                    return {
-                        baseUrl: 'http://localhost:4040/',
-                        version: '0.0.0-stub',
-                    };
-                }
-                return {
-                    ...cfg,
-                    baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
-                    version: version !== null && version !== void 0 ? version : cfg.version,
-                };
-            });
-        },
+        provide: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
+        useClass: ChildAppResolutionConfigManager,
         deps: {
             configs: { token: CHILD_APP_RESOLUTION_CONFIGS_TOKEN, optional: true },
         },
     }),
+    provide({
+        provide: commandLineListTokens$1.resolvePageDeps,
+        multi: true,
+        useFactory: ({ resolutionConfigManager }) => {
+            return async function fallbackResolutionConfigManagerInit() {
+                await resolutionConfigManager.init();
+            };
+        },
+        deps: {
+            resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
+        },
+    }),
     provide({
         provide: CHILD_APP_RESOLVE_CONFIG_TOKEN,
-        useFactory: ({ envManager, rootBaseUrl, getResolutionConfig }) => {
+        useFactory: ({ envManager, rootBaseUrl, resolutionConfigManager }) => {
             const rawEnv = envManager.get('CHILD_APP_DEBUG');
             const debug = new Map();
             rawEnv === null || rawEnv === void 0 ? void 0 : rawEnv.split(';').reduce((acc, entry) => {
@@ -350,7 +385,10 @@ const sharedProviders = [
                 var _a, _b;
                 const { name, tag = debug.has(name) ? 'debug' : 'latest' } = request;
                 const req = { name, tag, version: request.version };
-                const config = getResolutionConfig(req);
+                const config = resolutionConfigManager.resolve(req);
+                if (!config) {
+                    throw new Error(`Child-app "${name}" with tag "${tag}" has not found`);
+                }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;
                 const baseUrl = (_b = (_a = debug.get(name)) !== null && _a !== void 0 ? _a : configBaseUrl) !== null && _b !== void 0 ? _b : rootBaseUrl;
                 if (!baseUrl) {
@@ -382,7 +420,7 @@ const sharedProviders = [
         deps: {
             envManager: ENV_MANAGER_TOKEN,
             rootBaseUrl: CHILD_APP_RESOLVE_BASE_URL_TOKEN,
-            getResolutionConfig: CHILD_APP_GET_RESOLUTION_CONFIG_TOKEN,
+            resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
         },
     }),
     provide({
@@ -551,23 +589,18 @@ class ServerLoader extends Loader {
 }
 
 class PreloadManager {
-    constructor({ loader, runner, stateManager, preloadExternalConfig, resolveFullConfig, }) {
+    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, }) {
         this.shouldRunImmediately = false;
         this.map = new Map();
         this.preloadMap = new Map();
-        this.configHasBeenPreloaded = false;
         this.loader = loader;
         this.runner = runner;
         this.stateManager = stateManager;
-        this.preloadExternalConfig = preloadExternalConfig;
+        this.resolutionConfigManager = resolutionConfigManager;
         this.resolveFullConfig = resolveFullConfig;
     }
     async preload(request) {
-        var _a;
-        if (!this.configHasBeenPreloaded) {
-            await ((_a = this.preloadExternalConfig) === null || _a === void 0 ? void 0 : _a.call(this));
-            this.configHasBeenPreloaded = true;
-        }
+        await this.resolutionConfigManager.init();
         const config = this.resolveFullConfig(request);
         const { key } = config;
         if (this.map.has(key)) {
@@ -806,7 +839,7 @@ const serverProviders = [
             loader: CHILD_APP_LOADER_TOKEN,
             runner: CHILD_APP_COMMAND_LINE_RUNNER_TOKEN,
             stateManager: CHILD_APP_STATE_MANAGER_TOKEN,
-            preloadExternalConfig: { token: CHILD_APP_PRELOAD_EXTERNAL_CONFIG_TOKEN, optional: true },
+            resolutionConfigManager: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
             resolveFullConfig: CHILD_APP_RESOLVE_CONFIG_TOKEN,
         },
     }),

package/lib/server.js

@@ -4,14 +4,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var core = require('@tramvai/core');
-var flatten = require('@tinkoff/utils/array/flatten');
 var dippy = require('@tinkoff/dippy');
 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 flatten = require('@tinkoff/utils/array/flatten');
 var state = require('@tramvai/state');
 var React = require('react');
+var applyOrReturn = require('@tinkoff/utils/function/applyOrReturn');
 var envValidators = require('@tinkoff/env-validators');
 var safeStrings = require('@tramvai/safe-strings');
 var moduleLoaderServer = require('@tinkoff/module-loader-server');
@@ -23,6 +24,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var applyOrReturn__default = /*#__PURE__*/_interopDefaultLegacy(applyOrReturn);
 var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
 
 const getChildProviders$1 = (appDi) => {
@@ -305,6 +307,51 @@ const resolveComponent = async (componentOrLoader) => {
         : componentOrLoader;
 };
 
+class ChildAppResolutionConfigManager {
+    constructor({ configs }) {
+        this.hasInitialized = false;
+        this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
+        this.mapping = new Map();
+    }
+    async init() {
+        if (this.hasInitialized) {
+            return;
+        }
+        if (this.initPromise) {
+            return this.initPromise;
+        }
+        this.initPromise = (async () => {
+            const configs = await Promise.all(this.rawConfigs.map((rawConfig) => {
+                return applyOrReturn__default["default"]([], rawConfig);
+            }));
+            flatten__default["default"](configs).forEach((config) => {
+                this.mapping.set(config.name, config);
+            });
+            this.hasInitialized = true;
+        })();
+        return this.initPromise;
+    }
+    resolve({ name, version, tag = 'latest' }) {
+        var _a;
+        const fromMapping = this.mapping.get(name);
+        if (!fromMapping) {
+            return null;
+        }
+        const cfg = fromMapping.byTag[tag];
+        if (process.env.NODE_ENV === 'development' && tag === 'debug' && !cfg) {
+            return {
+                baseUrl: 'http://localhost:4040/',
+                version: '0.0.0-stub',
+            };
+        }
+        return {
+            ...cfg,
+            baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
+            version: version !== null && version !== void 0 ? version : cfg.version,
+        };
+    }
+}
+
 const sharedProviders = [
     core.provide({
         provide: tokensCommon.COMBINE_REDUCERS,
@@ -317,38 +364,27 @@ const sharedProviders = [
         useValue: initModuleFederation,
     }),
     core.provide({
-        provide: tokensChildApp.CHILD_APP_GET_RESOLUTION_CONFIG_TOKEN,
-        useFactory: ({ configs }) => {
-            const mapping = flatten__default["default"](configs !== null && configs !== void 0 ? configs : []).reduce((map, config) => {
-                return map.set(config.name, config);
-            }, new Map());
-            return (({ name, version, tag = 'latest' }) => {
-                var _a;
-                const fromMapping = mapping.get(name);
-                if (!fromMapping) {
-                    return null;
-                }
-                const cfg = fromMapping.byTag[tag];
-                if (process.env.NODE_ENV === 'development' && tag === 'debug' && !cfg) {
-                    return {
-                        baseUrl: 'http://localhost:4040/',
-                        version: '0.0.0-stub',
-                    };
-                }
-                return {
-                    ...cfg,
-                    baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
-                    version: version !== null && version !== void 0 ? version : cfg.version,
-                };
-            });
-        },
+        provide: tokensChildApp.CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
+        useClass: ChildAppResolutionConfigManager,
         deps: {
             configs: { token: tokensChildApp.CHILD_APP_RESOLUTION_CONFIGS_TOKEN, optional: true },
         },
     }),
+    core.provide({
+        provide: core.commandLineListTokens.resolvePageDeps,
+        multi: true,
+        useFactory: ({ resolutionConfigManager }) => {
+            return async function fallbackResolutionConfigManagerInit() {
+                await resolutionConfigManager.init();
+            };
+        },
+        deps: {
+            resolutionConfigManager: tokensChildApp.CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
+        },
+    }),
     core.provide({
         provide: tokensChildApp.CHILD_APP_RESOLVE_CONFIG_TOKEN,
-        useFactory: ({ envManager, rootBaseUrl, getResolutionConfig }) => {
+        useFactory: ({ envManager, rootBaseUrl, resolutionConfigManager }) => {
             const rawEnv = envManager.get('CHILD_APP_DEBUG');
             const debug = new Map();
             rawEnv === null || rawEnv === void 0 ? void 0 : rawEnv.split(';').reduce((acc, entry) => {
@@ -359,7 +395,10 @@ const sharedProviders = [
                 var _a, _b;
                 const { name, tag = debug.has(name) ? 'debug' : 'latest' } = request;
                 const req = { name, tag, version: request.version };
-                const config = getResolutionConfig(req);
+                const config = resolutionConfigManager.resolve(req);
+                if (!config) {
+                    throw new Error(`Child-app "${name}" with tag "${tag}" has not found`);
+                }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;
                 const baseUrl = (_b = (_a = debug.get(name)) !== null && _a !== void 0 ? _a : configBaseUrl) !== null && _b !== void 0 ? _b : rootBaseUrl;
                 if (!baseUrl) {
@@ -391,7 +430,7 @@ const sharedProviders = [
         deps: {
             envManager: tokensCommon.ENV_MANAGER_TOKEN,
             rootBaseUrl: tokensChildApp.CHILD_APP_RESOLVE_BASE_URL_TOKEN,
-            getResolutionConfig: tokensChildApp.CHILD_APP_GET_RESOLUTION_CONFIG_TOKEN,
+            resolutionConfigManager: tokensChildApp.CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
         },
     }),
     core.provide({
@@ -560,23 +599,18 @@ class ServerLoader extends Loader {
 }
 
 class PreloadManager {
-    constructor({ loader, runner, stateManager, preloadExternalConfig, resolveFullConfig, }) {
+    constructor({ loader, runner, stateManager, resolutionConfigManager, resolveFullConfig, }) {
         this.shouldRunImmediately = false;
         this.map = new Map();
         this.preloadMap = new Map();
-        this.configHasBeenPreloaded = false;
         this.loader = loader;
         this.runner = runner;
         this.stateManager = stateManager;
-        this.preloadExternalConfig = preloadExternalConfig;
+        this.resolutionConfigManager = resolutionConfigManager;
         this.resolveFullConfig = resolveFullConfig;
     }
     async preload(request) {
-        var _a;
-        if (!this.configHasBeenPreloaded) {
-            await ((_a = this.preloadExternalConfig) === null || _a === void 0 ? void 0 : _a.call(this));
-            this.configHasBeenPreloaded = true;
-        }
+        await this.resolutionConfigManager.init();
         const config = this.resolveFullConfig(request);
         const { key } = config;
         if (this.map.has(key)) {
@@ -815,7 +849,7 @@ const serverProviders = [
             loader: tokensChildApp.CHILD_APP_LOADER_TOKEN,
             runner: tokensChildApp.CHILD_APP_COMMAND_LINE_RUNNER_TOKEN,
             stateManager: tokensChildApp.CHILD_APP_STATE_MANAGER_TOKEN,
-            preloadExternalConfig: { token: tokensChildApp.CHILD_APP_PRELOAD_EXTERNAL_CONFIG_TOKEN, optional: true },
+            resolutionConfigManager: tokensChildApp.CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
             resolveFullConfig: tokensChildApp.CHILD_APP_RESOLVE_CONFIG_TOKEN,
         },
     }),

package/lib/shared/resolutionConfigManager.d.ts

@@ -0,0 +1,14 @@
+import type { ChildAppRequestConfig, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, ResolutionConfig } from '@tramvai/tokens-child-app';
+declare type Interface = typeof CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN;
+export declare class ChildAppResolutionConfigManager implements Interface {
+    private rawConfigs;
+    private mapping;
+    private hasInitialized;
+    private initPromise;
+    constructor({ configs }: {
+        configs: typeof CHILD_APP_RESOLUTION_CONFIGS_TOKEN | null;
+    });
+    init(): Promise<void>;
+    resolve({ name, version, tag }: ChildAppRequestConfig): ResolutionConfig;
+}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "1.65.1",
+  "version": "1.66.0",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -30,20 +30,20 @@
     "@tinkoff/env-validators": "0.0.3",
     "@tinkoff/module-loader-client": "0.3.25",
     "@tinkoff/module-loader-server": "0.4.41",
-    "@tramvai/child-app-core": "1.65.1",
+    "@tramvai/child-app-core": "1.66.0",
     "@tramvai/safe-strings": "0.4.3",
-    "@tramvai/tokens-child-app": "1.65.1"
+    "@tramvai/tokens-child-app": "1.66.0"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.38",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "1.65.1",
-    "@tramvai/state": "1.65.1",
-    "@tramvai/react": "1.65.1",
-    "@tramvai/tokens-common": "1.65.1",
-    "@tramvai/tokens-render": "1.65.1",
-    "@tramvai/tokens-router": "1.65.1",
+    "@tramvai/core": "1.66.0",
+    "@tramvai/state": "1.66.0",
+    "@tramvai/react": "1.66.0",
+    "@tramvai/tokens-common": "1.66.0",
+    "@tramvai/tokens-render": "1.66.0",
+    "@tramvai/tokens-router": "1.66.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
     "object-assign": "^4.1.1",