@tramvai/module-child-app 2.0.0 → 2.2.2

package/lib/server/render-slots.d.ts

@@ -1,8 +1,9 @@
+import type { ExtractDependencyType } from '@tinkoff/dippy';
 import type { ChildAppDiManager, ChildAppPreloadManager, CHILD_APP_RESOLVE_CONFIG_TOKEN } from '@tramvai/tokens-child-app';
 import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
 export declare const registerChildAppRenderSlots: ({ logger, diManager, resolveFullConfig, preloadManager, }: {
-    logger: typeof LOGGER_TOKEN;
+    logger: ExtractDependencyType<typeof LOGGER_TOKEN>;
     diManager: ChildAppDiManager;
-    resolveFullConfig: typeof CHILD_APP_RESOLVE_CONFIG_TOKEN;
+    resolveFullConfig: ExtractDependencyType<typeof CHILD_APP_RESOLVE_CONFIG_TOKEN>;
     preloadManager: ChildAppPreloadManager;
-}) => (import("@tramvai/tokens-render").PageResource | import("@tramvai/tokens-render").PageResource[])[][];
+}) => import("@tramvai/tokens-render").PageResource[];

package/lib/server/stateManager.d.ts

@@ -1,10 +1,11 @@
+import type { ExtractTokenType } from '@tinkoff/dippy';
 import type { ChildAppDiManager, ChildAppStateManager, ChildAppFinalConfig } from '@tramvai/tokens-child-app';
 import type { LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
 import type { EXTEND_RENDER } from '@tramvai/tokens-render';
 export declare const executeRootStateSubscriptions: ({ store, diManager, }: {
     store: typeof STORE_TOKEN;
     diManager: ChildAppDiManager;
-}) => typeof EXTEND_RENDER[number];
+}) => ExtractTokenType<typeof EXTEND_RENDER>;
 export declare class StateManager implements ChildAppStateManager {
     private readonly log;
     private readonly diManager;

package/lib/{browser.js → server.browser.js}

@@ -3,7 +3,7 @@ import { provide, COMMAND_LINE_RUNNER_TOKEN, walkOfModules, getModuleParameters,
 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_INTERNAL_ROOT_STATE_ALLOWED_STORE_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, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN, COMBINE_REDUCERS, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
+import { CONTEXT_TOKEN, ACTION_PAGE_RUNNER_TOKEN, LOGGER_TOKEN, DISPATCHER_TOKEN, STORE_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_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 { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
 import flatten from '@tinkoff/utils/array/flatten';
@@ -393,7 +393,7 @@ const resolveComponent = async (componentOrLoader) => {
 };
 
 class ChildAppResolutionConfigManager {
-    constructor({ configs }) {
+    constructor({ configs, }) {
         this.hasInitialized = false;
         this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
         this.mapping = new Map();

package/lib/server.es.js

@@ -331,7 +331,7 @@ const resolveComponent = async (componentOrLoader) => {
 };
 
 class ChildAppResolutionConfigManager {
-    constructor({ configs }) {
+    constructor({ configs, }) {
         this.hasInitialized = false;
         this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
         this.mapping = new Map();
@@ -803,11 +803,12 @@ class RenderManager {
 
 const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, preloadManager, }) => {
     const log = logger('child-app:render:slots');
-    return preloadManager.getPreloadedList().map((requestConfig) => {
+    const result = [];
+    preloadManager.getPreloadedList().forEach((requestConfig) => {
         const config = resolveFullConfig(requestConfig);
         const di = diManager.getChildDi(config);
         if (!di) {
-            return [];
+            return;
         }
         const slots = [
             {
@@ -841,8 +842,9 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
                 config: requestConfig,
             });
         }
-        return slots;
+        result.push(...slots);
     });
+    return result;
 };
 
 const serverProviders = [

package/lib/server.js

@@ -340,7 +340,7 @@ const resolveComponent = async (componentOrLoader) => {
 };
 
 class ChildAppResolutionConfigManager {
-    constructor({ configs }) {
+    constructor({ configs, }) {
         this.hasInitialized = false;
         this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
         this.mapping = new Map();
@@ -812,11 +812,12 @@ class RenderManager {
 
 const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, preloadManager, }) => {
     const log = logger('child-app:render:slots');
-    return preloadManager.getPreloadedList().map((requestConfig) => {
+    const result = [];
+    preloadManager.getPreloadedList().forEach((requestConfig) => {
         const config = resolveFullConfig(requestConfig);
         const di = diManager.getChildDi(config);
         if (!di) {
-            return [];
+            return;
         }
         const slots = [
             {
@@ -850,8 +851,9 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
                 config: requestConfig,
             });
         }
-        return slots;
+        result.push(...slots);
     });
+    return result;
 };
 
 const serverProviders = [

package/lib/shared/render.d.ts

@@ -1,5 +1,6 @@
 import type { EXTEND_RENDER } from '@tramvai/tokens-render';
 import type { ChildAppRenderManager } from '@tramvai/tokens-child-app';
+import type { ExtractTokenType } from '@tinkoff/dippy';
 export declare const extendRender: ({ renderManager, }: {
     renderManager: ChildAppRenderManager;
-}) => typeof EXTEND_RENDER[number];
+}) => ExtractTokenType<typeof EXTEND_RENDER>;

package/lib/shared/resolutionConfigManager.d.ts

@@ -1,12 +1,13 @@
 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;
+import type { ExtractDependencyType, ExtractTokenType } from '@tinkoff/dippy';
+declare type Interface = ExtractTokenType<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;
+    constructor({ configs, }: {
+        configs: ExtractDependencyType<typeof CHILD_APP_RESOLUTION_CONFIGS_TOKEN> | null;
     });
     init(): Promise<void>;
     resolve({ name, version, tag }: ChildAppRequestConfig): ResolutionConfig;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "2.0.0",
+  "version": "2.2.2",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
     "./lib/server/child/singletonProviders.js": "./lib/browser/child/singletonProviders.js",
     "./lib/server/child/providers.js": "./lib/browser/child/providers.js",
-    "./lib/server.es.js": "./lib/browser.js"
+    "./lib/server.es.js": "./lib/server.browser.js"
   },
   "main": "lib/server.js",
   "typings": "lib/server.d.ts",
@@ -28,23 +28,23 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tinkoff/env-validators": "0.0.4",
-    "@tinkoff/module-loader-client": "0.3.27",
-    "@tinkoff/module-loader-server": "0.4.44",
-    "@tramvai/child-app-core": "2.0.0",
-    "@tramvai/safe-strings": "0.4.4",
-    "@tramvai/tokens-child-app": "2.0.0"
+    "@tinkoff/env-validators": "0.0.5",
+    "@tinkoff/module-loader-client": "0.3.28",
+    "@tinkoff/module-loader-server": "0.4.45",
+    "@tramvai/child-app-core": "2.2.2",
+    "@tramvai/safe-strings": "0.4.5",
+    "@tramvai/tokens-child-app": "2.2.2"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@tinkoff/dippy": "0.7.41",
+    "@tinkoff/dippy": "0.7.43",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.0.0",
-    "@tramvai/state": "2.0.0",
-    "@tramvai/react": "2.0.0",
-    "@tramvai/tokens-common": "2.0.0",
-    "@tramvai/tokens-render": "2.0.0",
-    "@tramvai/tokens-router": "2.0.0",
+    "@tramvai/core": "2.2.2",
+    "@tramvai/state": "2.2.2",
+    "@tramvai/react": "2.2.2",
+    "@tramvai/tokens-common": "2.2.2",
+    "@tramvai/tokens-render": "2.2.2",
+    "@tramvai/tokens-router": "2.2.2",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",