@tramvai/module-environment 2.70.0 → 2.72.0

package/lib/browser.js

@@ -2,34 +2,8 @@ import { __decorate } from 'tslib';
 import { Module, Scope } from '@tramvai/core';
 import { ENV_MANAGER_TOKEN, STORE_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
 export { ENV_MANAGER_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
-import { createReducer } from '@tramvai/state';
-
-class EnvironmentManager {
-    constructor() {
-        this.parameters = {};
-    }
-    get(name) {
-        return this.parameters[name];
-    }
-    getInt(name, def) {
-        const value = Number(name in this.parameters ? this.parameters[name] : def);
-        return Number.isFinite(value) ? value : def;
-    }
-    getAll() {
-        return this.parameters;
-    }
-    update(result) {
-        this.parameters = Object.assign(this.parameters, result);
-    }
-    clientUsed() {
-        return this.getAll();
-    }
-    updateClientUsed(result) {
-        this.update(result);
-    }
-}
-
-const EnvironmentStore = createReducer('environment', {});
+import { EnvironmentManager } from './shared/EnvironmentManager.browser.js';
+import { EnvironmentStore } from './shared/EnvironmentStore.browser.js';
 
 let EnvironmentModule = class EnvironmentModule {
 };

package/lib/server/EnvironmentManagerServer.es.js

@@ -0,0 +1,76 @@
+import noop from '@tinkoff/utils/function/noop';
+import { EnvironmentManager } from '../shared/EnvironmentManager.es.js';
+
+const readFileWithEnv = (path) => {
+    try {
+        const requireFunc = 
+        // @ts-ignore
+        typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require;
+        return requireFunc(path);
+    }
+    catch (e) {
+        return {};
+    }
+};
+class EnvironmentManagerServer extends EnvironmentManager {
+    constructor(tokens) {
+        super();
+        this.tokens = tokens;
+        this.clientUsedList = {};
+        this.processing();
+    }
+    clientUsed() {
+        return this.clientUsedList;
+    }
+    updateClientUsed(result) {
+        this.clientUsedList = Object.assign(this.clientUsedList, result);
+    }
+    // eslint-disable-next-line class-methods-use-this
+    getEnvInFiles() {
+        if (process.env.NODE_ENV === 'production' &&
+            process.env.DANGEROUS_UNSAFE_ENV_FILES !== 'true') {
+            return {};
+        }
+        const path = require('path');
+        return {
+            ...readFileWithEnv(path.resolve(process.cwd(), 'server', `env.js`)),
+            ...readFileWithEnv(path.resolve(process.cwd(), `env.development.js`)),
+            ...readFileWithEnv(path.resolve(process.cwd(), `env.js`)),
+        };
+    }
+    getEnvInApp() {
+        const appValue = {};
+        this.tokens.forEach((token) => {
+            if (token.value !== undefined) {
+                appValue[token.key] = token.value;
+            }
+        });
+        return appValue;
+    }
+    collectionEnv() {
+        return { ...this.getEnvInApp(), ...this.getEnvInFiles(), ...process.env };
+    }
+    processing() {
+        const result = {};
+        const envParameters = this.collectionEnv();
+        this.tokens.forEach(({ key, validator = noop, optional, dehydrate }) => {
+            const value = envParameters[key];
+            if (typeof value === 'undefined' && !optional) {
+                throw new Error(`Env parameter ${key} not found. You need add a this env parameter. If you have questions read the docs`);
+            }
+            // Not calling validation on empty values.
+            const validation = typeof value !== 'undefined' && validator(value);
+            if (typeof validation === 'string') {
+                throw new Error(`Env parameter ${key} with value ${value} not valid, message: ${validation}`);
+            }
+            result[key] = value;
+            if (dehydrate !== false) {
+                this.clientUsedList[key] = value;
+            }
+        });
+        process.env = envParameters; // Записываем в process.env итоговый результат. TODO убрать позже
+        this.update(result);
+    }
+}
+
+export { EnvironmentManagerServer };

package/lib/server/EnvironmentManagerServer.js

@@ -0,0 +1,84 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var noop = require('@tinkoff/utils/function/noop');
+var EnvironmentManager = require('../shared/EnvironmentManager.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
+
+const readFileWithEnv = (path) => {
+    try {
+        const requireFunc = 
+        // @ts-ignore
+        typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require;
+        return requireFunc(path);
+    }
+    catch (e) {
+        return {};
+    }
+};
+class EnvironmentManagerServer extends EnvironmentManager.EnvironmentManager {
+    constructor(tokens) {
+        super();
+        this.tokens = tokens;
+        this.clientUsedList = {};
+        this.processing();
+    }
+    clientUsed() {
+        return this.clientUsedList;
+    }
+    updateClientUsed(result) {
+        this.clientUsedList = Object.assign(this.clientUsedList, result);
+    }
+    // eslint-disable-next-line class-methods-use-this
+    getEnvInFiles() {
+        if (process.env.NODE_ENV === 'production' &&
+            process.env.DANGEROUS_UNSAFE_ENV_FILES !== 'true') {
+            return {};
+        }
+        const path = require('path');
+        return {
+            ...readFileWithEnv(path.resolve(process.cwd(), 'server', `env.js`)),
+            ...readFileWithEnv(path.resolve(process.cwd(), `env.development.js`)),
+            ...readFileWithEnv(path.resolve(process.cwd(), `env.js`)),
+        };
+    }
+    getEnvInApp() {
+        const appValue = {};
+        this.tokens.forEach((token) => {
+            if (token.value !== undefined) {
+                appValue[token.key] = token.value;
+            }
+        });
+        return appValue;
+    }
+    collectionEnv() {
+        return { ...this.getEnvInApp(), ...this.getEnvInFiles(), ...process.env };
+    }
+    processing() {
+        const result = {};
+        const envParameters = this.collectionEnv();
+        this.tokens.forEach(({ key, validator = noop__default["default"], optional, dehydrate }) => {
+            const value = envParameters[key];
+            if (typeof value === 'undefined' && !optional) {
+                throw new Error(`Env parameter ${key} not found. You need add a this env parameter. If you have questions read the docs`);
+            }
+            // Not calling validation on empty values.
+            const validation = typeof value !== 'undefined' && validator(value);
+            if (typeof validation === 'string') {
+                throw new Error(`Env parameter ${key} with value ${value} not valid, message: ${validation}`);
+            }
+            result[key] = value;
+            if (dehydrate !== false) {
+                this.clientUsedList[key] = value;
+            }
+        });
+        process.env = envParameters; // Записываем в process.env итоговый результат. TODO убрать позже
+        this.update(result);
+    }
+}
+
+exports.EnvironmentManagerServer = EnvironmentManagerServer;

package/lib/server.es.js

@@ -5,107 +5,8 @@ import { ENV_MANAGER_TOKEN, ENV_USED_TOKEN, COMBINE_REDUCERS, CONTEXT_TOKEN } fr
 export { ENV_MANAGER_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
 import { createPapiMethod } from '@tramvai/papi';
-import { createReducer } from '@tramvai/state';
-import noop from '@tinkoff/utils/function/noop';
-
-const EnvironmentStore = createReducer('environment', {});
-
-class EnvironmentManager {
-    constructor() {
-        this.parameters = {};
-    }
-    get(name) {
-        return this.parameters[name];
-    }
-    getInt(name, def) {
-        const value = Number(name in this.parameters ? this.parameters[name] : def);
-        return Number.isFinite(value) ? value : def;
-    }
-    getAll() {
-        return this.parameters;
-    }
-    update(result) {
-        this.parameters = Object.assign(this.parameters, result);
-    }
-    clientUsed() {
-        return this.getAll();
-    }
-    updateClientUsed(result) {
-        this.update(result);
-    }
-}
-
-const readFileWithEnv = (path) => {
-    try {
-        const requireFunc = 
-        // @ts-ignore
-        typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require;
-        return requireFunc(path);
-    }
-    catch (e) {
-        return {};
-    }
-};
-class EnvironmentManagerServer extends EnvironmentManager {
-    constructor(tokens) {
-        super();
-        this.tokens = tokens;
-        this.clientUsedList = {};
-        this.processing();
-    }
-    clientUsed() {
-        return this.clientUsedList;
-    }
-    updateClientUsed(result) {
-        this.clientUsedList = Object.assign(this.clientUsedList, result);
-    }
-    // eslint-disable-next-line class-methods-use-this
-    getEnvInFiles() {
-        if (process.env.NODE_ENV === 'production' &&
-            process.env.DANGEROUS_UNSAFE_ENV_FILES !== 'true') {
-            return {};
-        }
-        const path = require('path');
-        return {
-            ...readFileWithEnv(path.resolve(process.cwd(), 'server', `env.js`)),
-            ...readFileWithEnv(path.resolve(process.cwd(), `env.development.js`)),
-            ...readFileWithEnv(path.resolve(process.cwd(), `env.js`)),
-        };
-    }
-    getEnvInApp() {
-        const appValue = {};
-        this.tokens.forEach((token) => {
-            if (token.value !== undefined) {
-                appValue[token.key] = token.value;
-            }
-        });
-        return appValue;
-    }
-    collectionEnv() {
-        return { ...this.getEnvInApp(), ...this.getEnvInFiles(), ...process.env };
-    }
-    processing() {
-        const result = {};
-        const envParameters = this.collectionEnv();
-        this.tokens.forEach(({ key, validator = noop, optional, dehydrate }) => {
-            const value = envParameters[key];
-            if (typeof value === 'undefined' && !optional) {
-                throw new Error(`Env parameter ${key} not found. You need add a this env parameter. If you have questions read the docs`);
-            }
-            // Not calling validation on empty values.
-            const validation = typeof value !== 'undefined' && validator(value);
-            if (typeof validation === 'string') {
-                throw new Error(`Env parameter ${key} with value ${value} not valid, message: ${validation}`);
-            }
-            result[key] = value;
-            if (dehydrate !== false) {
-                this.clientUsedList[key] = value;
-            }
-        });
-        process.env = envParameters; // Записываем в process.env итоговый результат. TODO убрать позже
-        this.update(result);
-    }
-}
+import { EnvironmentStore } from './shared/EnvironmentStore.es.js';
+import { EnvironmentManagerServer } from './server/EnvironmentManagerServer.es.js';
 
 let EnvironmentModule = class EnvironmentModule {
 };

package/lib/server.js

@@ -8,112 +8,12 @@ var flatten = require('@tinkoff/utils/array/flatten');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensServer = require('@tramvai/tokens-server');
 var papi = require('@tramvai/papi');
-var state = require('@tramvai/state');
-var noop = require('@tinkoff/utils/function/noop');
+var EnvironmentStore = require('./shared/EnvironmentStore.js');
+var EnvironmentManagerServer = require('./server/EnvironmentManagerServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
-var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
-
-const EnvironmentStore = state.createReducer('environment', {});
-
-class EnvironmentManager {
-    constructor() {
-        this.parameters = {};
-    }
-    get(name) {
-        return this.parameters[name];
-    }
-    getInt(name, def) {
-        const value = Number(name in this.parameters ? this.parameters[name] : def);
-        return Number.isFinite(value) ? value : def;
-    }
-    getAll() {
-        return this.parameters;
-    }
-    update(result) {
-        this.parameters = Object.assign(this.parameters, result);
-    }
-    clientUsed() {
-        return this.getAll();
-    }
-    updateClientUsed(result) {
-        this.update(result);
-    }
-}
-
-const readFileWithEnv = (path) => {
-    try {
-        const requireFunc = 
-        // @ts-ignore
-        typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require;
-        return requireFunc(path);
-    }
-    catch (e) {
-        return {};
-    }
-};
-class EnvironmentManagerServer extends EnvironmentManager {
-    constructor(tokens) {
-        super();
-        this.tokens = tokens;
-        this.clientUsedList = {};
-        this.processing();
-    }
-    clientUsed() {
-        return this.clientUsedList;
-    }
-    updateClientUsed(result) {
-        this.clientUsedList = Object.assign(this.clientUsedList, result);
-    }
-    // eslint-disable-next-line class-methods-use-this
-    getEnvInFiles() {
-        if (process.env.NODE_ENV === 'production' &&
-            process.env.DANGEROUS_UNSAFE_ENV_FILES !== 'true') {
-            return {};
-        }
-        const path = require('path');
-        return {
-            ...readFileWithEnv(path.resolve(process.cwd(), 'server', `env.js`)),
-            ...readFileWithEnv(path.resolve(process.cwd(), `env.development.js`)),
-            ...readFileWithEnv(path.resolve(process.cwd(), `env.js`)),
-        };
-    }
-    getEnvInApp() {
-        const appValue = {};
-        this.tokens.forEach((token) => {
-            if (token.value !== undefined) {
-                appValue[token.key] = token.value;
-            }
-        });
-        return appValue;
-    }
-    collectionEnv() {
-        return { ...this.getEnvInApp(), ...this.getEnvInFiles(), ...process.env };
-    }
-    processing() {
-        const result = {};
-        const envParameters = this.collectionEnv();
-        this.tokens.forEach(({ key, validator = noop__default["default"], optional, dehydrate }) => {
-            const value = envParameters[key];
-            if (typeof value === 'undefined' && !optional) {
-                throw new Error(`Env parameter ${key} not found. You need add a this env parameter. If you have questions read the docs`);
-            }
-            // Not calling validation on empty values.
-            const validation = typeof value !== 'undefined' && validator(value);
-            if (typeof validation === 'string') {
-                throw new Error(`Env parameter ${key} with value ${value} not valid, message: ${validation}`);
-            }
-            result[key] = value;
-            if (dehydrate !== false) {
-                this.clientUsedList[key] = value;
-            }
-        });
-        process.env = envParameters; // Записываем в process.env итоговый результат. TODO убрать позже
-        this.update(result);
-    }
-}
 
 exports.EnvironmentModule = class EnvironmentModule {
 };
@@ -123,7 +23,7 @@ exports.EnvironmentModule = tslib.__decorate([
             core.provide({
                 provide: tokensCommon.ENV_MANAGER_TOKEN,
                 useFactory: ({ tokens }) => {
-                    return new EnvironmentManagerServer(flatten__default["default"](tokens !== null && tokens !== void 0 ? tokens : []));
+                    return new EnvironmentManagerServer.EnvironmentManagerServer(flatten__default["default"](tokens !== null && tokens !== void 0 ? tokens : []));
                 },
                 deps: {
                     tokens: {
@@ -135,7 +35,7 @@ exports.EnvironmentModule = tslib.__decorate([
             }),
             core.provide({
                 provide: tokensCommon.COMBINE_REDUCERS,
-                useValue: EnvironmentStore,
+                useValue: EnvironmentStore.EnvironmentStore,
                 multi: true,
             }),
             core.provide({

package/lib/shared/EnvironmentManager.browser.js

@@ -0,0 +1,26 @@
+class EnvironmentManager {
+    constructor() {
+        this.parameters = {};
+    }
+    get(name) {
+        return this.parameters[name];
+    }
+    getInt(name, def) {
+        const value = Number(name in this.parameters ? this.parameters[name] : def);
+        return Number.isFinite(value) ? value : def;
+    }
+    getAll() {
+        return this.parameters;
+    }
+    update(result) {
+        this.parameters = Object.assign(this.parameters, result);
+    }
+    clientUsed() {
+        return this.getAll();
+    }
+    updateClientUsed(result) {
+        this.update(result);
+    }
+}
+
+export { EnvironmentManager };

package/lib/shared/EnvironmentManager.es.js

@@ -0,0 +1,26 @@
+class EnvironmentManager {
+    constructor() {
+        this.parameters = {};
+    }
+    get(name) {
+        return this.parameters[name];
+    }
+    getInt(name, def) {
+        const value = Number(name in this.parameters ? this.parameters[name] : def);
+        return Number.isFinite(value) ? value : def;
+    }
+    getAll() {
+        return this.parameters;
+    }
+    update(result) {
+        this.parameters = Object.assign(this.parameters, result);
+    }
+    clientUsed() {
+        return this.getAll();
+    }
+    updateClientUsed(result) {
+        this.update(result);
+    }
+}
+
+export { EnvironmentManager };

package/lib/shared/EnvironmentManager.js

@@ -0,0 +1,30 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+class EnvironmentManager {
+    constructor() {
+        this.parameters = {};
+    }
+    get(name) {
+        return this.parameters[name];
+    }
+    getInt(name, def) {
+        const value = Number(name in this.parameters ? this.parameters[name] : def);
+        return Number.isFinite(value) ? value : def;
+    }
+    getAll() {
+        return this.parameters;
+    }
+    update(result) {
+        this.parameters = Object.assign(this.parameters, result);
+    }
+    clientUsed() {
+        return this.getAll();
+    }
+    updateClientUsed(result) {
+        this.update(result);
+    }
+}
+
+exports.EnvironmentManager = EnvironmentManager;

package/lib/shared/EnvironmentStore.browser.js

@@ -0,0 +1,5 @@
+import { createReducer } from '@tramvai/state';
+
+const EnvironmentStore = createReducer('environment', {});
+
+export { EnvironmentStore };

package/lib/shared/EnvironmentStore.es.js

@@ -0,0 +1,5 @@
+import { createReducer } from '@tramvai/state';
+
+const EnvironmentStore = createReducer('environment', {});
+
+export { EnvironmentStore };

package/lib/shared/EnvironmentStore.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var state = require('@tramvai/state');
+
+const EnvironmentStore = state.createReducer('environment', {});
+
+exports.EnvironmentStore = EnvironmentStore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-environment",
-  "version": "2.70.0",
+  "version": "2.72.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -14,18 +14,17 @@
     "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"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.70.0",
-    "@tramvai/papi": "2.70.0",
-    "@tramvai/state": "2.70.0",
-    "@tramvai/tokens-common": "2.70.0",
-    "@tramvai/tokens-server": "2.70.0",
-    "@tinkoff/dippy": "0.8.12",
+    "@tramvai/core": "2.72.0",
+    "@tramvai/papi": "2.72.0",
+    "@tramvai/state": "2.72.0",
+    "@tramvai/tokens-common": "2.72.0",
+    "@tramvai/tokens-server": "2.72.0",
+    "@tinkoff/dippy": "0.8.13",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "tslib": "^2.4.0"