ts-openapi-codegen 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/cli/generate/runGenerateOpenApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runGenerateOpenApi.d.ts","sourceRoot":"","sources":["../../../src/cli/generate/runGenerateOpenApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAazC;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,YAAY,iBAwC7D"}
+{"version":3,"file":"runGenerateOpenApi.d.ts","sourceRoot":"","sources":["../../../src/cli/generate/runGenerateOpenApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAezC;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,YAAY,iBAsD7D"}

package/dist/cli/generate/runGenerateOpenApi.js

@@ -35,6 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runGenerateOpenApi = runGenerateOpenApi;
 const defaultOptions_1 = require("../../common/defaultOptions");
+const Enums_1 = require("../../common/Enums");
+const Logger_1 = require("../../common/Logger");
 const Utils_1 = require("../../common/Utils");
 const MultiOptionsMigrationPlan_1 = require("../../common/VersionedSchema/MultiOptionsMigrationPlan");
 const MultiOptionsVersionedSchemas_1 = require("../../common/VersionedSchema/MultiOptionsVersionedSchemas");
@@ -48,38 +50,52 @@ const isInstanceOfMultiOptions_1 = require("../../core/utils/isInstanceOfMultiOp
  * @param options Options for starting generation.
  */
 async function runGenerateOpenApi(options) {
-    const hasMinimumRequiredOptions = !!options.input && !!options.output;
-    if (hasMinimumRequiredOptions) {
-        const { error: defaultValuesError, value } = defaultOptions_1.defaultOptions.validate(options);
-        if (defaultValuesError) {
-            await OpenAPI.generate(value);
-            return;
+    const logger = new Logger_1.Logger({
+        level: Enums_1.ELogLevel.INFO,
+        instanceId: 'openapi-cli',
+        logOutput: Enums_1.ELogOutput.CONSOLE,
+    });
+    try {
+        const hasMinimumRequiredOptions = !!options.input && !!options.output;
+        if (hasMinimumRequiredOptions) {
+            const { error: defaultValuesError, value } = defaultOptions_1.defaultOptions.validate(options);
+            if (defaultValuesError) {
+                await OpenAPI.generate(value);
+                process.exit(0);
+            }
         }
+        const configData = (0, Utils_1.loadConfigIfExists)();
+        if (!configData) {
+            logger.error('The configuration file is missing');
+        }
+        const preparedOptions = (0, Utils_1.convertArrayToObject)(configData);
+        const isMultiOptions = (0, isInstanceOfMultiOptions_1.isInstanceOfMultioptions)(preparedOptions);
+        const migratedOptions = isMultiOptions
+            ? (0, migrateToLatestVersion_1.migrateToLatestVersion)({
+                rawInput: preparedOptions,
+                migrationPlans: MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan,
+                versionedSchemas: MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema,
+            })
+            : (0, migrateToLatestVersion_1.migrateToLatestVersion)({
+                rawInput: preparedOptions,
+                migrationPlans: OptionsMigrationPlans_1.optionsMigrationPlans,
+                versionedSchemas: OptionsVersionedSchemas_1.optionsVersionedSchemas,
+            });
+        if (!migratedOptions) {
+            logger.error("Couldn't convert the set of options to the current version");
+        }
+        else {
+            const { value } = migratedOptions;
+            if (isMultiOptions) {
+                await OpenAPI.generate(value);
+            }
+            else {
+                await OpenAPI.generate(value);
+            }
+        }
+        process.exit(0);
     }
-    const configData = (0, Utils_1.loadConfigIfExists)();
-    if (!configData) {
-        throw new Error('Error: The configuration file is missing');
-    }
-    const isMultiOptions = (0, isInstanceOfMultiOptions_1.isInstanceOfMultioptions)(configData);
-    const migratedOptions = isMultiOptions
-        ? (0, migrateToLatestVersion_1.migrateToLatestVersion)({
-            rawInput: configData,
-            migrationPlans: MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan,
-            versionedSchemas: MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema,
-        })
-        : (0, migrateToLatestVersion_1.migrateToLatestVersion)({
-            rawInput: configData,
-            migrationPlans: OptionsMigrationPlans_1.optionsMigrationPlans,
-            versionedSchemas: OptionsVersionedSchemas_1.optionsVersionedSchemas,
-        });
-    if (!migratedOptions) {
-        throw new Error('Error: Couldn\'t convert the set of options to the current version');
-    }
-    const { value } = migratedOptions;
-    if (isMultiOptions) {
-        await OpenAPI.generate(value);
-    }
-    else {
-        await OpenAPI.generate(value);
+    catch (error) {
+        logger.error(error.message);
     }
 }

package/dist/cli/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
+const Enums_1 = require("../common/Enums");
+const Enums_2 = require("../core/types/Enums");
 const runGenerateOpenApi_1 = require("./generate/runGenerateOpenApi");
 const APP_NAME = 'ts-openapi-codegen-cli';
 const APP_VERSION = '1.0.0';
@@ -16,7 +18,7 @@ program
     .option('-os, --outputServices <value>', 'Output directory for services')
     .option('-om, --outputModels <value>', 'Output directory for models')
     .option('-osm, --outputSchemas <value>', 'Output directory for schemas')
-    .option('-c, --client <value>', 'HTTP client to generate [fetch, xhr, node]', 'fetch')
+    .addOption(new commander_1.Option('-c, --httpClient <value>', 'HTTP client to generate').choices([...Object.values(Enums_2.HttpClient)]).default(Enums_2.HttpClient.FETCH))
     .option('--useOptions <value>', 'Use options instead of arguments', false)
     .option('--useUnionTypes <value>', 'Use union types instead of enums', false)
     .option('--exportCore <value>', 'Write core files to disk', true)
@@ -29,6 +31,8 @@ program
     .option('--enumPrefix <value>', 'Prefix for enum model(default: "E")')
     .option('--typePrefix <value>', 'Prefix for type model(default: "T")')
     .option('--useCancelableRequest <value>', 'Use cancelled promise as returned data type in request(default: false)', false)
+    .addOption(new commander_1.Option('-l, --logLevel <level>', 'Logging level').choices([...Object.values(Enums_1.ELogLevel)]).default(Enums_1.ELogLevel.ERROR))
+    .addOption(new commander_1.Option('-t, --logTarget <target>', 'Target of logging').choices([...Object.values(Enums_1.ELogOutput)]).default(Enums_1.ELogOutput.CONSOLE))
     .action(async (options) => {
     await (0, runGenerateOpenApi_1.runGenerateOpenApi)(options);
 });

package/dist/cli/utils.d.ts

@@ -16,5 +16,4 @@
  */
 export declare function isNil(value: any): boolean;
 export declare function isValidJson(value: any): boolean;
-export declare function startGenerate(options: any): Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/cli/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/cli/utils.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,GAAG,WAE/B;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,WAOrC;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,GAAG,iBAgBzC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/cli/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,GAAG,WAE/B;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,WAOrC"}

package/dist/cli/utils.js

@@ -1,46 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNil = isNil;
 exports.isValidJson = isValidJson;
-exports.startGenerate = startGenerate;
-const path_1 = __importDefault(require("path"));
-const OpenAPI = __importStar(require("../core"));
 /**
  * Checks if `value` is `null` or `undefined`.
  *
@@ -69,20 +30,3 @@ function isValidJson(value) {
         return false;
     }
 }
-function startGenerate(options) {
-    return OpenAPI.generate(options)
-        .then(() => {
-        console.group(`Generation from has been finished`);
-        const group = Array.isArray(options) ? options : Array.of(options);
-        group.forEach(option => {
-            console.log(`Generation from "${option.input}" was finished`);
-            console.log(`Output folder: ${path_1.default.resolve(process.cwd(), option.output)}`);
-            console.log('==================================');
-        });
-        console.groupEnd();
-    })
-        .catch((error) => {
-        console.log(error);
-        process.exit(1);
-    });
-}

package/dist/common/Enums.d.ts

@@ -0,0 +1,10 @@
+export declare enum ELogLevel {
+    INFO = "info",
+    WARN = "warn",
+    ERROR = "error"
+}
+export declare enum ELogOutput {
+    CONSOLE = "console",
+    FILE = "file"
+}
+//# sourceMappingURL=Enums.d.ts.map

package/dist/common/Enums.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Enums.d.ts","sourceRoot":"","sources":["../../src/common/Enums.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IACjB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;CAClB;AACD,oBAAY,UAAU;IAClB,OAAO,YAAY;IACnB,IAAI,SAAS;CAChB"}

package/dist/common/Enums.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ELogOutput = exports.ELogLevel = void 0;
+var ELogLevel;
+(function (ELogLevel) {
+    ELogLevel["INFO"] = "info";
+    ELogLevel["WARN"] = "warn";
+    ELogLevel["ERROR"] = "error";
+})(ELogLevel || (exports.ELogLevel = ELogLevel = {}));
+var ELogOutput;
+(function (ELogOutput) {
+    ELogOutput["CONSOLE"] = "console";
+    ELogOutput["FILE"] = "file";
+})(ELogOutput || (exports.ELogOutput = ELogOutput = {}));

package/dist/common/Logger.d.ts

@@ -0,0 +1,33 @@
+import { ELogLevel, ELogOutput } from './Enums';
+interface LoggerOptions {
+    /** Instance ID (letters/numbers/hyphens/handwriting only) */
+    instanceId: string;
+    /** The initial logging level */
+    level: ELogLevel;
+    /** Where to write: 'console' or 'file' */
+    logOutput: ELogOutput;
+    /** Folder for logs (only with LogOutput='file') */
+    /** Rotation parameters (only for LogOutput='file') */
+    rotate?: {
+        /** Template for the date in the file name */
+        datePattern?: string;
+        /** The maximum file size, for example '20m' */
+        maxSize?: string;
+        /** Do not store files for longer, for example '14d' */
+        maxFiles?: string;
+    };
+}
+export declare class Logger {
+    private _logger;
+    private _currentLevel;
+    private _instanceId;
+    constructor(options: LoggerOptions);
+    setLevel(level: ELogLevel): void;
+    error(message: string): void;
+    warn(message: string): void;
+    info(message: string, hasSeparator?: boolean): void;
+    forceInfo(message: string): void;
+    shutdownLogger(): void;
+}
+export {};
+//# sourceMappingURL=Logger.d.ts.map

package/dist/common/Logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/common/Logger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEhD,UAAU,aAAa;IACnB,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,KAAK,EAAE,SAAS,CAAC;IACjB,0CAA0C;IAC1C,SAAS,EAAE,UAAU,CAAC;IACtB,mDAAmD;IACnD,sDAAsD;IACtD,MAAM,CAAC,EAAE;QACL,6CAA6C;QAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,+CAA+C;QAC/C,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,uDAAuD;QACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACL;AAED,qBAAa,MAAM;IACf,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,EAAE,aAAa;IA6C3B,QAAQ,CAAC,KAAK,EAAE,SAAS;IAKzB,KAAK,CAAC,OAAO,EAAE,MAAM;IAKrB,IAAI,CAAC,OAAO,EAAE,MAAM;IAIpB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO;IAO5C,SAAS,CAAC,OAAO,EAAE,MAAM;IAOzB,cAAc,IAAI,IAAI;CAahC"}

package/dist/common/Logger.js

@@ -0,0 +1,117 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logger = void 0;
+const path = __importStar(require("path"));
+const winston_1 = require("winston");
+const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
+const Enums_1 = require("./Enums");
+class Logger {
+    _logger;
+    _currentLevel;
+    _instanceId;
+    constructor(options) {
+        const { instanceId, level, logOutput, rotate = { datePattern: 'YYYY-MM-DD', maxSize: '20m', maxFiles: '14d' } } = options;
+        this._currentLevel = level;
+        this._instanceId = instanceId;
+        const chosenTransports = [];
+        if (logOutput === Enums_1.ELogOutput.CONSOLE) {
+            chosenTransports.push(new winston_1.transports.Console({
+                format: winston_1.format.combine(winston_1.format.colorize(), winston_1.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston_1.format.printf(({ level, message, timestamp, label }) => {
+                    return `[${level}] [${label}] ${timestamp}: ${message}`;
+                })),
+            }));
+        }
+        else {
+            const logDir = path.join(process.cwd(), '__logs__');
+            chosenTransports.push(new winston_daily_rotate_file_1.default({
+                filename: path.join(logDir, 'app-%DATE%.log'),
+                datePattern: rotate.datePattern,
+                zippedArchive: true,
+                maxSize: rotate.maxSize,
+                maxFiles: rotate.maxFiles,
+                format: winston_1.format.combine(winston_1.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston_1.format.printf(({ level, message, timestamp, label }) => {
+                    return `[${level}] [${label}] ${timestamp}: ${message}`;
+                })),
+            }));
+        }
+        this._logger = (0, winston_1.createLogger)({
+            level: this._currentLevel,
+            levels: { error: 0, warn: 1, info: 2 },
+            format: winston_1.format.label({ label: this._instanceId }),
+            transports: chosenTransports,
+        });
+    }
+    setLevel(level) {
+        this._currentLevel = level;
+        this._logger.level = level;
+    }
+    error(message) {
+        this._logger.error(`Error: ${message}`);
+        process.exit(1);
+    }
+    warn(message) {
+        this._logger.warn(message);
+    }
+    info(message, hasSeparator) {
+        this._logger.info(message);
+        if (hasSeparator) {
+            this._logger.info('==========================================');
+        }
+    }
+    forceInfo(message) {
+        const originalLevel = this._logger.level;
+        this._logger.level = 'info';
+        this._logger.info(message);
+        this._logger.level = originalLevel;
+    }
+    shutdownLogger() {
+        if (this._logger) {
+            this._logger.close();
+            this._logger.transports.forEach(transport => {
+                if (typeof transport.close === 'function') {
+                    transport.close();
+                }
+                if (typeof transport.end === 'function') {
+                    transport.end();
+                }
+            });
+        }
+    }
+}
+exports.Logger = Logger;

package/dist/common/Options.d.ts

@@ -1,5 +1,5 @@
 import { HttpClient } from "../core/types/Enums";
-export type Options = {
+export type TOptions = {
     input: string | Record<string, any>;
     output: string;
     outputCore?: string;
@@ -21,7 +21,7 @@ export type Options = {
     typePrefix?: string;
     useCancelableRequest?: boolean;
 };
-export type MultiOptions = {
-    items: Options[];
-} & Omit<Options, 'input' | 'output'>;
+export type TMultiOptions = {
+    items: TOptions[];
+} & Omit<TOptions, 'input' | 'output'>;
 //# sourceMappingURL=Options.d.ts.map

package/dist/common/Options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/common/Options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,MAAM,MAAM,OAAO,GAAG;IAClB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/common/Options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,MAAM,MAAM,QAAQ,GAAG;IACnB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC"}

package/dist/common/Utils.d.ts

@@ -1,2 +1,3 @@
-export declare function loadConfigIfExists(): Record<string, any> | null;
+export declare function loadConfigIfExists(): Record<string, any> | Record<string, any>[] | null;
+export declare function convertArrayToObject(optionsArr: Record<string, any> | Record<string, any>[] | null): Record<string, any>;
 //# sourceMappingURL=Utils.d.ts.map

package/dist/common/Utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../src/common/Utils.ts"],"names":[],"mappings":"AAOA,wBAAgB,kBAAkB,+BAYjC"}
+{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../src/common/Utils.ts"],"names":[],"mappings":"AAOA,wBAAgB,kBAAkB,uDAYjC;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA6DxH"}

package/dist/common/Utils.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfigIfExists = loadConfigIfExists;
+exports.convertArrayToObject = convertArrayToObject;
 const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("../cli/utils");
 const pathHelpers_1 = require("../core/utils/pathHelpers");
@@ -20,3 +21,56 @@ function loadConfigIfExists() {
     }
     return configData;
 }
+function convertArrayToObject(optionsArr) {
+    const emptyResult = {
+        items: [],
+        exportCore: undefined,
+        exportServices: undefined,
+        exportModels: undefined,
+        exportSchemas: undefined,
+        request: undefined,
+        useOptions: undefined,
+        useCancelableRequest: undefined,
+    };
+    if (!optionsArr) {
+        return emptyResult;
+    }
+    if (Array.isArray(optionsArr)) {
+        if (optionsArr.length === 0) {
+            return emptyResult;
+        }
+        const items = optionsArr.map(item => ({
+            input: item.input,
+            output: item.output,
+            outputCore: item.outputCore,
+            outputServices: item.outputServices,
+            outputModels: item.outputModels,
+            outputSchemas: item.outputSchemas,
+        }));
+        const firstItem = optionsArr[0];
+        const fieldsToExtract = [
+            'httpClient',
+            'useOptions',
+            'useUnionTypes',
+            'exportCore',
+            'exportServices',
+            'exportModels',
+            'exportSchemas',
+            'clean',
+            'request',
+            'interfacePrefix',
+            'enumPrefix',
+            'typePrefix',
+            'useCancelableRequest',
+        ];
+        const extractedFields = fieldsToExtract.reduce((acc, field) => ({
+            ...acc,
+            [field]: firstItem[field],
+        }), {});
+        return {
+            ...extractedFields,
+            items,
+        };
+    }
+    return optionsArr;
+}

package/dist/common/VersionedSchema/MultiOptionsMigrationPlan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiOptionsMigrationPlan.d.ts","sourceRoot":"","sources":["../../../src/common/VersionedSchema/MultiOptionsMigrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EA2BpG,CAAC"}
+{"version":3,"file":"MultiOptionsMigrationPlan.d.ts","sourceRoot":"","sources":["../../../src/common/VersionedSchema/MultiOptionsMigrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAyBpG,CAAC"}

package/dist/common/VersionedSchema/MultiOptionsMigrationPlan.js

@@ -8,11 +8,9 @@ exports.multiOptionsMigrationPlan = [
     {
         fromVersion: '1.0.0',
         toVersion: '1.0.1',
-        migrate: ({ items, client, output, ...otherProps }) => ({
+        migrate: ({ client, ...otherProps }) => ({
             ...otherProps,
-            output,
             httpClient: client,
-            items: items.map((el) => ({ ...el, output })),
         }),
     },
     {

package/dist/common/VersionedSchema/Utils/getUniqueAllShemasKeys.d.ts

@@ -1,8 +1,8 @@
-import { VersionedSchema } from "../Types";
+import Joi from "joi";
 /**
  * Get all the unique parameter keys of all Joi schemes in the array
  * @param schemas array of joi schemes
  * @returns All the unique parameter keys of all Joi schemes in the array
  */
-export declare function getUniqueAllShemasKeys(schemas: VersionedSchema<Record<string, any>>[]): Set<string>;
+export declare function getUniqueAllShemasKeys(schemas: Joi.Schema[]): Set<string>;
 //# sourceMappingURL=getUniqueAllShemasKeys.d.ts.map

package/dist/common/VersionedSchema/Utils/getUniqueAllShemasKeys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUniqueAllShemasKeys.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueAllShemasKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,eAMrF"}
+{"version":3,"file":"getUniqueAllShemasKeys.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueAllShemasKeys.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAKtB;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,eAQ3D"}

package/dist/common/VersionedSchema/Utils/getUniqueAllShemasKeys.js

@@ -10,6 +10,8 @@ const traverseGeneric_1 = require("./traverseGeneric");
  */
 function getUniqueAllShemasKeys(schemas) {
     const result = new Set();
-    (0, traverseGeneric_1.traverseGeneric)(schemas, [joiHandlers_1.joiSchemaHandler, joiHandlers_1.joiDescHandler], result);
+    for (const schema of schemas) {
+        (0, traverseGeneric_1.traverseGeneric)(schema, [joiHandlers_1.joiSchemaHandler, joiHandlers_1.joiDescHandler], result);
+    }
     return result;
 }

package/dist/common/VersionedSchema/Utils/migrateToLatestVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrateToLatestVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateToLatestVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAMhE,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IACzD,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;CACnF,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAA;AAED,wBAAgB,sBAAsB,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CA+BzI"}
+{"version":3,"file":"migrateToLatestVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateToLatestVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAMhE,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IACzD,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;CACnF,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAA;AAED,wBAAgB,sBAAsB,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAgCzI"}

package/dist/common/VersionedSchema/Utils/migrateToLatestVersion.js

@@ -7,8 +7,9 @@ const guessVersion_1 = require("./guessVersion");
 const validateUnknownKeys_1 = require("./validateUnknownKeys");
 function migrateToLatestVersion({ rawInput, migrationPlans, versionedSchemas }) {
     let currentData = rawInput;
+    const schemas = versionedSchemas.map(el => el.schema);
     const allRawInputKeys = (0, getUniqueObjectKeys_1.getUniqueObjectKeys)(rawInput);
-    const allSchemasKeys = (0, getUniqueAllShemasKeys_1.getUniqueAllShemasKeys)(versionedSchemas);
+    const allSchemasKeys = (0, getUniqueAllShemasKeys_1.getUniqueAllShemasKeys)(schemas);
     (0, validateUnknownKeys_1.validateUnknownKeys)(allRawInputKeys, allSchemasKeys);
     const guessed = (0, guessVersion_1.guessVersion)(rawInput, versionedSchemas);
     for (let idx = guessed.index; idx < versionedSchemas.length - 1; idx++) {

package/dist/common/__tests__/convertArrayToObject.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=convertArrayToObject.test.d.ts.map

package/dist/common/__tests__/convertArrayToObject.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertArrayToObject.test.d.ts","sourceRoot":"","sources":["../../../src/common/__tests__/convertArrayToObject.test.ts"],"names":[],"mappings":""}

package/dist/common/__tests__/convertArrayToObject.test.js

@@ -0,0 +1,227 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const Utils_1 = require("common/Utils");
+(0, node_test_1.describe)('convertArrayToObject', () => {
+    (0, node_test_1.test)('@unit: Empty array', () => {
+        const input = [];
+        const result = (0, Utils_1.convertArrayToObject)(input);
+        const expected = {
+            items: [],
+            exportCore: undefined,
+            exportServices: undefined,
+            exportModels: undefined,
+            exportSchemas: undefined,
+            request: undefined,
+            useOptions: undefined,
+            useCancelableRequest: undefined,
+        };
+        node_assert_1.default.deepStrictEqual(result, expected);
+    });
+    (0, node_test_1.test)('@unit: An array with one element', () => {
+        const input = [
+            {
+                input: 'url1',
+                output: 'res1',
+                exportCore: true,
+                request: 'req1',
+                useOptions: true,
+            },
+        ];
+        const expected = {
+            httpClient: undefined,
+            useOptions: true,
+            useUnionTypes: undefined,
+            exportCore: true,
+            exportServices: undefined,
+            exportModels: undefined,
+            exportSchemas: undefined,
+            clean: undefined,
+            request: 'req1',
+            interfacePrefix: undefined,
+            enumPrefix: undefined,
+            typePrefix: undefined,
+            useCancelableRequest: undefined,
+            items: [
+                {
+                    input: 'url1',
+                    output: 'res1',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+            ],
+        };
+        const result = (0, Utils_1.convertArrayToObject)(input);
+        node_assert_1.default.deepStrictEqual(result, expected);
+    });
+    (0, node_test_1.test)('@unit: Multiple elements with the same outer margins', () => {
+        const input = [
+            { input: 'url1', output: 'res1', exportCore: true, request: 'req1', useOptions: true },
+            { input: 'url2', output: 'res2', exportCore: true, request: 'req1', useOptions: true },
+        ];
+        const expected = {
+            httpClient: undefined,
+            useOptions: true,
+            useUnionTypes: undefined,
+            exportCore: true,
+            exportServices: undefined,
+            exportModels: undefined,
+            exportSchemas: undefined,
+            clean: undefined,
+            request: 'req1',
+            interfacePrefix: undefined,
+            enumPrefix: undefined,
+            typePrefix: undefined,
+            useCancelableRequest: undefined,
+            items: [
+                {
+                    input: 'url1',
+                    output: 'res1',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+                {
+                    input: 'url2',
+                    output: 'res2',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+            ],
+        };
+        const result = (0, Utils_1.convertArrayToObject)(input);
+        node_assert_1.default.deepStrictEqual(result, expected);
+    });
+    (0, node_test_1.test)('@unit: Multiple elements with different external margins', () => {
+        const input = [
+            { input: 'url1', output: 'res1', exportCore: true, request: 'req1', useOptions: true },
+            { input: 'url2', output: 'res2', exportCore: false, request: 'req2', useOptions: false },
+        ];
+        const expected = {
+            httpClient: undefined,
+            useOptions: true,
+            useUnionTypes: undefined,
+            exportCore: true,
+            exportServices: undefined,
+            exportModels: undefined,
+            exportSchemas: undefined,
+            clean: undefined,
+            request: 'req1',
+            interfacePrefix: undefined,
+            enumPrefix: undefined,
+            typePrefix: undefined,
+            useCancelableRequest: undefined,
+            items: [
+                {
+                    input: 'url1',
+                    output: 'res1',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+                {
+                    input: 'url2',
+                    output: 'res2',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+            ],
+        };
+        const result = (0, Utils_1.convertArrayToObject)(input);
+        node_assert_1.default.deepStrictEqual(result, expected);
+    });
+    (0, node_test_1.test)('@unit: No optional fields', () => {
+        const input = [
+            { input: 'url1', output: 'res1' },
+            { input: 'url2', output: 'res2' },
+        ];
+        const expected = {
+            httpClient: undefined,
+            useOptions: undefined,
+            useUnionTypes: undefined,
+            exportCore: undefined,
+            exportServices: undefined,
+            exportModels: undefined,
+            exportSchemas: undefined,
+            clean: undefined,
+            request: undefined,
+            interfacePrefix: undefined,
+            enumPrefix: undefined,
+            typePrefix: undefined,
+            useCancelableRequest: undefined,
+            items: [
+                {
+                    input: 'url1',
+                    output: 'res1',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+                {
+                    input: 'url2',
+                    output: 'res2',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+            ],
+        };
+        const result = (0, Utils_1.convertArrayToObject)(input);
+        node_assert_1.default.deepStrictEqual(result, expected);
+    });
+    (0, node_test_1.test)('@unit: Mixed presence of optional fields', () => {
+        const input = [
+            { input: 'url1', output: 'res1', exportCore: true },
+            { input: 'url2', output: 'res2', request: 'req2' },
+        ];
+        const expected = {
+            httpClient: undefined,
+            useOptions: undefined,
+            useUnionTypes: undefined,
+            exportCore: true,
+            exportServices: undefined,
+            exportModels: undefined,
+            exportSchemas: undefined,
+            clean: undefined,
+            request: undefined,
+            interfacePrefix: undefined,
+            enumPrefix: undefined,
+            typePrefix: undefined,
+            useCancelableRequest: undefined,
+            items: [
+                {
+                    input: 'url1',
+                    output: 'res1',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+                {
+                    input: 'url2',
+                    output: 'res2',
+                    outputCore: undefined,
+                    outputServices: undefined,
+                    outputModels: undefined,
+                    outputSchemas: undefined,
+                },
+            ],
+        };
+        const result = (0, Utils_1.convertArrayToObject)(input);
+        node_assert_1.default.deepStrictEqual(result, expected);
+    });
+});

package/dist/common/__tests__/migrationForMultiOptions.test.js

@@ -11,17 +11,19 @@ const core_1 = require("../../core");
 const Enums_1 = require("../VersionedSchema/Enums");
 const migrateToLatestVersion_1 = require("../VersionedSchema/Utils/migrateToLatestVersion");
 (0, node_test_1.describe)('migrateToLatestVersion for Multioptions', () => {
-    node_test_1.test.skip('@unit: should migrate Multioptions data from 1.0.0 to 2.0.0', () => {
+    (0, node_test_1.test)('@unit: should migrate Multioptions data from 1.0.0 to 2.0.0', () => {
         const dataMultiV1 = {
             input: 'source/path',
             output: 'generated/path',
             client: core_1.HttpClient.AXIOS,
-            items: [{ input: 'item1', output: 'generated/path', }, { input: 'item2', output: 'generated/path', }],
+            items: [{ input: 'source/path' }, { input: 'source/path' }],
         };
         const expectedDataMultiV3 = {
-            input: 'source/path',
             httpClient: core_1.HttpClient.AXIOS,
-            items: [{ input: 'item1' }, { input: 'item2' }],
+            items: [
+                { input: 'source/path', output: 'generated/path', outputCore: undefined, outputServices: undefined, outputModels: undefined, outputSchemas: undefined },
+                { input: 'source/path', output: 'generated/path', outputCore: undefined, outputServices: undefined, outputModels: undefined, outputSchemas: undefined },
+            ],
             useCancelableRequest: false,
         };
         const result = (0, migrateToLatestVersion_1.migrateToLatestVersion)({
@@ -31,7 +33,7 @@ const migrateToLatestVersion_1 = require("../VersionedSchema/Utils/migrateToLate
         });
         node_assert_1.default.deepEqual(result, { value: expectedDataMultiV3, schemaVersion: '2.0.0', schemaType: Enums_1.EVersionedSchemaType.MULTI_OPTIONS }, 'Should migrate Multioptions V1 data to V3 correctly');
     });
-    node_test_1.test.skip('@unit: should migrate Multioptions data from 1.0.1 to 2.0.0', () => {
+    (0, node_test_1.test)('@unit: should migrate Multioptions data from 1.0.1 to 2.0.0', () => {
         const dataMultiV2 = {
             input: 'source/path',
             output: 'generated/path',
@@ -40,30 +42,34 @@ const migrateToLatestVersion_1 = require("../VersionedSchema/Utils/migrateToLate
         };
         const expectedDataMultiV3 = {
             httpClient: core_1.HttpClient.FETCH,
-            items: [{ input: 'item1', output: 'generated/path', }, { input: 'item2', output: 'generated/path' }],
+            items: [
+                { input: 'source/path', output: 'generated/path', outputCore: undefined, outputServices: undefined, outputModels: undefined, outputSchemas: undefined },
+                { input: 'source/path', output: 'generated/path', outputCore: undefined, outputServices: undefined, outputModels: undefined, outputSchemas: undefined },
+            ],
         };
         const result = (0, migrateToLatestVersion_1.migrateToLatestVersion)({
             rawInput: dataMultiV2,
             versionedSchemas: MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema,
             migrationPlans: MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan,
         });
-        node_assert_1.default.deepEqual(result, { value: expectedDataMultiV3, schemaVersion: '2.0.0', schemaType: Enums_1.EVersionedSchemaType.MULTI_OPTIONS }, 'Should migrate Multioptions V2 data to V3 correctly');
+        node_assert_1.default.deepEqual(result, { value: expectedDataMultiV3, schemaVersion: '2.0.0', schemaType: Enums_1.EVersionedSchemaType.MULTI_OPTIONS }, 'Should migrate Multioptions 1.0.1 data to 2.0.0 correctly');
     });
-    node_test_1.test.skip('@unit: should return null for invalid Multioptions data after migration', () => {
+    (0, node_test_1.test)('@unit: should throw error if not conform any known version schema', () => {
         const dataMultiV1 = {
             input: 'source/path',
             output: 'generated/path',
-            client: 'invalid-client', // Некорректное значение
+            client: 'invalid-client',
             items: [{ input: 'item1' }, { input: 'item2' }],
         };
-        const result = (0, migrateToLatestVersion_1.migrateToLatestVersion)({
-            rawInput: dataMultiV1,
-            versionedSchemas: MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema,
-            migrationPlans: MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan,
-        });
-        node_assert_1.default.equal(result, null, 'Should return null for invalid Multioptions data');
+        node_assert_1.default.throws(() => {
+            (0, migrateToLatestVersion_1.migrateToLatestVersion)({
+                rawInput: dataMultiV1,
+                versionedSchemas: MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema,
+                migrationPlans: MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan,
+            });
+        }, /Data does not conform to any known version schema/, 'Should throw error if not conform any known version schema');
     });
-    node_test_1.test.skip('@unit: should throw error if no migration plan exists for Multioptions', () => {
+    (0, node_test_1.test)('@unit: should throw error if no migration plan exists for Multioptions', () => {
         const dataMultiV1 = {
             input: 'source/path',
             output: 'generated/path',

package/dist/common/__tests__/migrationForOptions.test.js

@@ -40,14 +40,15 @@ const migrateToLatestVersion_1 = require("../VersionedSchema/Utils/migrateToLate
         });
         node_assert_1.default.deepEqual(result, { value: expectedDataV3, schemaVersion: '2.0.0', schemaType: Enums_1.EVersionedSchemaType.OPTIONS }, 'Should migrate 1.0.1 data to 2.0.0 correctly');
     });
-    node_test_1.test.skip('@unit: should return null for invalid data after migration', () => {
+    (0, node_test_1.test)('@unit: should throw error if not conform any known version schema', () => {
         const dataV1 = { input: 'source/path', output: 'generated/path', client: 'invalid-client' };
-        const result = (0, migrateToLatestVersion_1.migrateToLatestVersion)({
-            rawInput: dataV1,
-            versionedSchemas: OptionsVersionedSchemas_1.optionsVersionedSchemas,
-            migrationPlans: OptionsMigrationPlans_1.optionsMigrationPlans,
-        });
-        node_assert_1.default.equal(result, null, 'Should return null for invalid data');
+        node_assert_1.default.throws(() => {
+            (0, migrateToLatestVersion_1.migrateToLatestVersion)({
+                rawInput: dataV1,
+                versionedSchemas: OptionsVersionedSchemas_1.optionsVersionedSchemas,
+                migrationPlans: OptionsMigrationPlans_1.optionsMigrationPlans,
+            });
+        }, /Data does not conform to any known version schema/, 'Should throw error if not conform any known version schema');
     });
     (0, node_test_1.test)('@unit: should throw error if no migration plan exists', () => {
         const dataV1 = { input: 'source/path', output: 'generated/path', client: core_1.HttpClient.AXIOS };

package/dist/common/defaultOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultOptions.d.ts","sourceRoot":"","sources":["../../src/common/defaultOptions.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAGtB,eAAO,MAAM,cAAc,uBAA8B,CAAC"}
+{"version":3,"file":"defaultOptions.d.ts","sourceRoot":"","sources":["../../src/common/defaultOptions.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAItB,eAAO,MAAM,cAAc,uBA0BV,CAAC"}

package/dist/common/defaultOptions.js

@@ -5,5 +5,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultOptions = void 0;
 const joi_1 = __importDefault(require("joi"));
-// Заполнить
-exports.defaultOptions = joi_1.default.object().unknown(false);
+const Enums_1 = require("../core/types/Enums");
+exports.defaultOptions = joi_1.default.object({
+    input: joi_1.default.string().required(),
+    output: joi_1.default.string().required(),
+    httpClient: joi_1.default.string().valid(...Object.values(Enums_1.HttpClient)),
+    outputCore: joi_1.default.string().optional(),
+    outputServices: joi_1.default.string().optional(),
+    outputModels: joi_1.default.string().optional(),
+    outputSchemas: joi_1.default.string().optional(),
+    useOptions: joi_1.default.boolean().optional(),
+    useUnionTypes: joi_1.default.boolean().optional(),
+    exportCore: joi_1.default.boolean().optional(),
+    exportServices: joi_1.default.boolean().optional(),
+    exportModels: joi_1.default.boolean().optional(),
+    exportSchemas: joi_1.default.boolean().optional(),
+    clean: joi_1.default.boolean().optional(),
+    request: joi_1.default.string().optional(),
+    interfacePrefix: joi_1.default.string().optional(),
+    enumPrefix: joi_1.default.string().optional(),
+    typePrefix: joi_1.default.string().optional(),
+    useCancelableRequest: joi_1.default.boolean().optional(),
+}).unknown(false);

package/dist/core/index.d.ts

@@ -1,4 +1,4 @@
-import { MultiOptions, Options } from '../common/Options';
+import { TMultiOptions, TOptions } from '../common/Options';
 export { HttpClient } from './types/Enums';
-export declare function generate(options: Options | Options[] | MultiOptions): Promise<void>;
+export declare function generate(options: TOptions | TOptions[] | TMultiOptions): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAmB1D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAmH3C,wBAAsB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCzF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAmB5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAsH3C,wBAAsB,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAmD5F"}

package/dist/core/index.js

@@ -1,7 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 exports.generate = generate;
+/* istanbul ignore file */
+const path_1 = __importDefault(require("path"));
 const Parser_1 = require("./api/v2/Parser");
 const Parser_2 = require("./api/v3/Parser");
 const Context_1 = require("./Context");
@@ -59,12 +64,14 @@ async function generateFrom({ input, output, outputCore, outputServices, outputM
         useUnionTypes,
         useOptions,
     });
+    writeClient.logger.info('Defining the version of the openapi specification (2 or 3)');
     switch (openApiVersion) {
         case getOpenApiVersion_1.OpenApiVersion.V2: {
             const client = new Parser_1.Parser(context).parse(openApi);
             const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
             if (!write)
                 break;
+            writeClient.logger.info('Write our OpenAPI client version 2 to disk.');
             await writeClient.writeClient({
                 client: clientFinal,
                 templates,
@@ -87,6 +94,7 @@ async function generateFrom({ input, output, outputCore, outputServices, outputM
             const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
             if (!write)
                 break;
+            writeClient.logger.info('Write our OpenAPI client version 3 to disk.');
             await writeClient.writeClient({
                 client: clientFinal,
                 templates,
@@ -118,27 +126,41 @@ async function generate(options) {
     else {
         preparedOptions = Array.of(options);
     }
-    const optionsFinal = preparedOptions.map((op) => (0, prepareOptions_1.prepareOptions)(op));
-    for (const option of optionsFinal) {
-        if (option.output) {
-            await fileSystem_1.fileSystem.rmdir(option.output);
-        }
-        if (option.outputCore) {
-            await fileSystem_1.fileSystem.rmdir(option.outputCore);
-        }
-        if (option.outputSchemas) {
-            await fileSystem_1.fileSystem.rmdir(option.outputSchemas);
-        }
-        if (option.outputModels) {
-            await fileSystem_1.fileSystem.rmdir(option.outputModels);
+    const optionsFinal = preparedOptions.map(op => (0, prepareOptions_1.prepareOptions)(op));
+    const writeClient = new writeClient_1.WriteClient();
+    writeClient.logger.forceInfo(`Generation has begun. Total number of specification files: ${optionsFinal.length}`);
+    try {
+        const start = process.hrtime();
+        for (const option of optionsFinal) {
+            if (option.output) {
+                await fileSystem_1.fileSystem.rmdir(option.output);
+            }
+            if (option.outputCore) {
+                await fileSystem_1.fileSystem.rmdir(option.outputCore);
+            }
+            if (option.outputSchemas) {
+                await fileSystem_1.fileSystem.rmdir(option.outputSchemas);
+            }
+            if (option.outputModels) {
+                await fileSystem_1.fileSystem.rmdir(option.outputModels);
+            }
+            if (option.outputServices) {
+                await fileSystem_1.fileSystem.rmdir(option.outputServices);
+            }
         }
-        if (option.outputServices) {
-            await fileSystem_1.fileSystem.rmdir(option.outputServices);
+        for (const option of optionsFinal) {
+            await generateFrom(option, writeClient);
+            writeClient.logger.info(`Generation from "${option.input}" was finished`);
+            writeClient.logger.info(`Output folder: ${path_1.default.resolve(process.cwd(), option.output)}`, true);
         }
+        await writeClient.combineAndWrite();
+        writeClient.logger.forceInfo("Generation from has been finished");
+        const [seconds, nanoseconds] = process.hrtime(start);
+        const durationInMs = seconds + nanoseconds / 1e6;
+        writeClient.logger.forceInfo(`Lead time: ${durationInMs.toFixed(2)} sec`);
     }
-    const writeClient = new writeClient_1.WriteClient();
-    for (const option of optionsFinal) {
-        await generateFrom(option, writeClient);
+    catch (error) {
+        writeClient.logger.error(error.message);
     }
-    await writeClient.combineAndWrite();
+    writeClient.logger.shutdownLogger();
 }

package/dist/core/utils/precompileTemplates.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const handlebars_1 = __importDefault(require("handlebars"));
 const path_1 = __importDefault(require("path"));
+const Enums_1 = require("../../common/Enums");
+const Logger_1 = require("../../common/Logger");
 const templatesDir = path_1.default.resolve(__dirname, '../../templates');
 const compiledDir = path_1.default.resolve(__dirname, '../../templatesCompiled');
 const header = `// This is an automatically generated file for the hbs template.
@@ -19,6 +21,11 @@ export default `;
  * Фунукция для пре-компеляции шаблонов (hbs) перед дальнейшим использованием
  */
 const precompileTemplates = () => {
+    const logger = new Logger_1.Logger({
+        instanceId: 'templates',
+        level: Enums_1.ELogLevel.INFO,
+        logOutput: Enums_1.ELogOutput.CONSOLE,
+    });
     try {
         if (!fs_1.default.existsSync(compiledDir)) {
             fs_1.default.mkdirSync(compiledDir, { recursive: true });
@@ -64,10 +71,10 @@ const precompileTemplates = () => {
             });
         };
         walk(templatesDir);
-        console.log('The templates have been successfully precompiled and saved!');
+        logger.info('The templates have been successfully precompiled and saved!');
     }
     catch (error) {
-        console.error('Error during pre-compilation of templates: ', error);
+        logger.error(`Error during pre-compilation of templates: ${error.message}`);
     }
 };
 precompileTemplates();

package/dist/core/utils/prepareOptions.d.ts

@@ -1,8 +1,8 @@
-import { Options } from "../../common/Options";
+import { TOptions } from "../../common/Options";
 /**
  * Preparation the configuration
  * @param options
  * @returns
  */
-export declare function prepareOptions(options: Options): Options;
+export declare function prepareOptions(options: TOptions): TOptions;
 //# sourceMappingURL=prepareOptions.d.ts.map

package/dist/core/utils/prepareOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepareOptions.d.ts","sourceRoot":"","sources":["../../../src/core/utils/prepareOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAI9C;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAsBxD"}
+{"version":3,"file":"prepareOptions.d.ts","sourceRoot":"","sources":["../../../src/core/utils/prepareOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAI/C;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAsB1D"}

package/dist/core/utils/writeClient.d.ts

@@ -1,3 +1,4 @@
+import { Logger } from '../../common/Logger';
 import { HttpClient } from '../types/Enums';
 import { IOutput } from '../types/Models';
 import type { Client } from '../types/shared/Client.model';
@@ -57,6 +58,8 @@ export interface IWriteClientIndex {
  */
 export declare class WriteClient {
     private options;
+    private _logger;
+    constructor();
     /**
      * Write our OpenAPI client, using the given templates at the given output
      * @param client Client object with all the models, services, etc.
@@ -80,6 +83,7 @@ export declare class WriteClient {
      */
     writeClientIndex(options: IWriteClientIndex): Promise<void>;
     combineAndWrite(): Promise<void>;
+    get logger(): Logger;
 }
 export {};
 //# sourceMappingURL=writeClient.d.ts.map

package/dist/core/utils/writeClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeClient.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAoCzD;;;;;;;;;;;;;;GAcG;AACH,UAAU,YAAY;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,OAAO,CAA+C;IAE9D;;;;;;;;;;;;;;;OAeG;IACG,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA+DvD;;;OAGG;IACG,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3D,eAAe;CAsFxB"}
+{"version":3,"file":"writeClient.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAoCzD;;;;;;;;;;;;;;GAcG;AACH,UAAU,YAAY;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,OAAO,CAA+C;IAC9D,OAAO,CAAC,OAAO,CAAS;;IAUxB;;;;;;;;;;;;;;;OAeG;IACG,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA+DvD;;;OAGG;IACG,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3D,eAAe;IAuFrB,IAAW,MAAM,WAEhB;CACJ"}

package/dist/core/utils/writeClient.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WriteClient = void 0;
+const Enums_1 = require("../../common/Enums");
+const Logger_1 = require("../../common/Logger");
 const pathHelpers_1 = require("../utils/pathHelpers");
 const fileSystem_1 = require("./fileSystem");
 const unique_1 = require("./unique");
@@ -40,6 +42,14 @@ function prepareAlias(models) {
  */
 class WriteClient {
     options = new Map();
+    _logger;
+    constructor() {
+        this._logger = new Logger_1.Logger({
+            level: Enums_1.ELogLevel.ERROR,
+            instanceId: 'client',
+            logOutput: Enums_1.ELogOutput.CONSOLE,
+        });
+    }
     /**
      * Write our OpenAPI client, using the given templates at the given output
      * @param client Client object with all the models, services, etc.
@@ -210,5 +220,8 @@ class WriteClient {
             await (0, writeClientIndex_1.writeClientIndex)(value);
         }
     }
+    get logger() {
+        return this._logger;
+    }
 }
 exports.WriteClient = WriteClient;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-openapi-codegen",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "description": "Library that generates Typescript clients based on the OpenAPI specification. It bases on openapi-typescript-codegen",
     "author": "Alexey Zverev",
     "homepage": "https://github.com/ozonophore/openapi-codegen.git",
@@ -68,7 +68,9 @@
         "json-schema-ref-parser": "9.0.7",
         "leven": "^4.0.0",
         "mkdirp": "1.0.4",
-        "rimraf": "3.0.2"
+        "rimraf": "3.0.2",
+        "winston": "^3.17.0",
+        "winston-daily-rotate-file": "^5.0.0"
     },
     "devDependencies": {
         "@babel/cli": "7.14.8",
@@ -86,6 +88,7 @@
         "@types/node-fetch": "2.5.12",
         "@types/prettier": "3.0.0",
         "@types/qs": "6.9.7",
+        "@types/winston": "^2.4.4",
         "@typescript-eslint/eslint-plugin": "^8.34.1",
         "@typescript-eslint/parser": "^8.34.1",
         "abort-controller": "^3.0.0",