@tramvai/cli 2.64.0 → 2.66.0

package/lib/library/webpack/utils/files.d.ts

@@ -1,6 +1,7 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-export declare const addSvgrLoader: (configManager: ConfigManager, config: Config, svgoOptions: Record<string, any>) => void;
-export declare const getSvgoOptions: (configManager: ConfigManager) => {
-    plugins: Record<string, any>[];
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+export declare const addSvgrLoader: (configManager: ConfigManager<CliConfigEntry>, config: Config, svgoOptions: Record<string, any>) => void;
+export declare const getSvgoOptions: (configManager: ConfigManager<CliConfigEntry>) => {
+    plugins: any[];
 };

package/lib/library/webpack/utils/files.js

@@ -15,9 +15,9 @@ const addSvgrLoader = (configManager, config, svgoOptions) => {
 };
 exports.addSvgrLoader = addSvgrLoader;
 const getSvgoOptions = (configManager) => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     return {
-        plugins: (_d = (_c = (_b = (_a = configManager.build) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b.svgo) === null || _c === void 0 ? void 0 : _c.plugins) !== null && _d !== void 0 ? _d : [
+        plugins: (_b = (_a = configManager.svgo) === null || _a === void 0 ? void 0 : _a.plugins) !== null && _b !== void 0 ? _b : [
             {
                 cleanupIDs: false,
             },

package/lib/library/webpack/utils/files.js.map

@@ -1 +1 @@
-{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/files.ts"],"names":[],"mappings":";;;AAEA,6CAAwE;AAEjE,MAAM,aAAa,GAAG,CAC3B,aAA4B,EAC5B,MAAc,EACd,WAAgC,EAChC,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;IAC5D,4FAA4F;IAC5F,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM;SAC7B,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,QAAQ,CAAC;QACf,4CAA4C;SAC3C,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAA,gCAAmB,EAAC,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,kCAC/D,gBAAgB,KACnB,UAAU,EAAE,IAAI,IAChB,CAAC;IAEH,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;AACpG,CAAC,CAAC;AAnBW,QAAA,aAAa,iBAmBxB;AAEK,MAAM,cAAc,GAAG,CAAC,aAA4B,EAAE,EAAE;;IAC7D,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,IAAI,0CAAE,OAAO,mCAAI;YAC7D;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB"}
+{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/files.ts"],"names":[],"mappings":";;;AAGA,6CAAwE;AAEjE,MAAM,aAAa,GAAG,CAC3B,aAA4C,EAC5C,MAAc,EACd,WAAgC,EAChC,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;IAC5D,4FAA4F;IAC5F,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM;SAC7B,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,QAAQ,CAAC;QACf,4CAA4C;SAC3C,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAA,gCAAmB,EAAC,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,kCAC/D,gBAAgB,KACnB,UAAU,EAAE,IAAI,IAChB,CAAC;IAEH,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;AACpG,CAAC,CAAC;AAnBW,QAAA,aAAa,iBAmBxB;AAEK,MAAM,cAAc,GAAG,CAAC,aAA4C,EAAE,EAAE;;IAC7E,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,mCAAI;YACtC;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB"}

package/lib/library/webpack/utils/transpiler.d.ts

@@ -2,6 +2,7 @@ import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
 import type { Env } from '../../../typings/Env';
 import type { Target } from '../../../typings/target';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 export type TranspilerConfig = {
     env: Env;
     target: Target;
@@ -19,5 +20,5 @@ export type TranspilerConfig = {
     excludesPresetEnv: string[];
     rootDir: string;
 };
-export declare const addTranspilerLoader: (configManager: ConfigManager, rule: Config.Use, transpilerConfig: TranspilerConfig) => Config.Rule;
-export declare const getTranspilerConfig: (configManager: ConfigManager, overrideOptions?: Partial<TranspilerConfig>) => TranspilerConfig;
+export declare const addTranspilerLoader: (configManager: ConfigManager<CliConfigEntry>, rule: Config.Use, transpilerConfig: TranspilerConfig) => Config.Rule;
+export declare const getTranspilerConfig: (configManager: ConfigManager<CliConfigEntry>, overrideOptions?: Partial<TranspilerConfig>) => TranspilerConfig;

package/lib/library/webpack/utils/transpiler.js

@@ -24,12 +24,12 @@ Please run "tramvai add --dev @tramvai/swc-integration" to fix the problem
 };
 exports.addTranspilerLoader = addTranspilerLoader;
 const getTranspilerConfig = (configManager, overrideOptions = {}) => {
-    const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin, excludesPresetEnv, } = configManager.build.configurations;
+    const { generateDataQaTag, alias, enableFillActionNamePlugin, excludesPresetEnv } = configManager;
     const { env, modern } = configManager;
     return Object.assign({ isServer: configManager.buildType === 'server', env,
         generateDataQaTag,
         modern,
-        alias, tramvai: true, removeTypeofWindow, hot: configManager.hotRefresh, excludesPresetEnv,
+        alias, tramvai: true, removeTypeofWindow: true, hot: !!configManager.hotRefresh.enabled, excludesPresetEnv,
         enableFillActionNamePlugin, rootDir: configManager.rootDir, target: configManager.target, loader: true, modules: false, typescript: false }, overrideOptions);
 };
 exports.getTranspilerConfig = getTranspilerConfig;

package/lib/library/webpack/utils/transpiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAE1C,mCAA0C;AAC1C,gEAAsC;AAsB/B,MAAM,mBAAmB,GAAG,CACjC,aAA4B,EAC5B,IAAgB,EAChB,gBAAkC,EAClC,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEf,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B;AAEK,MAAM,mBAAmB,GAAG,CACjC,aAA4B,EAC5B,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,iBAAiB,GAClB,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IACvC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEtC,uBACE,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ,EAC9C,GAAG;QACH,iBAAiB;QACjB,MAAM;QACN,KAAK,EACL,OAAO,EAAE,IAAI,EACb,kBAAkB,EAClB,GAAG,EAAE,aAAa,CAAC,UAAU,EAC7B,iBAAiB;QACjB,0BAA0B,EAC1B,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,KAAK,IACd,eAAe,EAClB;AACJ,CAAC,CAAC;AA/BW,QAAA,mBAAmB,uBA+B9B"}
+{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAE1C,mCAA0C;AAC1C,gEAAsC;AAuB/B,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,IAAgB,EAChB,gBAAkC,EAClC,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEf,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B;AAEK,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAClG,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEtC,uBACE,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ,EAC9C,GAAG;QACH,iBAAiB;QACjB,MAAM;QACN,KAAK,EACL,OAAO,EAAE,IAAI,EACb,kBAAkB,EAAE,IAAI,EACxB,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,EACvC,iBAAiB;QACjB,0BAA0B,EAC1B,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,KAAK,IACd,eAAe,EAClB;AACJ,CAAC,CAAC;AAzBW,QAAA,mBAAmB,uBAyB9B"}

package/lib/library/webpack/utils/workersPool.d.ts

@@ -1,7 +1,4 @@
 import type { ConfigManager } from '../../../config/configManager';
-export declare const createWorkerPoolTranspiler: (configManager: ConfigManager) => {
-    name: string;
-    poolTimeout: number;
-    workers: number;
-};
-export declare const closeWorkerPoolTranspiler: (configManager: ConfigManager) => void;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+export declare const createWorkerPoolTranspiler: (configManager: ConfigManager<CliConfigEntry>) => any;
+export declare const closeWorkerPoolTranspiler: (configManager: ConfigManager<CliConfigEntry>) => void;

package/lib/library/webpack/utils/workersPool.js

@@ -15,7 +15,7 @@ function calculateNumberOfWorkers() {
     return Math.max(1, cpus / 2 - 1);
 }
 const getCustomConfig = (configManager) => {
-    const { build: { configurations: { threadLoader: additionalConfig }, }, } = configManager;
+    const { threadLoader: additionalConfig } = configManager;
     return additionalConfig || {};
 };
 const createTranspilerConfig = (configManager) => {

package/lib/library/webpack/utils/workersPool.js.map

@@ -1 +1 @@
-{"version":3,"file":"workersPool.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/workersPool.ts"],"names":[],"mappings":";;;;AAAA,oEAA8C;AAC9C,gEAAyD;AACzD,oDAAoB;AAGpB,4HAA4H;AAC5H,SAAS,YAAY;IACnB,OAAO,CAAC,YAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;AAC7C,CAAC;AAED,SAAS,wBAAwB;IAC/B,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;IAE5B,mGAAmG;IACnG,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,aAA4B,EAAE,EAAE;IACvD,MAAM,EACJ,KAAK,EAAE,EACL,cAAc,EAAE,EAAE,YAAY,EAAE,gBAAgB,EAAE,GACnD,GACF,GAAG,aAAa,CAAC;IAElB,OAAO,gBAAgB,IAAI,EAAE,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAC9D,uBACE,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EACvE,OAAO,EAAE,wBAAwB,EAAE,IAChC,eAAe,CAAC,aAAa,CAAC,EACjC;AACJ,CAAC,CAAC;AAEK,MAAM,0BAA0B,GAAG,CAAC,aAA4B,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAErD,IAAI,CAAE,kCAAkC,CAAC,MAAM,EAAE;QAC/C,IAAI,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,KAAK,KAAK,EAAE;YAC5D,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;SAC1D;aAAM;YACL,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC1B,cAAc;gBACd,mBAAmB;gBACnB,0BAA0B;gBAC1B,qBAAqB;gBACrB,iCAAiC;gBACjC,qBAAqB;aACtB,CAAC,CAAC;SACJ;QACA,kCAAkC,CAAC,MAAM,GAAG,IAAI,CAAC;KACnD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AApBW,QAAA,0BAA0B,8BAoBrC;AAEK,MAAM,yBAAyB,GAAG,CAAC,aAA4B,EAAE,EAAE;;IACxE,MAAA,IAAA,qBAAO,EAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,0CAAE,cAAc,EAAE,CAAC;AACnE,CAAC,CAAC;AAFW,QAAA,yBAAyB,6BAEpC"}
+{"version":3,"file":"workersPool.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/workersPool.ts"],"names":[],"mappings":";;;;AAAA,oEAA8C;AAC9C,gEAAyD;AACzD,oDAAoB;AAIpB,4HAA4H;AAC5H,SAAS,YAAY;IACnB,OAAO,CAAC,YAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;AAC7C,CAAC;AAED,SAAS,wBAAwB;IAC/B,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;IAE5B,mGAAmG;IACnG,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,aAA4C,EAAO,EAAE;IAC5E,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,aAAa,CAAC;IAEzD,OAAO,gBAAgB,IAAI,EAAE,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,aAA4C,EAAE,EAAE;IAC9E,uBACE,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EACvE,OAAO,EAAE,wBAAwB,EAAE,IAChC,eAAe,CAAC,aAAa,CAAC,EACjC;AACJ,CAAC,CAAC;AAEK,MAAM,0BAA0B,GAAG,CAAC,aAA4C,EAAE,EAAE;IACzF,MAAM,MAAM,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAErD,IAAI,CAAE,kCAAkC,CAAC,MAAM,EAAE;QAC/C,IAAI,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,KAAK,KAAK,EAAE;YAC5D,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;SAC1D;aAAM;YACL,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC1B,cAAc;gBACd,mBAAmB;gBACnB,0BAA0B;gBAC1B,qBAAqB;gBACrB,iCAAiC;gBACjC,qBAAqB;aACtB,CAAC,CAAC;SACJ;QACA,kCAAkC,CAAC,MAAM,GAAG,IAAI,CAAC;KACnD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AApBW,QAAA,0BAA0B,8BAoBrC;AAEK,MAAM,yBAAyB,GAAG,CAAC,aAA4C,EAAE,EAAE;;IACxF,MAAA,IAAA,qBAAO,EAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,0CAAE,cAAc,EAAE,CAAC;AACnE,CAAC,CAAC;AAFW,QAAA,yBAAyB,6BAEpC"}

package/lib/models/config.d.ts

@@ -1,12 +1,11 @@
 import type { Config, SyncJsonFile } from '../typings/projectType';
 import type { ConfigEntry } from '../typings/configEntry/common';
 export declare class ConfigManager {
-    private readonly defaultConfigFileName;
     config: Config;
     syncConfigFile: SyncJsonFile;
     constructor({ config, syncConfigFile }: {
-        config: any;
-        syncConfigFile: any;
+        config: Config;
+        syncConfigFile: SyncJsonFile;
     });
     get(): Config;
     set(config: Config): void;

package/lib/models/config.js

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigManager = void 0;
 const tslib_1 = require("tslib");
 const ajv_1 = tslib_1.__importDefault(require("ajv"));
+const object_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/object"));
+const empty_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/empty"));
 const clone_1 = tslib_1.__importDefault(require("@tinkoff/utils/clone"));
+const common_1 = require("../typings/configEntry/common");
 const getTramvaiConfig_1 = require("../utils/getTramvaiConfig");
 const merge_1 = require("../utils/merge");
 const tramvai_1 = require("../schema/tramvai");
 class ConfigManager {
     constructor({ config, syncConfigFile }) {
-        this.defaultConfigFileName = 'platform.json';
         this.config = config;
         this.syncConfigFile = syncConfigFile;
         this.validateConfig();
@@ -40,7 +42,7 @@ class ConfigManager {
         return this.updateConfig(newConfig);
     }
     updateConfig(config) {
-        const { path, configName: configFileName = this.defaultConfigFileName } = (0, getTramvaiConfig_1.getTramvaiConfig)();
+        const { path } = (0, getTramvaiConfig_1.getTramvaiConfig)();
         return this.syncConfigFile({ path, newContent: config }).then(() => {
             this.set(config);
             this.validateConfig();
@@ -58,9 +60,36 @@ class ConfigManager {
         // Мержим projectsConfig в каждый projects до валидации, чтобы не применялись дефолты
         Object.keys(configParameters.projects).forEach((projectName) => {
             const entry = configParameters.projects[projectName];
-            configParameters.projects[projectName] = (0, merge_1.merge)(projectsConfig, projectsConfig[entry.type], entry);
+            configParameters.projects[projectName] = (0, merge_1.merge)(projectsConfig, entry);
         });
         const ajv = new ajv_1.default({ useDefaults: true });
+        ajv.addKeyword('cli_overridable', {
+            modifying: true,
+            errors: false,
+            validate(schemaValue, currentValue, propSchema) {
+                const defaultValue = propSchema.default;
+                if (!(0, object_1.default)(currentValue)) {
+                    return true;
+                }
+                let defaultDev = defaultValue;
+                let defaultProd = defaultValue;
+                if ((0, common_1.isOverridableOption)(defaultValue)) {
+                    defaultDev = defaultValue.development;
+                    defaultProd = defaultValue.production;
+                }
+                if ((0, common_1.isOverridableOption)(currentValue) || (0, empty_1.default)(currentValue)) {
+                    if (!currentValue.development) {
+                        // eslint-disable-next-line no-param-reassign
+                        currentValue.development = defaultDev;
+                    }
+                    if (!currentValue.production) {
+                        // eslint-disable-next-line no-param-reassign
+                        currentValue.production = defaultProd;
+                    }
+                }
+                return true;
+            },
+        });
         const validate = ajv.compile(tramvai_1.schema);
         const valid = validate(configParameters);
         // сохраняем обновленные параметры, в них были добавлены значения по умолчанию

package/lib/models/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/models/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/models/config.ts"],"names":[],"mappings":"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"}

package/lib/schema/ConfigSchema.d.ts

@@ -2,6 +2,14 @@ import type { ModuleConfigEntry } from '../typings/configEntry/module';
 import type { ApplicationConfigEntry } from '../typings/configEntry/application';
 import type { PackageConfigEntry } from '../typings/configEntry/package';
 import type { ChildAppConfigEntry } from '../typings/configEntry/child-app';
+import type { ConfigEntry, OverridableOption } from '../typings/configEntry/common';
+type ConvertOptionsToSchema<T> = T extends OverridableOption<infer U> ? {
+    development?: U;
+    production?: U;
+} | U : T extends Record<string, any> ? {
+    [key in keyof T]?: ConvertOptionsToSchema<T[key]>;
+} : T;
+export type ConvertToSchema<T extends ConfigEntry> = ConfigEntry & ConvertOptionsToSchema<T>;
 /**
  * Исходный интерфейс для генерации JSON Schema файла конфигурации.
  *
@@ -13,8 +21,9 @@ import type { ChildAppConfigEntry } from '../typings/configEntry/child-app';
  * которые можно использовать как угодно, в том числе внутри conditional веток с ключевыми словами `if`, `then`, `else`
  */
 export type ConfigSchema = {
-    application: ApplicationConfigEntry;
-    module: ModuleConfigEntry;
-    'child-app': ChildAppConfigEntry;
-    package: PackageConfigEntry;
+    application: ConvertToSchema<ApplicationConfigEntry>;
+    module: ConvertToSchema<ModuleConfigEntry>;
+    'child-app': ConvertToSchema<ChildAppConfigEntry>;
+    package: ConvertToSchema<PackageConfigEntry>;
 };
+export {};