@tramvai/core 1.55.1 → 1.55.5

package/lib/actions/createActions.d.ts

@@ -1,2 +1,2 @@
-import type { ActionParameters, Action } from '../types/action';
+import type { ActionParameters, Action } from '@tramvai/tokens-core';
 export declare function createAction<Result = any, Payload = any, Deps = any>(action: ActionParameters<Payload, Result, Deps>): Action<Payload, Result, Deps>;

package/lib/bundles/createBundle.d.ts

@@ -1,2 +1,2 @@
-import type { BundleOptions, Bundle } from './createBundle.h';
+import type { BundleOptions, Bundle } from '@tramvai/tokens-core';
 export declare function createBundle(options: BundleOptions): Bundle;

package/lib/createApp.d.ts

@@ -1,6 +1,6 @@
 import type { Container, Provider } from '@tinkoff/dippy';
+import type { Bundle } from '@tramvai/tokens-core';
 import type { ModuleType, ExtendedModule } from './modules/module.h';
-import type { Bundle } from './bundles/createBundle.h';
 interface AppOptions {
     name: string;
     modules?: (ModuleType | ExtendedModule)[];

package/lib/index.d.ts

@@ -1,13 +1,10 @@
 export { createApp, App } from './createApp';
 export { createBundle } from './bundles/createBundle';
-export { Bundle, BundleImport } from './bundles/createBundle.h';
 export { createAction } from './actions/createActions';
-export * from './types/action';
 export { Module, deprecatedModule as module, MODULE_PARAMETERS } from './modules/module';
 export { getModuleParameters } from './modules/getModuleParameters';
 export { walkOfModules } from './modules/walkOfModules';
 export { isExtendedModule } from './modules/isExtendedModule';
 export { ModuleType, ExtendedModule } from './modules/module.h';
-export { Command } from './command/command.h';
-export * from './tokens';
-export { Scope, Provider, createToken, provide } from '@tinkoff/dippy';
+export * from '@tramvai/tokens-core';
+export { DI_TOKEN, IS_DI_CHILD_CONTAINER_TOKEN, Scope, Provider, createToken, provide, } from '@tinkoff/dippy';

package/lib/index.es.js

@@ -1,10 +1,11 @@
-import { createToken, createContainer, Scope } from '@tinkoff/dippy';
+import { createContainer, Scope } from '@tinkoff/dippy';
 export { DI_TOKEN, IS_DI_CHILD_CONTAINER_TOKEN, Scope, createToken, provide } from '@tinkoff/dippy';
+import { APP_INFO_TOKEN, BUNDLE_LIST_TOKEN, ACTIONS_LIST_TOKEN, MODULES_LIST_TOKEN, COMMAND_LINE_RUNNER_TOKEN, ACTION_PARAMETERS } from '@tramvai/tokens-core';
+export * from '@tramvai/tokens-core';
+import { LOGGER_TOKEN } from '@tramvai/tokens-common';
 import concat from '@tinkoff/utils/array/concat';
 import mergeWith from '@tinkoff/utils/object/mergeWith';
 import omit from '@tinkoff/utils/object/omit';
-import { ACTION_PARAMETERS } from '@tramvai/types-actions-state-context';
-export { ACTION_PARAMETERS } from '@tramvai/types-actions-state-context';
 
 const MODULE_PARAMETERS = '_module_parameters_';
 function Module({ providers, imports, deps = {}, }) {
@@ -25,29 +26,6 @@ function Module({ providers, imports, deps = {}, }) {
  * @deprecated Используйте Module вместо module - `import { Module } from '@tramvai/core';` Иначе не будет работать hot reload
  */ const deprecatedModule = Module;
 
-const BUNDLE_LIST_TOKEN = createToken('bundleList');
-const ACTIONS_LIST_TOKEN = createToken('actionsList');
-const MODULES_LIST_TOKEN = createToken('modulesList');
-const APP_INFO_TOKEN = createToken('appInfo');
-const COMMAND_LINE_RUNNER_TOKEN = createToken('commandLineRunner');
-const COMMAND_LINES_TOKEN = createToken('commandLines');
-const multiOptions = { multi: true };
-const commandLineListTokens = {
-    // Блок: Создание
-    init: createToken('init', multiOptions),
-    listen: createToken('listen', multiOptions),
-    // Блок: Обработка клиентов
-    customerStart: createToken('customer_start', multiOptions),
-    resolveUserDeps: createToken('resolve_user_deps', multiOptions),
-    resolvePageDeps: createToken('resolve_page_deps', multiOptions),
-    generatePage: createToken('generate_page', multiOptions),
-    clear: createToken('clear', multiOptions),
-    // Блок: Переходы на клиенте
-    spaTransition: createToken('spa_transition', multiOptions),
-    // Блок: Закрытие сервера
-    close: createToken('close', multiOptions),
-};
-
 const isValidModule = (module) => {
     // Если у нас undefined или null
     if (Boolean(module) === false)
@@ -159,8 +137,26 @@ class App {
         }
     }
     async initialization(env, type = 'init') {
-        const di = await this.di.get(COMMAND_LINE_RUNNER_TOKEN).run(env, type);
+        const logger = this.di.get({ token: LOGGER_TOKEN, optional: true });
+        const log = logger === null || logger === void 0 ? void 0 : logger('tramvai-core');
+        const commandLineRunner = this.di.get({ token: COMMAND_LINE_RUNNER_TOKEN, optional: true });
+        if (!commandLineRunner) {
+            throw new Error('`COMMAND_LINE_RUNNER_TOKEN` is not defined, have you added `@tramvai/module-common` to your dependency list?');
+        }
+        log === null || log === void 0 ? void 0 : log.warn({
+            event: 'tramvai-app-init',
+            message: 'Initializing. Run CommandLineRunner.',
+        });
+        const di = await commandLineRunner.run(env, type);
+        log === null || log === void 0 ? void 0 : log.warn({
+            event: 'tramvai-app-init',
+            message: 'CommandLineRunner executed successfully. Resolving modules.',
+        });
         this.resolveModules();
+        log === null || log === void 0 ? void 0 : log.warn({
+            event: 'tramvai-app-init',
+            message: 'Modules resolved successfully. Tramvai App initialized',
+        });
         return di;
     }
     resolveModules() {
@@ -240,4 +236,4 @@ function createAction(action) {
     return result;
 }
 
-export { ACTIONS_LIST_TOKEN, APP_INFO_TOKEN, App, BUNDLE_LIST_TOKEN, COMMAND_LINES_TOKEN, COMMAND_LINE_RUNNER_TOKEN, MODULES_LIST_TOKEN, MODULE_PARAMETERS, Module, commandLineListTokens, createAction, createApp, createBundle, getModuleParameters, isExtendedModule, deprecatedModule as module, walkOfModules };
+export { App, MODULE_PARAMETERS, Module, createAction, createApp, createBundle, getModuleParameters, isExtendedModule, deprecatedModule as module, walkOfModules };

package/lib/index.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var dippy = require('@tinkoff/dippy');
+var tokensCore = require('@tramvai/tokens-core');
+var tokensCommon = require('@tramvai/tokens-common');
 var concat = require('@tinkoff/utils/array/concat');
 var mergeWith = require('@tinkoff/utils/object/mergeWith');
 var omit = require('@tinkoff/utils/object/omit');
-var typesActionsStateContext = require('@tramvai/types-actions-state-context');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -33,29 +34,6 @@ function Module({ providers, imports, deps = {}, }) {
  * @deprecated Используйте Module вместо module - `import { Module } from '@tramvai/core';` Иначе не будет работать hot reload
  */ const deprecatedModule = Module;
 
-const BUNDLE_LIST_TOKEN = dippy.createToken('bundleList');
-const ACTIONS_LIST_TOKEN = dippy.createToken('actionsList');
-const MODULES_LIST_TOKEN = dippy.createToken('modulesList');
-const APP_INFO_TOKEN = dippy.createToken('appInfo');
-const COMMAND_LINE_RUNNER_TOKEN = dippy.createToken('commandLineRunner');
-const COMMAND_LINES_TOKEN = dippy.createToken('commandLines');
-const multiOptions = { multi: true };
-const commandLineListTokens = {
-    // Блок: Создание
-    init: dippy.createToken('init', multiOptions),
-    listen: dippy.createToken('listen', multiOptions),
-    // Блок: Обработка клиентов
-    customerStart: dippy.createToken('customer_start', multiOptions),
-    resolveUserDeps: dippy.createToken('resolve_user_deps', multiOptions),
-    resolvePageDeps: dippy.createToken('resolve_page_deps', multiOptions),
-    generatePage: dippy.createToken('generate_page', multiOptions),
-    clear: dippy.createToken('clear', multiOptions),
-    // Блок: Переходы на клиенте
-    spaTransition: dippy.createToken('spa_transition', multiOptions),
-    // Блок: Закрытие сервера
-    close: dippy.createToken('close', multiOptions),
-};
-
 const isValidModule = (module) => {
     // Если у нас undefined или null
     if (Boolean(module) === false)
@@ -126,7 +104,7 @@ function appProviders(name, bundles, actions, modules) {
     return [
         {
             // Информация о приложении
-            provide: APP_INFO_TOKEN,
+            provide: tokensCore.APP_INFO_TOKEN,
             scope: dippy.Scope.SINGLETON,
             useValue: {
                 appName: name,
@@ -134,20 +112,20 @@ function appProviders(name, bundles, actions, modules) {
         },
         {
             // Список бандлов
-            provide: BUNDLE_LIST_TOKEN,
+            provide: tokensCore.BUNDLE_LIST_TOKEN,
             scope: dippy.Scope.SINGLETON,
             useValue: bundles,
         },
         {
             // Список переданных экшенов
-            provide: ACTIONS_LIST_TOKEN,
+            provide: tokensCore.ACTIONS_LIST_TOKEN,
             scope: dippy.Scope.SINGLETON,
             useValue: actions,
             multi: true,
         },
         {
             // Спислок переданных модулей
-            provide: MODULES_LIST_TOKEN,
+            provide: tokensCore.MODULES_LIST_TOKEN,
             scope: dippy.Scope.SINGLETON,
             useValue: modules,
         },
@@ -167,8 +145,26 @@ class App {
         }
     }
     async initialization(env, type = 'init') {
-        const di = await this.di.get(COMMAND_LINE_RUNNER_TOKEN).run(env, type);
+        const logger = this.di.get({ token: tokensCommon.LOGGER_TOKEN, optional: true });
+        const log = logger === null || logger === void 0 ? void 0 : logger('tramvai-core');
+        const commandLineRunner = this.di.get({ token: tokensCore.COMMAND_LINE_RUNNER_TOKEN, optional: true });
+        if (!commandLineRunner) {
+            throw new Error('`COMMAND_LINE_RUNNER_TOKEN` is not defined, have you added `@tramvai/module-common` to your dependency list?');
+        }
+        log === null || log === void 0 ? void 0 : log.warn({
+            event: 'tramvai-app-init',
+            message: 'Initializing. Run CommandLineRunner.',
+        });
+        const di = await commandLineRunner.run(env, type);
+        log === null || log === void 0 ? void 0 : log.warn({
+            event: 'tramvai-app-init',
+            message: 'CommandLineRunner executed successfully. Resolving modules.',
+        });
         this.resolveModules();
+        log === null || log === void 0 ? void 0 : log.warn({
+            event: 'tramvai-app-init',
+            message: 'Modules resolved successfully. Tramvai App initialized',
+        });
         return di;
     }
     resolveModules() {
@@ -239,7 +235,7 @@ function createBundle(options) {
 
 function createAction(action) {
     const result = Object.assign(action.fn, {
-        [typesActionsStateContext.ACTION_PARAMETERS]: action,
+        [tokensCore.ACTION_PARAMETERS]: action,
     });
     if (!action.conditions) {
         // eslint-disable-next-line no-param-reassign
@@ -268,20 +264,9 @@ Object.defineProperty(exports, 'provide', {
     enumerable: true,
     get: function () { return dippy.provide; }
 });
-Object.defineProperty(exports, 'ACTION_PARAMETERS', {
-    enumerable: true,
-    get: function () { return typesActionsStateContext.ACTION_PARAMETERS; }
-});
-exports.ACTIONS_LIST_TOKEN = ACTIONS_LIST_TOKEN;
-exports.APP_INFO_TOKEN = APP_INFO_TOKEN;
 exports.App = App;
-exports.BUNDLE_LIST_TOKEN = BUNDLE_LIST_TOKEN;
-exports.COMMAND_LINES_TOKEN = COMMAND_LINES_TOKEN;
-exports.COMMAND_LINE_RUNNER_TOKEN = COMMAND_LINE_RUNNER_TOKEN;
-exports.MODULES_LIST_TOKEN = MODULES_LIST_TOKEN;
 exports.MODULE_PARAMETERS = MODULE_PARAMETERS;
 exports.Module = Module;
-exports.commandLineListTokens = commandLineListTokens;
 exports.createAction = createAction;
 exports.createApp = createApp;
 exports.createBundle = createBundle;
@@ -289,3 +274,9 @@ exports.getModuleParameters = getModuleParameters;
 exports.isExtendedModule = isExtendedModule;
 exports.module = deprecatedModule;
 exports.walkOfModules = walkOfModules;
+Object.keys(tokensCore).forEach(function (k) {
+    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+        enumerable: true,
+        get: function () { return tokensCore[k]; }
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/core",
-  "version": "1.55.1",
+  "version": "1.55.5",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -20,8 +20,10 @@
   },
   "dependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/types-actions-state-context": "1.55.1",
-    "@tinkoff/dippy": "0.7.37",
+    "@tramvai/tokens-common": "1.55.5",
+    "@tramvai/tokens-core": "1.55.5",
+    "@tramvai/types-actions-state-context": "1.55.5",
+    "@tinkoff/dippy": "0.7.38",
     "tslib": "^2.0.3"
   },
   "peerDependencies": {

package/lib/bundles/createBundle.h.d.ts

@@ -1,20 +0,0 @@
-import type { Action } from '../types/action';
-export interface BundleOptions {
-    presets?: BundlePreset[];
-    name: string;
-    components: {
-        [key: string]: any;
-    };
-    reducers?: any[];
-    actions?: Action[];
-}
-export declare type BundlePreset = Partial<BundleOptions>;
-export interface Bundle {
-    name: string;
-    components: BundleOptions['components'];
-    actions?: BundleOptions['actions'];
-    reducers?: BundleOptions['reducers'];
-}
-export declare type BundleImport = () => Promise<{
-    default: Bundle;
-}>;

package/lib/command/command.h.d.ts

@@ -1 +0,0 @@
-export declare type Command = () => any;

package/lib/tokens.d.ts

@@ -1,33 +0,0 @@
-import type { Container, Provider } from '@tinkoff/dippy';
-import type { Command } from './command/command.h';
-import type { Action } from './types/action';
-export { DI_TOKEN, IS_DI_CHILD_CONTAINER_TOKEN } from '@tinkoff/dippy';
-export declare const BUNDLE_LIST_TOKEN: any;
-export declare const ACTIONS_LIST_TOKEN: Action<any, any, any>[];
-export declare const MODULES_LIST_TOKEN: any;
-export declare const APP_INFO_TOKEN: {
-    [key: string]: string;
-    appName: string;
-};
-export interface CommandLine {
-    lines: CommandLines;
-    run(type: keyof CommandLines, status: keyof CommandLineDescription, providers?: Provider[], customDi?: Container): Promise<Container>;
-}
-export declare type CommandLineDescription = Record<string, Command[]>;
-export declare type CommandLines = {
-    server: CommandLineDescription;
-    client: CommandLineDescription;
-};
-export declare const COMMAND_LINE_RUNNER_TOKEN: CommandLine;
-export declare const COMMAND_LINES_TOKEN: CommandLines;
-export declare const commandLineListTokens: {
-    init: Command;
-    listen: Command;
-    customerStart: Command;
-    resolveUserDeps: Command;
-    resolvePageDeps: Command;
-    generatePage: Command;
-    clear: Command;
-    spaTransition: Command;
-    close: Command;
-};

package/lib/types/action.d.ts

@@ -1 +0,0 @@
-export { ActionConditionsParameters, ActionParameters, Action, ActionContext, ACTION_PARAMETERS, } from '@tramvai/types-actions-state-context';