ts-openapi-codegen 2.0.0-beta.8 → 2.0.0-beta.9

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

@@ -14,9 +14,10 @@ function getServices(openApi) {
         if ((0, safeHasOwn_1.safeHasOwn)(openApi.paths, url)) {
             // Grab path and parse any global 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 || '';
+            const rootPath = this.context.root?.path || '';
+            const path = (pathByUrl.$ref ? this.context.get(pathByUrl.$ref, rootPath) : pathByUrl);
+            const parentFileRef = pathByUrl.$ref || rootPath;
+            const pathParams = this.getOperationParameters(openApi, path.parameters || [], parentFileRef);
             // Parse all the methods for this path
             (0, serviceHelpers_1.forEachOperationInPath)(path, (method, op) => {
                 // Each method contains an OpenAPI operation, we parse the operation

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":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAK7D,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,CA4C5E"}
+{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getType.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAK7D,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,CA6C5E"}

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

@@ -35,7 +35,7 @@ function getType(value, parentRef) {
          * В этом случае надо брать непосредственно normalizedValue - это относительный путь или фрагмент.
          * Предполагаем, что в таком случае расчитывать нет нужды. Это путь от папки outputModels
          */
-        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue);
+        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue, parentRef);
         let valuePath = valueClean;
         if (canonicalValue) {
             const refValuePath = canonicalValue?.fragment ? `${canonicalValue.outputFile}${canonicalValue.fragment}` : canonicalValue?.outputFile || '';
@@ -43,7 +43,7 @@ function getType(value, parentRef) {
             valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
         }
         valuePath = !valuePath.startsWith('./') && !valuePath.startsWith('../') ? `./${valuePath}` : valuePath;
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), parentRef);
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), normalizedValue, parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;
         result.type = type;

package/dist/core/api/v3/Parser.d.ts

@@ -16,7 +16,7 @@ export declare class Parser {
     private _context;
     constructor(context: Context);
     get context(): Context;
-    getTypeNameByRef(value: string, ref?: string): string;
+    getTypeNameByRef(value: string, ref: string, parentSourceFile?: string): string;
     parse: typeof parse;
     getModels: typeof getModels;
     getType: typeof getType;

package/dist/core/api/v3/Parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Parser.d.ts","sourceRoot":"","sources":["../../../../src/core/api/v3/Parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,MAAM;IACf,OAAO,CAAC,QAAQ,CAAU;gBAEd,OAAO,EAAE,OAAO;IAI5B,IAAI,OAAO,IAAI,OAAO,CAErB;IAEM,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IASrD,KAAK,eAAS;IACd,SAAS,mBAAa;IACtB,OAAO,iBAAW;IAClB,QAAQ,kBAAY;IACpB,mBAAmB,6BAAuB;IAC1C,kBAAkB,4BAAsB;IACxC,WAAW,qBAAe;IAC1B,sBAAsB,gCAA0B;IAChD,qBAAqB,+BAAyB;IAC9C,YAAY,sBAAgB;IAC5B,qBAAqB,+BAAyB;IAC9C,oBAAoB,8BAAwB;IAC5C,uBAAuB,iCAA2B;CAC5D"}
+{"version":3,"file":"Parser.d.ts","sourceRoot":"","sources":["../../../../src/core/api/v3/Parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,MAAM;IACf,OAAO,CAAC,QAAQ,CAAU;gBAEd,OAAO,EAAE,OAAO;IAI5B,IAAI,OAAO,IAAI,OAAO,CAErB;IAEM,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAS/E,KAAK,eAAS;IACd,SAAS,mBAAa;IACtB,OAAO,iBAAW;IAClB,QAAQ,kBAAY;IACpB,mBAAmB,6BAAuB;IAC1C,kBAAkB,4BAAsB;IACxC,WAAW,qBAAe;IAC1B,sBAAsB,gCAA0B;IAChD,qBAAqB,+BAAyB;IAC9C,YAAY,sBAAgB;IAC5B,qBAAqB,+BAAyB;IAC9C,oBAAoB,8BAAwB;IAC5C,uBAAuB,iCAA2B;CAC5D"}

package/dist/core/api/v3/Parser.js

@@ -23,9 +23,9 @@ class Parser {
     get context() {
         return this._context;
     }
-    getTypeNameByRef(value, ref) {
+    getTypeNameByRef(value, ref, parentSourceFile) {
         if (ref) {
-            const definition = this.context.get(ref);
+            const definition = this.context.get(ref, parentSourceFile);
             return (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(value, definition, this._context.prefix);
         }
         return value;

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;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"}
+{"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"}

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

@@ -6,7 +6,6 @@ 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;
@@ -44,8 +43,7 @@ function getModel(config) {
         properties: [],
     };
     if (definition.$ref) {
-        const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.$ref, parentRef);
-        const definitionRef = this.getType(definition.$ref, normalizedRef);
+        const definitionRef = this.getType(definition.$ref, parentRef);
         model.export = 'reference';
         model.type = definitionRef.type;
         model.base = definitionRef.base;
@@ -78,8 +76,7 @@ function getModel(config) {
     }
     if (definition.type === 'array' && definition.items) {
         if (definition.items.$ref) {
-            const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.items.$ref, parentRef);
-            const arrayItems = this.getType(definition.items.$ref, normalizedRef);
+            const arrayItems = this.getType(definition.items.$ref, parentRef);
             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":"AACA,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"}
+{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModelProperties.ts"],"names":[],"mappings":"AACA,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/v3/parser/getModelProperties.js

@@ -6,7 +6,6 @@ const escapeName_1 = require("../../../utils/escapeName");
 const getClassName_1 = require("../../../utils/getClassName");
 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) {
@@ -14,8 +13,7 @@ function getModelProperties(openApi, definition, parentRef) {
             const property = definition.properties[propertyName];
             const propertyRequired = definition.required?.includes(propertyName) || property.default !== undefined;
             if (property.$ref) {
-                const normalizedRef = (0, normalizeRef_1.normalizeRef)(property.$ref, parentRef);
-                const model = this.getType(property.$ref, normalizedRef);
+                const model = this.getType(property.$ref, parentRef);
                 models.push({
                     name: (0, escapeName_1.escapeName)(propertyName),
                     alias: '',

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

@@ -1 +1 @@
-{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/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"}
+{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModels.ts"],"names":[],"mappings":"AAAA,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;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CAsBjE"}

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
-const getModelNameWithPrefix_1 = require("../../../utils/getModelNameWithPrefix");
 const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
@@ -16,7 +15,7 @@ function getModels(openApi) {
                 openApi: openApi,
                 definition: definition,
                 isDefinition: true,
-                name: (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(definitionType.base, definition, this.context.prefix),
+                name: definitionType.base,
                 path: definitionType.path,
                 parentRef: modelRef,
             });

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

@@ -48,7 +48,7 @@ function getOperation(openApi, url, method, op, pathParams, serviceClassName, pa
     }
     if (op.requestBody) {
         const sortByRequired = this.context.sortByRequired ? sortByRequiredExtended_1.sortByRequiredExtended : sortByRequiredSimple_1.sortByRequiredSimple;
-        const requestBodyDef = (op.requestBody.$ref ? this.context.get(op.requestBody.$ref) : op.requestBody);
+        const requestBodyDef = (op.requestBody.$ref ? this.context.get(op.requestBody.$ref, parentFileRef) : op.requestBody);
         const requestBody = this.getOperationRequestBody(openApi, requestBodyDef, parentFileRef);
         operation.imports.push(...requestBody.imports);
         operation.parameters.push(requestBody);

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameter.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAKzF,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,CAgFxI"}
+{"version":3,"file":"getOperationParameter.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAIzF,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,CA8ExI"}

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

@@ -4,7 +4,6 @@ exports.getOperationParameter = getOperationParameter;
 const getComment_1 = require("../../../utils/getComment");
 const getOperationParameterName_1 = require("../../../utils/getOperationParameterName");
 const getPattern_1 = require("../../../utils/getPattern");
-const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getModelDefault_1 = require("./getModelDefault");
 function getOperationParameter(openApi, parameter, parentRef) {
     const operationParameter = {
@@ -30,8 +29,7 @@ function getOperationParameter(openApi, parameter, parentRef) {
         mediaType: null,
     };
     if (parameter.$ref) {
-        const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.$ref, parentRef);
-        const definitionRef = this.getType(parameter.$ref, normalizedRef);
+        const definitionRef = this.getType(parameter.$ref, parentRef);
         operationParameter.export = 'reference';
         operationParameter.type = definitionRef.type;
         operationParameter.base = definitionRef.base;
@@ -41,8 +39,7 @@ function getOperationParameter(openApi, parameter, parentRef) {
     }
     if (parameter.schema) {
         if (parameter.schema.$ref) {
-            const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.schema.$ref, parentRef);
-            const model = this.getType(parameter.schema.$ref, normalizedRef);
+            const model = this.getType(parameter.schema.$ref, parentRef);
             operationParameter.export = 'reference';
             operationParameter.type = model.type;
             operationParameter.base = model.base;

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

@@ -16,7 +16,7 @@ function getOperationParameters(openApi, parameters, parentRef) {
     };
     // Iterate over the parameters
     parameters.forEach(parameterOrReference => {
-        const parameterDef = (parameterOrReference.$ref ? this.context.get(parameterOrReference.$ref) : parameterOrReference);
+        const parameterDef = (parameterOrReference.$ref ? this.context.get(parameterOrReference.$ref, parentRef) : parameterOrReference);
         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.

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationRequestBody.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationRequestBody.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAIzF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAG5E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,CA8E5I"}
+{"version":3,"file":"getOperationRequestBody.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationRequestBody.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGzF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAG5E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,CA6E5I"}

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationRequestBody = getOperationRequestBody;
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
-const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getContent_1 = require("./getContent");
 function getOperationRequestBody(openApi, parameter, parentRef) {
     const requestBody = {
@@ -38,8 +37,7 @@ function getOperationRequestBody(openApi, parameter, parentRef) {
                 (requestBody.in = 'formData'), (requestBody.name = 'formData'), (requestBody.prop = 'formData');
             }
             if (content?.schema?.$ref) {
-                const normalizedRef = (0, normalizeRef_1.normalizeRef)(content.schema.$ref, parentRef);
-                const model = this.getType(content.schema.$ref, normalizedRef);
+                const model = this.getType(content.schema.$ref, parentRef);
                 requestBody.export = 'reference';
                 requestBody.type = model.type;
                 requestBody.base = model.base;

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponse.ts"],"names":[],"mappings":"AACA,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;AAGtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAqF1J"}
+{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponse.ts"],"names":[],"mappings":"AACA,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;AAGtE,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/v3/parser/getOperationResponse.js

@@ -4,7 +4,6 @@ exports.getOperationResponse = getOperationResponse;
 const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
-const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getContent_1 = require("./getContent");
 function getOperationResponse(openApi, response, responseCode, parentRef) {
     const operationResponse = {
@@ -32,8 +31,7 @@ function getOperationResponse(openApi, response, responseCode, parentRef) {
         const content = (0, getContent_1.getContent)(response.content);
         if (content) {
             if (content?.schema?.$ref) {
-                const normalizedRef = (0, normalizeRef_1.normalizeRef)(content.schema.$ref, parentRef);
-                const model = this.getType(content.schema.$ref, normalizedRef);
+                const model = this.getType(content.schema.$ref, parentRef);
                 operationResponse.export = 'reference';
                 operationResponse.type = model.type;
                 operationResponse.base = model.base;

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

@@ -10,7 +10,7 @@ function getOperationResponses(openApi, responses, parentRef) {
     for (const code in responses) {
         if ((0, safeHasOwn_1.safeHasOwn)(responses, code)) {
             const responseOrReference = responses[code];
-            const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref) : responseOrReference);
+            const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref, parentRef) : responseOrReference);
             const responseCode = (0, getOperationResponseCode_1.getOperationResponseCode)(code);
             if (responseCode) {
                 const operationResponse = this.getOperationResponse(openApi, response, responseCode, parentRef);

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

@@ -1 +1 @@
-{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServices.ts"],"names":[],"mappings":"AACA,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"}
+{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServices.ts"],"names":[],"mappings":"AACA,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,CAiCrE"}

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

@@ -14,9 +14,10 @@ function getServices(openApi) {
         if ((0, safeHasOwn_1.safeHasOwn)(openApi.paths, url)) {
             // Grab path and parse any global 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 || '';
+            const rootPath = this.context.root?.path || '';
+            const path = (pathByUrl.$ref ? this.context.get(pathByUrl.$ref, rootPath) : pathByUrl);
+            const parentFileRef = pathByUrl.$ref || rootPath;
+            const pathParams = this.getOperationParameters(openApi, path.parameters || [], parentFileRef);
             // Parse all the methods for this path
             (0, serviceHelpers_1.forEachOperationInPath)(path, (method, op) => {
                 // Each method contains an OpenAPI operation, we parse the operation

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

@@ -35,7 +35,7 @@ function getType(value, parentRef) {
          * В этом случае надо брать непосредственно normalizedValue - это относительный путь или фрагмент.
          * Предполагаем, что в таком случае расчитывать нет нужды. Это путь от папки outputModels
          */
-        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue);
+        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue, parentRef);
         let valuePath = valueClean;
         if (canonicalValue) {
             const refValuePath = canonicalValue?.fragment ? `${canonicalValue.outputFile}${canonicalValue.fragment}` : canonicalValue?.outputFile || '';
@@ -43,7 +43,7 @@ function getType(value, parentRef) {
             valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
         }
         valuePath = !valuePath.startsWith('./') && !valuePath.startsWith('../') ? `./${valuePath}` : valuePath;
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), parentRef);
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), normalizedValue, parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;
         result.type = type;

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrE"}

package/dist/core/index.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 exports.generate = generate;
 const OpenApiClient_1 = require("./OpenApiClient");
+const validateRawOptions_1 = require("./utils/validateRawOptions");
 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) {
+    (0, validateRawOptions_1.validateRawOptions)(rawOptions);
     const openApiClient = new OpenApiClient_1.OpenApiClient();
     await openApiClient.generate(rawOptions);
 }

package/dist/core/utils/__tests__/isSubdirectory.test.js

@@ -7,8 +7,8 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const pathHelpers_1 = require("../../../common/utils/pathHelpers");
 const isSubdirectory_1 = require("../isSubdirectory");
-(0, node_test_1.describe)('@unit: isSubDirectory', () => {
-    node_test_1.test.skip('should return correct result', () => {
+node_test_1.describe.skip('@unit: isSubDirectory', () => {
+    (0, node_test_1.test)('should return correct result', () => {
         node_assert_1.default.strictEqual((0, isSubdirectory_1.isSubDirectory)((0, pathHelpers_1.resolveHelper)('/'), (0, pathHelpers_1.resolveHelper)('/')), false);
         node_assert_1.default.strictEqual((0, isSubdirectory_1.isSubDirectory)((0, pathHelpers_1.resolveHelper)('.'), (0, pathHelpers_1.resolveHelper)('.')), false);
         node_assert_1.default.strictEqual((0, isSubdirectory_1.isSubDirectory)((0, pathHelpers_1.resolveHelper)('./project'), (0, pathHelpers_1.resolveHelper)('./project')), false);

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

@@ -1 +1 @@
-{"version":3,"file":"serviceHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/serviceHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAK7D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAOhH;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAWxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAMvF;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAiChE"}
+{"version":3,"file":"serviceHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/serviceHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAK7D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAOhH;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAWxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAMvF;AA+CD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAiChE"}

package/dist/core/utils/serviceHelpers.js

@@ -63,13 +63,39 @@ function mergeOperationImportsIntoService(service, operation) {
 /**
  * Internal helper: apply alias value to models that reference the import.
  */
+function normalizeImportPath(path) {
+    return path.startsWith('./') ? path.slice(2) : path;
+}
+function applyAliasToModel(model, value) {
+    const modelPath = normalizeImportPath(model.path);
+    const importPath = normalizeImportPath(value.path);
+    if (modelPath === importPath && model.type === value.name && value.alias) {
+        model.alias = value.alias;
+        model.base = value.alias;
+    }
+    if (value.alias && model.imports?.some(imprt => normalizeImportPath(imprt.path) === importPath && imprt.name === value.name)) {
+        if (model.base === value.name) {
+            model.base = value.alias;
+        }
+        if (model.type === value.name) {
+            model.type = value.alias;
+        }
+        if (!model.alias) {
+            model.alias = value.alias;
+        }
+    }
+    if (model.link) {
+        applyAliasToModel(model.link, value);
+    }
+    if (model.properties?.length) {
+        model.properties.forEach(child => applyAliasToModel(child, value));
+    }
+    if (model.enums?.length) {
+        model.enums.forEach(child => applyAliasToModel(child, value));
+    }
+}
 function fillModelsByAlias(items = [], value) {
-    items
-        .filter(result => result.path === value.path && result.type === value.name && value.alias)
-        .forEach(result => {
-        result.alias = value.alias;
-        result.base = value.alias;
-    });
+    items.forEach(item => applyAliasToModel(item, value));
 }
 /**
  * Finalize imports for a service:

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

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

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

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

package/dist/core/utils/validateRawOptions.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateRawOptions = validateRawOptions;
+const Consts_1 = require("../../common/Consts");
+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) {
+    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'));
+        process.exit(1);
+    }
+}

package/dist/templatesCompiled/client/exportService.js

@@ -180,7 +180,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "imports"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 7, "column": 7 } } })) != null ? stack1 : "")
             + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(5, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 8, "column": 0 }, "end": { "line": 10, "column": 7 } } })) != null ? stack1 : "")
             + "import type { RequestExecutor, RequestConfig } from '"
-            + ((stack1 = lookupProperty(helpers, "joinPath").call(alias1, lookupProperty(lookupProperty(data, "root"), "outputCore"), "requestExecutor", { "name": "joinPath", "hash": {}, "data": data, "loc": { "start": { "line": 11, "column": 53 }, "end": { "line": 11, "column": 102 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "joinPath").call(alias1, lookupProperty(lookupProperty(data, "root"), "outputCore"), "./executor/requestExecutor", { "name": "joinPath", "hash": {}, "data": data, "loc": { "start": { "line": 11, "column": 53 }, "end": { "line": 11, "column": 113 } } })) != null ? stack1 : "")
             + "';\n\n"
             + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(7, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 13, "column": 0 }, "end": { "line": 18, "column": 9 } } })) != null ? stack1 : "")
             + "\nexport type T"

package/dist/templatesCompiled/client/partials/exportComposition.d.ts

@@ -5,6 +5,8 @@ declare const _default: {
     "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "10": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "12": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/partials/exportComposition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exportComposition.d.ts","sourceRoot":"","sources":["../../../../src/templatesCompiled/client/partials/exportComposition.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,wBAuEmC"}
+{"version":3,"file":"exportComposition.d.ts","sourceRoot":"","sources":["../../../../src/templatesCompiled/client/partials/exportComposition.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAMA,wBAiFmC"}

package/dist/templatesCompiled/client/partials/exportComposition.js

@@ -18,7 +18,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = lookupProperty(helpers, "unless").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useUnionTypes"), { "name": "unless", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 8, "column": 0 }, "end": { "line": 27, "column": 11 } } })) != null ? stack1 : "");
+        return ((stack1 = lookupProperty(helpers, "unless").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useUnionTypes"), { "name": "unless", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 8, "column": 0 }, "end": { "line": 31, "column": 11 } } })) != null ? stack1 : "");
     }, "4": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -29,7 +29,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
         return "\nexport namespace "
             + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 10, "column": 20 }, "end": { "line": 10, "column": 24 } }), depth0)) != null ? stack1 : "")
             + " {\n\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "enums"), { "name": "each", "hash": {}, "fn": container.program(5, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 12, "column": 4 }, "end": { "line": 24, "column": 13 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "enums"), { "name": "each", "hash": {}, "fn": container.program(5, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 12, "column": 4 }, "end": { "line": 28, "column": 13 } } })) != null ? stack1 : "")
             + "\n}\n";
     }, "5": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -39,10 +39,8 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "description"), { "name": "if", "hash": {}, "fn": container.program(6, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 13, "column": 4 }, "end": { "line": 17, "column": 11 } } })) != null ? stack1 : "")
-            + "    export enum "
-            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 18, "column": 19 }, "end": { "line": 18, "column": 23 } }), depth0)) != null ? stack1 : "")
-            + " {\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "enum"), { "name": "each", "hash": {}, "fn": container.program(8, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 19, "column": 8 }, "end": { "line": 21, "column": 17 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "alias"), { "name": "if", "hash": {}, "fn": container.program(8, data, 0), "inverse": container.program(10, data, 0), "data": data, "loc": { "start": { "line": 18, "column": 4 }, "end": { "line": 22, "column": 11 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "enum"), { "name": "each", "hash": {}, "fn": container.program(12, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 23, "column": 8 }, "end": { "line": 25, "column": 17 } } })) != null ? stack1 : "")
             + "    }\n\n";
     }, "6": function (container, depth0, helpers, partials, data) {
         var stack1;
@@ -50,11 +48,21 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = container.lambda(container.strict(depth0, "description", { "start": { "line": 15, "column": 10 }, "end": { "line": 15, "column": 21 } }), depth0)) != null ? stack1 : "")
             + "\n     */\n";
     }, "8": function (container, depth0, helpers, partials, data) {
+        var stack1;
+        return "    export enum "
+            + ((stack1 = container.lambda(container.strict(depth0, "alias", { "start": { "line": 19, "column": 19 }, "end": { "line": 19, "column": 24 } }), depth0)) != null ? stack1 : "")
+            + " {\n";
+    }, "10": function (container, depth0, helpers, partials, data) {
+        var stack1;
+        return "    export enum "
+            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 21, "column": 19 }, "end": { "line": 21, "column": 23 } }), depth0)) != null ? stack1 : "")
+            + " {\n";
+    }, "12": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = container.strict, alias2 = container.lambda;
         return "        "
-            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 20, "column": 11 }, "end": { "line": 20, "column": 15 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 24, "column": 11 }, "end": { "line": 24, "column": 15 } }), depth0)) != null ? stack1 : "")
             + " = "
-            + ((stack1 = alias2(alias1(depth0, "value", { "start": { "line": 20, "column": 24 }, "end": { "line": 20, "column": 29 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "value", { "start": { "line": 24, "column": 24 }, "end": { "line": 24, "column": 29 } }), depth0)) != null ? stack1 : "")
             + ",\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -69,5 +77,5 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + " = "
             + ((stack1 = container.invokePartial(lookupProperty(partials, "type"), depth0, { "name": "type", "hash": { "parent": lookupProperty(depth0, "name") }, "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + ";\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "enums"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 7, "column": 0 }, "end": { "line": 28, "column": 7 } } })) != null ? stack1 : "");
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "enums"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 7, "column": 0 }, "end": { "line": 32, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-openapi-codegen",
-    "version": "2.0.0-beta.8",
+    "version": "2.0.0-beta.9",
     "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/cli/validation/errorFormatter.d.ts

@@ -1,6 +0,0 @@
-import { ZodError } from 'zod';
-/**
- * Форматирует Zod ошибку в читаемое сообщение для CLI
- */
-export declare function formatZodErrorForCLI(error: ZodError): string;
-//# sourceMappingURL=errorFormatter.d.ts.map

package/dist/cli/validation/errorFormatter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"errorFormatter.d.ts","sourceRoot":"","sources":["../../../src/cli/validation/errorFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAE/B;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAY5D"}

package/dist/cli/validation/index.d.ts

@@ -1,3 +0,0 @@
-export * from './errorFormatter';
-export * from './validateCLIOptions';
-//# sourceMappingURL=index.d.ts.map

package/dist/cli/validation/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/validation/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC"}

package/dist/cli/validation/validateCLIOptions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"validateCLIOptions.d.ts","sourceRoot":"","sources":["../../../src/cli/validation/validateCLIOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAI1C;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjG;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAiB9F;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAQ9I"}

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

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

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

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

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

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getErrorFieldsFromValidation = getErrorFieldsFromValidation;
-// Auxiliary function for getting error fields from the Joi validation result
-function getErrorFieldsFromValidation(error) {
-    return error?.details.map(detail => ({ path: Array.isArray(detail.path) ? detail.path.join('.') : detail.path, type: detail.type })) ?? [];
-}

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

@@ -1,6 +0,0 @@
-import { TraverseHandler } from '../Types';
-/** Handler for Joi.Schema: only the launch remains .describe() */
-export declare const handleJoiSchema: TraverseHandler<Set<string>>;
-/** Handler for the result of describe(): pulls out only the real keys of the field */
-export declare const handleJoiDescription: TraverseHandler<Set<string>>;
-//# sourceMappingURL=joiHandlers.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"joiHandlers.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/joiHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,kEAAkE;AAClE,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAOxD,CAAC;AAEF,sFAAsF;AACtF,eAAO,MAAM,oBAAoB,EAAE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAgD7D,CAAC"}