ts-openapi-codegen 1.0.0-beta.5 → 1.0.0-beta.6

package/dist/cli/chekOpenApiConfig/chekOpenApiConfig.d.ts

@@ -0,0 +1,5 @@
+/**
+ * The function checks whether the configuration file data is filled in correctly
+ */
+export declare function chekOpenApiConfig(): void;
+//# sourceMappingURL=chekOpenApiConfig.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"chekOpenApiConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/chekOpenApiConfig/chekOpenApiConfig.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,wBAAgB,iBAAiB,SA4BhC"}

package/dist/cli/chekOpenApiConfig/chekOpenApiConfig.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.chekOpenApiConfig = chekOpenApiConfig;
+const Enums_1 = require("../../common/Enums");
+const Logger_1 = require("../../common/Logger");
+const Utils_1 = require("../../common/Utils");
+const MultiOptionsVersionedSchemas_1 = require("../../common/VersionedSchema/MultiOptionsVersionedSchemas");
+const OptionsVersionedSchemas_1 = require("../../common/VersionedSchema/OptionsVersionedSchemas");
+const getErrorFieldsFromValidation_1 = require("../../common/VersionedSchema/Utils/getErrorFieldsFromValidation");
+const isInstanceOfMultiOptions_1 = require("../../core/utils/isInstanceOfMultiOptions");
+/**
+ * The function checks whether the configuration file data is filled in correctly
+ */
+function chekOpenApiConfig() {
+    const logger = new Logger_1.Logger({
+        level: Enums_1.ELogLevel.INFO,
+        instanceId: 'check-openapi-config',
+        logOutput: Enums_1.ELogOutput.CONSOLE,
+    });
+    try {
+        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 currentMigrationPlan = isMultiOptions ? MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema : OptionsVersionedSchemas_1.optionsVersionedSchemas;
+        const currentSchema = currentMigrationPlan
+            .map((sch, idx) => ({ ...sch, index: idx + 1 }))
+            .reduce((prev, curr) => (curr.index > prev.index ? curr : prev));
+        const { error } = currentSchema.schema.validate(preparedOptions);
+        if (error) {
+            const details = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error).map((e) => `${e.path}: ${e.type}`).join(',');
+            logger.error(`The configuration file data is specified incorrectly: ${details}`);
+        }
+    }
+    catch (error) {
+        logger.error(error.message);
+    }
+}

package/dist/cli/index.js

@@ -1,17 +1,30 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const Enums_1 = require("../common/Enums");
+const Logger_1 = require("../common/Logger");
+const UpdateNotifier_1 = require("../common/UpdateNotifier");
 const Enums_2 = require("../core/types/Enums");
+const chekOpenApiConfig_1 = require("./chekOpenApiConfig/chekOpenApiConfig");
 const runGenerateOpenApi_1 = require("./generate/runGenerateOpenApi");
-const APP_NAME = 'ts-openapi-codegen-cli';
-const APP_VERSION = '1.0.0';
+const utils_1 = require("./utils");
+const packageDetails = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '../../package.json'), 'utf-8'));
+const APP_NAME = packageDetails.name || 'ts-openapi-codegen-cli';
+const APP_VERSION = packageDetails.version || '1.0.0';
+const APP_DESCRIPTION = packageDetails.description || 'Description';
+const updateNotifier = new UpdateNotifier_1.UpdateNotifier(APP_NAME, APP_VERSION);
 const program = new commander_1.Command();
-program.version(APP_VERSION).name(APP_NAME).description('Description').addHelpText('before', 'Additional text');
+program.version(APP_VERSION).name(APP_NAME).description(APP_DESCRIPTION).addHelpText('before', (0, utils_1.getCLIName)(APP_NAME));
 program
     .command('generate')
+    .description('Starts code generation based on the provided opeanpi specifications')
+    .addHelpText('before', (0, utils_1.getCLIName)(APP_NAME))
     .usage('[options]')
-    .version(APP_VERSION)
     .option('-i, --input <value>', 'OpenAPI specification, can be a path, url or string content (required)', '')
     .option('-o, --output <value>', 'Output directory (required)', '')
     .option('-oc, --outputCore <value>', 'Output directory for core files')
@@ -34,7 +47,35 @@ program
     .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))
     .option('-s, --sortByRequired', 'Property sorting strategy: simplified or extended')
+    .hook('preAction', () => {
+    updateNotifier.checkAndNotify();
+})
     .action(async (options) => {
     await (0, runGenerateOpenApi_1.runGenerateOpenApi)(options);
 });
-program.parse(process.argv);
+program
+    .command('check-openapi-config')
+    .description('Starts checking whether the configuration file data is filled in correctly.')
+    .addHelpText('before', (0, utils_1.getCLIName)(APP_NAME))
+    .hook('preAction', () => {
+    updateNotifier.checkAndNotify();
+})
+    .action(() => {
+    (0, chekOpenApiConfig_1.chekOpenApiConfig)();
+});
+try {
+    program.parse(process.argv);
+}
+catch (error) {
+    if (error.code === 'commander.unknownOption') {
+        const errorMessage = error?.message ?? '';
+        if (errorMessage) {
+            const logger = new Logger_1.Logger({
+                level: Enums_1.ELogLevel.INFO,
+                instanceId: 'check-openapi-config',
+                logOutput: Enums_1.ELogOutput.CONSOLE,
+            });
+            logger.error(errorMessage);
+        }
+    }
+}

package/dist/cli/utils.d.ts

@@ -16,4 +16,9 @@
  */
 export declare function isNil(value: any): boolean;
 export declare function isValidJson(value: any): boolean;
+/**
+ * Returns the stylized package name to display in the terminal
+ * @param appName Package name
+ */
+export declare function getCLIName(appName: string): string;
 //# 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":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,GAAG,WAE/B;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,WAOrC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/cli/utils.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,GAAG,WAE/B;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,WAOrC;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,UAazC"}

package/dist/cli/utils.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.isNil = isNil;
 exports.isValidJson = isValidJson;
+exports.getCLIName = getCLIName;
+const figlet_1 = __importDefault(require("figlet"));
 /**
  * Checks if `value` is `null` or `undefined`.
  *
@@ -30,3 +35,20 @@ function isValidJson(value) {
         return false;
     }
 }
+/**
+ * Returns the stylized package name to display in the terminal
+ * @param appName Package name
+ */
+function getCLIName(appName) {
+    const name = figlet_1.default.textSync(appName, {
+        horizontalLayout: 'default',
+        verticalLayout: 'default',
+        width: 75,
+        whitespaceBreak: true,
+    });
+    return `
+    
+    ${name}
+    
+    `;
+}

package/dist/common/UpdateNotifier.d.ts

@@ -0,0 +1,24 @@
+/**
+ * A class for tracking the release of a newer version of the generator
+ */
+export declare class UpdateNotifier {
+    private _packageName;
+    private _packageVersion;
+    private _configStore;
+    private _packageStoreInfo;
+    private _logger;
+    constructor(packageName: string, packageVersion: string);
+    /**
+     * Requests the latest version of the generator via npm
+     */
+    private fetchNpmPackageInfo;
+    /**
+     * Checks for updates and writes useful information to the cache
+     */
+    private checkUpdate;
+    /**
+     * Checks for updates and notifies about the possibility to install a new version.
+     */
+    checkAndNotify(): void;
+}
+//# sourceMappingURL=UpdateNotifier.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"UpdateNotifier.d.ts","sourceRoot":"","sources":["../../src/common/UpdateNotifier.ts"],"names":[],"mappings":"AAqBA;;GAEG;AACH,qBAAa,cAAc;IACvB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,iBAAiB,CAAkC;IAC3D,OAAO,CAAC,OAAO,CAAS;gBAEZ,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IA0BvD;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAkB3B;;OAEG;IACH,OAAO,CAAC,WAAW;IAwBnB;;OAEG;IACH,cAAc;CAmCjB"}

package/dist/common/UpdateNotifier.js

@@ -0,0 +1,120 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateNotifier = void 0;
+const boxen_1 = __importDefault(require("boxen"));
+const chalk_1 = __importDefault(require("chalk"));
+const child_process_1 = require("child_process");
+const configstore_1 = __importDefault(require("configstore"));
+const semver_1 = __importDefault(require("semver"));
+const Enums_1 = require("./Enums");
+const Logger_1 = require("./Logger");
+// one week
+const UPDATE_CHECK_INTERVAL = 1000 * 60 * 60 * 24 * 7;
+const INCLUDED_RELEASE_TYPES = ['major', 'minor'];
+/**
+ * A class for tracking the release of a newer version of the generator
+ */
+class UpdateNotifier {
+    _packageName;
+    _packageVersion;
+    _configStore = null;
+    _packageStoreInfo = null;
+    _logger;
+    constructor(packageName, packageVersion) {
+        this._logger = new Logger_1.Logger({
+            instanceId: '',
+            level: Enums_1.ELogLevel.INFO,
+            logOutput: Enums_1.ELogOutput.CONSOLE,
+        });
+        if (!packageName || !packageVersion) {
+            this._logger.warn(`
+                The necessary parameters for checking the version are not specified.
+                Current values packageName: ${packageName}, packageVersion: ${packageVersion}
+            `);
+        }
+        this._packageName = packageName;
+        this._packageVersion = packageVersion;
+        try {
+            this._configStore = new configstore_1.default(`-${this._packageName}`, {
+                lastUpdateCheck: Date.now(),
+            });
+        }
+        catch {
+            this._logger.warn('The settings store has not been created. The package update will be checked more often than once every 1 week!');
+        }
+    }
+    /**
+     * Requests the latest version of the generator via npm
+     */
+    fetchNpmPackageInfo() {
+        try {
+            const latestVersion = (0, child_process_1.execSync)(`npm view ${this._packageName} version`).toString().trim();
+            const releaseType = semver_1.default.diff(this._packageVersion, latestVersion);
+            return {
+                currentVersion: this._packageVersion,
+                differenceType: releaseType,
+                latestVersion,
+                packageName: this._packageName,
+            };
+        }
+        catch {
+            this._logger.warn("Couldn't get information about the latest current version");
+            return null;
+        }
+    }
+    /**
+     * Checks for updates and writes useful information to the cache
+     */
+    checkUpdate() {
+        if (!this._configStore) {
+            return;
+        }
+        this._packageStoreInfo = this._configStore.get('package_store_info');
+        if (this._packageStoreInfo) {
+            this._packageStoreInfo.currentVersion = this._packageVersion;
+            // clean cache
+            this._configStore.delete('package_store_info');
+        }
+        if (Date.now() - this._configStore.get('lastUpdateCheck') < UPDATE_CHECK_INTERVAL) {
+            return;
+        }
+        const fetchInfo = this.fetchNpmPackageInfo();
+        this._configStore.set('lastUpdateCheck', Date.now());
+        if (fetchInfo?.differenceType && INCLUDED_RELEASE_TYPES.includes(fetchInfo.differenceType)) {
+            this._configStore.set('package_store_info', fetchInfo);
+        }
+    }
+    /**
+     * Checks for updates and notifies about the possibility to install a new version.
+     */
+    checkAndNotify() {
+        if (!this._configStore) {
+            this._logger.warn("Couldn't get information about the latest current version");
+            this._logger.shutdownLogger();
+            return;
+        }
+        this.checkUpdate();
+        if (!this._packageStoreInfo || !semver_1.default.gt(this._packageStoreInfo.latestVersion, this._packageStoreInfo.currentVersion)) {
+            return;
+        }
+        const { packageName, currentVersion, latestVersion } = this._packageStoreInfo;
+        const scriptText = chalk_1.default.yellowBright(`npm i -D ${packageName}@${latestVersion}`);
+        const message = `
+        An update is available: ${chalk_1.default.gray(currentVersion)} -> ${chalk_1.default.greenBright(latestVersion)}}
+        Run ${scriptText} to update
+        `;
+        console.log((0, boxen_1.default)(message, {
+            borderColor: 'cyanBright',
+            margin: 1,
+            padding: 1,
+            title: 'Pay attention',
+            titleAlignment: 'center',
+            textAlignment: 'center',
+        }));
+        this._logger.shutdownLogger();
+    }
+}
+exports.UpdateNotifier = UpdateNotifier;

package/dist/core/{utils/writeClient.d.ts → WriteClient.d.ts}

@@ -1,8 +1,8 @@
-import { Logger } from '../../common/Logger';
-import { HttpClient } from '../types/Enums';
-import { IOutput } from '../types/Models';
-import type { Client } from '../types/shared/Client.model';
-import { Templates } from './registerHandlebarTemplates';
+import { Logger } from '../common/Logger';
+import { HttpClient } from './types/Enums';
+import { IOutput } from './types/Models';
+import type { Client } from './types/shared/Client.model';
+import { Templates } from './utils/registerHandlebarTemplates';
 /**
  * @param client Client object with all the models, services, etc.
  * @param templates Templates wrapper with all loaded Handlebars templates
@@ -84,6 +84,13 @@ export declare class WriteClient {
     writeClientIndex(options: IWriteClientIndex): Promise<void>;
     combineAndWrite(): Promise<void>;
     get logger(): Logger;
+    private buildClientIndexMap;
+    private finalizeAndWright;
+    private getOutputPath;
+    private ensureClientIndex;
+    private isSameModel;
+    private isSameShema;
+    private isSomeService;
 }
 export {};
-//# sourceMappingURL=writeClient.d.ts.map
+//# sourceMappingURL=WriteClient.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAI1D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAU/D;;;;;;;;;;;;;;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;IAKrB,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,mBAAmB;YAgEb,iBAAiB;IAU/B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;CAGxB"}

package/dist/core/{utils/writeClient.js → WriteClient.js}

@@ -1,42 +1,18 @@
 "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");
-const writeClientCore_1 = require("./writeClientCore");
-const writeClientIndex_1 = require("./writeClientIndex");
-const writeClientModels_1 = require("./writeClientModels");
-const writeClientSchemas_1 = require("./writeClientSchemas");
-const writeClientServices_1 = require("./writeClientServices");
-function sortModelByName(a, b) {
-    if (a.name > b.name) {
-        return 1;
-    }
-    if (a.name < b.name) {
-        return -1;
-    }
-    return 0;
-}
-function prepareAlias(models) {
-    let modelPrevious = undefined;
-    let index = 1;
-    for (const model of models) {
-        if (modelPrevious && model.name === modelPrevious.name) {
-            model.alias = `${model.name}$${index}`;
-            if (!modelPrevious.alias) {
-                modelPrevious.alias = `${modelPrevious.name}$${index - 1}`;
-            }
-            index++;
-        }
-        else if (modelPrevious && model.name !== modelPrevious.name) {
-            index = 1;
-        }
-        modelPrevious = model;
-    }
-}
+const Enums_1 = require("../common/Enums");
+const Logger_1 = require("../common/Logger");
+const fileSystem_1 = require("./utils/fileSystem");
+const pathHelpers_1 = require("./utils/pathHelpers");
+const prepareAlias_1 = require("./utils/prepareAlias");
+const sortModelByName_1 = require("./utils/sortModelByName");
+const unique_1 = require("./utils/unique");
+const writeClientCore_1 = require("./utils/writeClientCore");
+const writeClientIndex_1 = require("./utils/writeClientIndex");
+const writeClientModels_1 = require("./utils/writeClientModels");
+const writeClientSchemas_1 = require("./utils/writeClientSchemas");
+const writeClientServices_1 = require("./utils/writeClientServices");
 /**
  * The client which is writing all items and keep the parameters to write index file
  */
@@ -138,31 +114,26 @@ class WriteClient {
         }
     }
     async combineAndWrite() {
+        const result = this.buildClientIndexMap();
+        await this.finalizeAndWright(result);
+    }
+    get logger() {
+        return this._logger;
+    }
+    buildClientIndexMap() {
         const result = new Map();
         for (const [key, value] of this.options.entries()) {
             for (const item of value) {
-                const { exportCore, outputPaths, exportModels, exportSchemas, exportServices, client, templates } = item;
-                const outputCore = outputPaths.outputCore ? outputPaths.outputCore : (0, pathHelpers_1.resolve)(key, 'core');
-                const outputModels = outputPaths.outputModels ? outputPaths.outputModels : (0, pathHelpers_1.resolve)(key, 'models');
-                const outputSchemas = outputPaths.outputSchemas ? outputPaths.outputSchemas : (0, pathHelpers_1.resolve)(key, 'schemas');
-                const outputServices = outputPaths.outputServices ? outputPaths.outputServices : (0, pathHelpers_1.resolve)(key, 'services');
-                let clientIndex = result.get(`${key}`);
-                if (!clientIndex) {
-                    clientIndex = {
-                        templates: templates,
-                        outputPath: key,
-                        core: [],
-                        models: [],
-                        schemas: [],
-                        services: [],
-                    };
-                    result.set(`${key}`, clientIndex);
-                }
+                const { exportCore, outputPaths, exportModels, exportSchemas, exportServices, client, templates, useUnionTypes } = item;
+                const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
+                const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
+                const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
+                const outputServices = this.getOutputPath(outputPaths?.outputServices, key, 'services');
+                const clientIndex = this.ensureClientIndex(result, key, templates);
                 if (exportCore) {
-                    const relativePath = `${(0, pathHelpers_1.relative)(key, outputCore)}`;
-                    const clientCore = clientIndex.core.find(item => item === relativePath);
-                    if (!clientCore) {
-                        clientIndex.core.push(relativePath);
+                    const rel = (0, pathHelpers_1.relative)(key, outputCore);
+                    if (!clientIndex.core.includes(rel)) {
+                        clientIndex.core.push(rel);
                     }
                 }
                 if (exportModels || exportSchemas) {
@@ -175,24 +146,15 @@ class WriteClient {
                             path: model.path,
                             package: relativePathModel,
                             enum: model.enum && model.enum.length > 0,
-                            useUnionTypes: item.useUnionTypes,
+                            useUnionTypes,
                             enums: model.enums && model.enums.length > 0,
                         };
-                        if (exportModels) {
-                            const value = clientIndex.models.find(item => item.name === modelFinal.name &&
-                                item.path === modelFinal.path &&
-                                item.package === modelFinal.package &&
-                                item.enum === modelFinal.enum &&
-                                item.enums === modelFinal.enums &&
-                                item.useUnionTypes === modelFinal.useUnionTypes);
-                            if (!value) {
-                                clientIndex.models.push(modelFinal);
-                            }
+                        if (exportModels && clientIndex.models.some(m => this.isSameModel(m, modelFinal))) {
+                            clientIndex.models.push(modelFinal);
                         }
                         if (exportSchemas) {
                             const schema = { ...modelFinal, package: relativePathSchema };
-                            const indexValue = clientIndex.schemas.find(item => item.name === schema.name && item.path === schema.path && item.package === schema.package);
-                            if (!indexValue) {
+                            if (!clientIndex.schemas.some(s => this.isSameShema(s, schema))) {
                                 clientIndex.schemas.push(schema);
                             }
                         }
@@ -201,8 +163,7 @@ class WriteClient {
                 if (exportServices) {
                     const relativeService = `${(0, pathHelpers_1.relative)(key, outputServices)}`;
                     for (const service of client.services) {
-                        const valueIndex = clientIndex.services.find(item => item.name === service.name && item.package === relativeService);
-                        if (!valueIndex) {
+                        if (!clientIndex.services.some(s => this.isSomeService(s, service.name, relativeService))) {
                             clientIndex.services.push({
                                 name: service.name,
                                 package: relativeService,
@@ -212,16 +173,46 @@ class WriteClient {
                 }
             }
         }
+        return result;
+    }
+    async finalizeAndWright(result) {
         for (const value of result.values()) {
-            value.models = value.models.filter(unique_1.unique).sort(sortModelByName);
-            prepareAlias(value.models);
-            value.schemas = value.schemas.filter(unique_1.unique).sort(sortModelByName);
-            prepareAlias(value.schemas);
+            value.models = value.models.filter(unique_1.unique).sort(sortModelByName_1.sortModelByName);
+            (0, prepareAlias_1.prepareAlias)(value.models);
+            value.schemas = value.schemas.filter(unique_1.unique).sort(sortModelByName_1.sortModelByName);
+            (0, prepareAlias_1.prepareAlias)(value.schemas);
             await (0, writeClientIndex_1.writeClientIndex)(value);
         }
     }
-    get logger() {
-        return this._logger;
+    getOutputPath(output, key, fallback) {
+        return output ? output : (0, pathHelpers_1.resolve)(key, fallback);
+    }
+    ensureClientIndex(map, key, templates) {
+        if (!map.has(key)) {
+            map.set(key, {
+                templates,
+                outputPath: key,
+                core: [],
+                models: [],
+                schemas: [],
+                services: [],
+            });
+        }
+        return map.get(key);
+    }
+    isSameModel(a, b) {
+        return (a.name === b.name &&
+            a.path === b.path &&
+            a.package === b.package &&
+            a.enum === b.enum &&
+            a.enums === b.enums &&
+            a.useUnionTypes === b.useUnionTypes);
+    }
+    isSameShema(a, b) {
+        return a.name === b.name && a.path === b.path && a.package === b.package;
+    }
+    isSomeService(a, name, pkg) {
+        return a.name === name && a.package === pkg;
     }
 }
 exports.WriteClient = WriteClient;

package/dist/core/__tests__/WriteClient.test.d.ts

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

package/dist/core/__tests__/WriteClient.test.d.ts.map

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

package/dist/core/{utils/__tests__/writeClient.test.js → __tests__/WriteClient.test.js}

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
 const node_test_1 = require("node:test");
-const Enums_1 = require("../../types/Enums");
-const fileSystem_1 = require("../fileSystem");
-const getOutputPaths_1 = require("../getOutputPaths");
-const writeClient_1 = require("../writeClient");
+const Enums_1 = require("../types/Enums");
+const fileSystem_1 = require("../utils/fileSystem");
+const getOutputPaths_1 = require("../utils/getOutputPaths");
+const WriteClient_1 = require("../WriteClient");
 (0, node_test_1.test)('@unit: writeClient should write to filesystem', async () => {
     const mkdirCalls = [];
     const writeFileCalls = [];
@@ -47,7 +47,7 @@ const writeClient_1 = require("../writeClient");
         },
     };
     const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });
-    await new writeClient_1.WriteClient().writeClient({
+    await new WriteClient_1.WriteClient().writeClient({
         client,
         templates,
         outputPaths,

package/dist/core/index.js

@@ -20,7 +20,7 @@ const isString_1 = require("./utils/isString");
 const postProcessClient_1 = require("./utils/postProcessClient");
 const prepareOptions_1 = require("./utils/prepareOptions");
 const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
-const writeClient_1 = require("./utils/writeClient");
+const WriteClient_1 = require("./WriteClient");
 var Enums_2 = require("./types/Enums");
 Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return Enums_2.HttpClient; } });
 /**
@@ -128,7 +128,7 @@ async function generate(options) {
         preparedOptions = Array.of(options);
     }
     const optionsFinal = preparedOptions.map(op => (0, prepareOptions_1.prepareOptions)(op));
-    const writeClient = new writeClient_1.WriteClient();
+    const writeClient = new WriteClient_1.WriteClient();
     writeClient.logger.forceInfo(`Generation has begun. Total number of specification files: ${optionsFinal.length}`);
     try {
         const start = process.hrtime();

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

@@ -0,0 +1,7 @@
+import { IModel } from "./writeClientIndex";
+/**
+ * Function for creating aliases for names
+ * @param models Array of models
+ */
+export declare function prepareAlias(models: IModel[]): void;
+//# sourceMappingURL=prepareAlias.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"prepareAlias.d.ts","sourceRoot":"","sources":["../../../src/core/utils/prepareAlias.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAe5C"}

package/dist/core/utils/prepareAlias.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareAlias = prepareAlias;
+/**
+ * Function for creating aliases for names
+ * @param models Array of models
+ */
+function prepareAlias(models) {
+    let modelPrevious = undefined;
+    let index = 1;
+    for (const model of models) {
+        if (modelPrevious && model.name === modelPrevious.name) {
+            model.alias = `${model.name}$${index}`;
+            if (!modelPrevious.alias) {
+                modelPrevious.alias = `${modelPrevious.name}$${index - 1}`;
+            }
+            index++;
+        }
+        else if (modelPrevious && model.name !== modelPrevious.name) {
+            index = 1;
+        }
+        modelPrevious = model;
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAiFjD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,WAAW,SAAS;IACtB,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACnC,OAAO,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;KAC/C,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAoGnI"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAkFjD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,WAAW,SAAS;IACtB,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACnC,OAAO,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;KAC/C,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAqGnI"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -96,6 +96,7 @@ const header_1 = __importDefault(require("../../templatesCompiled/partials/heade
 const isNullable_1 = __importDefault(require("../../templatesCompiled/partials/isNullable"));
 const isReadOnly_1 = __importDefault(require("../../templatesCompiled/partials/isReadOnly"));
 const isRequired_1 = __importDefault(require("../../templatesCompiled/partials/isRequired"));
+const isRequiredDefinition_1 = __importDefault(require("../../templatesCompiled/partials/isRequiredDefinition"));
 const parameters_1 = __importDefault(require("../../templatesCompiled/partials/parameters"));
 const parametersDefinition_1 = __importDefault(require("../../templatesCompiled/partials/parametersDefinition"));
 const parameterValues_1 = __importDefault(require("../../templatesCompiled/partials/parameterValues"));
@@ -151,6 +152,7 @@ function registerHandlebarTemplates(root) {
     Handlebars.registerPartial('isNullable', Handlebars.template(isNullable_1.default));
     Handlebars.registerPartial('isReadOnly', Handlebars.template(isReadOnly_1.default));
     Handlebars.registerPartial('isRequired', Handlebars.template(isRequired_1.default));
+    Handlebars.registerPartial('isRequiredDefinition', Handlebars.template(isRequiredDefinition_1.default));
     Handlebars.registerPartial('parameters', Handlebars.template(parameters_1.default));
     Handlebars.registerPartial('parametersDefinition', Handlebars.template(parametersDefinition_1.default));
     Handlebars.registerPartial('parameterValues', Handlebars.template(parameterValues_1.default));

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

@@ -0,0 +1,3 @@
+import { IModel } from "./writeClientIndex";
+export declare function sortModelByName(a: IModel, b: IModel): number;
+//# sourceMappingURL=sortModelByName.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sortModelByName.d.ts","sourceRoot":"","sources":["../../../src/core/utils/sortModelByName.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ5D"}

package/dist/core/utils/sortModelByName.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortModelByName = sortModelByName;
+function sortModelByName(a, b) {
+    if (a.name > b.name) {
+        return 1;
+    }
+    if (a.name < b.name) {
+        return -1;
+    }
+    return 0;
+}

package/dist/templatesCompiled/partials/isReadOnly.d.ts

@@ -1,7 +1,7 @@
 declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
-    main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    main: (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
     useData: boolean;
 };
 export default _default;

package/dist/templatesCompiled/partials/isReadOnly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isReadOnly.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/partials/isReadOnly.ts"],"names":[],"mappings":";;;;;;AAMA,wBAYiB"}
+{"version":3,"file":"isReadOnly.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/partials/isReadOnly.ts"],"names":[],"mappings":";;;;;;AAMA,wBAWiB"}

package/dist/templatesCompiled/partials/isReadOnly.js

@@ -15,6 +15,5 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "isReadOnly"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 1, "column": 0 }, "end": { "line": 1, "column": 34 } } })) != null ? stack1 : "")
-            + "\n";
+        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "isReadOnly"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 1, "column": 0 }, "end": { "line": 1, "column": 37 } } })) != null ? stack1 : "");
     }, "useData": true };

package/dist/templatesCompiled/partials/isRequiredDefinition.d.ts

@@ -0,0 +1,9 @@
+declare const _default: {
+    "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    compiler: (string | number)[];
+    main: (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    useData: boolean;
+};
+export default _default;
+//# sourceMappingURL=isRequiredDefinition.d.ts.map

package/dist/templatesCompiled/partials/isRequiredDefinition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isRequiredDefinition.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/partials/isRequiredDefinition.ts"],"names":[],"mappings":";;;;;;;AAMA,wBAoBiB"}

package/dist/templatesCompiled/partials/isRequiredDefinition.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// This is an automatically generated file for the hbs template.
+// You don't need to change it, run npm run build:hbs to update it.
+/* istanbul ignore file */
+/* tslint: disable */
+/* eslint: disable */
+// @ts-nocheck
+exports.default = { "1": function (container, depth0, helpers, partials, data) {
+        return "?";
+    }, "3": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "default"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 1, "column": 23 }, "end": { "line": 1, "column": 43 } } })) != null ? stack1 : "");
+    }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return ((stack1 = lookupProperty(helpers, "unless").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "isRequired"), { "name": "unless", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.program(3, data, 0), "data": data, "loc": { "start": { "line": 1, "column": 0 }, "end": { "line": 1, "column": 54 } } })) != null ? stack1 : "");
+    }, "useData": true };

package/dist/templatesCompiled/partials/parametersDefinition.js

@@ -38,7 +38,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 9, "column": 3 }, "end": { "line": 9, "column": 7 } }), depth0)) != null ? stack1 : "")
-            + ((stack1 = container.invokePartial(lookupProperty(partials, "isRequired"), depth0, { "name": "isRequired", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
+            + ((stack1 = container.invokePartial(lookupProperty(partials, "isRequiredDefinition"), depth0, { "name": "isRequiredDefinition", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + ": "
             + ((stack1 = container.invokePartial(lookupProperty(partials, "type"), depth0, { "name": "type", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + ",\n";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-openapi-codegen",
-    "version": "1.0.0-beta.5",
+    "version": "1.0.0-beta.6",
     "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",
@@ -59,9 +59,13 @@
         "codecov": "codecov --token=89a9fe76-2714-4b5b-83e3-9d809615064d"
     },
     "dependencies": {
+        "boxen": "^5.1.2",
         "camelcase": "6.2.0",
+        "chalk": "^4.1.2",
         "commander": "8.0.0",
+        "configstore": "^5.0.1",
         "fast-deep-equal": "^3.1.3",
+        "figlet": "^1.8.0",
         "handlebars": "4.7.6",
         "joi": "^17.13.3",
         "json-schema": "0.4.0",
@@ -69,6 +73,7 @@
         "leven": "^4.0.0",
         "mkdirp": "1.0.4",
         "rimraf": "3.0.2",
+        "semver": "^7.7.1",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
     },
@@ -81,13 +86,16 @@
         "@eslint/eslintrc": "^3.3.1",
         "@eslint/js": "^9.29.0",
         "@types/axios": "^0.14.0",
+        "@types/configstore": "^6.0.2",
         "@types/express": "4.17.13",
+        "@types/figlet": "^1.5.8",
         "@types/json-schema": "^7.0.15",
         "@types/lodash-es": "^4.17.12",
         "@types/node": "22.5.1",
         "@types/node-fetch": "2.5.12",
         "@types/prettier": "3.0.0",
         "@types/qs": "6.9.7",
+        "@types/semver": "^7.7.0",
         "@types/winston": "^2.4.4",
         "@typescript-eslint/eslint-plugin": "^8.34.1",
         "@typescript-eslint/parser": "^8.34.1",

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

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

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

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

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

@@ -1 +0,0 @@
-{"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"}