@tramvai/module-environment 5.5.4 → 5.6.2

package/lib/server/EnvironmentManagerServer.es.js

@@ -18,9 +18,9 @@ class EnvironmentManagerServer extends EnvironmentManager {
     constructor(tokens, templates = []) {
         super();
         this.tokens = tokens;
-        this.templates = templates.reduce((acc, { key, fn }) => {
+        this.templates = templates.reduce((acc, { key, fn, validator }) => {
             // TODO: key duplicates?
-            acc[key] = fn;
+            acc[key] = { fn, validator };
             return acc;
         }, {});
         this.processing();

package/lib/server/EnvironmentManagerServer.js

@@ -26,9 +26,9 @@ class EnvironmentManagerServer extends EnvironmentManager.EnvironmentManager {
     constructor(tokens, templates = []) {
         super();
         this.tokens = tokens;
-        this.templates = templates.reduce((acc, { key, fn }) => {
+        this.templates = templates.reduce((acc, { key, fn, validator }) => {
             // TODO: key duplicates?
-            acc[key] = fn;
+            acc[key] = { fn, validator };
             return acc;
         }, {});
         this.processing();

package/lib/shared/template.d.ts

@@ -1,5 +1,8 @@
 import type { EnvTemplate } from '@tramvai/tokens-common';
-export type Templates = Record<string, EnvTemplate['fn']>;
+export type Templates = Record<string, {
+    fn: EnvTemplate['fn'];
+    validator: EnvTemplate['validator'];
+}>;
 export declare function interpolate({ envKey, envValue, templates, }: {
     envKey: string;
     envValue: string | undefined;

package/lib/shared/template.es.js

@@ -7,11 +7,15 @@ function interpolate({ envKey, envValue, templates, }) {
     }
     return envValue.replace(templateRegex, (templateRaw, templateStr) => {
         // expect string in `key:param1,param2` format
-        const [key, paramsRaw = ''] = templateStr.split(':');
+        const [key, ...rest] = templateStr.split(':');
+        const paramsRaw = rest.join('');
         const params = paramsRaw.split(',').filter(Boolean);
         const template = templates[key];
         if (template) {
-            return template(...params);
+            if (template.validator) {
+                template.validator(envKey, params);
+            }
+            return template.fn(...params);
         }
         throw Error(`Problem with "${envKey}=${originalValue}" env variable - template for ${templateRaw} not found.`);
     });

package/lib/shared/template.js

@@ -11,11 +11,15 @@ function interpolate({ envKey, envValue, templates, }) {
     }
     return envValue.replace(templateRegex, (templateRaw, templateStr) => {
         // expect string in `key:param1,param2` format
-        const [key, paramsRaw = ''] = templateStr.split(':');
+        const [key, ...rest] = templateStr.split(':');
+        const paramsRaw = rest.join('');
         const params = paramsRaw.split(',').filter(Boolean);
         const template = templates[key];
         if (template) {
-            return template(...params);
+            if (template.validator) {
+                template.validator(envKey, params);
+            }
+            return template.fn(...params);
         }
         throw Error(`Problem with "${envKey}=${originalValue}" env variable - template for ${templateRaw} not found.`);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-environment",
-  "version": "5.5.4",
+  "version": "5.6.2",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -19,11 +19,11 @@
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "5.5.4",
-    "@tramvai/papi": "5.5.4",
-    "@tramvai/state": "5.5.4",
-    "@tramvai/tokens-common": "5.5.4",
-    "@tramvai/tokens-server": "5.5.4",
+    "@tramvai/core": "5.6.2",
+    "@tramvai/papi": "5.6.2",
+    "@tramvai/state": "5.6.2",
+    "@tramvai/tokens-common": "5.6.2",
+    "@tramvai/tokens-server": "5.6.2",
     "@tinkoff/dippy": "0.11.3",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",