@tramvai/module-child-app 1.82.3 → 1.85.0

package/lib/browser/preload.d.ts

@@ -1,4 +1,4 @@
-import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+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 { STORE_TOKEN } from '@tramvai/tokens-common';
 export declare class PreloadManager implements ChildAppPreloadManager {
     private loader;
@@ -8,8 +8,8 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     private resolveExternalConfig;
     private pageHasRendered;
     private pageHasLoaded;
-    private map;
-    private serverPreloaded;
+    private currentlyPreloaded;
+    private hasPreloadBefore;
     private hasInitialized;
     constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, }: {
         loader: ChildAppLoader;
@@ -23,7 +23,7 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     runPreloaded(): Promise<void>;
     pageRender(): void;
     clearPreloaded(): Promise<void>;
-    getPreloadedList(): ChildAppRequestConfig[];
+    getPreloadedList(): ChildAppFinalConfig[];
     private initServerPreloaded;
     private init;
     private run;

package/lib/browser/render.d.ts

@@ -6,8 +6,6 @@ export declare class RenderManager implements ChildAppRenderManager {
     private readonly diManager;
     private readonly resolveExternalConfig;
     private readonly log;
-    private readonly hasRenderedSet;
-    private readonly loadingInProgress;
     constructor({ logger, preloadManager, diManager, resolveExternalConfig, }: {
         logger: typeof LOGGER_TOKEN;
         preloadManager: ChildAppPreloadManager;

package/lib/browser/runCommand.d.ts

@@ -0,0 +1,6 @@
+import type { CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+export declare const runCommand: ({ status, runner, preloader, }: {
+    status: string;
+    runner: typeof CHILD_APP_COMMAND_LINE_RUNNER_TOKEN;
+    preloader: typeof CHILD_APP_PRELOAD_MANAGER_TOKEN;
+}) => Promise<void>;

package/lib/server/preload.d.ts

@@ -1,4 +1,4 @@
-import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, ChildAppStateManager, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+import type { ChildAppCommandLineRunner, ChildAppRequestConfig, ChildAppLoader, ChildAppPreloadManager, ChildAppStateManager, CHILD_APP_RESOLVE_CONFIG_TOKEN, ChildAppFinalConfig, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
 export declare class PreloadManager implements ChildAppPreloadManager {
     private loader;
     private runner;
@@ -20,6 +20,6 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     runPreloaded(): Promise<void>;
     pageRender(): void;
     clearPreloaded(): Promise<void>;
-    getPreloadedList(): ChildAppRequestConfig[];
+    getPreloadedList(): ChildAppFinalConfig[];
     private run;
 }

package/lib/server.browser.js

@@ -5,13 +5,13 @@ import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN
 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 { RENDER_SLOTS, EXTEND_RENDER } from '@tramvai/tokens-render';
-import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
 import flatten from '@tinkoff/utils/array/flatten';
+import noop from '@tinkoff/utils/function/noop';
 import { Subscription, ChildDispatcherContext, 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';
 
 const getChildProviders$2 = (appDi) => {
@@ -53,6 +53,46 @@ const getChildProviders$2 = (appDi) => {
                 actions: CHILD_APP_INTERNAL_ACTION_TOKEN,
             },
         }),
+        provide({
+            provide: commandLineListTokens.spaTransition,
+            multi: true,
+            useFactory: ({ spaMode, actionRunner, actions }) => {
+                if (spaMode !== 'after') {
+                    return function childAppRunActions() {
+                        return actionRunner.runActions(flatten(actions));
+                    };
+                }
+                return noop;
+            },
+            deps: {
+                actionRunner: ACTION_PAGE_RUNNER_TOKEN,
+                actions: CHILD_APP_INTERNAL_ACTION_TOKEN,
+                spaMode: {
+                    token: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+                    optional: true,
+                },
+            },
+        }),
+        provide({
+            provide: commandLineListTokens.afterSpaTransition,
+            multi: true,
+            useFactory: ({ spaMode, actionRunner, actions }) => {
+                if (spaMode === 'after') {
+                    return function childAppRunActions() {
+                        return actionRunner.runActions(flatten(actions));
+                    };
+                }
+                return noop;
+            },
+            deps: {
+                actionRunner: ACTION_PAGE_RUNNER_TOKEN,
+                actions: CHILD_APP_INTERNAL_ACTION_TOKEN,
+                spaMode: {
+                    token: ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN,
+                    optional: true,
+                },
+            },
+        }),
     ];
 };
 
@@ -671,8 +711,8 @@ class PreloadManager {
     constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, }) {
         this.pageHasRendered = false;
         this.pageHasLoaded = false;
-        this.map = new Map();
-        this.serverPreloaded = new Map();
+        this.currentlyPreloaded = new Map();
+        this.hasPreloadBefore = new Set();
         this.hasInitialized = false;
         this.loader = loader;
         this.runner = runner;
@@ -689,66 +729,64 @@ class PreloadManager {
             // as it will lead to markup mismatch on markup hydration
             if (this.pageHasRendered) {
                 // but in case render has happened load child-app as soon as possible
-                const promise = (async () => {
-                    try {
-                        await this.loader.load(config);
-                        await this.run('customer', config);
-                        await this.run('clear', config);
-                    }
-                    catch (error) { }
-                    return config;
-                })();
-                this.map.set(key, promise);
-                await promise;
+                try {
+                    await this.loader.load(config);
+                    await this.run('customer', config);
+                    await this.run('clear', config);
+                    this.hasPreloadBefore.add(key);
+                }
+                catch (error) { }
             }
         }
+        if (this.pageHasRendered) {
+            this.currentlyPreloaded.set(key, config);
+        }
     }
     isPreloaded(request) {
         const config = this.resolveExternalConfig(request);
         const { key } = config;
-        return this.map.has(key) || this.serverPreloaded.has(key);
+        return this.hasPreloadBefore.has(key);
     }
     async runPreloaded() {
         await this.init();
-        const promises = [];
-        if (this.pageHasLoaded) {
-            this.map.forEach((childAppPromise) => {
-                promises.push((async () => {
-                    await this.run('spa', await childAppPromise);
-                })());
-            });
-        }
-        else {
-            this.serverPreloaded.forEach((config) => {
-                promises.push((async () => {
-                    await this.loader.init(config);
-                    await this.run('customer', config);
-                })());
-            });
+        if (this.pageHasRendered) {
+            return;
         }
+        const promises = [];
+        this.currentlyPreloaded.forEach((config) => {
+            promises.push((async () => {
+                await this.loader.init(config);
+                await this.run('customer', config);
+            })());
+        });
         await Promise.all(promises);
     }
     pageRender() {
         this.pageHasRendered = true;
     }
     async clearPreloaded() {
+        if (this.pageHasLoaded) {
+            this.currentlyPreloaded.clear();
+            return;
+        }
         this.pageHasLoaded = true;
         const promises = [];
-        this.serverPreloaded.forEach((config) => {
+        this.currentlyPreloaded.forEach((config) => {
             promises.push(this.run('clear', config));
         });
-        this.serverPreloaded.clear();
+        this.currentlyPreloaded.clear();
         await Promise.all(promises);
     }
     getPreloadedList() {
-        return [...this.serverPreloaded.values()];
+        return Array.from(this.currentlyPreloaded.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.currentlyPreloaded.set(config.key, config);
+                this.hasPreloadBefore.add(config.key);
             });
             this.hasInitialized = true;
         }
@@ -768,8 +806,6 @@ class PreloadManager {
 
 class RenderManager {
     constructor({ logger, preloadManager, diManager, resolveExternalConfig, }) {
-        this.hasRenderedSet = new Set();
-        this.loadingInProgress = new Map();
         this.log = logger('child-app:render');
         this.preloadManager = preloadManager;
         this.diManager = diManager;
@@ -777,7 +813,6 @@ class RenderManager {
     }
     getChildDi(request) {
         const config = this.resolveExternalConfig(request);
-        this.hasRenderedSet.add(config.key);
         if (this.preloadManager.isPreloaded(request)) {
             return [this.diManager.getChildDi(config), null];
         }
@@ -785,7 +820,6 @@ class RenderManager {
             message: 'Child-app has been used but not preloaded before React render',
             request,
         });
-        this.loadingInProgress.set(config.key, config);
         const promiseDi = this.preloadManager.preload(request).then(() => {
             return this.diManager.getChildDi(config);
         });
@@ -797,6 +831,13 @@ class RenderManager {
     clear() { }
 }
 
+const runCommand = async ({ status, runner, preloader, }) => {
+    const childApps = preloader.getPreloadedList();
+    await Promise.all(childApps.map((config) => {
+        return runner.run('client', status, config);
+    }));
+};
+
 const browserProviders = [
     provide({
         provide: CHILD_APP_LOADER_TOKEN,
@@ -848,16 +889,50 @@ const browserProviders = [
             preloader: CHILD_APP_PRELOAD_MANAGER_TOKEN,
         },
     }),
+    provide({
+        provide: commandLineListTokens$1.customerStart,
+        multi: true,
+        useFactory: ({ router, preloader }) => {
+            router.registerHook('beforeNavigate', () => preloader.clearPreloaded());
+            router.registerHook('beforeUpdateCurrent', () => preloader.clearPreloaded());
+        },
+        deps: {
+            router: ROUTER_TOKEN,
+            preloader: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+        },
+    }),
     provide({
         provide: commandLineListTokens$1.spaTransition,
         multi: true,
-        useFactory: ({ preloader }) => {
-            return function childAppRunPreloaded() {
-                return preloader.runPreloaded();
+        useFactory: ({ preloader, runner }) => {
+            return async function childAppRunPreloaded() {
+                await runCommand({
+                    preloader,
+                    runner,
+                    status: 'spa',
+                });
+            };
+        },
+        deps: {
+            preloader: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            runner: CHILD_APP_COMMAND_LINE_RUNNER_TOKEN,
+        },
+    }),
+    provide({
+        provide: commandLineListTokens$1.afterSpaTransition,
+        multi: true,
+        useFactory: ({ preloader, runner }) => {
+            return async function childAppRunPreloaded() {
+                await runCommand({
+                    preloader,
+                    runner,
+                    status: 'afterSpa',
+                });
             };
         },
         deps: {
             preloader: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            runner: CHILD_APP_COMMAND_LINE_RUNNER_TOKEN,
         },
     }),
 ];

package/lib/server.es.js

@@ -688,7 +688,7 @@ class PreloadManager {
         await Promise.all(promises);
     }
     getPreloadedList() {
-        return [...this.preloadMap.values()];
+        return Array.from(this.preloadMap.values());
     }
     async run(status, config) {
         const childApp = this.loader.get(config);

package/lib/server.js

@@ -698,7 +698,7 @@ class PreloadManager {
         await Promise.all(promises);
     }
     getPreloadedList() {
-        return [...this.preloadMap.values()];
+        return Array.from(this.preloadMap.values());
     }
     async run(status, config) {
         const childApp = this.loader.get(config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "1.82.3",
+  "version": "1.85.0",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -31,20 +31,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.82.3",
+    "@tramvai/child-app-core": "1.85.0",
     "@tramvai/safe-strings": "0.4.3",
-    "@tramvai/tokens-child-app": "1.82.3"
+    "@tramvai/tokens-child-app": "1.85.0"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.39",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "1.82.3",
-    "@tramvai/state": "1.82.3",
-    "@tramvai/react": "1.82.3",
-    "@tramvai/tokens-common": "1.82.3",
-    "@tramvai/tokens-render": "1.82.3",
-    "@tramvai/tokens-router": "1.82.3",
+    "@tramvai/core": "1.85.0",
+    "@tramvai/state": "1.85.0",
+    "@tramvai/react": "1.85.0",
+    "@tramvai/tokens-common": "1.85.0",
+    "@tramvai/tokens-render": "1.85.0",
+    "@tramvai/tokens-router": "1.85.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
     "object-assign": "^4.1.1",