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

package/dist/core/utils/getOpenApiSpec.js

@@ -17,7 +17,20 @@ async function getOpenApiSpec(context, input) {
         throw new Error(`OpenAPI spec not found: ${absoluteInput}`);
     }
     const parser = new swagger_parser_1.default();
-    const resolved = await parser.resolve(absoluteInput);
+    const previousCwd = process.cwd();
+    const inputDir = (0, pathHelpers_1.dirNameHelper)(absoluteInput);
+    if (previousCwd !== inputDir) {
+        process.chdir(inputDir);
+    }
+    let resolved;
+    try {
+        resolved = await parser.resolve(absoluteInput);
+    }
+    finally {
+        if (process.cwd() !== previousCwd) {
+            process.chdir(previousCwd);
+        }
+    }
     context.addRefs(resolved);
     // Получить основную схему
     const raw = resolved.get(absoluteInput);

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

@@ -0,0 +1,9 @@
+/**
+ * The function calculates the relative path to the model.
+ * Removes the transition to the directory with a level above.
+ * @param folderPath Root folder.
+ * @param relativeModelPath Relative path to the model.
+ * @returns Correct relative model path.
+ */
+export declare function getRelativeModelPath(folderPath: string | undefined, relativeModelPath: string): string;
+//# sourceMappingURL=getRelativeModelPath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getRelativeModelPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getRelativeModelPath.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,iBAAiB,EAAE,MAAM,UA2B7F"}

package/dist/core/utils/getRelativeModelPath.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRelativeModelPath = getRelativeModelPath;
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const getTypeName_1 = require("./getTypeName");
+const isInsideDirectory_1 = require("./isInsideDirectory");
+/**
+ * The function calculates the relative path to the model.
+ * Removes the transition to the directory with a level above.
+ * @param folderPath Root folder.
+ * @param relativeModelPath Relative path to the model.
+ * @returns Correct relative model path.
+ */
+function getRelativeModelPath(folderPath, relativeModelPath) {
+    if (!folderPath) {
+        return relativeModelPath;
+    }
+    const pathSep = '/';
+    let mappedPaths = '';
+    let modelPath = relativeModelPath;
+    // If absolute path (filesystem or URL-like), collapse to type name only
+    if (modelPath.startsWith('/')) {
+        return (0, getTypeName_1.getTypeName)(modelPath);
+    }
+    if (modelPath.startsWith('../')) {
+        const pathArray = modelPath.split(pathSep).filter(Boolean);
+        while (pathArray[0] === '..') {
+            pathArray.shift();
+        }
+        modelPath = pathArray.join(pathSep);
+    }
+    const resolvedPath = (0, pathHelpers_1.resolveHelper)(folderPath, modelPath);
+    if ((0, isInsideDirectory_1.isInsideDirectory)(resolvedPath, folderPath)) {
+        mappedPaths = modelPath;
+    }
+    return mappedPaths;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CA+BrF"}
+{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CA4ErF"}

package/dist/core/utils/modelHelpers.js

@@ -52,8 +52,36 @@ function setDuplicateModelAliases(models) {
  * @returns the same array of models (modified)
  */
 function resolveModelImports(models, outputModelsDir) {
+    const normalizeImportPath = (value) => (value.startsWith('./') ? value.slice(2) : value);
+    const applyAliasToModel = (model, imprt) => {
+        const modelPath = normalizeImportPath(model.path);
+        const importPath = normalizeImportPath(imprt.path);
+        if (modelPath === importPath && model.type === imprt.name && imprt.alias) {
+            model.alias = imprt.alias;
+            model.base = imprt.alias;
+            model.type = imprt.alias;
+        }
+        if (imprt.alias && model.imports?.some(item => normalizeImportPath(item.path) === importPath && item.name === imprt.name)) {
+            if (model.base === imprt.name) {
+                model.base = imprt.alias;
+            }
+            if (model.type === imprt.name) {
+                model.type = imprt.alias;
+            }
+        }
+        if (model.link) {
+            applyAliasToModel(model.link, imprt);
+        }
+        if (model.properties?.length) {
+            model.properties.forEach(child => applyAliasToModel(child, imprt));
+        }
+        if (model.enums?.length) {
+            model.enums.forEach(child => applyAliasToModel(child, imprt));
+        }
+    };
     models.forEach(model => {
-        model.imports = model.imports.map(imprt => {
+        const importsWithSourcePath = model.imports.map(imprt => {
+            const sourcePath = imprt.path;
             const importModel = models.find(value => {
                 const normalizedPath = !value.path.startsWith('./') ? `./${value.path}` : value.path;
                 return normalizedPath === imprt.path && value.name === imprt.name;
@@ -69,16 +97,22 @@ function resolveModelImports(models, outputModelsDir) {
                     importPath = `./${file}`;
                 }
                 else if (relativePath.startsWith('./')) {
-                    importPath = `${relativePath}${file}`;
+                    importPath = `${relativePath}/${file}`;
                 }
                 else {
                     importPath = `${relativePath}/${file}`;
                 }
             }
-            return Object.assign(imprt, {
+            const mappedImport = Object.assign(imprt, {
                 alias: importAlias,
                 path: importPath,
             });
+            return { mappedImport, sourcePath };
+        });
+        model.imports = importsWithSourcePath.map(item => item.mappedImport);
+        importsWithSourcePath.forEach(item => {
+            applyAliasToModel(model, item.mappedImport);
+            applyAliasToModel(model, Object.assign({}, item.mappedImport, { path: item.sourcePath }));
         });
     });
     return models;

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

@@ -1 +1 @@
-{"version":3,"file":"postProcessModelImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessModelImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAIzD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE,CAK9D"}
+{"version":3,"file":"postProcessModelImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessModelImports.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAQzD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE,CAY9D"}

package/dist/core/utils/postProcessModelImports.js

@@ -1,15 +1,28 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postProcessModelImports = postProcessModelImports;
+const path_1 = __importDefault(require("path"));
 const sort_1 = require("./sort");
 const unique_1 = require("./unique");
+function normalizePath(value) {
+    return value.startsWith('./') ? value.slice(2) : value;
+}
 /**
  * Set unique imports, sorted by name
  * @param model The model that is post-processed
  */
 function postProcessModelImports(model) {
+    const currentModelPath = normalizePath(model.path);
+    const currentModelDir = path_1.default.posix.dirname(currentModelPath);
     return model?.imports
         ?.filter(unique_1.unique)
         ?.sort(sort_1.sort)
-        ?.filter(item => model.name !== item.name);
+        ?.filter(item => {
+        const importPath = normalizePath(item.path);
+        const resolvedFromCurrentModel = path_1.default.posix.normalize(path_1.default.posix.join(currentModelDir, importPath));
+        return resolvedFromCurrentModel !== currentModelPath;
+    });
 }

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/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,CAgM5H"}

package/dist/core/utils/registerHandlebarHelpers.js

@@ -168,6 +168,31 @@ function registerHandlebarHelpers(root) {
                 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 '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":"AA8FA,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,CAqK1K"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -89,6 +89,7 @@ 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 exportService_1 = __importDefault(require("../../templatesCompiled/client/exportService"));
 const indexFull_1 = __importDefault(require("../../templatesCompiled/client/indexFull"));
@@ -130,7 +131,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 +140,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 +149,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 +158,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 +186,7 @@ function registerHandlebarTemplates(root) {
         exports: {
             client: Handlebars.template(exportClient_1.default),
             model: Handlebars.template(exportModel_1.default),
-            schema: undefined,
+            schema: Handlebars.template(exportSchema_1.default),
             service: Handlebars.template(exportService_1.default),
         },
         core: {
@@ -277,50 +278,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/writeClientExecutor.d.ts

@@ -4,9 +4,12 @@ import { WriteClient } from '../WriteClient';
 interface WriteClientExecutor {
     outputPath: string;
     outputCorePath: string;
+    request?: string;
+    customExecutorPath?: string;
     services: Service[];
     templates: Templates;
 }
+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":"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,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;CACxB;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,CAgBxG;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/core/utils/writeClientExecutor.js

@@ -1,16 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientExecutor = writeClientExecutor;
+exports.deduplicateServicesByName = deduplicateServicesByName;
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
+function deduplicateServicesByName(services) {
+    const seen = new Set();
+    return services.filter(service => {
+        if (seen.has(service.name)) {
+            return false;
+        }
+        seen.add(service.name);
+        return true;
+    });
+}
 async function writeClientExecutor(options) {
-    const { outputPath, outputCorePath, templates, services } = options;
+    const { outputPath, outputCorePath, templates, services, request, customExecutorPath } = options;
     const file = (0, pathHelpers_1.resolveHelper)(outputPath, 'createClient.ts');
+    const uniqueServices = deduplicateServicesByName(services);
+    const hasCustomRequest = !!request;
     this.logger.info(`Началась запись файла ${file}`);
     const templateResult = templates.exports.client({
         outputCore: outputCorePath,
-        services,
+        useCustomRequest: hasCustomRequest,
+        customExecutorPath,
+        services: uniqueServices,
     });
     const formattedValue = await (0, format_1.format)(templateResult);
     await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);

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

@@ -1,4 +1,5 @@
 import { Templates } from '../types/base/Templates.model';
+import { EmptySchemaStrategy } from '../types/enums/EmptySchemaStrategy.enum';
 import { HttpClient } from '../types/enums/HttpClient.enum';
 import { ValidationLibrary } from '../types/enums/ValidationLibrary.enum';
 import type { Model } from '../types/shared/Model.model';
@@ -17,7 +18,9 @@ interface IWriteClientSchemas {
     httpClient: HttpClient;
     useUnionTypes: boolean;
     validationLibrary?: ValidationLibrary;
+    emptySchemaStrategy: EmptySchemaStrategy;
 }
+export declare function isEmptySchemaModel(model: Model): boolean;
 /**
  * Generate Schemas using the Handlebar template and write to disk.
  * @param models Array of Models to write
@@ -26,6 +29,6 @@ interface IWriteClientSchemas {
  * @param httpClient The selected httpClient (fetch, xhr or node)
  * @param useUnionTypes Use union types instead of enums
  */
-export declare function writeClientSchemas(this: WriteClient, options: IWriteClientSchemas): Promise<void>;
+export declare function writeClientSchemas(this: WriteClient, options: IWriteClientSchemas): Promise<Model[]>;
 export {};
 //# sourceMappingURL=writeClientSchemas.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientSchemas.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemas.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,UAAU,mBAAmB;IACzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCvG"}
+{"version":3,"file":"writeClientSchemas.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemas.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,UAAU,mBAAmB;IACzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;CAC5C;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAExD;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAwC1G"}

package/dist/core/utils/writeClientSchemas.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmptySchemaModel = isEmptySchemaModel;
 exports.writeClientSchemas = writeClientSchemas;
 const fs_1 = require("fs");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const EmptySchemaStrategy_enum_1 = require("../types/enums/EmptySchemaStrategy.enum");
+function isEmptySchemaModel(model) {
+    return model.export === 'interface' && model.properties.length === 0;
+}
 /**
  * Generate Schemas using the Handlebar template and write to disk.
  * @param models Array of Models to write
@@ -14,10 +19,11 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
  * @param useUnionTypes Use union types instead of enums
  */
 async function writeClientSchemas(options) {
-    const { models, templates, outputSchemasPath, httpClient, useUnionTypes, validationLibrary } = options;
+    const { models, templates, outputSchemasPath, httpClient, useUnionTypes, validationLibrary, emptySchemaStrategy } = options;
     if (templates.exports.schema) {
         this.logger.info('The recording of model validation schema files begins.');
-        for (const model of models) {
+        const modelsToWrite = emptySchemaStrategy === EmptySchemaStrategy_enum_1.EmptySchemaStrategy.SKIP ? models.filter(model => !isEmptySchemaModel(model)) : models;
+        for (const model of modelsToWrite) {
             const modelFolderPath = model?.path;
             const dir = (0, pathHelpers_1.dirNameHelper)(modelFolderPath);
             if (dir) {
@@ -32,11 +38,14 @@ async function writeClientSchemas(options) {
                 httpClient,
                 useUnionTypes,
                 validationLibrary,
+                emptySchemaStrategy,
             });
             const formattedValue = await (0, format_1.format)(templateResult);
             await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
             this.logger.info(`File recording completed: ${file}`);
         }
         this.logger.info('The recording of model validation schema files has been completed successfully');
+        return modelsToWrite;
     }
+    return [];
 }

package/dist/templatesCompiled/client/core/ApiError.js

@@ -14,5 +14,5 @@ exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, de
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nexport class ApiError<TBody = unknown> extends Error {\n    readonly status: number;\n    readonly body?: TBody;\n    readonly headers?: Record<string, string>;\n    readonly request: RequestConfig;\n\n    constructor(params: { status: number; message: string; body?: TBody; headers?: Record<string, string>; request: RequestConfig }) {\n        super(params.message);\n        this.name = 'ApiError';\n        this.status = params.status;\n        this.body = params.body;\n        this.headers = params.headers;\n        this.request = params.request;\n    }\n}\n";
+            + "\nimport { RequestConfig } from './executor/requestExecutor';\n\nexport class ApiError<TBody = unknown> extends Error {\n    readonly status: number;\n    readonly body?: TBody;\n    readonly headers?: Record<string, string>;\n    readonly request: RequestConfig;\n\n    constructor(params: { status: number; message: string; body?: TBody; headers?: Record<string, string>; request: RequestConfig }) {\n        super(params.message);\n        this.name = 'ApiError';\n        this.status = params.status;\n        this.body = params.body;\n        this.headers = params.headers;\n        this.request = params.request;\n    }\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/ApiResult.js

@@ -14,5 +14,5 @@ exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, de
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nexport type ApiResult = {\n    readonly url: string;\n    readonly ok: boolean;\n    readonly status: number;\n    readonly statusText: string;\n    readonly body: any;\n}\n";
+            + "\nexport type ApiResult<TBody = unknown> = {\n    readonly url: string;\n    readonly ok: boolean;\n    readonly status: number;\n    readonly statusText: string;\n    readonly body: TBody;\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/axios/request.js

@@ -9,9 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
         return "import { CancelablePromise } from './CancelablePromise';\n";
     }, "3": function (container, depth0, helpers, partials, data) {
-        return " export function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async(resolve, reject, onCancel) => {\n        try {\n            const url = getUrl(options, config);\n            \n            if (!onCancel.isCancelled) {\n                const response = await sendRequest<T>(options, url, config, onCancel);\n                const responseBody = getResponseBody(response);\n                const responseHeader = getResponseHeader(response, options.responseHeader);\n                const result: ApiResult = {\n                    url,\n                    ok: isSuccess(response.status),\n                    status: response.status,\n                    statusText: response.statusText,\n                    body: responseHeader || responseBody,\n                };\n\n                catchErrors(options, result);\n                resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
+        return " export function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<ApiResult<T>> {\n    return new CancelablePromise(async(resolve, reject, onCancel) => {\n        try {\n            const url = getUrl(options, config);\n            \n            if (!onCancel.isCancelled) {\n                const response = await sendRequest<T>(options, url, config, onCancel);\n                const responseBody = getResponseBody(response);\n                const responseHeader = getResponseHeader(response, options.responseHeader);\n                const result: ApiResult<T> = {\n                    url,\n                    ok: isSuccess(response.status),\n                    status: response.status,\n                    statusText: response.statusText,\n                    body: (responseHeader || responseBody) as T,\n                };\n\n                catchErrors(options, result);\n                resolve(result);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n\nexport function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n   return new CancelablePromise(async(resolve, reject, onCancel) => {\n       try {\n           const url = getUrl(options, config);\n           \n           if (!onCancel.isCancelled) {\n               const response = await sendRequest<T>(options, url, config, onCancel);\n               const responseBody = getResponseBody(response);\n               const responseHeader = getResponseHeader(response, options.responseHeader);\n               const result: ApiResult<T> = {\n                   url,\n                   ok: isSuccess(response.status),\n                   status: response.status,\n                   statusText: response.statusText,\n                   body: (responseHeader || responseBody) as T,\n               };\n\n               catchErrors(options, result);\n               resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
     }, "5": function (container, depth0, helpers, partials, data) {
-        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    return new Promise(async (resolve, reject) => {\n        try {\n            const url = getUrl(options, config);\n            const response = await sendRequest(options, url, config);\n            const responseBody = getResponseBody(response);\n            const responseHeader = getResponseHeader(response, options.responseHeader);\n\n            const result: ApiResult = {\n                url,\n                ok: isSuccess(response.status),\n                status: response.status,\n                statusText: response.statusText,\n                body: responseHeader || responseBody,\n            };\n\n            catchErrors(options, result);\n            resolve(result.body);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
+        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const result = await requestRaw<T>(options, config);\n    return result.body;\n}\n\nexport async function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<ApiResult<T>> {\n    return new Promise(async (resolve, reject) => {\n        try {\n            const url = getUrl(options, config);\n            const response = await sendRequest(options, url, config);\n            const responseBody = getResponseBody(response);\n            const responseHeader = getResponseHeader(response, options.responseHeader);\n\n            const result: ApiResult<T> = {\n                url,\n                ok: isSuccess(response.status),\n                status: response.status,\n                statusText: response.statusText,\n                body: (responseHeader || responseBody) as T,\n            };\n\n            catchErrors(options, result);\n            resolve(result);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\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) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -53,5 +53,5 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + "\n\n"
             + ((stack1 = container.invokePartial(lookupProperty(partials, "functions/catchErrors"), depth0, { "name": "functions/catchErrors", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "\n\n/**\n * Request using axios client\n * @param config The OpenAPI configuration object\n * @param options The request options from the the service\n * @returns ApiResult\n * @throws ApiError\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 69, "column": 0 }, "end": { "line": 119, "column": 7 } } })) != null ? stack1 : "");
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 69, "column": 0 }, "end": { "line": 150, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/executor/createExecutorAdapter.d.ts

@@ -3,6 +3,8 @@ declare const _default: {
     "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "7": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "11": (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;