@tramvai/module-log 2.70.1 → 2.72.3

package/lib/LogStore.browser.js

@@ -0,0 +1,6 @@
+import { createEvent, createReducer } from '@tramvai/state';
+
+const setLogs = createEvent('setLogs');
+const LogStore = createReducer('devLogs', []).on(setLogs, (_, logs) => logs);
+
+export { LogStore, setLogs };

package/lib/LogStore.es.js

@@ -0,0 +1,6 @@
+import { createEvent, createReducer } from '@tramvai/state';
+
+const setLogs = createEvent('setLogs');
+const LogStore = createReducer('devLogs', []).on(setLogs, (_, logs) => logs);
+
+export { LogStore, setLogs };

package/lib/LogStore.js

@@ -0,0 +1,11 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var state = require('@tramvai/state');
+
+const setLogs = state.createEvent('setLogs');
+const LogStore = state.createReducer('devLogs', []).on(setLogs, (_, logs) => logs);
+
+exports.LogStore = LogStore;
+exports.setLogs = setLogs;

package/lib/browser.js

@@ -1,180 +1,11 @@
 import { __decorate } from 'tslib';
-import { logger as logger$1, BrowserReporter, createLoggerFactory } from '@tinkoff/logger';
-import { provide, Scope, commandLineListTokens, Module } from '@tramvai/core';
-import { LOGGER_INIT_HOOK, COMBINE_REDUCERS, CONTEXT_TOKEN, LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
+import { createLoggerFactory, BrowserReporter } from '@tinkoff/logger';
+import { Module } from '@tramvai/core';
+import { LOGGER_TOKEN, LOGGER_INIT_HOOK } from '@tramvai/tokens-common';
 export { LOGGER_TOKEN } from '@tramvai/tokens-common';
-import { createPapiMethod } from '@tramvai/papi';
-import { SERVER_MODULE_PAPI_PRIVATE_ROUTE } from '@tramvai/tokens-server';
-import { ENV_MANAGER_TOKEN } from '@tramvai/module-environment';
-import each from '@tinkoff/utils/array/each';
-import split from '@tinkoff/utils/string/split';
-import { createEvent, createReducer } from '@tramvai/state';
-
-const LOGGER_NAME = '';
-const LOGGER_KEY = 'tramvai';
-
-const setLogs = createEvent('setLogs');
-const LogStore = createReducer('devLogs', []).on(setLogs, (_, logs) => logs);
-
-class DevLogsReporter {
-    constructor() {
-        this.logs = [];
-    }
-    log(logObj) {
-        this.logs.push(logObj);
-    }
-    start() {
-        this.reset();
-    }
-    reset() {
-        this.logs = [];
-    }
-    flush() {
-        const flushed = this.logs;
-        this.reset();
-        return flushed;
-    }
-}
-class DevLogsExtension {
-    constructor(logs) {
-        this.logs = [];
-        this.logs = logs;
-    }
-    extend(logObj) {
-        const [index] = logObj.args;
-        // @ts-ignore
-        return this.logs[index];
-    }
-}
-[
-    provide({
-        provide: LOGGER_INIT_HOOK,
-        multi: true,
-        useFactory({ reporter }) {
-            return (loggerInstance) => {
-                loggerInstance.addReporter(reporter);
-            };
-        },
-        deps: {
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    provide({
-        provide: 'ssrDevReporter',
-        scope: Scope.SINGLETON,
-        useClass: DevLogsReporter,
-    }),
-    provide({
-        provide: COMBINE_REDUCERS,
-        multi: true,
-        useValue: LogStore,
-    }),
-    provide({
-        provide: commandLineListTokens.customerStart,
-        multi: true,
-        useFactory: ({ reporter }) => {
-            return function startSsrLogs() {
-                reporter.start();
-            };
-        },
-        deps: {
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    provide({
-        provide: commandLineListTokens.generatePage,
-        multi: true,
-        useFactory: ({ context, reporter }) => {
-            const logs = reporter.flush();
-            return function endSsrLogs() {
-                return context.dispatch(setLogs(logs));
-            };
-        },
-        deps: {
-            context: CONTEXT_TOKEN,
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    provide({
-        provide: SERVER_MODULE_PAPI_PRIVATE_ROUTE,
-        multi: true,
-        useFactory: ({ environmentManager }) => {
-            return createPapiMethod({
-                method: 'get',
-                path: '/logger',
-                async handler({ parsedUrl: { query } }) {
-                    const { mode, level, enable } = query;
-                    const applyDefaultConfig = mode === 'default';
-                    const clearCurrentConfig = mode || level || enable;
-                    let debugLevel;
-                    let debugEnable;
-                    if (applyDefaultConfig) {
-                        debugLevel = environmentManager.get('DEBUG_LEVEL');
-                        debugEnable = environmentManager.get('DEBUG_ENABLE');
-                    }
-                    if (level) {
-                        debugLevel = level;
-                    }
-                    if (enable) {
-                        debugEnable = enable;
-                    }
-                    if (clearCurrentConfig) {
-                        logger$1.clear();
-                    }
-                    if (debugLevel) {
-                        logger$1.setLevel(debugLevel);
-                    }
-                    if (debugEnable) {
-                        each((val) => {
-                            const [lvl, name] = val.split(':');
-                            logger$1.enable(lvl, name);
-                        }, split(',', debugEnable));
-                    }
-                },
-            });
-        },
-        deps: {
-            environmentManager: ENV_MANAGER_TOKEN,
-        },
-    }),
-];
-const flushLogs = (ssrLogger, logs) => {
-    if (logs && logs.length) {
-        // eslint-disable-next-line no-console
-        console.groupCollapsed('%c🚀 Tramvai SSR Logs', 'font-size: 110%');
-        logs.forEach((logObj, index) => ssrLogger[logObj.type](index));
-        // eslint-disable-next-line no-console
-        console.groupEnd();
-    }
-};
-const clientProviders = [
-    provide({
-        provide: COMBINE_REDUCERS,
-        multi: true,
-        useValue: LogStore,
-    }),
-    provide({
-        provide: commandLineListTokens.customerStart,
-        multi: true,
-        useFactory: ({ logger, store }) => {
-            return function rehydrateSsrDevLogs() {
-                const logs = store.getState(LogStore);
-                const ssrLogger = logger({
-                    name: 'ssr-logger',
-                    // сетим пустой массив в beforeReporters, чтобы не подтягивать настройки рутового логгера с RemoteReporter
-                    beforeReporters: [],
-                    reporters: [new BrowserReporter()],
-                    extensions: [new DevLogsExtension(logs)],
-                });
-                flushLogs(ssrLogger, logs);
-            };
-        },
-        deps: {
-            logger: LOGGER_TOKEN,
-            store: STORE_TOKEN,
-        },
-    }),
-];
+import { LOGGER_NAME, LOGGER_KEY } from './constants.browser.js';
+import { clientProviders } from './devLogs.browser.js';
+export { LogStore, setLogs } from './LogStore.browser.js';
 
 const logger = createLoggerFactory({
     name: LOGGER_NAME,
@@ -205,4 +36,4 @@ LogModule = __decorate([
     })
 ], LogModule);
 
-export { LogModule, LogStore, logger, setLogs };
+export { LogModule, logger };

package/lib/constants.browser.js

@@ -0,0 +1,4 @@
+const LOGGER_NAME = '';
+const LOGGER_KEY = 'tramvai';
+
+export { LOGGER_KEY, LOGGER_NAME };

package/lib/constants.es.js

@@ -0,0 +1,4 @@
+const LOGGER_NAME = '';
+const LOGGER_KEY = 'tramvai';
+
+export { LOGGER_KEY, LOGGER_NAME };

package/lib/constants.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const LOGGER_NAME = '';
+const LOGGER_KEY = 'tramvai';
+
+exports.LOGGER_KEY = LOGGER_KEY;
+exports.LOGGER_NAME = LOGGER_NAME;

package/lib/devLogs.browser.js

@@ -0,0 +1,171 @@
+import { createPapiMethod } from '@tramvai/papi';
+import { provide, Scope, commandLineListTokens } from '@tramvai/core';
+import { LOGGER_INIT_HOOK, COMBINE_REDUCERS, CONTEXT_TOKEN, LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
+import { logger, BrowserReporter } from '@tinkoff/logger';
+import { SERVER_MODULE_PAPI_PRIVATE_ROUTE } from '@tramvai/tokens-server';
+import { ENV_MANAGER_TOKEN } from '@tramvai/module-environment';
+import each from '@tinkoff/utils/array/each';
+import split from '@tinkoff/utils/string/split';
+import { LogStore, setLogs } from './LogStore.browser.js';
+
+class DevLogsReporter {
+    constructor() {
+        this.logs = [];
+    }
+    log(logObj) {
+        this.logs.push(logObj);
+    }
+    start() {
+        this.reset();
+    }
+    reset() {
+        this.logs = [];
+    }
+    flush() {
+        const flushed = this.logs;
+        this.reset();
+        return flushed;
+    }
+}
+class DevLogsExtension {
+    constructor(logs) {
+        this.logs = [];
+        this.logs = logs;
+    }
+    extend(logObj) {
+        const [index] = logObj.args;
+        // @ts-ignore
+        return this.logs[index];
+    }
+}
+[
+    provide({
+        provide: LOGGER_INIT_HOOK,
+        multi: true,
+        useFactory({ reporter }) {
+            return (loggerInstance) => {
+                loggerInstance.addReporter(reporter);
+            };
+        },
+        deps: {
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    provide({
+        provide: 'ssrDevReporter',
+        scope: Scope.SINGLETON,
+        useClass: DevLogsReporter,
+    }),
+    provide({
+        provide: COMBINE_REDUCERS,
+        multi: true,
+        useValue: LogStore,
+    }),
+    provide({
+        provide: commandLineListTokens.customerStart,
+        multi: true,
+        useFactory: ({ reporter }) => {
+            return function startSsrLogs() {
+                reporter.start();
+            };
+        },
+        deps: {
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    provide({
+        provide: commandLineListTokens.generatePage,
+        multi: true,
+        useFactory: ({ context, reporter }) => {
+            const logs = reporter.flush();
+            return function endSsrLogs() {
+                return context.dispatch(setLogs(logs));
+            };
+        },
+        deps: {
+            context: CONTEXT_TOKEN,
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    provide({
+        provide: SERVER_MODULE_PAPI_PRIVATE_ROUTE,
+        multi: true,
+        useFactory: ({ environmentManager }) => {
+            return createPapiMethod({
+                method: 'get',
+                path: '/logger',
+                async handler({ parsedUrl: { query } }) {
+                    const { mode, level, enable } = query;
+                    const applyDefaultConfig = mode === 'default';
+                    const clearCurrentConfig = mode || level || enable;
+                    let debugLevel;
+                    let debugEnable;
+                    if (applyDefaultConfig) {
+                        debugLevel = environmentManager.get('DEBUG_LEVEL');
+                        debugEnable = environmentManager.get('DEBUG_ENABLE');
+                    }
+                    if (level) {
+                        debugLevel = level;
+                    }
+                    if (enable) {
+                        debugEnable = enable;
+                    }
+                    if (clearCurrentConfig) {
+                        logger.clear();
+                    }
+                    if (debugLevel) {
+                        logger.setLevel(debugLevel);
+                    }
+                    if (debugEnable) {
+                        each((val) => {
+                            const [lvl, name] = val.split(':');
+                            logger.enable(lvl, name);
+                        }, split(',', debugEnable));
+                    }
+                },
+            });
+        },
+        deps: {
+            environmentManager: ENV_MANAGER_TOKEN,
+        },
+    }),
+];
+const flushLogs = (ssrLogger, logs) => {
+    if (logs && logs.length) {
+        // eslint-disable-next-line no-console
+        console.groupCollapsed('%c🚀 Tramvai SSR Logs', 'font-size: 110%');
+        logs.forEach((logObj, index) => ssrLogger[logObj.type](index));
+        // eslint-disable-next-line no-console
+        console.groupEnd();
+    }
+};
+const clientProviders = [
+    provide({
+        provide: COMBINE_REDUCERS,
+        multi: true,
+        useValue: LogStore,
+    }),
+    provide({
+        provide: commandLineListTokens.customerStart,
+        multi: true,
+        useFactory: ({ logger, store }) => {
+            return function rehydrateSsrDevLogs() {
+                const logs = store.getState(LogStore);
+                const ssrLogger = logger({
+                    name: 'ssr-logger',
+                    // сетим пустой массив в beforeReporters, чтобы не подтягивать настройки рутового логгера с RemoteReporter
+                    beforeReporters: [],
+                    reporters: [new BrowserReporter()],
+                    extensions: [new DevLogsExtension(logs)],
+                });
+                flushLogs(ssrLogger, logs);
+            };
+        },
+        deps: {
+            logger: LOGGER_TOKEN,
+            store: STORE_TOKEN,
+        },
+    }),
+];
+
+export { DevLogsExtension, DevLogsReporter, clientProviders };

package/lib/devLogs.es.js

@@ -0,0 +1,171 @@
+import { createPapiMethod } from '@tramvai/papi';
+import { provide, Scope, commandLineListTokens } from '@tramvai/core';
+import { LOGGER_INIT_HOOK, COMBINE_REDUCERS, CONTEXT_TOKEN, LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
+import { logger, BrowserReporter } from '@tinkoff/logger';
+import { SERVER_MODULE_PAPI_PRIVATE_ROUTE } from '@tramvai/tokens-server';
+import { ENV_MANAGER_TOKEN } from '@tramvai/module-environment';
+import each from '@tinkoff/utils/array/each';
+import split from '@tinkoff/utils/string/split';
+import { LogStore, setLogs } from './LogStore.es.js';
+
+class DevLogsReporter {
+    constructor() {
+        this.logs = [];
+    }
+    log(logObj) {
+        this.logs.push(logObj);
+    }
+    start() {
+        this.reset();
+    }
+    reset() {
+        this.logs = [];
+    }
+    flush() {
+        const flushed = this.logs;
+        this.reset();
+        return flushed;
+    }
+}
+class DevLogsExtension {
+    constructor(logs) {
+        this.logs = [];
+        this.logs = logs;
+    }
+    extend(logObj) {
+        const [index] = logObj.args;
+        // @ts-ignore
+        return this.logs[index];
+    }
+}
+const serverProviders = [
+    provide({
+        provide: LOGGER_INIT_HOOK,
+        multi: true,
+        useFactory({ reporter }) {
+            return (loggerInstance) => {
+                loggerInstance.addReporter(reporter);
+            };
+        },
+        deps: {
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    provide({
+        provide: 'ssrDevReporter',
+        scope: Scope.SINGLETON,
+        useClass: DevLogsReporter,
+    }),
+    provide({
+        provide: COMBINE_REDUCERS,
+        multi: true,
+        useValue: LogStore,
+    }),
+    provide({
+        provide: commandLineListTokens.customerStart,
+        multi: true,
+        useFactory: ({ reporter }) => {
+            return function startSsrLogs() {
+                reporter.start();
+            };
+        },
+        deps: {
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    provide({
+        provide: commandLineListTokens.generatePage,
+        multi: true,
+        useFactory: ({ context, reporter }) => {
+            const logs = reporter.flush();
+            return function endSsrLogs() {
+                return context.dispatch(setLogs(logs));
+            };
+        },
+        deps: {
+            context: CONTEXT_TOKEN,
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    provide({
+        provide: SERVER_MODULE_PAPI_PRIVATE_ROUTE,
+        multi: true,
+        useFactory: ({ environmentManager }) => {
+            return createPapiMethod({
+                method: 'get',
+                path: '/logger',
+                async handler({ parsedUrl: { query } }) {
+                    const { mode, level, enable } = query;
+                    const applyDefaultConfig = mode === 'default';
+                    const clearCurrentConfig = mode || level || enable;
+                    let debugLevel;
+                    let debugEnable;
+                    if (applyDefaultConfig) {
+                        debugLevel = environmentManager.get('DEBUG_LEVEL');
+                        debugEnable = environmentManager.get('DEBUG_ENABLE');
+                    }
+                    if (level) {
+                        debugLevel = level;
+                    }
+                    if (enable) {
+                        debugEnable = enable;
+                    }
+                    if (clearCurrentConfig) {
+                        logger.clear();
+                    }
+                    if (debugLevel) {
+                        logger.setLevel(debugLevel);
+                    }
+                    if (debugEnable) {
+                        each((val) => {
+                            const [lvl, name] = val.split(':');
+                            logger.enable(lvl, name);
+                        }, split(',', debugEnable));
+                    }
+                },
+            });
+        },
+        deps: {
+            environmentManager: ENV_MANAGER_TOKEN,
+        },
+    }),
+];
+const flushLogs = (ssrLogger, logs) => {
+    if (logs && logs.length) {
+        // eslint-disable-next-line no-console
+        console.groupCollapsed('%c🚀 Tramvai SSR Logs', 'font-size: 110%');
+        logs.forEach((logObj, index) => ssrLogger[logObj.type](index));
+        // eslint-disable-next-line no-console
+        console.groupEnd();
+    }
+};
+[
+    provide({
+        provide: COMBINE_REDUCERS,
+        multi: true,
+        useValue: LogStore,
+    }),
+    provide({
+        provide: commandLineListTokens.customerStart,
+        multi: true,
+        useFactory: ({ logger, store }) => {
+            return function rehydrateSsrDevLogs() {
+                const logs = store.getState(LogStore);
+                const ssrLogger = logger({
+                    name: 'ssr-logger',
+                    // сетим пустой массив в beforeReporters, чтобы не подтягивать настройки рутового логгера с RemoteReporter
+                    beforeReporters: [],
+                    reporters: [new BrowserReporter()],
+                    extensions: [new DevLogsExtension(logs)],
+                });
+                flushLogs(ssrLogger, logs);
+            };
+        },
+        deps: {
+            logger: LOGGER_TOKEN,
+            store: STORE_TOKEN,
+        },
+    }),
+];
+
+export { DevLogsExtension, DevLogsReporter, serverProviders };

package/lib/devLogs.js

@@ -0,0 +1,182 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var papi = require('@tramvai/papi');
+var core = require('@tramvai/core');
+var tokensCommon = require('@tramvai/tokens-common');
+var logger = require('@tinkoff/logger');
+var tokensServer = require('@tramvai/tokens-server');
+var moduleEnvironment = require('@tramvai/module-environment');
+var each = require('@tinkoff/utils/array/each');
+var split = require('@tinkoff/utils/string/split');
+var LogStore = require('./LogStore.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var each__default = /*#__PURE__*/_interopDefaultLegacy(each);
+var split__default = /*#__PURE__*/_interopDefaultLegacy(split);
+
+class DevLogsReporter {
+    constructor() {
+        this.logs = [];
+    }
+    log(logObj) {
+        this.logs.push(logObj);
+    }
+    start() {
+        this.reset();
+    }
+    reset() {
+        this.logs = [];
+    }
+    flush() {
+        const flushed = this.logs;
+        this.reset();
+        return flushed;
+    }
+}
+class DevLogsExtension {
+    constructor(logs) {
+        this.logs = [];
+        this.logs = logs;
+    }
+    extend(logObj) {
+        const [index] = logObj.args;
+        // @ts-ignore
+        return this.logs[index];
+    }
+}
+const serverProviders = [
+    core.provide({
+        provide: tokensCommon.LOGGER_INIT_HOOK,
+        multi: true,
+        useFactory({ reporter }) {
+            return (loggerInstance) => {
+                loggerInstance.addReporter(reporter);
+            };
+        },
+        deps: {
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    core.provide({
+        provide: 'ssrDevReporter',
+        scope: core.Scope.SINGLETON,
+        useClass: DevLogsReporter,
+    }),
+    core.provide({
+        provide: tokensCommon.COMBINE_REDUCERS,
+        multi: true,
+        useValue: LogStore.LogStore,
+    }),
+    core.provide({
+        provide: core.commandLineListTokens.customerStart,
+        multi: true,
+        useFactory: ({ reporter }) => {
+            return function startSsrLogs() {
+                reporter.start();
+            };
+        },
+        deps: {
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    core.provide({
+        provide: core.commandLineListTokens.generatePage,
+        multi: true,
+        useFactory: ({ context, reporter }) => {
+            const logs = reporter.flush();
+            return function endSsrLogs() {
+                return context.dispatch(LogStore.setLogs(logs));
+            };
+        },
+        deps: {
+            context: tokensCommon.CONTEXT_TOKEN,
+            reporter: 'ssrDevReporter',
+        },
+    }),
+    core.provide({
+        provide: tokensServer.SERVER_MODULE_PAPI_PRIVATE_ROUTE,
+        multi: true,
+        useFactory: ({ environmentManager }) => {
+            return papi.createPapiMethod({
+                method: 'get',
+                path: '/logger',
+                async handler({ parsedUrl: { query } }) {
+                    const { mode, level, enable } = query;
+                    const applyDefaultConfig = mode === 'default';
+                    const clearCurrentConfig = mode || level || enable;
+                    let debugLevel;
+                    let debugEnable;
+                    if (applyDefaultConfig) {
+                        debugLevel = environmentManager.get('DEBUG_LEVEL');
+                        debugEnable = environmentManager.get('DEBUG_ENABLE');
+                    }
+                    if (level) {
+                        debugLevel = level;
+                    }
+                    if (enable) {
+                        debugEnable = enable;
+                    }
+                    if (clearCurrentConfig) {
+                        logger.logger.clear();
+                    }
+                    if (debugLevel) {
+                        logger.logger.setLevel(debugLevel);
+                    }
+                    if (debugEnable) {
+                        each__default["default"]((val) => {
+                            const [lvl, name] = val.split(':');
+                            logger.logger.enable(lvl, name);
+                        }, split__default["default"](',', debugEnable));
+                    }
+                },
+            });
+        },
+        deps: {
+            environmentManager: moduleEnvironment.ENV_MANAGER_TOKEN,
+        },
+    }),
+];
+const flushLogs = (ssrLogger, logs) => {
+    if (logs && logs.length) {
+        // eslint-disable-next-line no-console
+        console.groupCollapsed('%c🚀 Tramvai SSR Logs', 'font-size: 110%');
+        logs.forEach((logObj, index) => ssrLogger[logObj.type](index));
+        // eslint-disable-next-line no-console
+        console.groupEnd();
+    }
+};
+[
+    core.provide({
+        provide: tokensCommon.COMBINE_REDUCERS,
+        multi: true,
+        useValue: LogStore.LogStore,
+    }),
+    core.provide({
+        provide: core.commandLineListTokens.customerStart,
+        multi: true,
+        useFactory: ({ logger: logger$1, store }) => {
+            return function rehydrateSsrDevLogs() {
+                const logs = store.getState(LogStore.LogStore);
+                const ssrLogger = logger$1({
+                    name: 'ssr-logger',
+                    // сетим пустой массив в beforeReporters, чтобы не подтягивать настройки рутового логгера с RemoteReporter
+                    beforeReporters: [],
+                    reporters: [new logger.BrowserReporter()],
+                    extensions: [new DevLogsExtension(logs)],
+                });
+                flushLogs(ssrLogger, logs);
+            };
+        },
+        deps: {
+            logger: tokensCommon.LOGGER_TOKEN,
+            store: tokensCommon.STORE_TOKEN,
+        },
+    }),
+];
+
+exports.DevLogsExtension = DevLogsExtension;
+exports.DevLogsReporter = DevLogsReporter;
+exports.serverProviders = serverProviders;

package/lib/server.es.js

@@ -3,180 +3,14 @@ import each from '@tinkoff/utils/array/each';
 import split from '@tinkoff/utils/string/split';
 import { hostname } from 'os';
 import env from 'std-env';
-import { provide, Scope, commandLineListTokens, Module } from '@tramvai/core';
-import { LOGGER_INIT_HOOK, COMBINE_REDUCERS, CONTEXT_TOKEN, LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
+import { Module, Scope } from '@tramvai/core';
+import { LOGGER_TOKEN, LOGGER_INIT_HOOK } from '@tramvai/tokens-common';
 export { LOGGER_TOKEN } from '@tramvai/tokens-common';
-import { ENV_MANAGER_TOKEN, ENV_USED_TOKEN } from '@tramvai/module-environment';
-import { logger as logger$1, BrowserReporter, NodeBasicReporter, NodeDevReporter, JSONReporter, createLoggerFactory, LEVELS } from '@tinkoff/logger';
-import { createPapiMethod } from '@tramvai/papi';
-import { SERVER_MODULE_PAPI_PRIVATE_ROUTE } from '@tramvai/tokens-server';
-import { createEvent, createReducer } from '@tramvai/state';
-
-const setLogs = createEvent('setLogs');
-const LogStore = createReducer('devLogs', []).on(setLogs, (_, logs) => logs);
-
-class DevLogsReporter {
-    constructor() {
-        this.logs = [];
-    }
-    log(logObj) {
-        this.logs.push(logObj);
-    }
-    start() {
-        this.reset();
-    }
-    reset() {
-        this.logs = [];
-    }
-    flush() {
-        const flushed = this.logs;
-        this.reset();
-        return flushed;
-    }
-}
-class DevLogsExtension {
-    constructor(logs) {
-        this.logs = [];
-        this.logs = logs;
-    }
-    extend(logObj) {
-        const [index] = logObj.args;
-        // @ts-ignore
-        return this.logs[index];
-    }
-}
-const serverProviders = [
-    provide({
-        provide: LOGGER_INIT_HOOK,
-        multi: true,
-        useFactory({ reporter }) {
-            return (loggerInstance) => {
-                loggerInstance.addReporter(reporter);
-            };
-        },
-        deps: {
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    provide({
-        provide: 'ssrDevReporter',
-        scope: Scope.SINGLETON,
-        useClass: DevLogsReporter,
-    }),
-    provide({
-        provide: COMBINE_REDUCERS,
-        multi: true,
-        useValue: LogStore,
-    }),
-    provide({
-        provide: commandLineListTokens.customerStart,
-        multi: true,
-        useFactory: ({ reporter }) => {
-            return function startSsrLogs() {
-                reporter.start();
-            };
-        },
-        deps: {
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    provide({
-        provide: commandLineListTokens.generatePage,
-        multi: true,
-        useFactory: ({ context, reporter }) => {
-            const logs = reporter.flush();
-            return function endSsrLogs() {
-                return context.dispatch(setLogs(logs));
-            };
-        },
-        deps: {
-            context: CONTEXT_TOKEN,
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    provide({
-        provide: SERVER_MODULE_PAPI_PRIVATE_ROUTE,
-        multi: true,
-        useFactory: ({ environmentManager }) => {
-            return createPapiMethod({
-                method: 'get',
-                path: '/logger',
-                async handler({ parsedUrl: { query } }) {
-                    const { mode, level, enable } = query;
-                    const applyDefaultConfig = mode === 'default';
-                    const clearCurrentConfig = mode || level || enable;
-                    let debugLevel;
-                    let debugEnable;
-                    if (applyDefaultConfig) {
-                        debugLevel = environmentManager.get('DEBUG_LEVEL');
-                        debugEnable = environmentManager.get('DEBUG_ENABLE');
-                    }
-                    if (level) {
-                        debugLevel = level;
-                    }
-                    if (enable) {
-                        debugEnable = enable;
-                    }
-                    if (clearCurrentConfig) {
-                        logger$1.clear();
-                    }
-                    if (debugLevel) {
-                        logger$1.setLevel(debugLevel);
-                    }
-                    if (debugEnable) {
-                        each((val) => {
-                            const [lvl, name] = val.split(':');
-                            logger$1.enable(lvl, name);
-                        }, split(',', debugEnable));
-                    }
-                },
-            });
-        },
-        deps: {
-            environmentManager: ENV_MANAGER_TOKEN,
-        },
-    }),
-];
-const flushLogs = (ssrLogger, logs) => {
-    if (logs && logs.length) {
-        // eslint-disable-next-line no-console
-        console.groupCollapsed('%c🚀 Tramvai SSR Logs', 'font-size: 110%');
-        logs.forEach((logObj, index) => ssrLogger[logObj.type](index));
-        // eslint-disable-next-line no-console
-        console.groupEnd();
-    }
-};
-[
-    provide({
-        provide: COMBINE_REDUCERS,
-        multi: true,
-        useValue: LogStore,
-    }),
-    provide({
-        provide: commandLineListTokens.customerStart,
-        multi: true,
-        useFactory: ({ logger, store }) => {
-            return function rehydrateSsrDevLogs() {
-                const logs = store.getState(LogStore);
-                const ssrLogger = logger({
-                    name: 'ssr-logger',
-                    // сетим пустой массив в beforeReporters, чтобы не подтягивать настройки рутового логгера с RemoteReporter
-                    beforeReporters: [],
-                    reporters: [new BrowserReporter()],
-                    extensions: [new DevLogsExtension(logs)],
-                });
-                flushLogs(ssrLogger, logs);
-            };
-        },
-        deps: {
-            logger: LOGGER_TOKEN,
-            store: STORE_TOKEN,
-        },
-    }),
-];
-
-const LOGGER_NAME = '';
-const LOGGER_KEY = 'tramvai';
+import { ENV_USED_TOKEN } from '@tramvai/module-environment';
+import { NodeBasicReporter, NodeDevReporter, JSONReporter, createLoggerFactory, LEVELS } from '@tinkoff/logger';
+import { serverProviders } from './devLogs.es.js';
+import { LOGGER_NAME, LOGGER_KEY } from './constants.es.js';
+export { LogStore, setLogs } from './LogStore.es.js';
 
 const DefaultReporter = env.ci || env.test ? NodeBasicReporter : NodeDevReporter;
 const reporter = process.env.DEBUG_PLAIN || process.env.NODE_ENV !== 'production'
@@ -252,4 +86,4 @@ LogModule = __decorate([
     })
 ], LogModule);
 
-export { LogModule, LogStore, factory, logger, setLogs };
+export { LogModule, factory, logger };

package/lib/server.js

@@ -11,9 +11,9 @@ var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
 var moduleEnvironment = require('@tramvai/module-environment');
 var logger$1 = require('@tinkoff/logger');
-var papi = require('@tramvai/papi');
-var tokensServer = require('@tramvai/tokens-server');
-var state = require('@tramvai/state');
+var devLogs = require('./devLogs.js');
+var constants = require('./constants.js');
+var LogStore = require('./LogStore.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -21,179 +21,13 @@ var each__default = /*#__PURE__*/_interopDefaultLegacy(each);
 var split__default = /*#__PURE__*/_interopDefaultLegacy(split);
 var env__default = /*#__PURE__*/_interopDefaultLegacy(env);
 
-const setLogs = state.createEvent('setLogs');
-const LogStore = state.createReducer('devLogs', []).on(setLogs, (_, logs) => logs);
-
-class DevLogsReporter {
-    constructor() {
-        this.logs = [];
-    }
-    log(logObj) {
-        this.logs.push(logObj);
-    }
-    start() {
-        this.reset();
-    }
-    reset() {
-        this.logs = [];
-    }
-    flush() {
-        const flushed = this.logs;
-        this.reset();
-        return flushed;
-    }
-}
-class DevLogsExtension {
-    constructor(logs) {
-        this.logs = [];
-        this.logs = logs;
-    }
-    extend(logObj) {
-        const [index] = logObj.args;
-        // @ts-ignore
-        return this.logs[index];
-    }
-}
-const serverProviders = [
-    core.provide({
-        provide: tokensCommon.LOGGER_INIT_HOOK,
-        multi: true,
-        useFactory({ reporter }) {
-            return (loggerInstance) => {
-                loggerInstance.addReporter(reporter);
-            };
-        },
-        deps: {
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    core.provide({
-        provide: 'ssrDevReporter',
-        scope: core.Scope.SINGLETON,
-        useClass: DevLogsReporter,
-    }),
-    core.provide({
-        provide: tokensCommon.COMBINE_REDUCERS,
-        multi: true,
-        useValue: LogStore,
-    }),
-    core.provide({
-        provide: core.commandLineListTokens.customerStart,
-        multi: true,
-        useFactory: ({ reporter }) => {
-            return function startSsrLogs() {
-                reporter.start();
-            };
-        },
-        deps: {
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    core.provide({
-        provide: core.commandLineListTokens.generatePage,
-        multi: true,
-        useFactory: ({ context, reporter }) => {
-            const logs = reporter.flush();
-            return function endSsrLogs() {
-                return context.dispatch(setLogs(logs));
-            };
-        },
-        deps: {
-            context: tokensCommon.CONTEXT_TOKEN,
-            reporter: 'ssrDevReporter',
-        },
-    }),
-    core.provide({
-        provide: tokensServer.SERVER_MODULE_PAPI_PRIVATE_ROUTE,
-        multi: true,
-        useFactory: ({ environmentManager }) => {
-            return papi.createPapiMethod({
-                method: 'get',
-                path: '/logger',
-                async handler({ parsedUrl: { query } }) {
-                    const { mode, level, enable } = query;
-                    const applyDefaultConfig = mode === 'default';
-                    const clearCurrentConfig = mode || level || enable;
-                    let debugLevel;
-                    let debugEnable;
-                    if (applyDefaultConfig) {
-                        debugLevel = environmentManager.get('DEBUG_LEVEL');
-                        debugEnable = environmentManager.get('DEBUG_ENABLE');
-                    }
-                    if (level) {
-                        debugLevel = level;
-                    }
-                    if (enable) {
-                        debugEnable = enable;
-                    }
-                    if (clearCurrentConfig) {
-                        logger$1.logger.clear();
-                    }
-                    if (debugLevel) {
-                        logger$1.logger.setLevel(debugLevel);
-                    }
-                    if (debugEnable) {
-                        each__default["default"]((val) => {
-                            const [lvl, name] = val.split(':');
-                            logger$1.logger.enable(lvl, name);
-                        }, split__default["default"](',', debugEnable));
-                    }
-                },
-            });
-        },
-        deps: {
-            environmentManager: moduleEnvironment.ENV_MANAGER_TOKEN,
-        },
-    }),
-];
-const flushLogs = (ssrLogger, logs) => {
-    if (logs && logs.length) {
-        // eslint-disable-next-line no-console
-        console.groupCollapsed('%c🚀 Tramvai SSR Logs', 'font-size: 110%');
-        logs.forEach((logObj, index) => ssrLogger[logObj.type](index));
-        // eslint-disable-next-line no-console
-        console.groupEnd();
-    }
-};
-[
-    core.provide({
-        provide: tokensCommon.COMBINE_REDUCERS,
-        multi: true,
-        useValue: LogStore,
-    }),
-    core.provide({
-        provide: core.commandLineListTokens.customerStart,
-        multi: true,
-        useFactory: ({ logger, store }) => {
-            return function rehydrateSsrDevLogs() {
-                const logs = store.getState(LogStore);
-                const ssrLogger = logger({
-                    name: 'ssr-logger',
-                    // сетим пустой массив в beforeReporters, чтобы не подтягивать настройки рутового логгера с RemoteReporter
-                    beforeReporters: [],
-                    reporters: [new logger$1.BrowserReporter()],
-                    extensions: [new DevLogsExtension(logs)],
-                });
-                flushLogs(ssrLogger, logs);
-            };
-        },
-        deps: {
-            logger: tokensCommon.LOGGER_TOKEN,
-            store: tokensCommon.STORE_TOKEN,
-        },
-    }),
-];
-
-const LOGGER_NAME = '';
-const LOGGER_KEY = 'tramvai';
-
 const DefaultReporter = env__default["default"].ci || env__default["default"].test ? logger$1.NodeBasicReporter : logger$1.NodeDevReporter;
 const reporter = process.env.DEBUG_PLAIN || process.env.NODE_ENV !== 'production'
     ? new DefaultReporter()
     : new logger$1.JSONReporter();
 const logger = logger$1.createLoggerFactory({
-    name: LOGGER_NAME,
-    key: LOGGER_KEY,
+    name: constants.LOGGER_NAME,
+    key: constants.LOGGER_KEY,
     reporters: [reporter],
     defaults: {
         pid: process.pid,
@@ -229,7 +63,7 @@ exports.LogModule = class LogModule {
 exports.LogModule = tslib.__decorate([
     core.Module({
         providers: [
-            ...(process.env.NODE_ENV === 'development' ? serverProviders : []),
+            ...(process.env.NODE_ENV === 'development' ? devLogs.serverProviders : []),
             {
                 provide: tokensCommon.LOGGER_TOKEN,
                 scope: core.Scope.SINGLETON,
@@ -265,7 +99,7 @@ Object.defineProperty(exports, 'LOGGER_TOKEN', {
     enumerable: true,
     get: function () { return tokensCommon.LOGGER_TOKEN; }
 });
-exports.LogStore = LogStore;
+exports.LogStore = LogStore.LogStore;
+exports.setLogs = LogStore.setLogs;
 exports.factory = factory;
 exports.logger = logger;
-exports.setLogs = setLogs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-log",
-  "version": "2.70.1",
+  "version": "2.72.3",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -14,21 +14,20 @@
     "url": "git@github.com:Tinkoff/tramvai.git"
   },
   "scripts": {
-    "build": "tramvai-build --for-publish",
-    "watch": "tsc -w",
-    "build-for-publish": "true"
+    "build": "tramvai-build --forPublish --preserveModules",
+    "watch": "tsc -w"
   },
   "dependencies": {
-    "@tinkoff/logger": "0.10.57"
+    "@tinkoff/logger": "0.10.58"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.70.1",
-    "@tramvai/module-environment": "2.70.1",
-    "@tramvai/papi": "2.70.1",
-    "@tramvai/state": "2.70.1",
-    "@tramvai/tokens-common": "2.70.1",
-    "@tramvai/tokens-server": "2.70.1",
+    "@tramvai/core": "2.72.3",
+    "@tramvai/module-environment": "2.72.3",
+    "@tramvai/papi": "2.72.3",
+    "@tramvai/state": "2.72.3",
+    "@tramvai/tokens-common": "2.72.3",
+    "@tramvai/tokens-server": "2.72.3",
     "std-env": "^2.2.1",
     "tslib": "^2.4.0"
   },