@tramvai/module-common 2.35.0 → 2.37.0

package/lib/index.es.js

@@ -1,6 +1,6 @@
 import { __decorate } from 'tslib';
 import eachObj from '@tinkoff/utils/object/each';
-import { createBundle, Scope, Module, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN, COMMAND_LINES_TOKEN, DI_TOKEN, isTramvaiAction, ACTION_PARAMETERS, ACTIONS_LIST_TOKEN, provide as provide$1, IS_DI_CHILD_CONTAINER_TOKEN, BUNDLE_LIST_TOKEN } from '@tramvai/core';
+import { createBundle, provide, Scope, Module, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN, COMMAND_LINES_TOKEN, DI_TOKEN, isTramvaiAction, ACTION_PARAMETERS, createToken, ACTIONS_LIST_TOKEN, IS_DI_CHILD_CONTAINER_TOKEN, BUNDLE_LIST_TOKEN } from '@tramvai/core';
 import { EnvironmentModule } from '@tramvai/module-environment';
 import { CookieModule } from '@tramvai/module-cookie';
 export { COOKIE_MANAGER_TOKEN } from '@tramvai/module-cookie';
@@ -8,6 +8,8 @@ import { LogModule } from '@tramvai/module-log';
 import { Hooks } from '@tinkoff/hook-runner';
 import { REQUEST_MANAGER_TOKEN, COMBINE_REDUCERS, CONTEXT_TOKEN, RESPONSE_MANAGER_TOKEN, ACTION_EXECUTION_TOKEN, ROOT_EXECUTION_CONTEXT_TOKEN, LOGGER_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, PUBSUB_FACTORY_TOKEN, PUBSUB_TOKEN, ROOT_PUBSUB_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN, CLEAR_CACHE_TOKEN, CREATE_CACHE_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN } from '@tramvai/tokens-common';
 export * from '@tramvai/tokens-common';
+import isObject from '@tinkoff/utils/is/object';
+import isArray from '@tinkoff/utils/is/array';
 import { resolveLazyComponent, __lazyErrorHandler } from '@tramvai/react';
 import { fileSystemPagesEnabled, getAllFileSystemPages, isFileSystemPageComponent } from '@tramvai/experiments';
 import pathOr from '@tinkoff/utils/object/pathOr';
@@ -18,7 +20,7 @@ import { format, parse } from '@tinkoff/url';
 import isEmpty from '@tinkoff/utils/is/empty';
 import values from '@tinkoff/utils/object/values';
 import { METRICS_MODULE_TOKEN } from '@tramvai/tokens-metrics';
-import { createChildContainer, provide, Scope as Scope$1, createToken } from '@tinkoff/dippy';
+import { createChildContainer, provide as provide$1, Scope as Scope$1, createToken as createToken$1 } from '@tinkoff/dippy';
 import noop from '@tinkoff/utils/function/noop';
 import { isSilentError, ConditionFailError, ExecutionAbortError } from '@tinkoff/errors';
 import { PubSub } from '@tinkoff/pubsub';
@@ -79,16 +81,19 @@ class BundleManager {
         if (pageComponent && bundle.components[pageComponent]) {
             const componentOrLoader = bundle.components[pageComponent];
             const component = await resolveLazyComponent(componentOrLoader);
+            if (!component) {
+                return;
+            }
             // allow page components to register any other components
-            if ('components' in component) {
+            if ('components' in component && isObject(component.components)) {
                 eachObj((cmp, name) => {
                     this.componentRegistry.add(name, cmp, pageComponent);
                 }, component.components);
             }
-            if ('actions' in component) {
+            if ('actions' in component && isArray(component.actions)) {
                 this.actionRegistry.add(pageComponent, component.actions);
             }
-            if ('reducers' in component) {
+            if ('reducers' in component && isArray(component.reducers)) {
                 component.reducers.forEach((reducer) => {
                     this.dispatcher.registerStore(reducer);
                 });
@@ -196,19 +201,19 @@ class RequestManager {
 }
 
 const sharedProviders$1 = [
-    {
+    provide({
         provide: REQUEST_MANAGER_TOKEN,
         scope: Scope.REQUEST,
         useClass: RequestManager,
         deps: {
             request: FASTIFY_REQUEST,
         },
-    },
-    {
+    }),
+    provide({
         provide: COMBINE_REDUCERS,
         multi: true,
         useValue: RequestManagerStore,
-    },
+    }),
 ];
 
 let RequestManagerModule = class RequestManagerModule {
@@ -217,7 +222,7 @@ RequestManagerModule = __decorate([
     Module({
         providers: [
             ...sharedProviders$1,
-            {
+            provide({
                 provide: commandLineListTokens.customerStart,
                 multi: true,
                 useFactory: ({ context, requestManager }) => {
@@ -234,7 +239,7 @@ RequestManagerModule = __decorate([
                     context: CONTEXT_TOKEN,
                     requestManager: REQUEST_MANAGER_TOKEN,
                 },
-            },
+            }),
         ],
     })
 ], RequestManagerModule);
@@ -288,11 +293,11 @@ class ResponseManager {
 }
 
 const sharedProviders = [
-    {
+    provide({
         provide: RESPONSE_MANAGER_TOKEN,
         scope: Scope.REQUEST,
         useClass: ResponseManager,
-    },
+    }),
 ];
 
 let ResponseManagerModule = class ResponseManagerModule {
@@ -334,8 +339,8 @@ class ConsumerContext {
         this.dehydrate = () => ({
             dispatcher: this.dispatcher.dehydrate(),
         });
-        this.getState = (reducer) => {
-            return this.store.getState(reducer);
+        this.getState = (...args) => {
+            return this.store.getState(args[0]);
         };
         this.subscribe = (...args) => {
             return this.store.subscribe(args[0], args[1]);
@@ -344,6 +349,7 @@ class ConsumerContext {
         this.registerStore = (store) => this.dispatcher.registerStore(store);
         this.unregisterStore = (store) => this.dispatcher.unregisterStore(store);
         this.store = store;
+        // @ts-expect-error
         this.dispatcher = dispatcherContext;
         // TODO убрать, нужно для некоторых старых сторов на платформе
         this.dispatcher.setContext(this);
@@ -374,7 +380,7 @@ const resolveDi = (type, status, diContainer, providers) => {
     return di;
 };
 class CommandLineRunner {
-    constructor({ lines, rootDi, logger, metrics, executionContextManager, }) {
+    constructor({ lines, rootDi, logger, metrics, executionContextManager }) {
         this.executionContextByDi = new WeakMap();
         this.abortControllerByDi = new WeakMap();
         this.lines = lines;
@@ -449,6 +455,7 @@ class CommandLineRunner {
                 // пробегаемся по всем инстансам и для текущего получаем его запись, из которой можно получить стек
                 for (let i = 0; i < instances.length; i++) {
                     if (instances[i] === instance) {
+                        // @ts-expect-error
                         error.stack = `${error.stack}\n---- caused by: ----\n${record.multi[i].stack || ''}`;
                     }
                 }
@@ -531,7 +538,7 @@ let CommandModule = class CommandModule {
 CommandModule = __decorate([
     Module({
         providers: [
-            provide({
+            provide$1({
                 // Раннер процессов
                 provide: COMMAND_LINE_RUNNER_TOKEN,
                 scope: Scope$1.SINGLETON,
@@ -547,9 +554,9 @@ CommandModule = __decorate([
                     executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
                 },
             }),
-            provide({
+            provide$1({
                 provide: COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
-                useFactory: ({ di, commandLineRunner, }) => {
+                useFactory: ({ di, commandLineRunner }) => {
                     return () => {
                         return commandLineRunner.resolveExecutionContextFromDi(di);
                     };
@@ -559,7 +566,7 @@ CommandModule = __decorate([
                     commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
                 },
             }),
-            provide({
+            provide$1({
                 // Дефолтный список команл
                 provide: COMMAND_LINES_TOKEN,
                 scope: Scope$1.SINGLETON,
@@ -574,7 +581,7 @@ let PubSubModule = class PubSubModule {
 PubSubModule = __decorate([
     Module({
         providers: [
-            {
+            provide({
                 // Фабрика для создания pubsub
                 provide: PUBSUB_FACTORY_TOKEN,
                 scope: Scope.SINGLETON,
@@ -586,23 +593,23 @@ PubSubModule = __decorate([
                 deps: {
                     logger: LOGGER_TOKEN,
                 },
-            },
-            {
+            }),
+            provide({
                 provide: PUBSUB_TOKEN,
                 scope: Scope.REQUEST,
                 useFactory: ({ createPubsub }) => createPubsub(),
                 deps: {
                     createPubsub: PUBSUB_FACTORY_TOKEN,
                 },
-            },
-            {
+            }),
+            provide({
                 provide: ROOT_PUBSUB_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ createPubsub }) => createPubsub(),
                 deps: {
                     createPubsub: PUBSUB_FACTORY_TOKEN,
                 },
-            },
+            }),
         ],
     })
 ], PubSubModule);
@@ -901,24 +908,25 @@ const pageBrowser = {
     },
 };
 
+const LIMIT_ACTION_GLOBAL_TIME_RUN = createToken('limitActionGlobalTimeRun');
 let ActionModule = class ActionModule {
 };
 ActionModule = __decorate([
     Module({
         providers: [
-            {
+            provide({
                 provide: COMBINE_REDUCERS,
                 multi: true,
                 useValue: actionTramvaiReducer,
-            },
-            {
+            }),
+            provide({
                 // Регистер глобальных экшенов
                 provide: ACTION_REGISTRY_TOKEN,
                 scope: Scope.SINGLETON,
                 useClass: ActionRegistry,
                 deps: { actionsList: ACTIONS_LIST_TOKEN },
-            },
-            provide$1({
+            }),
+            provide({
                 provide: ACTION_EXECUTION_TOKEN,
                 scope: Scope.REQUEST,
                 useClass: ActionExecution,
@@ -934,7 +942,7 @@ ActionModule = __decorate([
                     },
                 },
             }),
-            provide$1({
+            provide({
                 provide: ACTION_PAGE_RUNNER_TOKEN,
                 scope: Scope.REQUEST,
                 useClass: ActionPageRunner,
@@ -943,19 +951,19 @@ ActionModule = __decorate([
                     executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
                     commandLineExecutionContext: COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
                     store: STORE_TOKEN,
-                    limitTime: 'limitActionGlobalTimeRun',
+                    limitTime: LIMIT_ACTION_GLOBAL_TIME_RUN,
                     logger: LOGGER_TOKEN,
                 },
             }),
-            {
-                provide: 'limitActionGlobalTimeRun',
+            provide({
+                provide: LIMIT_ACTION_GLOBAL_TIME_RUN,
                 useValue: 500,
-            },
-            {
+            }),
+            provide({
                 provide: ACTION_CONDITIONALS,
                 multi: true,
                 useValue: [alwaysCondition, onlyServer, onlyBrowser, pageServer, pageBrowser],
-            },
+            }),
         ],
     })
 ], ActionModule);
@@ -965,7 +973,7 @@ let StateModule = class StateModule {
 StateModule = __decorate([
     Module({
         providers: [
-            {
+            provide({
                 provide: DISPATCHER_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ stores }) => createDispatcher({ stores: stores && flatten(stores) }),
@@ -975,8 +983,8 @@ StateModule = __decorate([
                         optional: true,
                     },
                 },
-            },
-            {
+            }),
+            provide({
                 provide: DISPATCHER_CONTEXT_TOKEN,
                 scope: Scope.REQUEST,
                 useFactory: ({ dispatcher, initialState, middlewares }) => {
@@ -990,19 +998,19 @@ StateModule = __decorate([
                     middlewares: { token: STORE_MIDDLEWARE, optional: true },
                     initialState: { token: INITIAL_APP_STATE_TOKEN, optional: true },
                 },
-            },
-            {
+            }),
+            provide({
                 provide: STORE_TOKEN,
                 scope: Scope.REQUEST,
                 useFactory: ({ dispatcherContext }) => ({
-                    getState: (reducer) => dispatcherContext.getState(reducer),
-                    dispatch: (action) => dispatcherContext.dispatch(action),
-                    subscribe: (reducer, callback) => dispatcherContext.subscribe(reducer, callback),
+                    getState: dispatcherContext.getState.bind(dispatcherContext),
+                    dispatch: dispatcherContext.dispatch.bind(dispatcherContext),
+                    subscribe: dispatcherContext.subscribe.bind(dispatcherContext),
                 }),
                 deps: {
                     dispatcherContext: DISPATCHER_CONTEXT_TOKEN,
                 },
-            },
+            }),
         ],
     })
 ], StateModule);
@@ -1027,7 +1035,7 @@ const papiClearCache = ({ clearCache, logger, }) => {
 };
 
 const providers$1 = [
-    {
+    provide({
         provide: SERVER_MODULE_PAPI_PRIVATE_ROUTE,
         multi: true,
         useFactory: papiClearCache,
@@ -1035,10 +1043,10 @@ const providers$1 = [
             clearCache: CLEAR_CACHE_TOKEN,
             logger: LOGGER_TOKEN,
         },
-    },
+    }),
 ];
 
-const cachesToken = createToken('_cachesList');
+const cachesToken = createToken$1('_cachesList');
 let CacheModule = class CacheModule {
 };
 CacheModule = __decorate([
@@ -1133,7 +1141,8 @@ class ExecutionContextManager {
             throw error;
         }
         finally {
-            if (abortListener) {
+            // @ts-expect-error
+            if (abortListener && parentContext) {
                 parentContext.abortSignal.removeEventListener('abort', abortListener);
             }
         }
@@ -1157,13 +1166,13 @@ CommonModule = __decorate([
             CacheModule,
         ],
         providers: [
-            provide$1({
+            provide({
                 // Инстанс хук системы
                 provide: HOOK_TOKEN,
                 scope: Scope.SINGLETON,
                 useClass: Hooks,
             }),
-            provide$1({
+            provide({
                 // Регистр ui компонентов
                 provide: COMPONENT_REGISTRY_TOKEN,
                 scope: Scope.SINGLETON,
@@ -1172,7 +1181,7 @@ CommonModule = __decorate([
                     componentList: { token: 'componentDefaultList', optional: true },
                 },
             }),
-            provide$1({
+            provide({
                 // Управление бандлами, хранение и получение
                 provide: BUNDLE_MANAGER_TOKEN,
                 scope: Scope.SINGLETON,
@@ -1197,7 +1206,7 @@ CommonModule = __decorate([
                     logger: LOGGER_TOKEN,
                 },
             }),
-            provide$1({
+            provide({
                 //  Клиентский контекст исполнения
                 provide: CONTEXT_TOKEN,
                 scope: Scope.REQUEST,
@@ -1209,7 +1218,7 @@ CommonModule = __decorate([
                     store: STORE_TOKEN,
                 },
             }),
-            provide$1({
+            provide({
                 provide: EXECUTION_CONTEXT_MANAGER_TOKEN,
                 useClass: ExecutionContextManager,
             }),
@@ -1221,7 +1230,7 @@ CommonModule = __decorate([
 const providers = [];
 
 const stateProviders = [
-    provide$1({
+    provide({
         provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
         multi: true,
         useValue: [DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN],
@@ -1247,12 +1256,12 @@ const lines = {
     client: command,
 };
 const commandProviders = [
-    provide$1({
+    provide({
         provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
         multi: true,
         useValue: COMMAND_LINE_RUNNER_TOKEN,
     }),
-    provide$1({
+    provide({
         provide: COMMAND_LINES_TOKEN,
         scope: Scope.SINGLETON,
         useValue: lines,
@@ -1260,16 +1269,16 @@ const commandProviders = [
 ];
 
 const actionsProviders = [
-    provide$1({
+    provide({
         provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
         multi: true,
         useValue: [ACTION_EXECUTION_TOKEN, ACTION_PAGE_RUNNER_TOKEN],
     }),
-    {
+    provide({
         provide: COMBINE_REDUCERS,
         multi: true,
         useValue: actionTramvaiReducer,
-    },
+    }),
 ];
 
 let CommonChildAppModule = class CommonChildAppModule {
@@ -1281,7 +1290,7 @@ CommonChildAppModule = __decorate([
             ...stateProviders,
             ...commandProviders,
             ...actionsProviders,
-            provide$1({
+            provide({
                 provide: EXTEND_RENDER,
                 multi: true,
                 useFactory: ({ context }) => {