@tramvai/module-common 2.36.0 → 2.37.0

package/lib/index.js

@@ -10,6 +10,8 @@ var moduleCookie = require('@tramvai/module-cookie');
 var moduleLog = require('@tramvai/module-log');
 var hookRunner = require('@tinkoff/hook-runner');
 var tokensCommon = require('@tramvai/tokens-common');
+var isObject = require('@tinkoff/utils/is/object');
+var isArray = require('@tinkoff/utils/is/array');
 var react = require('@tramvai/react');
 var experiments = require('@tramvai/experiments');
 var pathOr = require('@tinkoff/utils/object/pathOr');
@@ -40,6 +42,8 @@ var tokensChildApp = require('@tramvai/tokens-child-app');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var eachObj__default = /*#__PURE__*/_interopDefaultLegacy(eachObj);
+var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
+var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
 var pathOr__default = /*#__PURE__*/_interopDefaultLegacy(pathOr);
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
@@ -96,16 +100,19 @@ class BundleManager {
         if (pageComponent && bundle.components[pageComponent]) {
             const componentOrLoader = bundle.components[pageComponent];
             const component = await react.resolveLazyComponent(componentOrLoader);
+            if (!component) {
+                return;
+            }
             // allow page components to register any other components
-            if ('components' in component) {
+            if ('components' in component && isObject__default["default"](component.components)) {
                 eachObj__default["default"]((cmp, name) => {
                     this.componentRegistry.add(name, cmp, pageComponent);
                 }, component.components);
             }
-            if ('actions' in component) {
+            if ('actions' in component && isArray__default["default"](component.actions)) {
                 this.actionRegistry.add(pageComponent, component.actions);
             }
-            if ('reducers' in component) {
+            if ('reducers' in component && isArray__default["default"](component.reducers)) {
                 component.reducers.forEach((reducer) => {
                     this.dispatcher.registerStore(reducer);
                 });
@@ -213,19 +220,19 @@ class RequestManager {
 }
 
 const sharedProviders$1 = [
-    {
+    core.provide({
         provide: tokensCommon.REQUEST_MANAGER_TOKEN,
         scope: core.Scope.REQUEST,
         useClass: RequestManager,
         deps: {
             request: tokensServerPrivate.FASTIFY_REQUEST,
         },
-    },
-    {
+    }),
+    core.provide({
         provide: tokensCommon.COMBINE_REDUCERS,
         multi: true,
         useValue: RequestManagerStore,
-    },
+    }),
 ];
 
 let RequestManagerModule = class RequestManagerModule {
@@ -234,7 +241,7 @@ RequestManagerModule = tslib.__decorate([
     core.Module({
         providers: [
             ...sharedProviders$1,
-            {
+            core.provide({
                 provide: core.commandLineListTokens.customerStart,
                 multi: true,
                 useFactory: ({ context, requestManager }) => {
@@ -251,7 +258,7 @@ RequestManagerModule = tslib.__decorate([
                     context: tokensCommon.CONTEXT_TOKEN,
                     requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
                 },
-            },
+            }),
         ],
     })
 ], RequestManagerModule);
@@ -305,11 +312,11 @@ class ResponseManager {
 }
 
 const sharedProviders = [
-    {
+    core.provide({
         provide: tokensCommon.RESPONSE_MANAGER_TOKEN,
         scope: core.Scope.REQUEST,
         useClass: ResponseManager,
-    },
+    }),
 ];
 
 let ResponseManagerModule = class ResponseManagerModule {
@@ -351,8 +358,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]);
@@ -361,6 +368,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);
@@ -391,7 +399,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;
@@ -466,6 +474,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 || ''}`;
                     }
                 }
@@ -566,7 +575,7 @@ exports.CommandModule = tslib.__decorate([
             }),
             dippy.provide({
                 provide: tokensCommon.COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
-                useFactory: ({ di, commandLineRunner, }) => {
+                useFactory: ({ di, commandLineRunner }) => {
                     return () => {
                         return commandLineRunner.resolveExecutionContextFromDi(di);
                     };
@@ -591,7 +600,7 @@ let PubSubModule = class PubSubModule {
 PubSubModule = tslib.__decorate([
     core.Module({
         providers: [
-            {
+            core.provide({
                 // Фабрика для создания pubsub
                 provide: tokensCommon.PUBSUB_FACTORY_TOKEN,
                 scope: core.Scope.SINGLETON,
@@ -603,23 +612,23 @@ PubSubModule = tslib.__decorate([
                 deps: {
                     logger: tokensCommon.LOGGER_TOKEN,
                 },
-            },
-            {
+            }),
+            core.provide({
                 provide: tokensCommon.PUBSUB_TOKEN,
                 scope: core.Scope.REQUEST,
                 useFactory: ({ createPubsub }) => createPubsub(),
                 deps: {
                     createPubsub: tokensCommon.PUBSUB_FACTORY_TOKEN,
                 },
-            },
-            {
+            }),
+            core.provide({
                 provide: tokensCommon.ROOT_PUBSUB_TOKEN,
                 scope: core.Scope.SINGLETON,
                 useFactory: ({ createPubsub }) => createPubsub(),
                 deps: {
                     createPubsub: tokensCommon.PUBSUB_FACTORY_TOKEN,
                 },
-            },
+            }),
         ],
     })
 ], PubSubModule);
@@ -918,23 +927,24 @@ const pageBrowser = {
     },
 };
 
+const LIMIT_ACTION_GLOBAL_TIME_RUN = core.createToken('limitActionGlobalTimeRun');
 let ActionModule = class ActionModule {
 };
 ActionModule = tslib.__decorate([
     core.Module({
         providers: [
-            {
+            core.provide({
                 provide: tokensCommon.COMBINE_REDUCERS,
                 multi: true,
                 useValue: actionTramvaiReducer,
-            },
-            {
+            }),
+            core.provide({
                 // Регистер глобальных экшенов
                 provide: tokensCommon.ACTION_REGISTRY_TOKEN,
                 scope: core.Scope.SINGLETON,
                 useClass: ActionRegistry,
                 deps: { actionsList: core.ACTIONS_LIST_TOKEN },
-            },
+            }),
             core.provide({
                 provide: tokensCommon.ACTION_EXECUTION_TOKEN,
                 scope: core.Scope.REQUEST,
@@ -960,19 +970,19 @@ ActionModule = tslib.__decorate([
                     executionContextManager: tokensCommon.EXECUTION_CONTEXT_MANAGER_TOKEN,
                     commandLineExecutionContext: tokensCommon.COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
                     store: tokensCommon.STORE_TOKEN,
-                    limitTime: 'limitActionGlobalTimeRun',
+                    limitTime: LIMIT_ACTION_GLOBAL_TIME_RUN,
                     logger: tokensCommon.LOGGER_TOKEN,
                 },
             }),
-            {
-                provide: 'limitActionGlobalTimeRun',
+            core.provide({
+                provide: LIMIT_ACTION_GLOBAL_TIME_RUN,
                 useValue: 500,
-            },
-            {
+            }),
+            core.provide({
                 provide: tokensCommon.ACTION_CONDITIONALS,
                 multi: true,
                 useValue: [alwaysCondition, onlyServer, onlyBrowser, pageServer, pageBrowser],
-            },
+            }),
         ],
     })
 ], ActionModule);
@@ -982,7 +992,7 @@ let StateModule = class StateModule {
 StateModule = tslib.__decorate([
     core.Module({
         providers: [
-            {
+            core.provide({
                 provide: tokensCommon.DISPATCHER_TOKEN,
                 scope: core.Scope.SINGLETON,
                 useFactory: ({ stores }) => state.createDispatcher({ stores: stores && flatten__default["default"](stores) }),
@@ -992,8 +1002,8 @@ StateModule = tslib.__decorate([
                         optional: true,
                     },
                 },
-            },
-            {
+            }),
+            core.provide({
                 provide: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
                 scope: core.Scope.REQUEST,
                 useFactory: ({ dispatcher, initialState, middlewares }) => {
@@ -1007,19 +1017,19 @@ StateModule = tslib.__decorate([
                     middlewares: { token: tokensCommon.STORE_MIDDLEWARE, optional: true },
                     initialState: { token: tokensCommon.INITIAL_APP_STATE_TOKEN, optional: true },
                 },
-            },
-            {
+            }),
+            core.provide({
                 provide: tokensCommon.STORE_TOKEN,
                 scope: core.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: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
                 },
-            },
+            }),
         ],
     })
 ], StateModule);
@@ -1044,7 +1054,7 @@ const papiClearCache = ({ clearCache, logger, }) => {
 };
 
 const providers$1 = [
-    {
+    core.provide({
         provide: tokensServer.SERVER_MODULE_PAPI_PRIVATE_ROUTE,
         multi: true,
         useFactory: papiClearCache,
@@ -1052,7 +1062,7 @@ const providers$1 = [
             clearCache: tokensCommon.CLEAR_CACHE_TOKEN,
             logger: tokensCommon.LOGGER_TOKEN,
         },
-    },
+    }),
 ];
 
 const cachesToken = dippy.createToken('_cachesList');
@@ -1150,7 +1160,8 @@ class ExecutionContextManager {
             throw error;
         }
         finally {
-            if (abortListener) {
+            // @ts-expect-error
+            if (abortListener && parentContext) {
                 parentContext.abortSignal.removeEventListener('abort', abortListener);
             }
         }
@@ -1282,11 +1293,11 @@ const actionsProviders = [
         multi: true,
         useValue: [tokensCommon.ACTION_EXECUTION_TOKEN, tokensCommon.ACTION_PAGE_RUNNER_TOKEN],
     }),
-    {
+    core.provide({
         provide: tokensCommon.COMBINE_REDUCERS,
         multi: true,
         useValue: actionTramvaiReducer,
-    },
+    }),
 ];
 
 exports.CommonChildAppModule = class CommonChildAppModule {

package/lib/providers/clientProviders.d.ts

@@ -1,20 +1,5 @@
-import { COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
-export declare const providers: ({
-    provide: import("@tinkoff/dippy").BaseTokenInterface<{
-        stores: Record<string, any>;
-    }>;
-    useFactory: () => any;
-    scope: import("@tinkoff/dippy/lib/Provider").ScopeVariants;
-    deps?: undefined;
-    multi?: undefined;
-} | {
-    provide: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>;
-    useFactory: ({ commandLineRunner, }: {
-        commandLineRunner: typeof COMMAND_LINE_RUNNER_TOKEN;
-    }) => () => Promise<import("@tinkoff/dippy").Container>;
-    deps: {
-        commandLineRunner: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-core").CommandLine>;
-    };
-    multi: boolean;
-    scope?: undefined;
-})[];
+export declare const providers: (import("@tramvai/core").Provider<unknown, import("@tinkoff/dippy").BaseTokenInterface<{
+    stores: Record<string, any>;
+}>> | import("@tramvai/core").Provider<{
+    commandLineRunner: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-core").CommandLine>;
+}, import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>>)[];

package/lib/providers/serverProviders.d.ts

@@ -1 +1 @@
-export declare const providers: any[];
+export declare const providers: never[];

package/lib/requestManager/requestManager.d.ts

@@ -13,8 +13,8 @@ export declare class RequestManager implements Interface {
     getUrl(): string;
     getParsedUrl(): Url;
     getMethod(): string;
-    getHeader(key: string): string | string[];
-    getHeaders(): Record<string, string | string[]>;
+    getHeader(key: string): string | string[] | undefined;
+    getHeaders(): Record<string, string | string[] | undefined>;
     getCookie(key: string): string;
     getCookies(): Record<string, string>;
     getClientIp(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-common",
-  "version": "2.36.0",
+  "version": "2.37.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -33,27 +33,27 @@
     "@tinkoff/lru-cache-nano": "^7.8.1",
     "@tinkoff/pubsub": "0.5.5",
     "@tinkoff/url": "0.8.4",
-    "@tramvai/experiments": "2.36.0",
-    "@tramvai/module-cookie": "2.36.0",
-    "@tramvai/module-environment": "2.36.0",
-    "@tramvai/module-log": "2.36.0",
-    "@tramvai/tokens-child-app": "2.36.0",
-    "@tramvai/tokens-common": "2.36.0",
-    "@tramvai/tokens-render": "2.36.0",
-    "@tramvai/tokens-server-private": "2.36.0",
+    "@tramvai/experiments": "2.37.0",
+    "@tramvai/module-cookie": "2.37.0",
+    "@tramvai/module-environment": "2.37.0",
+    "@tramvai/module-log": "2.37.0",
+    "@tramvai/tokens-child-app": "2.37.0",
+    "@tramvai/tokens-common": "2.37.0",
+    "@tramvai/tokens-render": "2.37.0",
+    "@tramvai/tokens-server-private": "2.37.0",
     "hoist-non-react-statics": "^3.3.1",
     "node-abort-controller": "^3.0.1"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.8.8",
+    "@tinkoff/dippy": "0.8.9",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.36.0",
-    "@tramvai/core": "2.36.0",
-    "@tramvai/papi": "2.36.0",
-    "@tramvai/react": "2.36.0",
-    "@tramvai/state": "2.36.0",
-    "@tramvai/tokens-metrics": "2.36.0",
-    "@tramvai/tokens-server": "2.36.0",
+    "@tramvai/cli": "2.37.0",
+    "@tramvai/core": "2.37.0",
+    "@tramvai/papi": "2.37.0",
+    "@tramvai/react": "2.37.0",
+    "@tramvai/state": "2.37.0",
+    "@tramvai/tokens-metrics": "2.37.0",
+    "@tramvai/tokens-server": "2.37.0",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"
   },