ts-openapi-codegen 2.0.0-beta.9 → 2.1.0-beta.1

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

@@ -1 +1 @@
-{"version":3,"file":"postProcessServiceImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessServiceImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAKpE"}
+{"version":3,"file":"postProcessServiceImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessServiceImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAIpE"}

package/dist/core/utils/postProcessServiceImports.js

@@ -10,6 +10,5 @@ const unique_1 = require("./unique");
 function postProcessServiceImports(service) {
     return service.imports
         .filter(unique_1.unique)
-        .sort(sort_1.sort)
-        .filter(item => service.name !== item.name);
+        .sort(sort_1.sort);
 }

package/dist/core/utils/precompileTemplates.js

@@ -66,6 +66,7 @@ const precompileTemplates = () => {
                             isBasicType: true,
                             yupBaseSchema: true,
                             joiBaseSchema: true,
+                            zodBaseSchema: true,
                             getRequiredFields: true,
                             getEnumType: true,
                             camelCase: true,

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

@@ -0,0 +1,3 @@
+import type { Client } from '../types/shared/Client.model';
+export declare const prepareDtoModels: (client: Client) => Client;
+//# sourceMappingURL=prepareDtoModels.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"prepareDtoModels.d.ts","sourceRoot":"","sources":["../../../src/core/utils/prepareDtoModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAyL3D,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,KAAG,MAqCjD,CAAC"}

package/dist/core/utils/prepareDtoModels.js

@@ -0,0 +1,189 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareDtoModels = void 0;
+const unique_1 = require("./unique");
+const escapeName_1 = require("./escapeName");
+const stripQuotes = (name) => {
+    if (name.startsWith("'") && name.endsWith("'")) {
+        return name.slice(1, -1);
+    }
+    return name;
+};
+const buildPropertyTarget = (name, prefix) => {
+    if (name.startsWith("'") && name.endsWith("'")) {
+        return `${prefix}[${name}]`;
+    }
+    return `${prefix}.${name}`;
+};
+const joinUnique = (items, separator) => items.filter(unique_1.unique).join(separator);
+const buildInlineInterfaceType = (model, resolveType) => {
+    if (!model.properties || model.properties.length === 0) {
+        return '{ [key: string]: any }';
+    }
+    const props = model.properties
+        .map(prop => {
+        const name = prop.name.startsWith("'") ? prop.name : `'${prop.name}'`;
+        const optional = prop.isRequired ? '' : '?';
+        const type = resolveType(prop);
+        const nullable = prop.isNullable ? ' | null' : '';
+        return `${name}${optional}: ${type}${nullable}`;
+    })
+        .join('; ');
+    return `{ ${props} }`;
+};
+const resolveTypeFactory = (nameMap, kind) => {
+    const resolveType = (model) => {
+        if (model.export === 'reference') {
+            const mapped = nameMap.get(model.type);
+            return mapped ? (kind === 'raw' ? mapped.rawName : mapped.dtoName) : model.type;
+        }
+        if (model.export === 'array') {
+            const itemModel = model.link ?? { ...model, export: 'reference', link: null };
+            const itemType = model.link ? resolveType(itemModel) : resolveType(itemModel);
+            return `${itemType}[]`;
+        }
+        if (model.export === 'dictionary') {
+            const itemModel = model.link ?? { ...model, export: 'reference', link: null };
+            const itemType = model.link ? resolveType(itemModel) : resolveType(itemModel);
+            return `Record<string, ${itemType}>`;
+        }
+        if (model.export === 'one-of' || model.export === 'any-of') {
+            const types = model.properties.map(prop => resolveType(prop));
+            const union = joinUnique(types, ' | ');
+            return types.length > 1 ? `(${union})` : union || 'any';
+        }
+        if (model.export === 'all-of') {
+            const types = model.properties.map(prop => resolveType(prop));
+            const intersection = joinUnique(types, ' & ');
+            return types.length > 1 ? `(${intersection})` : intersection || 'any';
+        }
+        if (model.export === 'enum' && model.enum?.length) {
+            return joinUnique(model.enum.map(en => en.value), ' | ') || model.type;
+        }
+        if (model.export === 'interface') {
+            return buildInlineInterfaceType(model, resolveType);
+        }
+        return model.type || 'any';
+    };
+    return resolveType;
+};
+const buildDtoInit = (property, nameMap) => {
+    const accessor = buildPropertyTarget(property.name, 'data');
+    const defaultSuffix = property.default ? ` ?? ${property.default}` : '';
+    const isReference = property.export === 'reference' && nameMap.has(property.type);
+    if (isReference) {
+        const dtoName = nameMap.get(property.type).dtoName;
+        if (property.isRequired) {
+            return `new ${dtoName}(${accessor})`;
+        }
+        return `${accessor} ? new ${dtoName}(${accessor}) : undefined`;
+    }
+    if (property.export === 'array') {
+        const itemModel = property.link ?? { ...property, export: 'reference', link: null };
+        const itemIsRef = itemModel.export === 'reference' && nameMap.has(itemModel.type);
+        if (itemIsRef) {
+            const dtoName = nameMap.get(itemModel.type).dtoName;
+            if (property.isRequired) {
+                return `fromArray(${dtoName}, ${accessor})`;
+            }
+            return `${accessor} ? fromArray(${dtoName}, ${accessor}) : undefined`;
+        }
+        return `${accessor}${defaultSuffix}`;
+    }
+    return `${accessor}${defaultSuffix}`;
+};
+const buildDtoToJson = (property, nameMap) => {
+    const accessor = buildPropertyTarget(property.name, 'this');
+    const isReference = property.export === 'reference' && nameMap.has(property.type);
+    if (isReference) {
+        if (property.isRequired) {
+            return `${accessor}.toJSON()`;
+        }
+        return `${accessor} ? ${accessor}.toJSON() : undefined`;
+    }
+    if (property.export === 'array') {
+        const itemModel = property.link ?? { ...property, export: 'reference', link: null };
+        const itemIsRef = itemModel.export === 'reference' && nameMap.has(itemModel.type);
+        if (itemIsRef) {
+            if (property.isRequired) {
+                return `${accessor}.map(item => item.toJSON())`;
+            }
+            return `${accessor} ? ${accessor}.map(item => item.toJSON()) : undefined`;
+        }
+    }
+    return undefined;
+};
+const attachDtoGetters = (client) => {
+    const miracles = (client.miracles ?? []).filter(miracle => miracle.type === 'RENAME');
+    if (miracles.length === 0)
+        return;
+    const miraclesByModel = new Map();
+    for (const miracle of miracles) {
+        if (!miracle.modelName || !miracle.oldProperty || !miracle.newProperty)
+            continue;
+        const list = miraclesByModel.get(miracle.modelName) ?? [];
+        list.push(miracle);
+        miraclesByModel.set(miracle.modelName, list);
+    }
+    client.models.forEach(model => {
+        if (!model.isDefinition || model.export !== 'interface')
+            return;
+        const entries = miraclesByModel.get(model.name);
+        if (!entries || entries.length === 0)
+            return;
+        const getters = entries
+            .map(entry => {
+            const oldName = (0, escapeName_1.escapeName)(entry.oldProperty ?? '');
+            const newName = (0, escapeName_1.escapeName)(entry.newProperty ?? '');
+            if (!oldName || !newName)
+                return null;
+            const hasNewProperty = model.properties.some(prop => prop.name === newName);
+            if (!hasNewProperty)
+                return null;
+            const target = buildPropertyTarget(newName, 'this');
+            return {
+                oldName,
+                newName,
+                target,
+                confidence: entry.confidence,
+            };
+        })
+            .filter((item) => !!item);
+        if (getters.length > 0) {
+            model.dtoGetters = getters;
+        }
+    });
+};
+const prepareDtoModels = (client) => {
+    const nameMap = new Map();
+    client.models.forEach(model => {
+        const rawName = `${model.name}Raw`;
+        const dtoName = `${model.name}Dto`;
+        model.rawName = rawName;
+        model.dtoName = dtoName;
+        model.dtoKind = model.export === 'interface' ? 'class' : 'alias';
+        nameMap.set(model.name, { rawName, dtoName });
+    });
+    const resolveRaw = resolveTypeFactory(nameMap, 'raw');
+    const resolveDto = resolveTypeFactory(nameMap, 'dto');
+    client.models.forEach(model => {
+        if (!model.isDefinition) {
+            return;
+        }
+        if (model.export !== 'interface') {
+            model.rawType = resolveRaw(model);
+            model.dtoType = resolveDto(model);
+            return;
+        }
+        model.properties.forEach(property => {
+            property.rawType = resolveRaw(property);
+            property.dtoType = resolveDto(property);
+            property.dtoInit = buildDtoInit(property, nameMap);
+            property.dtoToJSON = buildDtoToJson(property, nameMap);
+            property.dtoTarget = buildPropertyTarget(property.name, '');
+        });
+    });
+    attachDtoGetters(client);
+    return client;
+};
+exports.prepareDtoModels = prepareDtoModels;

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

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAqK5H"}
+{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAmM5H"}

package/dist/core/utils/registerHandlebarHelpers.js

@@ -125,7 +125,7 @@ function registerHandlebarHelpers(root) {
         if (link.path && link.path !== link.base?.toLowerCase())
             return false;
         // Проверяем, является ли base базовым типом
-        const basicTypes = ['string', 'number', 'integer', 'int', 'boolean', 'file', 'File', 'any', 'null'];
+        const basicTypes = ['string', 'number', 'integer', 'int', 'boolean', 'file', 'File', 'blob', 'Blob', 'any', 'null'];
         return basicTypes.includes(link.base);
     });
     Handlebars.registerHelper('yupBaseSchema', function (base) {
@@ -143,6 +143,7 @@ function registerHandlebarHelpers(root) {
             case 'boolean':
                 return 'yup.boolean()';
             case 'file':
+            case 'blob':
                 return 'yup.mixed()';
             default:
                 return 'yup.mixed()';
@@ -163,11 +164,38 @@ function registerHandlebarHelpers(root) {
             case 'boolean':
                 return 'Joi.boolean()';
             case 'file':
+            case 'blob':
                 return 'Joi.any()';
             default:
                 return 'Joi.any()';
         }
     });
+    Handlebars.registerHelper('zodBaseSchema', function (base) {
+        if (!base)
+            return 'z.any()';
+        const baseLower = base.toLowerCase();
+        switch (baseLower) {
+            case 'string':
+                return 'z.string()';
+            case 'number':
+                return 'z.number()';
+            case 'integer':
+            case 'int':
+                return 'z.number().int()';
+            case 'boolean':
+                return 'z.boolean()';
+            case 'null':
+                return 'z.null()';
+            case 'uuid':
+                return 'z.uuid()';
+            case 'file':
+            case 'blob':
+            case 'any':
+                return 'z.any()';
+            default:
+                return `${base}Schema`;
+        }
+    });
     Handlebars.registerHelper('getRequiredFields', function (properties) {
         const required = properties
             .filter(prop => prop.isRequired)

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":"AA6FA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAyK1K"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AAiGA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAwK1K"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -42,6 +42,8 @@ const Handlebars = __importStar(require("handlebars/runtime"));
 const ApiError_1 = __importDefault(require("../../templatesCompiled/client/core/ApiError"));
 const ApiRequestOptions_1 = __importDefault(require("../../templatesCompiled/client/core/ApiRequestOptions"));
 const ApiResult_1 = __importDefault(require("../../templatesCompiled/client/core/ApiResult"));
+const BaseDto_1 = __importDefault(require("../../templatesCompiled/client/core/BaseDto"));
+const dtoUtils_1 = __importDefault(require("../../templatesCompiled/client/core/dtoUtils"));
 const HttpStatusCode_1 = __importDefault(require("../../templatesCompiled/client/core/HttpStatusCode"));
 // axios START
 const getHeaders_1 = __importDefault(require("../../templatesCompiled/client/core/axios/getHeaders"));
@@ -89,7 +91,9 @@ const getResponseHeader_4 = __importDefault(require("../../templatesCompiled/cli
 const request_5 = __importDefault(require("../../templatesCompiled/client/core/xhr/request"));
 const sendRequest_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/sendRequest"));
 const exportClient_1 = __importDefault(require("../../templatesCompiled/client/exportClient"));
+const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/exportSchema"));
 const exportModel_1 = __importDefault(require("../../templatesCompiled/client/exportModel"));
+const exportModels_1 = __importDefault(require("../../templatesCompiled/client/exportModels"));
 const exportService_1 = __importDefault(require("../../templatesCompiled/client/exportService"));
 const indexFull_1 = __importDefault(require("../../templatesCompiled/client/indexFull"));
 const indexSimple_1 = __importDefault(require("../../templatesCompiled/client/indexSimple"));
@@ -130,7 +134,7 @@ const typeReference_1 = __importDefault(require("../../templatesCompiled/client/
 const typeUnion_1 = __importDefault(require("../../templatesCompiled/client/partials/typeUnion"));
 const registerHandlebarHelpers_1 = require("./registerHandlebarHelpers");
 const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum");
-const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/zod/exportSchema"));
+const exportSchema_2 = __importDefault(require("../../templatesCompiled/client/zod/exportSchema"));
 const zodSchema_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchema"));
 const zodSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaInterface"));
 const zodSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaEnum"));
@@ -139,7 +143,7 @@ const zodSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const zodSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaGeneric"));
 const zodSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaReference"));
 const zodSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaComposition"));
-const exportSchema_2 = __importDefault(require("../../templatesCompiled/client/yup/exportSchema"));
+const exportSchema_3 = __importDefault(require("../../templatesCompiled/client/yup/exportSchema"));
 const yupSchema_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchema"));
 const yupSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaInterface"));
 const yupSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaEnum"));
@@ -148,7 +152,7 @@ const yupSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const yupSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaGeneric"));
 const yupSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaReference"));
 const yupSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaComposition"));
-const exportSchema_3 = __importDefault(require("../../templatesCompiled/client/joi/exportSchema"));
+const exportSchema_4 = __importDefault(require("../../templatesCompiled/client/joi/exportSchema"));
 const joiSchema_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchema"));
 const joiSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaInterface"));
 const joiSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaEnum"));
@@ -157,7 +161,7 @@ const joiSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const joiSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaGeneric"));
 const joiSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaReference"));
 const joiSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaComposition"));
-const exportSchema_4 = __importDefault(require("../../templatesCompiled/client/jsonschema/exportSchema"));
+const exportSchema_5 = __importDefault(require("../../templatesCompiled/client/jsonschema/exportSchema"));
 const jsonschemaSchema_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchema"));
 const jsonschemaSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaInterface"));
 const jsonschemaSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaEnum"));
@@ -185,7 +189,8 @@ function registerHandlebarTemplates(root) {
         exports: {
             client: Handlebars.template(exportClient_1.default),
             model: Handlebars.template(exportModel_1.default),
-            schema: undefined,
+            models: Handlebars.template(exportModels_1.default),
+            schema: Handlebars.template(exportSchema_1.default),
             service: Handlebars.template(exportService_1.default),
         },
         core: {
@@ -193,6 +198,8 @@ function registerHandlebarTemplates(root) {
             apiError: Handlebars.template(ApiError_1.default),
             apiRequestOptions: Handlebars.template(ApiRequestOptions_1.default),
             apiResult: Handlebars.template(ApiResult_1.default),
+            baseDto: Handlebars.template(BaseDto_1.default),
+            dtoUtils: Handlebars.template(dtoUtils_1.default),
             request: Handlebars.template(request_4.default),
             cancelablePromise: Handlebars.template(CancelablePromise_1.default),
             httpStatusCode: Handlebars.template(HttpStatusCode_1.default),
@@ -277,50 +284,50 @@ function registerHandlebarTemplates(root) {
     Handlebars.registerPartial('axios/request', Handlebars.template(request_1.default));
     // Register Zod partials if validationLibrary is ZOD
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.ZOD) {
-        templates.exports.schema = Handlebars.template(exportSchema_1.default);
-        Handlebars.registerPartial('zodSchema', Handlebars.template(zodSchema_1.default));
-        Handlebars.registerPartial('zodSchemaInterface', Handlebars.template(zodSchemaInterface_1.default));
-        Handlebars.registerPartial('zodSchemaEnum', Handlebars.template(zodSchemaEnum_1.default));
-        Handlebars.registerPartial('zodSchemaArray', Handlebars.template(zodSchemaArray_1.default));
-        Handlebars.registerPartial('zodSchemaDictionary', Handlebars.template(zodSchemaDictionary_1.default));
-        Handlebars.registerPartial('zodSchemaGeneric', Handlebars.template(zodSchemaGeneric_1.default));
-        Handlebars.registerPartial('zodSchemaReference', Handlebars.template(zodSchemaReference_1.default));
-        Handlebars.registerPartial('zodSchemaComposition', Handlebars.template(zodSchemaComposition_1.default));
+        Handlebars.registerPartial('zod/exportSchema', Handlebars.template(exportSchema_2.default));
+        Handlebars.registerPartial('zod/zodSchema', Handlebars.template(zodSchema_1.default));
+        Handlebars.registerPartial('zod/zodSchemaInterface', Handlebars.template(zodSchemaInterface_1.default));
+        Handlebars.registerPartial('zod/zodSchemaEnum', Handlebars.template(zodSchemaEnum_1.default));
+        Handlebars.registerPartial('zod/zodSchemaArray', Handlebars.template(zodSchemaArray_1.default));
+        Handlebars.registerPartial('zod/zodSchemaDictionary', Handlebars.template(zodSchemaDictionary_1.default));
+        Handlebars.registerPartial('zod/zodSchemaGeneric', Handlebars.template(zodSchemaGeneric_1.default));
+        Handlebars.registerPartial('zod/zodSchemaReference', Handlebars.template(zodSchemaReference_1.default));
+        Handlebars.registerPartial('zod/zodSchemaComposition', Handlebars.template(zodSchemaComposition_1.default));
     }
     // Register Yup partials if validationLibrary is YUP
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.YUP) {
-        templates.exports.schema = Handlebars.template(exportSchema_2.default);
-        Handlebars.registerPartial('yupSchema', Handlebars.template(yupSchema_1.default));
-        Handlebars.registerPartial('yupSchemaInterface', Handlebars.template(yupSchemaInterface_1.default));
-        Handlebars.registerPartial('yupSchemaEnum', Handlebars.template(yupSchemaEnum_1.default));
-        Handlebars.registerPartial('yupSchemaArray', Handlebars.template(yupSchemaArray_1.default));
-        Handlebars.registerPartial('yupSchemaDictionary', Handlebars.template(yupSchemaDictionary_1.default));
-        Handlebars.registerPartial('yupSchemaGeneric', Handlebars.template(yupSchemaGeneric_1.default));
-        Handlebars.registerPartial('yupSchemaReference', Handlebars.template(yupSchemaReference_1.default));
-        Handlebars.registerPartial('yupSchemaComposition', Handlebars.template(yupSchemaComposition_1.default));
+        Handlebars.registerPartial('yup/exportSchema', Handlebars.template(exportSchema_3.default));
+        Handlebars.registerPartial('yup/yupSchema', Handlebars.template(yupSchema_1.default));
+        Handlebars.registerPartial('yup/yupSchemaInterface', Handlebars.template(yupSchemaInterface_1.default));
+        Handlebars.registerPartial('yup/yupSchemaEnum', Handlebars.template(yupSchemaEnum_1.default));
+        Handlebars.registerPartial('yup/yupSchemaArray', Handlebars.template(yupSchemaArray_1.default));
+        Handlebars.registerPartial('yup/yupSchemaDictionary', Handlebars.template(yupSchemaDictionary_1.default));
+        Handlebars.registerPartial('yup/yupSchemaGeneric', Handlebars.template(yupSchemaGeneric_1.default));
+        Handlebars.registerPartial('yup/yupSchemaReference', Handlebars.template(yupSchemaReference_1.default));
+        Handlebars.registerPartial('yup/yupSchemaComposition', Handlebars.template(yupSchemaComposition_1.default));
     }
     // Register Joi partials if validationLibrary is JOI
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JOI) {
-        templates.exports.schema = Handlebars.template(exportSchema_3.default);
-        Handlebars.registerPartial('joiSchema', Handlebars.template(joiSchema_1.default));
-        Handlebars.registerPartial('joiSchemaInterface', Handlebars.template(joiSchemaInterface_1.default));
-        Handlebars.registerPartial('joiSchemaEnum', Handlebars.template(joiSchemaEnum_1.default));
-        Handlebars.registerPartial('joiSchemaArray', Handlebars.template(joiSchemaArray_1.default));
-        Handlebars.registerPartial('joiSchemaDictionary', Handlebars.template(joiSchemaDictionary_1.default));
-        Handlebars.registerPartial('joiSchemaGeneric', Handlebars.template(joiSchemaGeneric_1.default));
-        Handlebars.registerPartial('joiSchemaReference', Handlebars.template(joiSchemaReference_1.default));
-        Handlebars.registerPartial('joiSchemaComposition', Handlebars.template(joiSchemaComposition_1.default));
+        Handlebars.registerPartial('joi/exportSchema', Handlebars.template(exportSchema_4.default));
+        Handlebars.registerPartial('joi/joiSchema', Handlebars.template(joiSchema_1.default));
+        Handlebars.registerPartial('joi/joiSchemaInterface', Handlebars.template(joiSchemaInterface_1.default));
+        Handlebars.registerPartial('joi/joiSchemaEnum', Handlebars.template(joiSchemaEnum_1.default));
+        Handlebars.registerPartial('joi/joiSchemaArray', Handlebars.template(joiSchemaArray_1.default));
+        Handlebars.registerPartial('joi/joiSchemaDictionary', Handlebars.template(joiSchemaDictionary_1.default));
+        Handlebars.registerPartial('joi/joiSchemaGeneric', Handlebars.template(joiSchemaGeneric_1.default));
+        Handlebars.registerPartial('joi/joiSchemaReference', Handlebars.template(joiSchemaReference_1.default));
+        Handlebars.registerPartial('joi/joiSchemaComposition', Handlebars.template(joiSchemaComposition_1.default));
     }
     if (root.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JSONSCHEMA) {
-        templates.exports.schema = Handlebars.template(exportSchema_4.default);
-        Handlebars.registerPartial('jsonschemaSchema', Handlebars.template(jsonschemaSchema_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaInterface', Handlebars.template(jsonschemaSchemaInterface_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaEnum', Handlebars.template(jsonschemaSchemaEnum_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaArray', Handlebars.template(jsonschemaSchemaArray_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaDictionary', Handlebars.template(jsonschemaSchemaDictionary_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaGeneric', Handlebars.template(jsonschemaSchemaGeneric_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaReference', Handlebars.template(jsonschemaSchemaReference_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaComposition', Handlebars.template(jsonschemaSchemaComposition_1.default));
+        Handlebars.registerPartial('jsonschema/exportSchema', Handlebars.template(exportSchema_5.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchema', Handlebars.template(jsonschemaSchema_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaInterface', Handlebars.template(jsonschemaSchemaInterface_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaEnum', Handlebars.template(jsonschemaSchemaEnum_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaArray', Handlebars.template(jsonschemaSchemaArray_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaDictionary', Handlebars.template(jsonschemaSchemaDictionary_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaGeneric', Handlebars.template(jsonschemaSchemaGeneric_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaReference', Handlebars.template(jsonschemaSchemaReference_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaComposition', Handlebars.template(jsonschemaSchemaComposition_1.default));
     }
     return templates;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"resolveRefPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefPath.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAEhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CA4BnF"}
+{"version":3,"file":"resolveRefPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAEhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CA0BnF"}

package/dist/core/utils/resolveRefPath.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveRefPath = resolveRefPath;
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
-const advancedDeduplicatePath_1 = require("./advancedDeduplicatePath");
 const parseRef_1 = require("./parseRef");
 /**
  * Resolve a parsed reference to an absolute path (when applicable).
@@ -19,9 +18,7 @@ function resolveRefPath(parsedRef, parentFilePath) {
         case parseRef_1.RefType.EXTERNAL_FILE_FRAGMENT:
             // Resolve relative to parent file directory
             if (parsedRef.filePath) {
-                const resolvedPath = (0, pathHelpers_1.resolveHelper)(parentDir, parsedRef.filePath);
-                // Clean any duplicate path segments
-                return (0, advancedDeduplicatePath_1.advancedDeduplicatePath)(resolvedPath);
+                return (0, pathHelpers_1.resolveHelper)(parentDir, parsedRef.filePath);
             }
             return parentFilePath;
         case parseRef_1.RefType.ABSOLUTE_PATH:

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

@@ -1,3 +1,3 @@
 import { TRawOptions } from '../../common/TRawOptions';
-export declare function validateRawOptions(rawOptions: TRawOptions): void;
+export declare function validateRawOptions(rawOptions: TRawOptions): Promise<void>;
 //# sourceMappingURL=validateRawOptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"validateRawOptions.d.ts","sourceRoot":"","sources":["../../../src/core/utils/validateRawOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,WAAW,QASzD"}
+{"version":3,"file":"validateRawOptions.d.ts","sourceRoot":"","sources":["../../../src/core/utils/validateRawOptions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/E"}

package/dist/core/utils/validateRawOptions.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateRawOptions = validateRawOptions;
 const Consts_1 = require("../../common/Consts");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const validateZodOptions_1 = require("../../common/Validation/validateZodOptions");
 const UnifiedVersionedSchemas_1 = require("../../common/VersionedSchema/AllVersionedSchemas/UnifiedVersionedSchemas");
 const dependentOptionsRefinement_1 = require("../../common/VersionedSchema/refinements/dependentOptionsRefinement");
-function validateRawOptions(rawOptions) {
+async function validateRawOptions(rawOptions) {
     const currentSchema = UnifiedVersionedSchemas_1.rawOptionsSchema.superRefine(dependentOptionsRefinement_1.dependentOptionsRefinement);
     const validationResult = (0, validateZodOptions_1.validateZodOptions)(currentSchema, rawOptions);
     if (!validationResult.success) {
-        Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
+        Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')));
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
         process.exit(1);
     }
 }

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

@@ -1,5 +1,6 @@
 import { Templates } from '../types/base/Templates.model';
 import { HttpClient } from '../types/enums/HttpClient.enum';
+import { ModelsMode } from '../types/enums/ModelsMode.enum';
 import type { Client } from '../types/shared/Client.model';
 import { WriteClient } from '../WriteClient';
 /**
@@ -18,6 +19,7 @@ interface IWriteClientCore {
     request?: string;
     useCancelableRequest?: boolean;
     useSeparatedIndexes?: boolean;
+    modelsMode?: ModelsMode;
 }
 /**
  * Generate OpenAPI core files, this includes the basic boilerplate code to handle requests.

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuCjG"}
+{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;CAC3B;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2CjG"}

package/dist/core/utils/writeClientCore.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientCore = writeClientCore;
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const ModelsMode_enum_1 = require("../types/enums/ModelsMode.enum");
 /**
  * Generate OpenAPI core files, this includes the basic boilerplate code to handle requests.
  * @param client Client object, containing, models, schemas and services
@@ -13,7 +14,7 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
  * @param useCancelableRequest Use cancelable request type
  */
 async function writeClientCore(options) {
-    const { client, templates, outputCorePath, httpClient, request, useCancelableRequest, useSeparatedIndexes } = options;
+    const { client, templates, outputCorePath, httpClient, request, useCancelableRequest, useSeparatedIndexes, modelsMode } = options;
     const context = {
         httpClient,
         server: client.server,
@@ -27,6 +28,10 @@ async function writeClientCore(options) {
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiError.ts'), templates.core.apiError({}));
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiRequestOptions.ts'), templates.core.apiRequestOptions({}));
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiResult.ts'), templates.core.apiResult({}));
+    if (modelsMode === ModelsMode_enum_1.ModelsMode.CLASSES) {
+        await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'BaseDto.ts'), templates.core.baseDto({}));
+        await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'dtoUtils.ts'), templates.core.dtoUtils({}));
+    }
     if (useCancelableRequest) {
         await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'CancelablePromise.ts'), templates.core.cancelablePromise({}));
     }

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

@@ -5,6 +5,7 @@ interface IOptionsProps {
     outputCorePath: string;
     useCancelableRequest?: boolean;
     useSeparatedIndexes?: boolean;
+    modelsMode?: import('../types/enums/ModelsMode.enum').ModelsMode;
 }
 export declare function writeClientCoreIndex(this: WriteClient, options: IOptionsProps): Promise<void>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientCoreIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCoreIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,UAAU,aAAa;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAcnF"}
+{"version":3,"file":"writeClientCoreIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCoreIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,UAAU,aAAa;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,gCAAgC,EAAE,UAAU,CAAC;CACpE;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAcnF"}

package/dist/core/utils/writeClientCoreIndex.js

@@ -4,13 +4,13 @@ exports.writeClientCoreIndex = writeClientCoreIndex;
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const appendUniqueLinesToFile_1 = require("./appendUniqueLinesToFile");
 async function writeClientCoreIndex(options) {
-    const { templates, outputCorePath, useCancelableRequest, useSeparatedIndexes } = options;
+    const { templates, outputCorePath, useCancelableRequest, useSeparatedIndexes, modelsMode } = options;
     if (!useSeparatedIndexes) {
         return;
     }
     const filePath = (0, pathHelpers_1.resolveHelper)(outputCorePath, 'index.ts');
     this.logger.info(`Data has been written to a file: ${filePath}`);
-    const content = templates.indexes.core({ useCancelableRequest });
+    const content = templates.indexes.core({ useCancelableRequest, modelsMode });
     await (0, appendUniqueLinesToFile_1.appendUniqueLinesToFile)(filePath, content);
     this.logger.info(`Writing to the file is completed: ${filePath}`);
 }

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

@@ -4,9 +4,14 @@ import { WriteClient } from '../WriteClient';
 interface WriteClientExecutor {
     outputPath: string;
     outputCorePath: string;
+    request?: string;
+    customExecutorPath?: string;
     services: Service[];
     templates: Templates;
+    useProjectPrettier?: boolean;
+    useEslintFix?: boolean;
 }
+declare function deduplicateServicesByName(services: Service[]): Service[];
 export declare function writeClientExecutor(this: WriteClient, options: WriteClientExecutor): Promise<void>;
-export {};
+export { deduplicateServicesByName };
 //# sourceMappingURL=writeClientExecutor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientExecutor.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientExecutor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,mBAAmB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAYxG"}
+{"version":3,"file":"writeClientExecutor.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientExecutor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,mBAAmB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,iBAAS,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CASjE;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBxG;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}