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

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,12 +35,14 @@ 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");
 const OptionsMigrationPlans_1 = require("../../common/VersionedSchema/OptionsMigrationPlans");
 const OptionsVersionedSchemas_1 = require("../../common/VersionedSchema/OptionsVersionedSchemas");
-const migrateToLatestVersion_1 = require("../../common/VersionedSchema/Utils/migrateToLatestVersion");
+const migrateDataToLatestSchemaVersion_1 = require("../../common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion");
 const OpenAPI = __importStar(require("../../core"));
 const isInstanceOfMultiOptions_1 = require("../../core/utils/isInstanceOfMultiOptions");
 /**
@@ -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, migrateDataToLatestSchemaVersion_1.migrateDataToLatestSchemaVersion)({
+                rawInput: preparedOptions,
+                migrationPlans: MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan,
+                versionedSchemas: MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema,
+            })
+            : (0, migrateDataToLatestSchemaVersion_1.migrateDataToLatestSchemaVersion)({
+                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/Types.d.ts

@@ -14,5 +14,5 @@ export type GuessVersion = {
     version: string;
     index: number;
 };
-export type TraverseHandler = (value: any, recurse: (v: any) => void, result: Set<string>) => boolean;
+export type TraverseHandler<T> = (value: any, recurse: (v: any) => void, result: T) => boolean;
 //# sourceMappingURL=Types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../../src/common/VersionedSchema/Types.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,IAAI,EAAE,EAAE,IAAI;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,EAAE,CAAC;CAChC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,CAC5B,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,EACzB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAChB,OAAO,CAAC"}
+{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../../src/common/VersionedSchema/Types.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,IAAI,EAAE,EAAE,IAAI;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,EAAE,CAAC;CAChC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB,CAAA;AAGD,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,OAAO,CAAC"}

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

@@ -0,0 +1,9 @@
+import { VersionedSchema } from '../Types';
+type VersionMatchResult = {
+    lastVersionIndex: number;
+    latestVersion: string;
+    firstVersion: string;
+};
+export declare function determineBestMatchingSchemaVersion(inputData: Record<string, any>, versionedSchemas: VersionedSchema<Record<string, any>>[]): VersionMatchResult;
+export {};
+//# sourceMappingURL=determineBestMatchingSchemaVersion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"determineBestMatchingSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/determineBestMatchingSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAK3C,KAAK,kBAAkB,GAAG;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAGF,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,kBAAkB,CA4C/J"}

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

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.determineBestMatchingSchemaVersion = determineBestMatchingSchemaVersion;
+const getErrorFieldsFromValidation_1 = require("./getErrorFieldsFromValidation");
+const getUniqueKeysFromSchemas_1 = require("./getUniqueKeysFromSchemas");
+const getUniqueObjectKeys_1 = require("./getUniqueObjectKeys");
+// Determining the most appropriate schema version
+function determineBestMatchingSchemaVersion(inputData, versionedSchemas) {
+    if (!versionedSchemas.length) {
+        throw new Error('The list of schemes cannot be empty');
+    }
+    const inputKeys = (0, getUniqueObjectKeys_1.getUniqueObjectKeys)(inputData);
+    const matchingSchemas = versionedSchemas
+        .map(({ schema, version }, idx) => {
+        const { error } = schema.validate(inputData, { allowUnknown: true });
+        const errorFields = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error).filter(err => err.type !== 'any.only');
+        return errorFields.length === 0 ? { version, index: idx } : null;
+    })
+        .filter((match) => match !== null);
+    if (matchingSchemas.length > 0) {
+        const latestMatch = matchingSchemas.reduce((prev, curr) => (curr.index > prev.index ? curr : prev));
+        return {
+            lastVersionIndex: latestMatch.index,
+            latestVersion: latestMatch.version,
+            firstVersion: matchingSchemas[0].version,
+        };
+    }
+    const schemaMatches = versionedSchemas.map(({ schema, version }, idx) => {
+        const schemaKeys = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)([schema]);
+        const { error } = schema.validate(inputData, { allowUnknown: true });
+        const errorFields = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error).filter(err => err.type !== 'any.only');
+        const matchingKeys = inputKeys.filter(key => schemaKeys.has(key));
+        return { index: idx, version, errorFields, matchingKeys };
+    });
+    const bestMatch = schemaMatches.reduce((best, current) => {
+        const isBetterMatch = current.matchingKeys.length >= best.matchingKeys.length && current.errorFields.length <= best.errorFields.length;
+        return isBetterMatch ? current : best;
+    }, schemaMatches[0]);
+    return {
+        lastVersionIndex: bestMatch.index,
+        latestVersion: bestMatch.version,
+        firstVersion: bestMatch.version,
+    };
+}

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

@@ -0,0 +1,2 @@
+export declare function generateKeyMappingForInvalidKeys(rawInputKeys: string[], allowedKeys: Set<string>): Map<string, string>;
+//# sourceMappingURL=generateKeyMappingForInvalidKeys.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generateKeyMappingForInvalidKeys.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/generateKeyMappingForInvalidKeys.ts"],"names":[],"mappings":"AAGA,wBAAgB,gCAAgC,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBtH"}

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

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateKeyMappingForInvalidKeys = generateKeyMappingForInvalidKeys;
+const leven_1 = __importDefault(require("leven"));
+// Generating a key replacement card
+function generateKeyMappingForInvalidKeys(rawInputKeys, allowedKeys) {
+    const result = new Map();
+    for (const key of rawInputKeys) {
+        if (!allowedKeys.has(key)) {
+            let bestMatch = null;
+            let bestDistance = Infinity;
+            for (const candidate of allowedKeys) {
+                const d = (0, leven_1.default)(key, candidate);
+                if (d < bestDistance && d <= 3) {
+                    bestDistance = d;
+                    bestMatch = candidate;
+                }
+            }
+            if (bestMatch)
+                result.set(key, bestMatch);
+        }
+    }
+    return result;
+}

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

@@ -0,0 +1,6 @@
+import Joi from 'joi';
+export declare function getErrorFieldsFromValidation(error: Joi.ValidationError | undefined): {
+    path: string;
+    type: string;
+}[];
+//# sourceMappingURL=getErrorFieldsFromValidation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getErrorFieldsFromValidation.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getErrorFieldsFromValidation.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAGtB,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,GAAG,SAAS;;;IAElF"}