@tramvai/module-common 4.18.4 → 4.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/actions/ActionModule.browser.js +2 -3
- package/lib/actions/ActionModule.es.js +2 -3
- package/lib/actions/ActionModule.js +2 -3
- package/lib/child-app/actions.browser.js +10 -2
- package/lib/child-app/actions.es.js +10 -2
- package/lib/child-app/actions.js +9 -1
- package/lib/child-app/command.browser.js +6 -1
- package/lib/child-app/command.es.js +6 -1
- package/lib/child-app/command.js +6 -1
- package/lib/child-app/state.browser.js +2 -2
- package/lib/child-app/state.es.js +2 -2
- package/lib/child-app/state.js +1 -1
- package/lib/command/commandLineRunner.browser.js +13 -13
- package/lib/command/commandLineRunner.d.ts +1 -0
- package/lib/command/commandLineRunner.es.js +13 -13
- package/lib/command/commandLineRunner.js +13 -13
- package/lib/providers/clientProviders.browser.js +2 -0
- package/lib/state/StateModule.browser.js +1 -4
- package/lib/state/StateModule.es.js +1 -4
- package/lib/state/StateModule.js +1 -4
- package/package.json +19 -19
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate } from 'tslib';
|
|
2
|
-
import {
|
|
3
|
-
import { COMBINE_REDUCERS, ACTION_REGISTRY_TOKEN, ACTION_EXECUTION_TOKEN, ACTION_CONDITIONALS, CONTEXT_TOKEN, STORE_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, DEFERRED_ACTIONS_MAP_TOKEN, ACTION_PAGE_RUNNER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, LOGGER_TOKEN } from '@tramvai/tokens-common';
|
|
2
|
+
import { Module, provide, Scope, ACTIONS_LIST_TOKEN, DI_TOKEN, optional } from '@tramvai/core';
|
|
3
|
+
import { COMBINE_REDUCERS, ACTION_REGISTRY_TOKEN, ACTION_EXECUTION_TOKEN, ACTION_CONDITIONALS, CONTEXT_TOKEN, STORE_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, DEFERRED_ACTIONS_MAP_TOKEN, ACTION_PAGE_RUNNER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, LOGGER_TOKEN } from '@tramvai/tokens-common';
|
|
4
4
|
import { SERVER_RESPONSE_TASK_MANAGER, SERVER_RESPONSE_STREAM } from '@tramvai/tokens-server-private';
|
|
5
5
|
import { ROUTER_TOKEN } from '@tramvai/tokens-router';
|
|
6
6
|
import { actionTramvaiReducer } from './actionTramvaiReducer.browser.js';
|
|
@@ -21,7 +21,6 @@ import { dynamicCondition } from './conditions/dynamic.browser.js';
|
|
|
21
21
|
export { dynamicCondition } from './conditions/dynamic.browser.js';
|
|
22
22
|
import { providers } from './deferred/providers.browser.browser.js';
|
|
23
23
|
|
|
24
|
-
const LIMIT_ACTION_GLOBAL_TIME_RUN = createToken('limitActionGlobalTimeRun');
|
|
25
24
|
let ActionModule = class ActionModule {
|
|
26
25
|
};
|
|
27
26
|
ActionModule = __decorate([
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate } from 'tslib';
|
|
2
|
-
import {
|
|
3
|
-
import { COMBINE_REDUCERS, ACTION_REGISTRY_TOKEN, ACTION_EXECUTION_TOKEN, ACTION_CONDITIONALS, CONTEXT_TOKEN, STORE_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, DEFERRED_ACTIONS_MAP_TOKEN, ACTION_PAGE_RUNNER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, LOGGER_TOKEN } from '@tramvai/tokens-common';
|
|
2
|
+
import { Module, provide, Scope, ACTIONS_LIST_TOKEN, DI_TOKEN, optional } from '@tramvai/core';
|
|
3
|
+
import { COMBINE_REDUCERS, ACTION_REGISTRY_TOKEN, ACTION_EXECUTION_TOKEN, ACTION_CONDITIONALS, CONTEXT_TOKEN, STORE_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN, DEFERRED_ACTIONS_MAP_TOKEN, ACTION_PAGE_RUNNER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, LOGGER_TOKEN } from '@tramvai/tokens-common';
|
|
4
4
|
import { SERVER_RESPONSE_TASK_MANAGER, SERVER_RESPONSE_STREAM } from '@tramvai/tokens-server-private';
|
|
5
5
|
import { ROUTER_TOKEN } from '@tramvai/tokens-router';
|
|
6
6
|
import { actionTramvaiReducer } from './actionTramvaiReducer.es.js';
|
|
@@ -21,7 +21,6 @@ import { dynamicCondition } from './conditions/dynamic.es.js';
|
|
|
21
21
|
export { dynamicCondition } from './conditions/dynamic.es.js';
|
|
22
22
|
import { providers } from './deferred/providers.es.js';
|
|
23
23
|
|
|
24
|
-
const LIMIT_ACTION_GLOBAL_TIME_RUN = createToken('limitActionGlobalTimeRun');
|
|
25
24
|
let ActionModule = class ActionModule {
|
|
26
25
|
};
|
|
27
26
|
ActionModule = __decorate([
|
|
@@ -19,7 +19,6 @@ var pageBrowser = require('./conditions/pageBrowser.js');
|
|
|
19
19
|
var dynamic = require('./conditions/dynamic.js');
|
|
20
20
|
var providers = require('./deferred/providers.js');
|
|
21
21
|
|
|
22
|
-
const LIMIT_ACTION_GLOBAL_TIME_RUN = core.createToken('limitActionGlobalTimeRun');
|
|
23
22
|
exports.ActionModule = class ActionModule {
|
|
24
23
|
};
|
|
25
24
|
exports.ActionModule = tslib.__decorate([
|
|
@@ -63,7 +62,7 @@ exports.ActionModule = tslib.__decorate([
|
|
|
63
62
|
executionContextManager: tokensCommon.EXECUTION_CONTEXT_MANAGER_TOKEN,
|
|
64
63
|
commandLineExecutionContext: tokensCommon.COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
|
|
65
64
|
store: tokensCommon.STORE_TOKEN,
|
|
66
|
-
limitTime: LIMIT_ACTION_GLOBAL_TIME_RUN,
|
|
65
|
+
limitTime: tokensCommon.LIMIT_ACTION_GLOBAL_TIME_RUN,
|
|
67
66
|
logger: tokensCommon.LOGGER_TOKEN,
|
|
68
67
|
deferredMap: tokensCommon.DEFERRED_ACTIONS_MAP_TOKEN,
|
|
69
68
|
responseTaskManager: core.optional(tokensServerPrivate.SERVER_RESPONSE_TASK_MANAGER),
|
|
@@ -72,7 +71,7 @@ exports.ActionModule = tslib.__decorate([
|
|
|
72
71
|
},
|
|
73
72
|
}),
|
|
74
73
|
core.provide({
|
|
75
|
-
provide: LIMIT_ACTION_GLOBAL_TIME_RUN,
|
|
74
|
+
provide: tokensCommon.LIMIT_ACTION_GLOBAL_TIME_RUN,
|
|
76
75
|
useValue: 500,
|
|
77
76
|
}),
|
|
78
77
|
core.provide({
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { provide } from '@tramvai/core';
|
|
2
2
|
import noop from '@tinkoff/utils/function/noop';
|
|
3
3
|
import { CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
|
|
4
|
-
import { ACTION_EXECUTION_TOKEN, ACTION_PAGE_RUNNER_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
|
|
4
|
+
import { ACTION_EXECUTION_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DEFERRED_ACTIONS_MAP_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
|
|
5
5
|
import { COMMAND_LINE_EXECUTION_END_TOKEN } from '@tramvai/tokens-core-private';
|
|
6
6
|
import { actionTramvaiReducer } from '../actions/actionTramvaiReducer.browser.js';
|
|
7
7
|
|
|
@@ -9,7 +9,15 @@ const actionsProviders = [
|
|
|
9
9
|
provide({
|
|
10
10
|
provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
11
11
|
multi: true,
|
|
12
|
-
useValue: [
|
|
12
|
+
useValue: [
|
|
13
|
+
ACTION_EXECUTION_TOKEN,
|
|
14
|
+
ACTION_PAGE_RUNNER_TOKEN,
|
|
15
|
+
// borrow for multi token with useValue is not working properly for v2.0.0 tramvai, not backward compatible.
|
|
16
|
+
// for legacy CA + modern host this token will be borrowed in `packages/modules/child-app/src/shared/child/singletonProviders.ts`
|
|
17
|
+
// for modern CA + legacy host this token will not be borrowed, but it is okay - there is full DI access.
|
|
18
|
+
// ACTION_CONDITIONALS,
|
|
19
|
+
DEFERRED_ACTIONS_MAP_TOKEN,
|
|
20
|
+
],
|
|
13
21
|
}),
|
|
14
22
|
provide({
|
|
15
23
|
provide: COMBINE_REDUCERS,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { provide } from '@tramvai/core';
|
|
2
2
|
import noop from '@tinkoff/utils/function/noop';
|
|
3
3
|
import { CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
|
|
4
|
-
import { ACTION_EXECUTION_TOKEN, ACTION_PAGE_RUNNER_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
|
|
4
|
+
import { ACTION_EXECUTION_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DEFERRED_ACTIONS_MAP_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
|
|
5
5
|
import { COMMAND_LINE_EXECUTION_END_TOKEN } from '@tramvai/tokens-core-private';
|
|
6
6
|
import { actionTramvaiReducer } from '../actions/actionTramvaiReducer.es.js';
|
|
7
7
|
|
|
@@ -9,7 +9,15 @@ const actionsProviders = [
|
|
|
9
9
|
provide({
|
|
10
10
|
provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
11
11
|
multi: true,
|
|
12
|
-
useValue: [
|
|
12
|
+
useValue: [
|
|
13
|
+
ACTION_EXECUTION_TOKEN,
|
|
14
|
+
ACTION_PAGE_RUNNER_TOKEN,
|
|
15
|
+
// borrow for multi token with useValue is not working properly for v2.0.0 tramvai, not backward compatible.
|
|
16
|
+
// for legacy CA + modern host this token will be borrowed in `packages/modules/child-app/src/shared/child/singletonProviders.ts`
|
|
17
|
+
// for modern CA + legacy host this token will not be borrowed, but it is okay - there is full DI access.
|
|
18
|
+
// ACTION_CONDITIONALS,
|
|
19
|
+
DEFERRED_ACTIONS_MAP_TOKEN,
|
|
20
|
+
],
|
|
13
21
|
}),
|
|
14
22
|
provide({
|
|
15
23
|
provide: COMBINE_REDUCERS,
|
package/lib/child-app/actions.js
CHANGED
|
@@ -17,7 +17,15 @@ const actionsProviders = [
|
|
|
17
17
|
core.provide({
|
|
18
18
|
provide: tokensChildApp.CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
19
19
|
multi: true,
|
|
20
|
-
useValue: [
|
|
20
|
+
useValue: [
|
|
21
|
+
tokensCommon.ACTION_EXECUTION_TOKEN,
|
|
22
|
+
tokensCommon.ACTION_PAGE_RUNNER_TOKEN,
|
|
23
|
+
// borrow for multi token with useValue is not working properly for v2.0.0 tramvai, not backward compatible.
|
|
24
|
+
// for legacy CA + modern host this token will be borrowed in `packages/modules/child-app/src/shared/child/singletonProviders.ts`
|
|
25
|
+
// for modern CA + legacy host this token will not be borrowed, but it is okay - there is full DI access.
|
|
26
|
+
// ACTION_CONDITIONALS,
|
|
27
|
+
tokensCommon.DEFERRED_ACTIONS_MAP_TOKEN,
|
|
28
|
+
],
|
|
21
29
|
}),
|
|
22
30
|
core.provide({
|
|
23
31
|
provide: tokensCommon.COMBINE_REDUCERS,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { provide, COMMAND_LINE_RUNNER_TOKEN, COMMAND_LINES_TOKEN, Scope } from '@tramvai/core';
|
|
2
2
|
import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
|
|
3
|
+
import { EXECUTION_CONTEXT_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN } from '@tramvai/tokens-common';
|
|
3
4
|
|
|
4
5
|
const command = {
|
|
5
6
|
customer: [
|
|
@@ -23,7 +24,11 @@ const commandProviders = [
|
|
|
23
24
|
provide({
|
|
24
25
|
provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
25
26
|
multi: true,
|
|
26
|
-
useValue:
|
|
27
|
+
useValue: [
|
|
28
|
+
COMMAND_LINE_RUNNER_TOKEN,
|
|
29
|
+
EXECUTION_CONTEXT_MANAGER_TOKEN,
|
|
30
|
+
COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
|
|
31
|
+
],
|
|
27
32
|
}),
|
|
28
33
|
provide({
|
|
29
34
|
provide: COMMAND_LINES_TOKEN,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { provide, COMMAND_LINE_RUNNER_TOKEN, COMMAND_LINES_TOKEN, Scope } from '@tramvai/core';
|
|
2
2
|
import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
|
|
3
|
+
import { EXECUTION_CONTEXT_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN } from '@tramvai/tokens-common';
|
|
3
4
|
|
|
4
5
|
const command = {
|
|
5
6
|
customer: [
|
|
@@ -23,7 +24,11 @@ const commandProviders = [
|
|
|
23
24
|
provide({
|
|
24
25
|
provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
25
26
|
multi: true,
|
|
26
|
-
useValue:
|
|
27
|
+
useValue: [
|
|
28
|
+
COMMAND_LINE_RUNNER_TOKEN,
|
|
29
|
+
EXECUTION_CONTEXT_MANAGER_TOKEN,
|
|
30
|
+
COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
|
|
31
|
+
],
|
|
27
32
|
}),
|
|
28
33
|
provide({
|
|
29
34
|
provide: COMMAND_LINES_TOKEN,
|
package/lib/child-app/command.js
CHANGED
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var core = require('@tramvai/core');
|
|
6
6
|
var tokensChildApp = require('@tramvai/tokens-child-app');
|
|
7
|
+
var tokensCommon = require('@tramvai/tokens-common');
|
|
7
8
|
|
|
8
9
|
const command = {
|
|
9
10
|
customer: [
|
|
@@ -27,7 +28,11 @@ const commandProviders = [
|
|
|
27
28
|
core.provide({
|
|
28
29
|
provide: tokensChildApp.CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
29
30
|
multi: true,
|
|
30
|
-
useValue:
|
|
31
|
+
useValue: [
|
|
32
|
+
core.COMMAND_LINE_RUNNER_TOKEN,
|
|
33
|
+
tokensCommon.EXECUTION_CONTEXT_MANAGER_TOKEN,
|
|
34
|
+
tokensCommon.COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
|
|
35
|
+
],
|
|
31
36
|
}),
|
|
32
37
|
core.provide({
|
|
33
38
|
provide: core.COMMAND_LINES_TOKEN,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { provide } from '@tramvai/core';
|
|
2
2
|
import { CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
|
|
3
|
-
import { DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN } from '@tramvai/tokens-common';
|
|
3
|
+
import { DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN, PUBSUB_TOKEN, PUBSUB_FACTORY_TOKEN } from '@tramvai/tokens-common';
|
|
4
4
|
|
|
5
5
|
const stateProviders = [
|
|
6
6
|
provide({
|
|
7
7
|
provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
8
8
|
multi: true,
|
|
9
|
-
useValue: [DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN],
|
|
9
|
+
useValue: [DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN, PUBSUB_TOKEN, PUBSUB_FACTORY_TOKEN],
|
|
10
10
|
}),
|
|
11
11
|
];
|
|
12
12
|
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { provide } from '@tramvai/core';
|
|
2
2
|
import { CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
|
|
3
|
-
import { DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN } from '@tramvai/tokens-common';
|
|
3
|
+
import { DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN, PUBSUB_TOKEN, PUBSUB_FACTORY_TOKEN } from '@tramvai/tokens-common';
|
|
4
4
|
|
|
5
5
|
const stateProviders = [
|
|
6
6
|
provide({
|
|
7
7
|
provide: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
8
8
|
multi: true,
|
|
9
|
-
useValue: [DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN],
|
|
9
|
+
useValue: [DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN, PUBSUB_TOKEN, PUBSUB_FACTORY_TOKEN],
|
|
10
10
|
}),
|
|
11
11
|
];
|
|
12
12
|
|
package/lib/child-app/state.js
CHANGED
|
@@ -10,7 +10,7 @@ const stateProviders = [
|
|
|
10
10
|
core.provide({
|
|
11
11
|
provide: tokensChildApp.CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN,
|
|
12
12
|
multi: true,
|
|
13
|
-
useValue: [tokensCommon.DISPATCHER_TOKEN, tokensCommon.STORE_TOKEN, tokensCommon.CONTEXT_TOKEN],
|
|
13
|
+
useValue: [tokensCommon.DISPATCHER_TOKEN, tokensCommon.STORE_TOKEN, tokensCommon.CONTEXT_TOKEN, tokensCommon.PUBSUB_TOKEN, tokensCommon.PUBSUB_FACTORY_TOKEN],
|
|
14
14
|
}),
|
|
15
15
|
];
|
|
16
16
|
|
|
@@ -3,18 +3,6 @@ import { COMMAND_LINE_TIMING_INFO_TOKEN } from '@tramvai/tokens-core-private';
|
|
|
3
3
|
import { createChildContainer } from '@tinkoff/dippy';
|
|
4
4
|
import { ROOT_EXECUTION_CONTEXT_TOKEN } from '@tramvai/tokens-common';
|
|
5
5
|
|
|
6
|
-
const resolveDi = (type, status, diContainer, providers) => {
|
|
7
|
-
let di = diContainer;
|
|
8
|
-
if (status === 'customer' && type !== 'client') {
|
|
9
|
-
di = createChildContainer(di);
|
|
10
|
-
}
|
|
11
|
-
if (providers) {
|
|
12
|
-
providers.forEach((item) => {
|
|
13
|
-
return di.register(item);
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
return di;
|
|
17
|
-
};
|
|
18
6
|
class CommandLineRunner {
|
|
19
7
|
constructor({ lines, rootDi, logger, executionContextManager, executionEndHandlers }) {
|
|
20
8
|
this.executionContextByDi = new WeakMap();
|
|
@@ -26,7 +14,7 @@ class CommandLineRunner {
|
|
|
26
14
|
this.executionEndHandlers = executionEndHandlers;
|
|
27
15
|
}
|
|
28
16
|
run(type, status, providers, customDi, key) {
|
|
29
|
-
const di = customDi !== null && customDi !== void 0 ? customDi : resolveDi(type, status, this.rootDi, providers);
|
|
17
|
+
const di = customDi !== null && customDi !== void 0 ? customDi : this.resolveDi(type, status, this.rootDi, providers);
|
|
30
18
|
const rootExecutionContext = di.get({ token: ROOT_EXECUTION_CONTEXT_TOKEN, optional: true });
|
|
31
19
|
this.log.debug({
|
|
32
20
|
event: 'command-run',
|
|
@@ -66,6 +54,18 @@ class CommandLineRunner {
|
|
|
66
54
|
})
|
|
67
55
|
.then(() => di));
|
|
68
56
|
}
|
|
57
|
+
resolveDi(type, status, rootDi, providers) {
|
|
58
|
+
let di = rootDi;
|
|
59
|
+
if (status === 'customer' && type !== 'client') {
|
|
60
|
+
di = createChildContainer(di);
|
|
61
|
+
}
|
|
62
|
+
if (providers) {
|
|
63
|
+
providers.forEach((item) => {
|
|
64
|
+
return di.register(item);
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
return di;
|
|
68
|
+
}
|
|
69
69
|
resolveExecutionContextFromDi(di) {
|
|
70
70
|
var _a;
|
|
71
71
|
return (_a = this.executionContextByDi.get(di)) !== null && _a !== void 0 ? _a : null;
|
|
@@ -19,6 +19,7 @@ export declare class CommandLineRunner implements Interface {
|
|
|
19
19
|
private abortControllerByDi;
|
|
20
20
|
constructor({ lines, rootDi, logger, executionContextManager, executionEndHandlers }: Deps);
|
|
21
21
|
run(type: keyof CommandLines, status: keyof CommandLineDescription, providers?: Provider[], customDi?: Container, key?: string | number): Promise<Container>;
|
|
22
|
+
resolveDi(type: keyof CommandLines, status: keyof CommandLineDescription, rootDi: Container, providers?: Provider[]): Container;
|
|
22
23
|
resolveExecutionContextFromDi(di: Container): ExecutionContext | null;
|
|
23
24
|
private createLineChain;
|
|
24
25
|
private instanceExecute;
|
|
@@ -3,18 +3,6 @@ import { COMMAND_LINE_TIMING_INFO_TOKEN } from '@tramvai/tokens-core-private';
|
|
|
3
3
|
import { createChildContainer } from '@tinkoff/dippy';
|
|
4
4
|
import { ROOT_EXECUTION_CONTEXT_TOKEN } from '@tramvai/tokens-common';
|
|
5
5
|
|
|
6
|
-
const resolveDi = (type, status, diContainer, providers) => {
|
|
7
|
-
let di = diContainer;
|
|
8
|
-
if (status === 'customer' && type !== 'client') {
|
|
9
|
-
di = createChildContainer(di);
|
|
10
|
-
}
|
|
11
|
-
if (providers) {
|
|
12
|
-
providers.forEach((item) => {
|
|
13
|
-
return di.register(item);
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
return di;
|
|
17
|
-
};
|
|
18
6
|
class CommandLineRunner {
|
|
19
7
|
constructor({ lines, rootDi, logger, executionContextManager, executionEndHandlers }) {
|
|
20
8
|
this.executionContextByDi = new WeakMap();
|
|
@@ -26,7 +14,7 @@ class CommandLineRunner {
|
|
|
26
14
|
this.executionEndHandlers = executionEndHandlers;
|
|
27
15
|
}
|
|
28
16
|
run(type, status, providers, customDi, key) {
|
|
29
|
-
const di = customDi !== null && customDi !== void 0 ? customDi : resolveDi(type, status, this.rootDi, providers);
|
|
17
|
+
const di = customDi !== null && customDi !== void 0 ? customDi : this.resolveDi(type, status, this.rootDi, providers);
|
|
30
18
|
const rootExecutionContext = di.get({ token: ROOT_EXECUTION_CONTEXT_TOKEN, optional: true });
|
|
31
19
|
this.log.debug({
|
|
32
20
|
event: 'command-run',
|
|
@@ -66,6 +54,18 @@ class CommandLineRunner {
|
|
|
66
54
|
})
|
|
67
55
|
.then(() => di));
|
|
68
56
|
}
|
|
57
|
+
resolveDi(type, status, rootDi, providers) {
|
|
58
|
+
let di = rootDi;
|
|
59
|
+
if (status === 'customer' && type !== 'client') {
|
|
60
|
+
di = createChildContainer(di);
|
|
61
|
+
}
|
|
62
|
+
if (providers) {
|
|
63
|
+
providers.forEach((item) => {
|
|
64
|
+
return di.register(item);
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
return di;
|
|
68
|
+
}
|
|
69
69
|
resolveExecutionContextFromDi(di) {
|
|
70
70
|
var _a;
|
|
71
71
|
return (_a = this.executionContextByDi.get(di)) !== null && _a !== void 0 ? _a : null;
|
|
@@ -7,18 +7,6 @@ var tokensCorePrivate = require('@tramvai/tokens-core-private');
|
|
|
7
7
|
var dippy = require('@tinkoff/dippy');
|
|
8
8
|
var tokensCommon = require('@tramvai/tokens-common');
|
|
9
9
|
|
|
10
|
-
const resolveDi = (type, status, diContainer, providers) => {
|
|
11
|
-
let di = diContainer;
|
|
12
|
-
if (status === 'customer' && type !== 'client') {
|
|
13
|
-
di = dippy.createChildContainer(di);
|
|
14
|
-
}
|
|
15
|
-
if (providers) {
|
|
16
|
-
providers.forEach((item) => {
|
|
17
|
-
return di.register(item);
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
|
-
return di;
|
|
21
|
-
};
|
|
22
10
|
class CommandLineRunner {
|
|
23
11
|
constructor({ lines, rootDi, logger, executionContextManager, executionEndHandlers }) {
|
|
24
12
|
this.executionContextByDi = new WeakMap();
|
|
@@ -30,7 +18,7 @@ class CommandLineRunner {
|
|
|
30
18
|
this.executionEndHandlers = executionEndHandlers;
|
|
31
19
|
}
|
|
32
20
|
run(type, status, providers, customDi, key) {
|
|
33
|
-
const di = customDi !== null && customDi !== void 0 ? customDi : resolveDi(type, status, this.rootDi, providers);
|
|
21
|
+
const di = customDi !== null && customDi !== void 0 ? customDi : this.resolveDi(type, status, this.rootDi, providers);
|
|
34
22
|
const rootExecutionContext = di.get({ token: tokensCommon.ROOT_EXECUTION_CONTEXT_TOKEN, optional: true });
|
|
35
23
|
this.log.debug({
|
|
36
24
|
event: 'command-run',
|
|
@@ -70,6 +58,18 @@ class CommandLineRunner {
|
|
|
70
58
|
})
|
|
71
59
|
.then(() => di));
|
|
72
60
|
}
|
|
61
|
+
resolveDi(type, status, rootDi, providers) {
|
|
62
|
+
let di = rootDi;
|
|
63
|
+
if (status === 'customer' && type !== 'client') {
|
|
64
|
+
di = dippy.createChildContainer(di);
|
|
65
|
+
}
|
|
66
|
+
if (providers) {
|
|
67
|
+
providers.forEach((item) => {
|
|
68
|
+
return di.register(item);
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
return di;
|
|
72
|
+
}
|
|
73
73
|
resolveExecutionContextFromDi(di) {
|
|
74
74
|
var _a;
|
|
75
75
|
return (_a = this.executionContextByDi.get(di)) !== null && _a !== void 0 ? _a : null;
|
|
@@ -20,6 +20,8 @@ const providers = [
|
|
|
20
20
|
if (error instanceof Error) {
|
|
21
21
|
error.event = 'initial-state-parse-error';
|
|
22
22
|
error.initialState = initialState;
|
|
23
|
+
error.readyState = document.readyState;
|
|
24
|
+
error.bodyComplete = !!document.getElementById('__TRAMVAI_BODY_TAIL__');
|
|
23
25
|
}
|
|
24
26
|
throw error;
|
|
25
27
|
}
|
|
@@ -14,10 +14,7 @@ StateModule = __decorate([
|
|
|
14
14
|
scope: Scope.SINGLETON,
|
|
15
15
|
useFactory: ({ stores }) => createDispatcher({ stores: stores && flatten(stores) }),
|
|
16
16
|
deps: {
|
|
17
|
-
stores:
|
|
18
|
-
token: COMBINE_REDUCERS,
|
|
19
|
-
optional: true,
|
|
20
|
-
},
|
|
17
|
+
stores: COMBINE_REDUCERS,
|
|
21
18
|
},
|
|
22
19
|
}),
|
|
23
20
|
provide({
|
|
@@ -14,10 +14,7 @@ StateModule = __decorate([
|
|
|
14
14
|
scope: Scope.SINGLETON,
|
|
15
15
|
useFactory: ({ stores }) => createDispatcher({ stores: stores && flatten(stores) }),
|
|
16
16
|
deps: {
|
|
17
|
-
stores:
|
|
18
|
-
token: COMBINE_REDUCERS,
|
|
19
|
-
optional: true,
|
|
20
|
-
},
|
|
17
|
+
stores: COMBINE_REDUCERS,
|
|
21
18
|
},
|
|
22
19
|
}),
|
|
23
20
|
provide({
|
package/lib/state/StateModule.js
CHANGED
|
@@ -22,10 +22,7 @@ exports.StateModule = tslib.__decorate([
|
|
|
22
22
|
scope: core.Scope.SINGLETON,
|
|
23
23
|
useFactory: ({ stores }) => state.createDispatcher({ stores: stores && flatten__default["default"](stores) }),
|
|
24
24
|
deps: {
|
|
25
|
-
stores:
|
|
26
|
-
token: tokensCommon.COMBINE_REDUCERS,
|
|
27
|
-
optional: true,
|
|
28
|
-
},
|
|
25
|
+
stores: tokensCommon.COMBINE_REDUCERS,
|
|
29
26
|
},
|
|
30
27
|
}),
|
|
31
28
|
core.provide({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/module-common",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.19.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -37,29 +37,29 @@
|
|
|
37
37
|
"@tinkoff/pubsub": "0.7.1",
|
|
38
38
|
"@tinkoff/url": "0.10.1",
|
|
39
39
|
"@tramvai/safe-strings": "0.7.1",
|
|
40
|
-
"@tramvai/experiments": "4.
|
|
41
|
-
"@tramvai/module-cookie": "4.
|
|
42
|
-
"@tramvai/module-environment": "4.
|
|
43
|
-
"@tramvai/module-log": "4.
|
|
44
|
-
"@tramvai/tokens-child-app": "4.
|
|
45
|
-
"@tramvai/tokens-core-private": "4.
|
|
46
|
-
"@tramvai/tokens-common": "4.
|
|
47
|
-
"@tramvai/tokens-render": "4.
|
|
48
|
-
"@tramvai/tokens-router": "4.
|
|
49
|
-
"@tramvai/tokens-server-private": "4.
|
|
50
|
-
"@tramvai/types-actions-state-context": "4.
|
|
40
|
+
"@tramvai/experiments": "4.19.0",
|
|
41
|
+
"@tramvai/module-cookie": "4.19.0",
|
|
42
|
+
"@tramvai/module-environment": "4.19.0",
|
|
43
|
+
"@tramvai/module-log": "4.19.0",
|
|
44
|
+
"@tramvai/tokens-child-app": "4.19.0",
|
|
45
|
+
"@tramvai/tokens-core-private": "4.19.0",
|
|
46
|
+
"@tramvai/tokens-common": "4.19.0",
|
|
47
|
+
"@tramvai/tokens-render": "4.19.0",
|
|
48
|
+
"@tramvai/tokens-router": "4.19.0",
|
|
49
|
+
"@tramvai/tokens-server-private": "4.19.0",
|
|
50
|
+
"@tramvai/types-actions-state-context": "4.19.0",
|
|
51
51
|
"hoist-non-react-statics": "^3.3.1",
|
|
52
52
|
"node-abort-controller": "^3.0.1"
|
|
53
53
|
},
|
|
54
54
|
"peerDependencies": {
|
|
55
|
-
"@tinkoff/dippy": "0.10.
|
|
55
|
+
"@tinkoff/dippy": "0.10.7",
|
|
56
56
|
"@tinkoff/utils": "^2.1.2",
|
|
57
|
-
"@tramvai/cli": "4.
|
|
58
|
-
"@tramvai/core": "4.
|
|
59
|
-
"@tramvai/papi": "4.
|
|
60
|
-
"@tramvai/react": "4.
|
|
61
|
-
"@tramvai/state": "4.
|
|
62
|
-
"@tramvai/tokens-server": "4.
|
|
57
|
+
"@tramvai/cli": "4.19.0",
|
|
58
|
+
"@tramvai/core": "4.19.0",
|
|
59
|
+
"@tramvai/papi": "4.19.0",
|
|
60
|
+
"@tramvai/react": "4.19.0",
|
|
61
|
+
"@tramvai/state": "4.19.0",
|
|
62
|
+
"@tramvai/tokens-server": "4.19.0",
|
|
63
63
|
"react": ">=16.14.0",
|
|
64
64
|
"tslib": "^2.4.0"
|
|
65
65
|
},
|