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

package/dist/core/api/v2/parser/__tests__/getType.test.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
-const json_schema_ref_parser_1 = __importDefault(require("json-schema-ref-parser"));
+const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
 const Context_1 = require("../../../../Context");
 const getOutputPaths_1 = require("../../../../utils/getOutputPaths");
 const Parser_1 = require("../../Parser");
@@ -13,7 +13,7 @@ const Parser_1 = require("../../Parser");
     (0, node_test_1.test)('@unit: should convert int', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
+        const parser = new swagger_parser_1.default();
         const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('int', '');
@@ -25,37 +25,19 @@ const Parser_1 = require("../../Parser");
     (0, node_test_1.test)('@unit: should support file with ext', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
+        const parser = new swagger_parser_1.default();
         const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('schemas/ModelWithString.yml', '');
-        node_assert_1.default.strictEqual(type.type, 'IModelWithString');
-        node_assert_1.default.strictEqual(type.base, 'IModelWithString');
+        node_assert_1.default.strictEqual(type.type, 'ModelWithString');
+        node_assert_1.default.strictEqual(type.base, 'ModelWithString');
         node_assert_1.default.strictEqual(type.template, null);
         node_assert_1.default.deepStrictEqual(type.imports, [
             {
-                name: 'IModelWithString',
+                name: 'ModelWithString',
                 alias: '',
-                path: './schemas/ModelWithString',
+                path: '././schemas/ModelWithString',
             },
         ]);
     });
-    const object = {
-        components: {
-            schemas: {
-                someSpecialSchema: {
-                    type: 'object',
-                },
-            },
-        },
-    };
-    (0, node_test_1.test)('@unit: should support external generation type', async () => {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context({ input: object, output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
-        context.addRefs(await parser.resolve(object));
-        const type = new Parser_1.Parser(context).getType('#/components/schemas/someSpecialSchema', '');
-        node_assert_1.default.strictEqual(type.type, 'ISomeSpecialSchema');
-    });
 });

package/dist/core/api/v2/parser/getModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CAyJjE"}
+{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAO/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CA2JjE"}

package/dist/core/api/v2/parser/getModel.js

@@ -6,6 +6,7 @@ const getComment_1 = require("../../../utils/getComment");
 const getEnum_1 = require("../../../utils/getEnum");
 const getEnumFromDescription_1 = require("../../../utils/getEnumFromDescription");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 function getModel(config) {
     const { openApi, definition, isDefinition = false, name = '', path = '', parentRef } = config;
     const model = {
@@ -44,7 +45,8 @@ function getModel(config) {
         properties: [],
     };
     if (definition.$ref) {
-        const definitionRef = this.getType(definition.$ref, parentRef);
+        const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.$ref, parentRef);
+        const definitionRef = this.getType(definition.$ref, normalizedRef);
         model.export = 'reference';
         model.type = definitionRef.type;
         model.base = definitionRef.base;
@@ -75,7 +77,8 @@ function getModel(config) {
     }
     if (definition.type === 'array' && definition.items) {
         if (definition.items.$ref) {
-            const arrayItems = this.getType(definition.items.$ref, parentRef);
+            const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.items.$ref, parentRef);
+            const arrayItems = this.getType(definition.items.$ref, normalizedRef);
             model.export = 'array';
             model.type = arrayItems.type;
             model.base = arrayItems.base;

package/dist/core/api/v2/parser/getModelProperties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModelProperties.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,KAAK,EAAE,CAgFxH"}
+{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModelProperties.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAK/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,KAAK,EAAE,CAiFxH"}

package/dist/core/api/v2/parser/getModelProperties.js

@@ -8,6 +8,7 @@ const get_1 = __importDefault(require("lodash-es/get"));
 const escapeName_1 = require("../../../utils/escapeName");
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 function getModelProperties(openApi, definition, parentRef) {
     const models = [];
     for (const propertyName in definition.properties) {
@@ -15,7 +16,8 @@ function getModelProperties(openApi, definition, parentRef) {
             const property = definition.properties[propertyName];
             const propertyRequired = definition.required?.includes(propertyName) || property.default !== undefined;
             if (property.$ref) {
-                const model = this.getType(property.$ref, parentRef);
+                const normalizedRef = (0, normalizeRef_1.normalizeRef)(property.$ref, parentRef);
+                const model = this.getType(property.$ref, normalizedRef);
                 models.push({
                     name: (0, escapeName_1.escapeName)(propertyName),
                     alias: '',

package/dist/core/api/v2/parser/getModels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAK/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CA+CjE"}
+{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAK/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CAsBjE"}

package/dist/core/api/v2/parser/getModels.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
 const getRefFromSchema_1 = require("../../../utils/getRefFromSchema");
-const pathHelpers_1 = require("../../../utils/pathHelpers");
+const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
 function getModels(openApi) {
@@ -23,34 +23,8 @@ function getModels(openApi) {
             models.push(model);
         }
         models = (0, sortModelsByName_1.sortModelsByName)(models.filter(unique_1.unique));
-        let previous;
-        let index = 1;
-        models.forEach(model => {
-            if (previous && previous.name === model.name) {
-                if (index === 1) {
-                    previous.alias = `${model.name}$${index}`;
-                    index++;
-                }
-                model.alias = `${model.name}$${index}`;
-                index++;
-            }
-            else {
-                model.alias = '';
-                index = 1;
-            }
-            previous = model;
-        });
-        models.forEach(model => {
-            model.imports = model.imports.map(imprt => {
-                const importModel = models.filter(value => `${value.path}${value.name}` === imprt.path && value.name === imprt.name);
-                const importAlias = importModel.length > 0 ? importModel[0].alias : imprt?.alias;
-                const importPath = importModel.length > 0 ? (0, pathHelpers_1.join)((0, pathHelpers_1.relative)(model.path, importModel[0].path), imprt.name) : imprt.path;
-                return Object.assign(imprt, {
-                    alias: importAlias,
-                    path: importPath,
-                });
-            });
-        });
+        (0, modelHelpers_1.setDuplicateModelAliases)(models);
+        (0, modelHelpers_1.resolveModelImports)(models, this.context.output.outputModels);
     }
     return models.filter(unique_1.unique);
 }

package/dist/core/api/v2/parser/getOperation.d.ts

@@ -3,5 +3,5 @@ import type { OperationParameters } from '../../../types/shared/OperationParamet
 import { Parser } from '../Parser';
 import type { OpenApi } from '../types/OpenApi.model';
 import type { OpenApiOperation } from '../types/OpenApiOperation.model';
-export declare function getOperation(this: Parser, openApi: OpenApi, url: string, method: string, op: OpenApiOperation, pathParams: OperationParameters): Operation;
+export declare function getOperation(this: Parser, openApi: OpenApi, url: string, method: string, op: OpenApiOperation, pathParams: OperationParameters, parentRef: string): Operation;
 //# sourceMappingURL=getOperation.d.ts.map

package/dist/core/api/v2/parser/getOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAQ3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAwD1J"}
+{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAQ3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAwD7K"}

package/dist/core/api/v2/parser/getOperation.js

@@ -8,7 +8,7 @@ const getOperationPath_1 = require("../../../utils/getOperationPath");
 const getOperationResponseHeader_1 = require("../../../utils/getOperationResponseHeader");
 const getOperationResults_1 = require("../../../utils/getOperationResults");
 const getServiceClassName_1 = require("../../../utils/getServiceClassName");
-function getOperation(openApi, url, method, op, pathParams) {
+function getOperation(openApi, url, method, op, pathParams, parentRef) {
     const serviceName = op.tags?.[0] || 'Service';
     const serviceClassName = (0, getServiceClassName_1.getServiceClassName)(serviceName);
     const operationNameFallback = `${method}${serviceClassName}`;
@@ -37,7 +37,7 @@ function getOperation(openApi, url, method, op, pathParams) {
     };
     // Parse the operation parameters (path, query, body, etc).
     if (op.parameters) {
-        const parameters = this.getOperationParameters(openApi, op.parameters);
+        const parameters = this.getOperationParameters(openApi, op.parameters, parentRef);
         operation.imports.push(...parameters.imports);
         operation.parameters.push(...parameters.parameters);
         operation.parametersPath.push(...parameters.parametersPath);
@@ -49,7 +49,7 @@ function getOperation(openApi, url, method, op, pathParams) {
     }
     // Parse the operation responses.
     if (op.responses) {
-        const operationResponses = this.getOperationResponses(openApi, op.responses);
+        const operationResponses = this.getOperationResponses(openApi, op.responses, parentRef);
         const operationResults = (0, getOperationResults_1.getOperationResults)(operationResponses);
         operation.errors = (0, getOperationErrors_1.getOperationErrors)(operationResponses);
         operation.responseHeader = (0, getOperationResponseHeader_1.getOperationResponseHeader)(operationResults);

package/dist/core/api/v2/parser/getOperationParameter.d.ts

@@ -2,5 +2,5 @@ import type { OperationParameter } from '../../../types/shared/OperationParamete
 import { Parser } from '../Parser';
 import type { OpenApi } from '../types/OpenApi.model';
 import type { OpenApiParameter } from '../types/OpenApiParameter.model';
-export declare function getOperationParameter(this: Parser, openApi: OpenApi, parameter: OpenApiParameter): OperationParameter;
+export declare function getOperationParameter(this: Parser, openApi: OpenApi, parameter: OpenApiParameter, parentRef: string): OperationParameter;
 //# sourceMappingURL=getOperationParameter.d.ts.map

package/dist/core/api/v2/parser/getOperationParameter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameter.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAOzF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,GAAG,kBAAkB,CAsIrH"}
+{"version":3,"file":"getOperationParameter.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAQzF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,CAuIxI"}

package/dist/core/api/v2/parser/getOperationParameter.js

@@ -7,8 +7,9 @@ const getEnum_1 = require("../../../utils/getEnum");
 const getEnumFromDescription_1 = require("../../../utils/getEnumFromDescription");
 const getOperationParameterName_1 = require("../../../utils/getOperationParameterName");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getOperationParameterDefault_1 = require("./getOperationParameterDefault");
-function getOperationParameter(openApi, parameter) {
+function getOperationParameter(openApi, parameter, parentRef) {
     const operationParameter = {
         path: '',
         in: parameter.in,
@@ -44,7 +45,8 @@ function getOperationParameter(openApi, parameter) {
         mediaType: null,
     };
     if (parameter.$ref) {
-        const definitionRef = this.getType(parameter.$ref, '');
+        const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.$ref, parentRef);
+        const definitionRef = this.getType(parameter.$ref, normalizedRef);
         operationParameter.export = 'reference';
         operationParameter.type = definitionRef.type;
         operationParameter.base = definitionRef.base;

package/dist/core/api/v2/parser/getOperationParameters.d.ts

@@ -2,5 +2,5 @@ import type { OperationParameters } from '../../../types/shared/OperationParamet
 import { Parser } from '../Parser';
 import type { OpenApi } from '../types/OpenApi.model';
 import type { OpenApiParameter } from '../types/OpenApiParameter.model';
-export declare function getOperationParameters(this: Parser, openApi: OpenApi, parameters: OpenApiParameter[]): OperationParameters;
+export declare function getOperationParameters(this: Parser, openApi: OpenApi, parameters: OpenApiParameter[], parentRef: string): OperationParameters;
 //# sourceMappingURL=getOperationParameters.d.ts.map

package/dist/core/api/v2/parser/getOperationParameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAG3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CA+D1H"}
+{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAG3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,mBAAmB,CA+D7I"}

package/dist/core/api/v2/parser/getOperationParameters.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationParameters = getOperationParameters;
 const sortByRequiredExtended_1 = require("../../../utils/sortByRequiredExtended");
 const sortByRequiredSimple_1 = require("../../../utils/sortByRequiredSimple");
-function getOperationParameters(openApi, parameters) {
+function getOperationParameters(openApi, parameters, parentRef) {
     const operationParameters = {
         imports: [],
         parameters: [],
@@ -17,7 +17,7 @@ function getOperationParameters(openApi, parameters) {
     // Iterate over the parameters
     parameters.forEach(parameterOrReference => {
         const parameterDef = (parameterOrReference.$ref ? this.context.get(parameterOrReference.$ref) : parameterOrReference);
-        const parameter = this.getOperationParameter(openApi, parameterDef);
+        const parameter = this.getOperationParameter(openApi, parameterDef, parentRef);
         // We ignore the "api-version" param, since we do not want to add this
         // as the first / default parameter for each of the service calls.
         if (parameter.prop !== 'api-version') {

package/dist/core/api/v2/parser/getOperationResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAGvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAmF1J"}
+{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAIvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAoF1J"}

package/dist/core/api/v2/parser/getOperationResponse.js

@@ -7,6 +7,7 @@ exports.getOperationResponse = getOperationResponse;
 const get_1 = __importDefault(require("lodash-es/get"));
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 function getOperationResponse(openApi, response, responseCode, parentRef) {
     const operationResponse = {
         in: 'response',
@@ -35,7 +36,8 @@ function getOperationResponse(openApi, response, responseCode, parentRef) {
     // then we need to parse the schema!
     if (response.schema) {
         if (response.schema.$ref) {
-            const model = this.getType(response.schema.$ref, parentRef);
+            const normalizedRef = (0, normalizeRef_1.normalizeRef)(response.schema.$ref, parentRef);
+            const model = this.getType(response.schema.$ref, normalizedRef);
             operationResponse.export = 'reference';
             operationResponse.type = model.type;
             operationResponse.base = model.base;

package/dist/core/api/v2/parser/getOperationResponses.d.ts

@@ -2,5 +2,5 @@ import type { OperationResponse } from '../../../types/shared/OperationResponse.
 import { Parser } from '../Parser';
 import type { OpenApi } from '../types/OpenApi.model';
 import type { OpenApiResponses } from '../types/OpenApiResponses.model';
-export declare function getOperationResponses(this: Parser, openApi: OpenApi, responses: OpenApiResponses): OperationResponse[];
+export declare function getOperationResponses(this: Parser, openApi: OpenApi, responses: OpenApiResponses, parentRef: string): OperationResponse[];
 //# sourceMappingURL=getOperationResponses.d.ts.map

package/dist/core/api/v2/parser/getOperationResponses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponses.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponses.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,GAAG,iBAAiB,EAAE,CAsBtH"}
+{"version":3,"file":"getOperationResponses.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponses.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAsBzI"}

package/dist/core/api/v2/parser/getOperationResponses.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationResponses = getOperationResponses;
 const get_1 = __importDefault(require("lodash-es/get"));
 const getOperationResponseCode_1 = require("../../../utils/getOperationResponseCode");
-function getOperationResponses(openApi, responses) {
+function getOperationResponses(openApi, responses, parentRef) {
     const operationResponses = [];
     // Iterate over each response code and get the
     // status code and response message (if any).
@@ -16,7 +16,7 @@ function getOperationResponses(openApi, responses) {
             const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref) : responseOrReference);
             const responseCode = (0, getOperationResponseCode_1.getOperationResponseCode)(code);
             if (responseCode) {
-                const operationResponse = this.getOperationResponse(openApi, response, responseCode, '');
+                const operationResponse = this.getOperationResponse(openApi, response, responseCode, parentRef);
                 operationResponses.push(operationResponse);
             }
         }

package/dist/core/api/v2/parser/getServiceName.d.ts

@@ -0,0 +1,3 @@
+import { OpenApiOperation } from "../types/OpenApiOperation.model";
+export declare function getServiceName(op: OpenApiOperation, fileName: string): string;
+//# sourceMappingURL=getServiceName.d.ts.map

package/dist/core/api/v2/parser/getServiceName.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getServiceName.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getServiceName.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,wBAAgB,cAAc,CAAC,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7E"}

package/dist/core/api/v2/parser/getServiceName.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getServiceName = getServiceName;
+const getClassName_1 = require("../../../utils/getClassName");
+const getServiceClassName_1 = require("../../../utils/getServiceClassName");
+function getServiceName(op, fileName) {
+    return (0, getServiceClassName_1.getServiceClassName)(op.tags?.[0] || `${(0, getClassName_1.getClassName)(fileName)}Service`);
+}

package/dist/core/api/v2/parser/getServices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getServices.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CA4CrE"}
+{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getServices.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAKtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CAgCrE"}

package/dist/core/api/v2/parser/getServices.js

@@ -5,6 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServices = getServices;
 const get_1 = __importDefault(require("lodash-es/get"));
+const getClassName_1 = require("../../../utils/getClassName");
+const serviceHelpers_1 = require("../../../utils/serviceHelpers");
+const getServiceName_1 = require("./getServiceName");
 /**
  * Get the OpenAPI services
  */
@@ -13,40 +16,26 @@ function getServices(openApi) {
     for (const url in openApi.paths) {
         if ((0, get_1.default)(openApi.paths, url, null)) {
             // Grab path and parse any global path parameters
-            const path = openApi.paths[url];
-            const pathParams = this.getOperationParameters(openApi, path.parameters || []);
+            const pathByUrl = openApi.paths[url];
+            const path = (pathByUrl.$ref ? this.context.get(pathByUrl.$ref) : pathByUrl);
+            const pathParams = this.getOperationParameters(openApi, path.parameters || [], '');
+            const parentFileRef = pathByUrl.$ref || this.context.root?.path || '';
             // Parse all the methods for this path
-            for (const method in path) {
-                if ((0, get_1.default)(path, method, null)) {
-                    switch (method) {
-                        case 'get':
-                        case 'put':
-                        case 'post':
-                        case 'delete':
-                        case 'options':
-                        case 'head':
-                        case 'patch': {
-                            // Each method contains an OpenAPI operation, we parse the operation
-                            const op = path[method];
-                            const operation = this.getOperation(openApi, url, method, op, pathParams);
-                            // If we have already declared a service, then we should fetch that and
-                            // append the new method to it. Otherwise we should create a new service object.
-                            const service = services.get(operation.service) || {
-                                name: operation.service,
-                                originName: operation.service,
-                                operations: [],
-                                imports: [],
-                            };
-                            // Push the operation in the service
-                            service.operations.push(operation);
-                            service.imports.push(...operation.imports);
-                            services.set(operation.service, service);
-                            break;
-                        }
-                    }
-                }
-            }
+            (0, serviceHelpers_1.forEachOperationInPath)(path, (method, op) => {
+                // Each method contains an OpenAPI operation, we parse the operation
+                const fileName = this.context.fileName();
+                const serviceName = (0, getServiceName_1.getServiceName)(op, fileName);
+                const service = (0, serviceHelpers_1.ensureService)(services, serviceName, (0, getClassName_1.getClassName)(op.tags?.[0] || fileName));
+                const operation = this.getOperation(openApi, url, method, op, pathParams, parentFileRef);
+                // Merge operation imports into service (reuse import objects when possible)
+                (0, serviceHelpers_1.mergeOperationImportsIntoService)(service, operation);
+                service.operations.push(operation);
+                services.set(operation.service, service);
+            });
         }
     }
+    services.forEach(service => {
+        (0, serviceHelpers_1.finalizeServiceImports)(service);
+    });
     return Array.from(services.values());
 }

package/dist/core/api/v2/parser/getType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAQ7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA8B5E"}
+{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAoC5E"}

package/dist/core/api/v2/parser/getType.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
-const getAbsolutePath_1 = require("../../../utils/getAbsolutePath");
 const getMappedType_1 = require("../../../utils/getMappedType");
-const getRelativeModelImportPath_1 = require("../../../utils/getRelativeModelImportPath");
-const getRelativeModelPath_1 = require("../../../utils/getRelativeModelPath");
 const getTypeName_1 = require("../../../utils/getTypeName");
 const replaceString_1 = require("../../../utils/replaceString");
+const resolveRefToImportPath_1 = require("../../../utils/resolveRefToImportPath");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
 /**
  * Parse any string value into a type object.
@@ -14,7 +12,7 @@ const stripNamespace_1 = require("../../../utils/stripNamespace");
  * @param parentRef Reference to a parent model
  */
 function getType(value, parentRef) {
-    const normalizedValue = (0, replaceString_1.replaceString)(value);
+    const normalizedValue = (0, replaceString_1.replaceString)(value) || '';
     const result = {
         type: 'any',
         base: 'any',
@@ -22,19 +20,25 @@ function getType(value, parentRef) {
         imports: [],
         path: '',
     };
-    const valueClean = (0, stripNamespace_1.stripNamespace)(normalizedValue || '');
-    const valuePath = (0, getRelativeModelPath_1.getRelativeModelPath)(this.context.output?.outputModels, valueClean);
+    const valueClean = (0, stripNamespace_1.stripNamespace)(normalizedValue);
     if ((0, getMappedType_1.hasMappedType)(valueClean)) {
         const mapped = (0, getMappedType_1.getMappedType)(valueClean);
-        result.path = valuePath;
+        result.path = valueClean;
         if (mapped) {
             result.type = mapped;
             result.base = mapped;
         }
     }
     else if (valueClean) {
-        const valueImportPath = (0, getRelativeModelImportPath_1.getRelativeModelImportPath)(this.context.output.outputModels, parentRef, valueClean);
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), (0, getAbsolutePath_1.getAbsolutePath)(value, parentRef));
+        // Safely calculate the path that the specification file will have in outputModels folder
+        const valuePath = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+            mainSpecPath: this.context.root?.path || '',
+            parentFilePath: parentRef,
+            refValuePath: normalizedValue,
+            outputModelsPath: this.context.output?.outputModels,
+        });
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean));
+        const valueImportPath = !valuePath.startsWith('/') ? `./${valuePath}` : valuePath;
         result.path = valuePath;
         result.type = type;
         result.base = type;

package/dist/core/api/v3/parser/__tests__/getType.test.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
-const json_schema_ref_parser_1 = __importDefault(require("json-schema-ref-parser"));
+const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
 const Context_1 = require("../../../../Context");
 const getOutputPaths_1 = require("../../../../utils/getOutputPaths");
 const Parser_1 = require("../../Parser");
@@ -13,7 +13,7 @@ const Parser_1 = require("../../Parser");
     (0, node_test_1.test)('@unit: should convert int', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
+        const parser = new swagger_parser_1.default();
         const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('int', '');
@@ -25,37 +25,19 @@ const Parser_1 = require("../../Parser");
     (0, node_test_1.test)('@unit: should support file with ext', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
+        const parser = new swagger_parser_1.default();
         const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('schemas/ModelWithString.yml', '');
-        node_assert_1.default.strictEqual(type.type, 'IModelWithString');
-        node_assert_1.default.strictEqual(type.base, 'IModelWithString');
+        node_assert_1.default.strictEqual(type.type, 'ModelWithString');
+        node_assert_1.default.strictEqual(type.base, 'ModelWithString');
         node_assert_1.default.strictEqual(type.template, null);
         node_assert_1.default.deepStrictEqual(type.imports, [
             {
-                name: 'IModelWithString',
+                name: 'ModelWithString',
                 alias: '',
                 path: './schemas/ModelWithString',
             },
         ]);
     });
-    const object = {
-        components: {
-            schemas: {
-                someSpecialSchema: {
-                    type: 'object',
-                },
-            },
-        },
-    };
-    (0, node_test_1.test)('@unit: should support external generation type', async () => {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context({ input: object, output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
-        context.addRefs(await parser.resolve(object));
-        const type = new Parser_1.Parser(context).getType('#/components/schemas/someSpecialSchema', '');
-        node_assert_1.default.strictEqual(type.type, 'ISomeSpecialSchema');
-    });
 });

package/dist/core/api/v3/parser/getModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CAgLjE"}
+{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAO/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CAkLjE"}

package/dist/core/api/v3/parser/getModel.js

@@ -6,6 +6,7 @@ const getComment_1 = require("../../../utils/getComment");
 const getEnum_1 = require("../../../utils/getEnum");
 const getEnumFromDescription_1 = require("../../../utils/getEnumFromDescription");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getModelDefault_1 = require("./getModelDefault");
 function getModel(config) {
     const { openApi, definition, isDefinition = false, name = '', path = '', parentRef } = config;
@@ -43,7 +44,8 @@ function getModel(config) {
         properties: [],
     };
     if (definition.$ref) {
-        const definitionRef = this.getType(definition.$ref, parentRef);
+        const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.$ref, parentRef);
+        const definitionRef = this.getType(definition.$ref, normalizedRef);
         model.export = 'reference';
         model.type = definitionRef.type;
         model.base = definitionRef.base;
@@ -76,7 +78,8 @@ function getModel(config) {
     }
     if (definition.type === 'array' && definition.items) {
         if (definition.items.$ref) {
-            const arrayItems = this.getType(definition.items.$ref, parentRef);
+            const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.items.$ref, parentRef);
+            const arrayItems = this.getType(definition.items.$ref, normalizedRef);
             model.export = 'array';
             model.type = arrayItems.type;
             model.base = arrayItems.base;

package/dist/core/api/v3/parser/getModelProperties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModelProperties.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAK/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,KAAK,EAAE,CAiFxH"}
+{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModelProperties.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,KAAK,EAAE,CAkFxH"}