ts-openapi-codegen 1.0.0 → 2.0.0-beta.0

package/dist/common/VersionedSchema/UnifiedOptionsVersioned/UnifiedOptionsSchemaV1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnifiedOptionsSchemaV1.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/UnifiedOptionsVersioned/UnifiedOptionsSchemaV1.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAqBtB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,uBA6BZ,CAAC"}

package/dist/common/VersionedSchema/UnifiedOptionsVersioned/UnifiedOptionsSchemaV1.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unifiedOptionsSchemaV1 = void 0;
+const joi_1 = __importDefault(require("joi"));
+const core_1 = require("../../../core");
+const CommonSchemas_1 = require("../CommonSchemas");
+const mergeObjectSchemas_1 = require("../Utils/mergeObjectSchemas");
+const itemSchema = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
+    input: joi_1.default.string().required().description('Путь, URL или строка OpenAPI спецификации'),
+    httpClient: joi_1.default.string().valid(...Object.values(core_1.HttpClient)).optional(),
+}), CommonSchemas_1.outputPathsSchema, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2);
+/**
+ * Unified options schema that supports both single and multi-item configurations.
+ * Use either 'items' array for multiple specs OR 'input'/'output' for single spec.
+ */
+exports.unifiedOptionsSchemaV1 = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
+    // Multi-item configuration
+    items: joi_1.default.array()
+        .items(itemSchema)
+        .min(1)
+        .optional()
+        .description('Массив спецификаций для генерации'),
+    // Single-item configuration (mutually exclusive with items)
+    input: joi_1.default.string()
+        .when('items', {
+        is: joi_1.default.exist(),
+        then: joi_1.default.forbidden(),
+        otherwise: joi_1.default.required(),
+    })
+        .description('Путь, URL или строка OpenAPI спецификации'),
+    output: joi_1.default.string()
+        .when('items', {
+        is: joi_1.default.exist(),
+        then: joi_1.default.forbidden(),
+        otherwise: joi_1.default.required(),
+    })
+        .description('Выходная директория'),
+}), CommonSchemas_1.outputPathsSchema, // outputCore, outputServices, etc. for single-item mode
+CommonSchemas_1.specialParametersSchemasV2, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2).xor('items', 'input');

package/dist/common/VersionedSchema/UnifiedOptionsVersioned/UnifiedOptionsVersionedSchemas.d.ts

@@ -0,0 +1,3 @@
+import { VersionedSchema } from "../Types";
+export declare const unifiedOptionsVersionedSchemas: VersionedSchema<Record<string, any>>[];
+//# sourceMappingURL=UnifiedOptionsVersionedSchemas.d.ts.map

package/dist/common/VersionedSchema/UnifiedOptionsVersioned/UnifiedOptionsVersionedSchemas.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnifiedOptionsVersionedSchemas.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/UnifiedOptionsVersioned/UnifiedOptionsVersionedSchemas.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,eAAO,MAAM,8BAA8B,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAI/E,CAAC"}

package/dist/common/VersionedSchema/UnifiedOptionsVersioned/UnifiedOptionsVersionedSchemas.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unifiedOptionsVersionedSchemas = void 0;
+const Enums_1 = require("../Enums");
+const UnifiedOptionsSchemaV1_1 = require("./UnifiedOptionsSchemaV1");
+exports.unifiedOptionsVersionedSchemas = [{
+        version: 'v1',
+        schema: UnifiedOptionsSchemaV1_1.unifiedOptionsSchemaV1,
+        type: Enums_1.EVersionedSchemaType.UNIFIED_OPTIONS,
+    }];

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

@@ -0,0 +1,11 @@
+import { SchemaMigrationPlan } from "../Types";
+/**
+ * Creates a simple migration plan that adds optional fields.
+ * Use this when migration only adds optional fields.
+ * @param fromVersion
+ * @param toVersion
+ * @param defaultFields
+ * @returns
+ */
+export declare function createDefaultFieldsMigration<From extends Record<string, any>>(fromVersion: string, toVersion: string, defaultFields: Record<string, any>): SchemaMigrationPlan<From, From>;
+//# sourceMappingURL=createDefaultFieldsMigration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createDefaultFieldsMigration.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/createDefaultFieldsMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzE,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACnC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAOjC"}

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDefaultFieldsMigration = createDefaultFieldsMigration;
+/**
+ * Creates a simple migration plan that adds optional fields.
+ * Use this when migration only adds optional fields.
+ * @param fromVersion
+ * @param toVersion
+ * @param defaultFields
+ * @returns
+ */
+function createDefaultFieldsMigration(fromVersion, toVersion, defaultFields) {
+    return {
+        fromVersion,
+        toVersion,
+        migrate: (oldVersion) => ({ ...oldVersion, ...defaultFields }),
+        description: `Adds default values for new optional fields: ${Object.keys(defaultFields).join(', ')}`,
+    };
+}

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

@@ -0,0 +1,7 @@
+import { SchemaMigrationPlan } from '../Types';
+/**
+ * Creates a trivial migration plan that just copies all fields.
+ * Use this when migration only adds doesn't require transformation.
+ */
+export declare function createTrivialMigration<From extends Record<string, any>>(fromVersion: string, toVersion: string, description?: string): SchemaMigrationPlan<From, From>;
+//# sourceMappingURL=createTrivialMigration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createTrivialMigration.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/createTrivialMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnE,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,GACrB,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAOjC"}

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTrivialMigration = createTrivialMigration;
+/**
+ * Creates a trivial migration plan that just copies all fields.
+ * Use this when migration only adds doesn't require transformation.
+ */
+function createTrivialMigration(fromVersion, toVersion, description) {
+    return {
+        fromVersion,
+        toVersion,
+        migrate: (oldVersion) => ({ ...oldVersion }),
+        description: description || 'Trivial migration that copies all fields without changes',
+    };
+}

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

@@ -1 +1 @@
-{"version":3,"file":"migrateDataToLatestSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AASpF,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAChF,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IACzD,aAAa,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAqDlK"}
+{"version":3,"file":"migrateDataToLatestSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AASpF,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAChF,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IACzD,aAAa,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAiElK"}

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

@@ -22,19 +22,26 @@ function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedS
     const actualVersionIndex = versionedSchemas.length - 1;
     const actualSchema = versionedSchemas[actualVersionIndex];
     for (let idx = guessedVersion.lastVersionIndex; idx < versionedSchemas.length - 1; idx++) {
-        const { error: firstError } = versionedSchemas[idx].schema.validate(currentData);
+        const currentVersionSchema = versionedSchemas[idx];
+        const { error: firstError } = currentVersionSchema.schema.validate(currentData);
         if (firstError) {
             (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(firstError, replacingKeysMap);
         }
-        const fromVersion = versionedSchemas[idx].version;
+        const fromVersion = currentVersionSchema.version;
         const migrationPlan = migrationPlans.find(p => p.fromVersion === fromVersion);
         if (!migrationPlan) {
-            throw new Error(`No migration plan from ${fromVersion}`);
+            const availableVersions = migrationPlans.map(p => p.fromVersion).join(', ');
+            throw new Error(`No migration plan from ${fromVersion}. ` +
+                `Available migration plans: ${availableVersions}. ` +
+                `This usually means the migration chain is incomplete.`);
         }
+        const toVersion = versionedSchemas[idx + 1].version;
         const migratedRaw = migrationPlan.migrate(currentData);
         const { error } = versionedSchemas[idx + 1].schema.validate(migratedRaw, { allowUnknown: false });
         if (error) {
-            throw new Error(error.message);
+            throw new Error(`Migration from ${fromVersion} to ${toVersion} failed validation. ` +
+                `Error: ${error.message}. ` +
+                `Migration description: ${migrationPlan.description || 'No description provided'}.`);
         }
         currentData = { ...migratedRaw };
         const isLastIteration = idx + 1 === actualVersionIndex;

package/dist/core/OpenApiClient.d.ts

@@ -0,0 +1,13 @@
+import { TRawOptions } from '../common/TRawOptions';
+import { WriteClient } from './WriteClient';
+export declare class OpenApiClient {
+    private _writeClient;
+    get writeClient(): WriteClient;
+    private normalizeOptions;
+    private addDefaultValues;
+    private cleanOutputDirectories;
+    private generateCodeForItems;
+    private generateSingle;
+    generate(rawOptions: TRawOptions): Promise<void>;
+}
+//# sourceMappingURL=OpenApiClient.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"OpenApiClient.d.ts","sourceRoot":"","sources":["../../src/core/OpenApiClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,WAAW,EAAsB,MAAM,uBAAuB,CAAC;AActF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAA4B;IAEhD,IAAW,WAAW,gBAKrB;IAED,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,gBAAgB;YAyBV,sBAAsB;YAUtB,oBAAoB;YAmCpB,cAAc;IAiFtB,QAAQ,CAAC,UAAU,EAAE,WAAW;CAWzC"}

package/dist/core/OpenApiClient.js

@@ -0,0 +1,175 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenApiClient = void 0;
+const Consts_1 = require("../common/Consts");
+const Logger_1 = require("../common/Logger");
+const LoggerMessages_1 = require("../common/LoggerMessages");
+const fileSystemHelpers_1 = require("../common/utils/fileSystemHelpers");
+const pathHelpers_1 = require("../common/utils/pathHelpers");
+const Parser_1 = require("./api/v2/Parser");
+const Parser_2 = require("./api/v3/Parser");
+const Context_1 = require("./Context");
+const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
+const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
+const getOutputPaths_1 = require("./utils/getOutputPaths");
+const postProcessClient_1 = require("./utils/postProcessClient");
+const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
+const WriteClient_1 = require("./WriteClient");
+class OpenApiClient {
+    _writeClient = null;
+    get writeClient() {
+        if (!this._writeClient) {
+            throw new Error('WriteClient must be initialized');
+        }
+        return this._writeClient;
+    }
+    normalizeOptions(rawOptions) {
+        if (rawOptions.items && rawOptions.items.length > 0) {
+            // Для items: Наследуем глобальный request, если не переопределён
+            return rawOptions.items.map(item => ({
+                ...item,
+                request: item.request ?? rawOptions.request, // ?? для fallback на глобальный
+            }));
+        }
+        else {
+            // Плоский формат (из CLI или старого конфига): Один item с глобальным request
+            return [rawOptions];
+        }
+    }
+    addDefaultValues(item) {
+        return {
+            input: item.input || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.input,
+            output: item.output || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.output,
+            outputCore: item.outputCore || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.outputCore,
+            outputServices: item.outputServices || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.outputServices,
+            outputModels: item.outputModels || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.outputModels,
+            outputSchemas: item.outputSchemas || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.outputSchemas,
+            httpClient: item.httpClient || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.httpClient,
+            useOptions: item.useOptions ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
+            useUnionTypes: item.useUnionTypes ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
+            excludeCoreServiceFiles: item.excludeCoreServiceFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.excludeCoreServiceFiles,
+            includeSchemasFiles: item.includeSchemasFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.includeSchemasFiles,
+            request: item.request || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.request,
+            interfacePrefix: item.interfacePrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
+            enumPrefix: item.enumPrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.enumPrefix,
+            typePrefix: item.typePrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.typePrefix,
+            useCancelableRequest: item.useCancelableRequest ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useCancelableRequest,
+            logLevel: item.logLevel || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.logLevel,
+            logTarget: item.logTarget || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.logTarget,
+            sortByRequired: item.sortByRequired ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.sortByRequired,
+            useSeparatedIndexes: item.useSeparatedIndexes ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
+        };
+    }
+    async cleanOutputDirectories(option) {
+        const outputDirs = [option.output, option.outputCore, option.outputSchemas, option.outputModels, option.outputServices];
+        for (const dir of outputDirs) {
+            if (dir) {
+                await fileSystemHelpers_1.fileSystemHelpers.rmdir(dir);
+            }
+        }
+    }
+    async generateCodeForItems(items) {
+        if (items.length === 0) {
+            throw new Error(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.NO_OPTIONS);
+        }
+        this.writeClient.logger.forceInfo(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.STARTED(items.length));
+        try {
+            const start = process.hrtime();
+            for (const option of items) {
+                await this.cleanOutputDirectories(option);
+            }
+            for (const option of items) {
+                const fileStart = process.hrtime();
+                await this.generateSingle(option);
+                const [fileSeconds, fileNanoseconds] = process.hrtime(fileStart);
+                const fileDuration = fileSeconds + fileNanoseconds / 1e6;
+                this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.DURATION_FOR_FILE(option.input, fileDuration.toFixed(2)));
+            }
+            if (items[0]?.useSeparatedIndexes) {
+                await this.writeClient.combineAndWrightSimple();
+            }
+            else {
+                await this.writeClient.combineAndWrite();
+            }
+            this.writeClient.logger.forceInfo(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.FINISHED);
+            const [seconds, nanoseconds] = process.hrtime(start);
+            const durationInMs = seconds + nanoseconds / 1e6;
+            this.writeClient.logger.forceInfo(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.FINISHED_WITH_DURATION(durationInMs.toFixed(2)));
+        }
+        catch (error) {
+            this.writeClient.logger.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(error.message));
+        }
+        this.writeClient.logger.shutdownLogger();
+    }
+    async generateSingle(item) {
+        const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, includeSchemasFiles, request, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, } = item;
+        const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
+            output,
+            outputCore,
+            outputServices,
+            outputModels,
+            outputSchemas,
+        });
+        const absoluteInput = (0, pathHelpers_1.resolveHelper)(process.cwd(), input);
+        const context = new Context_1.Context({ input: absoluteInput, output: outputPaths, prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix }, sortByRequired });
+        const openApi = await (0, getOpenApiSpec_1.getOpenApiSpec)(context, absoluteInput);
+        const openApiVersion = (0, getOpenApiVersion_1.getOpenApiVersion)(openApi);
+        const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
+            httpClient,
+            useUnionTypes,
+            useOptions,
+        });
+        this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.DEFINING_VERSION);
+        switch (openApiVersion) {
+            case getOpenApiVersion_1.OpenApiVersion.V2: {
+                const client = new Parser_1.Parser(context).parse(openApi);
+                const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
+                this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.WRITING_V2);
+                await this.writeClient.writeClient({
+                    client: clientFinal,
+                    templates,
+                    outputPaths,
+                    httpClient,
+                    useOptions,
+                    useUnionTypes,
+                    excludeCoreServiceFiles,
+                    includeSchemasFiles,
+                    request,
+                    useCancelableRequest,
+                    useSeparatedIndexes,
+                });
+                break;
+            }
+            case getOpenApiVersion_1.OpenApiVersion.V3: {
+                const client = new Parser_2.Parser(context).parse(openApi);
+                const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
+                this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.WRITING_V3);
+                await this.writeClient.writeClient({
+                    client: clientFinal,
+                    templates,
+                    outputPaths,
+                    httpClient,
+                    useOptions,
+                    useUnionTypes,
+                    excludeCoreServiceFiles,
+                    includeSchemasFiles,
+                    request,
+                    useCancelableRequest,
+                    useSeparatedIndexes,
+                });
+                break;
+            }
+        }
+    }
+    async generate(rawOptions) {
+        const logger = new Logger_1.Logger({
+            level: rawOptions.logLevel ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.logLevel,
+            instanceId: 'client',
+            logOutput: rawOptions.logTarget ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.logTarget,
+        });
+        this._writeClient = new WriteClient_1.WriteClient(logger);
+        const items = this.normalizeOptions(rawOptions).map(item => this.addDefaultValues(item));
+        await this.generateCodeForItems(items);
+    }
+}
+exports.OpenApiClient = OpenApiClient;

package/dist/core/WriteClient.d.ts

@@ -46,7 +46,7 @@ type TAPIClientGeneratorConfig = Omit<TWriteClientProps, 'httpClient' | 'useOpti
 export declare class WriteClient {
     private config;
     private _logger;
-    constructor();
+    constructor(logger?: Logger);
     /**
      * Write our OpenAPI client, using the given templates at the given output
      * @param client Client object with all the models, services, etc.

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

@@ -1 +1 @@
-{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,sBAAsB,GAAG,qBAAqB,CAAC,CAAC;AAEnJ;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAuD;IACrE,OAAO,CAAC,OAAO,CAAS;;IAUxB;;;;;;;;;;;;OAYG;IACG,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2F5D;;;OAGG;IACH,6BAA6B,CAAC,MAAM,EAAE,yBAAyB;IAUzD,eAAe;IAKf,sBAAsB;IAK5B,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,yBAAyB;IAyCjC,OAAO,CAAC,mBAAmB;YA4Db,gBAAgB;YAUhB,uBAAuB;IAMrC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAId,eAAe,yBAAmB;IAClC,oBAAoB,8BAAwB;IAC5C,oBAAoB,8BAAwB;IAC5C,iBAAiB,2BAAqB;IACtC,sBAAsB,gCAA0B;IAChD,kBAAkB,4BAAsB;IACxC,uBAAuB,iCAA2B;IAClD,mBAAmB,6BAAuB;IAC1C,wBAAwB,kCAA4B;IACpD,sBAAsB,gCAA0B;CAC1D"}
+{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,sBAAsB,GAAG,qBAAqB,CAAC,CAAC;AAEnJ;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAuD;IACrE,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,CAAC,EAAE,MAAM;IAQ3B;;;;;;;;;;;;OAYG;IACG,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2F5D;;;OAGG;IACH,6BAA6B,CAAC,MAAM,EAAE,yBAAyB;IAUzD,eAAe;IAKf,sBAAsB;IAK5B,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,yBAAyB;IAyCjC,OAAO,CAAC,mBAAmB;YA4Db,gBAAgB;YAUhB,uBAAuB;IAMrC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAId,eAAe,yBAAmB;IAClC,oBAAoB,8BAAwB;IAC5C,oBAAoB,8BAAwB;IAC5C,iBAAiB,2BAAqB;IACtC,sBAAsB,gCAA0B;IAChD,kBAAkB,4BAAsB;IACxC,uBAAuB,iCAA2B;IAClD,mBAAmB,6BAAuB;IAC1C,wBAAwB,kCAA4B;IACpD,sBAAsB,gCAA0B;CAC1D"}

package/dist/core/WriteClient.js

@@ -24,8 +24,8 @@ const writeClientSimpleIndex_1 = require("./utils/writeClientSimpleIndex");
 class WriteClient {
     config = new Map();
     _logger;
-    constructor() {
-        this._logger = new Logger_1.Logger({
+    constructor(logger) {
+        this._logger = logger || new Logger_1.Logger({
             level: Enums_1.ELogLevel.ERROR,
             instanceId: 'client',
             logOutput: Enums_1.ELogOutput.CONSOLE,

package/dist/core/index.d.ts

@@ -1,8 +1,4 @@
-import { TMultiOptions, TOptions } from '../common/Options';
+import { TRawOptions } from '../common/TRawOptions';
 export { HttpClient } from './types/enums/HttpClient.enum';
-/**
- * @throws {Error} If options validation fails or generation encounters an error
- * @returns {Promise<void>}
- */
-export declare function generate(options: TOptions | TOptions[] | TMultiOptions): Promise<void>;
+export declare function generate(rawOptions: TRawOptions): 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,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAoB5D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAkH3D;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAgD5F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrE"}

package/dist/core/index.js

@@ -2,172 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 exports.generate = generate;
-const fileSystemHelpers_1 = require("../common/utils/fileSystemHelpers");
-const pathHelpers_1 = require("../common/utils/pathHelpers");
-const Parser_1 = require("./api/v2/Parser");
-const Parser_2 = require("./api/v3/Parser");
-const Context_1 = require("./Context");
-const HttpClient_enum_1 = require("./types/enums/HttpClient.enum");
-const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
-const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
-const getOutputPaths_1 = require("./utils/getOutputPaths");
-const isInstanceOfMultiOptions_1 = require("./utils/isInstanceOfMultiOptions");
-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("./WriteClient");
-var HttpClient_enum_2 = require("./types/enums/HttpClient.enum");
-Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_enum_2.HttpClient; } });
-/**
- * Generate the OpenAPI client. This method will read the OpenAPI specification and based on the
- * given language it will generate the client, including the typed models, validation schemas,
- * service layer, etc.
- * @param input: The relative location of the OpenAPI spec
- * @param output: The relative location of the output directory
- * @param outputCore: The relative location of the output directory for core
- * @param outputServices: The relative location of the output directory for services
- * @param outputModels: The relative location of the output directory for models
- * @param outputSchemas: The relative location of the output directory for schemas
- * @param httpClient: The selected httpClient (fetch or XHR)
- * @param useOptions: Use options or arguments functions
- * @param useUnionTypes: Use union types instead of enums
- * @param excludeCoreServiceFiles The generation of the core and services is excluded
- * @param includeSchemasFiles The generation of model validation schemes is enabled
- * @param request: Path to custom request file
- * @param write: Write the files to disk (true or false)
- * @param interfacePrefix: Prefix for interface model(I)
- * @param enumPrefix: Prefix for enum model(E)
- * @param typePrefix: Prefix for type model(T)
- * @param useCancelableRequest Use cancelable request type.
- * @param sortByRequired Property sorting strategy: simplified or extended
- * @param useSeparatedIndexes Use separate index files for the core, models, schemas, and services
- */
-async function generateFrom({ input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient = HttpClient_enum_1.HttpClient.FETCH, useOptions = false, useUnionTypes = false, excludeCoreServiceFiles = false, includeSchemasFiles = false, request, write = true, interfacePrefix = 'I', enumPrefix = 'E', typePrefix = 'T', useCancelableRequest = false, sortByRequired = false, useSeparatedIndexes = false, }, writeClient) {
-    const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
-        output,
-        outputCore,
-        outputServices,
-        outputModels,
-        outputSchemas,
-    });
-    const absoluteInput = (0, isString_1.isString)(input) ? (0, pathHelpers_1.resolveHelper)(process.cwd(), input) : input;
-    const context = new Context_1.Context({ input: absoluteInput, output: outputPaths, prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix }, sortByRequired });
-    const openApi = (0, isString_1.isString)(input) ? await (0, getOpenApiSpec_1.getOpenApiSpec)(context, input) : input;
-    const openApiVersion = (0, getOpenApiVersion_1.getOpenApiVersion)(openApi);
-    const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
-        httpClient,
-        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,
-                outputPaths,
-                httpClient,
-                useOptions,
-                useUnionTypes,
-                excludeCoreServiceFiles,
-                includeSchemasFiles,
-                request,
-                useCancelableRequest,
-                useSeparatedIndexes,
-            });
-            break;
-        }
-        case getOpenApiVersion_1.OpenApiVersion.V3: {
-            const client = new Parser_2.Parser(context).parse(openApi);
-            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,
-                outputPaths,
-                httpClient,
-                useOptions,
-                useUnionTypes,
-                excludeCoreServiceFiles,
-                includeSchemasFiles,
-                request,
-                useCancelableRequest,
-                useSeparatedIndexes,
-            });
-            break;
-        }
-    }
+const OpenApiClient_1 = require("./OpenApiClient");
+var HttpClient_enum_1 = require("./types/enums/HttpClient.enum");
+Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_enum_1.HttpClient; } });
+async function generate(rawOptions) {
+    const openApiClient = new OpenApiClient_1.OpenApiClient();
+    await openApiClient.generate(rawOptions);
 }
-/**
- * @throws {Error} If options validation fails or generation encounters an error
- * @returns {Promise<void>}
- */
-async function generate(options) {
-    let preparedOptions = [];
-    if (Array.isArray(options)) {
-        preparedOptions = options;
-    }
-    else if ((0, isInstanceOfMultiOptions_1.isInstanceOfMultioptions)(options)) {
-        const { items, ...otherProps } = options;
-        preparedOptions = items.map(item => ({ ...item, ...otherProps }));
-    }
-    else {
-        preparedOptions = Array.of(options);
-    }
-    const optionsFinal = preparedOptions.map(op => (0, prepareOptions_1.prepareOptions)(op));
-    const writeClient = new WriteClient_1.WriteClient();
-    writeClient.logger.forceInfo(`${GENERATION_MESSAGES.STARTED}. Total number of specification files: ${optionsFinal.length}`);
-    if (optionsFinal.length === 0) {
-        throw new Error('No options provided for generation');
-    }
-    try {
-        const start = process.hrtime();
-        for (const option of optionsFinal) {
-            await cleanOutputDirectories(option);
-        }
-        for (const option of optionsFinal) {
-            const fileStart = process.hrtime();
-            await generateFrom(option, writeClient);
-            const [fileSeconds, fileNanoseconds] = process.hrtime(fileStart);
-            const fileDuration = fileSeconds + fileNanoseconds / 1e6;
-            writeClient.logger.info(`Duration for "${option.input}": ${fileDuration.toFixed(2)} sec`);
-        }
-        if (optionsFinal[0]?.useSeparatedIndexes) {
-            await writeClient.combineAndWrightSimple();
-        }
-        else {
-            await writeClient.combineAndWrite();
-        }
-        writeClient.logger.forceInfo(GENERATION_MESSAGES.FINISHED);
-        const [seconds, nanoseconds] = process.hrtime(start);
-        const durationInMs = seconds + nanoseconds / 1e6;
-        writeClient.logger.forceInfo(GENERATION_MESSAGES.DURATION(durationInMs));
-        writeClient.logger.forceInfo(GENERATION_MESSAGES.FINISHED);
-    }
-    catch (error) {
-        writeClient.logger.error(error.message);
-    }
-    writeClient.logger.shutdownLogger();
-}
-const cleanOutputDirectories = async (option) => {
-    const outputDirs = [option.output, option.outputCore, option.outputSchemas, option.outputModels, option.outputServices];
-    for (const dir of outputDirs) {
-        if (dir) {
-            await fileSystemHelpers_1.fileSystemHelpers.rmdir(dir);
-        }
-    }
-};
-const GENERATION_MESSAGES = {
-    STARTED: 'Generation has begun',
-    FINISHED: 'Generation from has been finished',
-    FILE_FINISHED: (input) => `Generation from "${input}" was finished`,
-    DURATION: (ms) => `Lead time: ${ms.toFixed(2)} sec`,
-};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-openapi-codegen",
-    "version": "1.0.0",
+    "version": "2.0.0-beta.0",
     "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",

package/dist/common/Options.d.ts

@@ -1,26 +0,0 @@
-import { HttpClient } from '../core';
-export type TOptions = {
-    input: string | Record<string, any>;
-    output: string;
-    outputCore?: string;
-    outputServices?: string;
-    outputModels?: string;
-    outputSchemas?: string;
-    httpClient?: HttpClient;
-    useOptions?: boolean;
-    useUnionTypes?: boolean;
-    excludeCoreServiceFiles?: boolean;
-    includeSchemasFiles?: boolean;
-    request?: string;
-    write?: boolean;
-    interfacePrefix?: string;
-    enumPrefix?: string;
-    typePrefix?: string;
-    useCancelableRequest?: boolean;
-    sortByRequired?: boolean;
-    useSeparatedIndexes?: boolean;
-};
-export type TMultiOptions = {
-    items: TOptions[];
-} & Omit<TOptions, 'input' | 'output'>;
-//# sourceMappingURL=Options.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"Options.d.ts","sourceRoot":"","sources":["../../src/common/Options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,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,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,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;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IACxB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACrB,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC"}