@tramvai/module-common 2.7.1 → 2.20.0

package/lib/index.browser.js

@@ -1,16 +1,15 @@
 import { __decorate } from 'tslib';
 import eachObj from '@tinkoff/utils/object/each';
-import { createBundle, Scope, Module, provide, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN, COMMAND_LINES_TOKEN, DI_TOKEN, ACTION_PARAMETERS, ACTIONS_LIST_TOKEN, IS_DI_CHILD_CONTAINER_TOKEN, BUNDLE_LIST_TOKEN } from '@tramvai/core';
+import { createBundle, Scope, Module, provide, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN, COMMAND_LINES_TOKEN, DI_TOKEN, isTramvaiAction, ACTION_PARAMETERS, 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';
 import { LogModule } from '@tramvai/module-log';
 import { Hooks } from '@tinkoff/hook-runner';
-import { REQUEST_MANAGER_TOKEN, REQUEST, COMBINE_REDUCERS, STORE_TOKEN, RESPONSE_MANAGER_TOKEN, RESPONSE, ACTION_EXECUTION_TOKEN, LOGGER_TOKEN, PUBSUB_FACTORY_TOKEN, PUBSUB_TOKEN, ROOT_PUBSUB_TOKEN, INITIAL_APP_STATE_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, CONTEXT_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, CREATE_CACHE_TOKEN, CLEAR_CACHE_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN } from '@tramvai/tokens-common';
+import { REQUEST_MANAGER_TOKEN, REQUEST, COMBINE_REDUCERS, STORE_TOKEN, RESPONSE_MANAGER_TOKEN, RESPONSE, 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, INITIAL_APP_STATE_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, CONTEXT_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, CREATE_CACHE_TOKEN, CLEAR_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 { __lazyErrorHandler } from '@tramvai/react';
+import { resolveLazyComponent, __lazyErrorHandler } from '@tramvai/react';
 import { fileSystemPagesEnabled, getAllFileSystemPages, isFileSystemPageComponent } from '@tramvai/experiments';
-import hoistNonReactStatics from 'hoist-non-react-statics';
 import pathOr from '@tinkoff/utils/object/pathOr';
 import flatten from '@tinkoff/utils/array/flatten';
 import { createEvent, createReducer, convertAction, createDispatcher, devTools, Provider } from '@tramvai/state';
@@ -18,9 +17,9 @@ import { format } 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, Scope as Scope$1, createToken } from '@tinkoff/dippy';
+import { createChildContainer, provide as provide$1, Scope as Scope$1, createToken } from '@tinkoff/dippy';
 import noop from '@tinkoff/utils/function/noop';
-import { isSilentError } from '@tinkoff/errors';
+import { isSilentError, ConditionFailError, ExecutionAbortError } from '@tinkoff/errors';
 import { PubSub } from '@tinkoff/pubsub';
 import identity from '@tinkoff/utils/function/identity';
 import objectMap from '@tinkoff/utils/object/map';
@@ -28,6 +27,7 @@ import uniq from '@tinkoff/utils/array/uniq';
 import difference from '@tinkoff/utils/array/difference';
 import toArray from '@tinkoff/utils/array/toArray';
 import LRU from '@tinkoff/lru-cache-nano';
+import { AbortController } from 'node-abort-controller';
 import { jsx } from 'react/jsx-runtime';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
 import { CHILD_APP_COMMON_INITIAL_STATE_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, commandLineListTokens as commandLineListTokens$1 } from '@tramvai/tokens-child-app';
@@ -75,24 +75,17 @@ class BundleManager {
         // preload `lazy` components then register actions and reducers
         if (pageComponent && bundle.components[pageComponent]) {
             const componentOrLoader = bundle.components[pageComponent];
-            const component = typeof componentOrLoader.load === 'function'
-                ? (await componentOrLoader.load()).default
-                : componentOrLoader;
-            // manually hoist static properties from preloaded component to loadable wrapper,
-            // this open access to current page component static properties outside before rendering
-            if (componentOrLoader !== component) {
-                hoistNonReactStatics(componentOrLoader, component);
-            }
+            const component = await resolveLazyComponent(componentOrLoader);
             // allow page components to register any other components
-            if (component.components) {
+            if ('components' in component) {
                 eachObj((cmp, name) => {
                     this.componentRegistry.add(name, cmp, pageComponent);
                 }, component.components);
             }
-            if (component.actions) {
+            if ('actions' in component) {
                 this.actionRegistry.add(pageComponent, component.actions);
             }
-            if (component.reducers) {
+            if ('reducers' in component) {
                 component.reducers.forEach((reducer) => {
                     this.dispatcher.registerStore(reducer);
                 });
@@ -378,14 +371,18 @@ const resolveDi = (type, status, diContainer, providers) => {
     return di;
 };
 class CommandLineRunner {
-    constructor({ lines, rootDi, logger, metrics, }) {
+    constructor({ lines, rootDi, logger, metrics, executionContextManager, }) {
+        this.executionContextByDi = new WeakMap();
+        this.abortControllerByDi = new WeakMap();
         this.lines = lines;
         this.rootDi = rootDi;
         this.log = logger('command:command-line-runner');
         this.metrics = metrics;
+        this.executionContextManager = executionContextManager;
     }
     run(type, status, providers, customDi) {
         const di = customDi !== null && customDi !== void 0 ? customDi : resolveDi(type, status, this.rootDi, providers);
+        const rootExecutionContext = di.get({ token: ROOT_EXECUTION_CONTEXT_TOKEN, optional: true });
         this.log.debug({
             event: 'command-run',
             type,
@@ -397,13 +394,27 @@ class CommandLineRunner {
                 const doneMetric = this.createDurationMetric();
                 // eslint-disable-next-line promise/no-nesting
                 return Promise.resolve()
-                    .then(() => this.createLineChain(di, line))
+                    .then(() => {
+                    return this.executionContextManager.withContext(rootExecutionContext, `command-line:${line.toString()}`, async (executionContext, abortController) => {
+                        this.executionContextByDi.set(di, executionContext);
+                        this.abortControllerByDi.set(di, abortController);
+                        await this.createLineChain(di, line);
+                    });
+                })
                     .finally(() => doneMetric({ line: line.toString() }));
             });
         }, Promise.resolve())
             // После завершения цепочки отдаем context выполнения
+            .finally(() => {
+            this.executionContextByDi.delete(di);
+            this.abortControllerByDi.delete(di);
+        })
             .then(() => di));
     }
+    resolveExecutionContextFromDi(di) {
+        var _a;
+        return (_a = this.executionContextByDi.get(di)) !== null && _a !== void 0 ? _a : null;
+    }
     createLineChain(di, line) {
         let lineInstance;
         try {
@@ -455,12 +466,15 @@ class CommandLineRunner {
         return Promise.resolve()
             .then(() => instance())
             .catch((err) => {
+            var _a;
             this.log[isSilentError(err) ? 'debug' : 'error']({
                 event: 'line-error',
                 error: err,
                 line: line.toString(),
                 command: name,
             });
+            // in case if any error happens during line execution results from other line handlers will not be used anyway
+            (_a = this.abortControllerByDi.get(di)) === null || _a === void 0 ? void 0 : _a.abort();
             this.throwError(err, di);
         });
     }
@@ -514,7 +528,7 @@ let CommandModule = class CommandModule {
 CommandModule = __decorate([
     Module({
         providers: [
-            {
+            provide$1({
                 // Раннер процессов
                 provide: COMMAND_LINE_RUNNER_TOKEN,
                 scope: Scope$1.SINGLETON,
@@ -527,14 +541,27 @@ CommandModule = __decorate([
                         token: METRICS_MODULE_TOKEN,
                         optional: true,
                     },
+                    executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
                 },
-            },
-            {
+            }),
+            provide$1({
+                provide: COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
+                useFactory: ({ di, commandLineRunner, }) => {
+                    return () => {
+                        return commandLineRunner.resolveExecutionContextFromDi(di);
+                    };
+                },
+                deps: {
+                    di: DI_TOKEN,
+                    commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
+                },
+            }),
+            provide$1({
                 // Дефолтный список команл
                 provide: COMMAND_LINES_TOKEN,
                 scope: Scope$1.SINGLETON,
                 useValue: lines$1,
-            },
+            }),
         ],
     })
 ], CommandModule);
@@ -602,14 +629,19 @@ const actionTramvaiReducer = createReducer('actionTramvai', initalState).on(acti
     serverState: payload,
 }));
 
+/**
+ * @deprecated only for compatibility with legacy createAction
+ */
 const actionType = {
     global: 'global',
     local: 'local',
 };
 
+const DEFAULT_CONDITIONS = {};
 class ActionChecker {
     // eslint-disable-next-line max-params
     constructor(globalConditionals, payload, parameters, executionState, type) {
+        var _a;
         this.globalConditionals = globalConditionals;
         this.payload = payload;
         this.parameters = parameters;
@@ -623,7 +655,7 @@ class ActionChecker {
             // если экшен был уже выполнен, то считаем, что его не нужно больше выполнять
             this.status = executionState.status !== 'success';
         }
-        this.conditions = parameters.conditions;
+        this.conditions = (_a = parameters.conditions) !== null && _a !== void 0 ? _a : DEFAULT_CONDITIONS;
     }
     check() {
         this.globalConditionals.forEach((filter) => {
@@ -640,6 +672,7 @@ class ActionChecker {
     }
     forbid() {
         this.executionState.status = 'forbidden';
+        this.executionState.forbiddenBy = this.key;
         this.forbiddenMarker = true;
     }
     allow() {
@@ -653,12 +686,16 @@ class ActionChecker {
     }
 }
 
+const EMPTY_DEPS = {};
+const DEFAULT_PAYLOAD = {};
 const getParameters = (action) => action[ACTION_PARAMETERS];
 class ActionExecution {
-    constructor({ actionConditionals, store, context, di, transformAction, }) {
+    constructor({ store, context, di, executionContextManager, actionConditionals, transformAction, }) {
         this.actionConditionals = flatten(actionConditionals !== null && actionConditionals !== void 0 ? actionConditionals : []);
         this.context = context;
+        this.store = store;
         this.di = di;
+        this.executionContextManager = executionContextManager;
         this.execution = new Map();
         this.transformAction = transformAction || identity;
         const initialState = store.getState(actionTramvaiReducer);
@@ -668,32 +705,64 @@ class ActionExecution {
             }, initialState.serverState);
         }
     }
-    run(action, payload, type = actionType.local) {
-        // TODO выпилить после перевода всех экшенов к виду Action
-        this.transformAction(action);
-        const parameters = getParameters(action);
-        const executionState = this.getExecutionState(parameters);
+    async runInContext(executionContext, action, ...params) {
+        var _a, _b;
+        let parameters;
+        const payload = (_a = params[0]) !== null && _a !== void 0 ? _a : DEFAULT_PAYLOAD;
+        // TODO: replace type with pure context usage
+        const type = (executionContext === null || executionContext === void 0 ? void 0 : executionContext.values.pageActions) === true ? actionType.global : actionType.local;
+        // TODO: remove else branch after migration to new declareAction
+        if (isTramvaiAction(action)) {
+            parameters = action;
+        }
+        else {
+            this.transformAction(action);
+            parameters = getParameters(action);
+        }
+        const executionState = this.getExecutionState(parameters.name);
         if (!this.canExecuteAction(payload, parameters, executionState, type)) {
-            return Promise.resolve();
+            switch (parameters.conditionsFailResult) {
+                case 'reject':
+                    return Promise.reject(new ConditionFailError({
+                        conditionName: (_b = executionState.forbiddenBy) !== null && _b !== void 0 ? _b : 'unknown',
+                        targetName: parameters.name,
+                    }));
+                default:
+                    return Promise.resolve();
+            }
         }
-        const deps = parameters.deps ? this.di.getOfDeps(parameters.deps) : {};
         executionState.status = 'pending';
-        return Promise.resolve()
-            .then(() => action(this.context, payload, deps))
-            .then((data) => {
-            executionState.status = 'success';
-            return data;
-        })
-            .catch((err) => {
-            executionState.status = 'failed';
-            throw err;
+        return this.executionContextManager.withContext(executionContext, {
+            name: parameters.name,
+            values: (executionContext === null || executionContext === void 0 ? void 0 : executionContext.values.pageActions) === true ? { pageActions: false } : undefined,
+        }, (executionActionContext, abortController) => {
+            const context = this.createActionContext(executionContext, executionActionContext, abortController, parameters);
+            return Promise.resolve()
+                .then(() => {
+                if (isTramvaiAction(action)) {
+                    return action.fn.apply(context, params);
+                }
+                return action(this.context, payload, context.deps);
+            })
+                .then((data) => {
+                executionState.status = 'success';
+                return data;
+            })
+                .catch((err) => {
+                executionState.status = 'failed';
+                throw err;
+            });
         });
     }
-    getExecutionState(parameters) {
-        let executionState = this.execution.get(parameters.name);
+    async run(action, ...params) {
+        return this.runInContext(null, action, ...params);
+    }
+    getExecutionState(name) {
+        let executionState = this.execution.get(name);
+        // TODO: probably do not need to create executionState on client as it is not used
         if (!executionState) {
             executionState = { status: 'pending', state: {} };
-            this.execution.set(parameters.name, executionState);
+            this.execution.set(name, executionState);
         }
         return executionState;
     }
@@ -701,6 +770,17 @@ class ActionExecution {
         const actionChecker = new ActionChecker(this.actionConditionals, payload, parameters, executionState, type);
         return actionChecker.check();
     }
+    createActionContext(parentExecutionContext, actionExecutionContext, abortController, parameters) {
+        return {
+            abortController,
+            abortSignal: actionExecutionContext === null || actionExecutionContext === void 0 ? void 0 : actionExecutionContext.abortSignal,
+            executeAction: this.runInContext.bind(this, actionExecutionContext),
+            deps: parameters.deps ? this.di.getOfDeps(parameters.deps) : EMPTY_DEPS,
+            actionType: (parentExecutionContext === null || parentExecutionContext === void 0 ? void 0 : parentExecutionContext.values.pageActions) ? 'page' : 'standalone',
+            dispatch: this.store.dispatch,
+            getState: this.store.getState,
+        };
+    }
 }
 
 const GLOBAL_PARAMETER = '@@global';
@@ -730,29 +810,32 @@ class ActionRegistry {
     }
 }
 
-const payload = {};
 class ActionPageRunner {
-    constructor({ actionExecution, logger, }) {
-        this.actionExecution = actionExecution;
-        this.log = logger('action:action-page-runner');
+    constructor(deps) {
+        this.deps = deps;
+        this.log = deps.logger('action:action-page-runner');
     }
     runActions(actions, stopRunAtError = () => false) {
-        const actionMapper = (action) => {
-            return Promise.resolve()
-                .then(() => this.actionExecution.run(action, payload, actionType.global))
-                .catch((error) => {
-                const parameters = action[ACTION_PARAMETERS];
-                this.log.error({
-                    error,
-                    event: `action-execution-error`,
-                    message: `${parameters.name} execution error`,
+        return this.deps.executionContextManager.withContext(this.deps.commandLineExecutionContext(), { name: 'pageActions', values: { pageActions: true } }, async (executionContext) => {
+            const actionMapper = (action) => {
+                return Promise.resolve()
+                    .then(() => this.deps.actionExecution.runInContext(executionContext, action))
+                    .catch((error) => {
+                    if (!isSilentError(error)) {
+                        const parameters = isTramvaiAction(action) ? action : action[ACTION_PARAMETERS];
+                        this.log.error({
+                            error,
+                            event: `action-execution-error`,
+                            message: `${parameters.name} execution error`,
+                        });
+                    }
+                    if (stopRunAtError(error)) {
+                        throw error;
+                    }
                 });
-                if (stopRunAtError(error)) {
-                    throw error;
-                }
-            });
-        };
-        return Promise.all(actions.map(actionMapper));
+            };
+            await Promise.all(actions.map(actionMapper));
+        });
     }
 }
 
@@ -830,23 +913,26 @@ ActionModule = __decorate([
                     context: CONTEXT_TOKEN,
                     store: STORE_TOKEN,
                     di: DI_TOKEN,
+                    executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
                     transformAction: {
                         token: 'actionTransformAction',
                         optional: true,
                     },
                 },
             }),
-            {
+            provide({
                 provide: ACTION_PAGE_RUNNER_TOKEN,
                 scope: Scope.REQUEST,
                 useClass: ActionPageRunner,
                 deps: {
                     actionExecution: ACTION_EXECUTION_TOKEN,
+                    executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
+                    commandLineExecutionContext: COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
                     store: STORE_TOKEN,
                     limitTime: 'limitActionGlobalTimeRun',
                     logger: LOGGER_TOKEN,
                 },
-            },
+            }),
             {
                 provide: 'limitActionGlobalTimeRun',
                 useValue: 500,
@@ -963,6 +1049,58 @@ CacheModule = __decorate([
     })
 ], CacheModule);
 
+const EMPTY_VALUES = {};
+const normalizeOptions = (nameOrOptions) => {
+    return typeof nameOrOptions === 'string' ? { name: nameOrOptions } : nameOrOptions;
+};
+class ExecutionContextManager {
+    async withContext(parentContext, nameOrOptions, cb) {
+        const options = normalizeOptions(nameOrOptions);
+        const { name, values: selfValues = EMPTY_VALUES } = options;
+        const contextName = parentContext ? `${parentContext.name}.${name}` : name;
+        if (parentContext === null || parentContext === void 0 ? void 0 : parentContext.abortSignal.aborted) {
+            throw new ExecutionAbortError({
+                message: `Execution aborted in context "${contextName}"`,
+                contextName,
+            });
+        }
+        const abortController = new AbortController();
+        let abortListener;
+        let values = selfValues;
+        if (parentContext) {
+            values = {
+                ...parentContext.values,
+                ...selfValues,
+            };
+            abortListener = () => {
+                abortController.abort();
+            };
+            // abort child context AbortController if parent AbortController was aborted
+            parentContext.abortSignal.addEventListener('abort', abortListener);
+        }
+        const context = {
+            name: contextName,
+            abortSignal: abortController.signal,
+            values,
+        };
+        try {
+            const result = await cb(context, abortController);
+            return result;
+        }
+        catch (error) {
+            if (!error.executionContextName) {
+                error.executionContextName = context.name;
+            }
+            throw error;
+        }
+        finally {
+            if (abortListener) {
+                parentContext.abortSignal.removeEventListener('abort', abortListener);
+            }
+        }
+    }
+}
+
 let CommonModule = class CommonModule {
 };
 CommonModule = __decorate([
@@ -1033,6 +1171,10 @@ CommonModule = __decorate([
                     store: STORE_TOKEN,
                 },
             }),
+            provide({
+                provide: EXECUTION_CONTEXT_MANAGER_TOKEN,
+                useClass: ExecutionContextManager,
+            }),
             ...providers$2,
         ],
     })
@@ -1129,4 +1271,4 @@ CommonChildAppModule = __decorate([
     })
 ], CommonChildAppModule);
 
-export { ActionExecution, CommandModule, CommonChildAppModule, CommonModule, alwaysCondition, createConsumerContext, onlyBrowser, onlyServer, pageBrowser, pageServer };
+export { ActionExecution, CommandModule, CommonChildAppModule, CommonModule, ExecutionContextManager, alwaysCondition, createConsumerContext, onlyBrowser, onlyServer, pageBrowser, pageServer };

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 export { CommonModule } from './CommonModule';
 export { CommandModule } from './command/CommandModule';
 export { ActionExecution } from './actions/actionExecution';
+export { ExecutionContextManager } from './executionContext/executionContextManager';
 export { alwaysCondition, onlyServer, onlyBrowser, pageServer, pageBrowser, } from './actions/ActionModule';
 export { createConsumerContext } from './createConsumerContext/createConsumerContext';
 export { CommonChildAppModule } from './child-app/ChildAppModule';