ts-openapi-codegen 2.1.0-beta.4 → 2.1.0-beta.6

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

@@ -0,0 +1,97 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_test_1 = require("node:test");
+const Enums_1 = require("../../../common/Enums");
+const Logger_1 = require("../../../common/Logger");
+const loadDiffReport_1 = require("../loadDiffReport");
+const createTempDir = (t, prefix) => {
+    const root = node_path_1.default.join(__dirname, 'generated');
+    node_fs_1.default.mkdirSync(root, { recursive: true });
+    const tempDir = node_fs_1.default.mkdtempSync(node_path_1.default.join(root, prefix));
+    t.after(() => {
+        node_fs_1.default.rmSync(tempDir, { recursive: true, force: true });
+    });
+    return tempDir;
+};
+const createLogger = () => new Logger_1.Logger({
+    instanceId: 'load-diff-report-test',
+    level: Enums_1.ELogLevel.ERROR,
+    logOutput: Enums_1.ELogOutput.CONSOLE,
+    disableColors: true,
+});
+(0, node_test_1.describe)('@unit: loadDiffReport', () => {
+    (0, node_test_1.test)('returns null when history and diffReport path are disabled', () => {
+        const result = (0, loadDiffReport_1.loadDiffReport)({
+            useHistory: false,
+            logger: createLogger(),
+        });
+        node_assert_1.default.strictEqual(result, null);
+    });
+    (0, node_test_1.test)('returns null when report file is missing', () => {
+        const result = (0, loadDiffReport_1.loadDiffReport)({
+            useHistory: true,
+            diffReport: node_path_1.default.join(__dirname, 'missing-report.json'),
+            logger: createLogger(),
+        });
+        node_assert_1.default.strictEqual(result, null);
+    });
+    (0, node_test_1.test)('loads report with diff entries', async (t) => {
+        const dir = createTempDir(t, 'diff-report-');
+        const reportPath = node_path_1.default.join(dir, 'report.json');
+        const report = {
+            diff: {
+                all: [{ action: 'changed', path: '$.info.version', severity: 'info', from: '1', to: '2' }],
+            },
+        };
+        node_fs_1.default.writeFileSync(reportPath, JSON.stringify(report), 'utf-8');
+        const loaded = (0, loadDiffReport_1.loadDiffReport)({
+            diffReport: reportPath,
+            logger: createLogger(),
+        });
+        node_assert_1.default.ok(loaded);
+        node_assert_1.default.strictEqual(loaded?.diff?.all?.length, 1);
+    });
+    (0, node_test_1.test)('returns null for empty report without diff or miracles', async (t) => {
+        const dir = createTempDir(t, 'diff-report-empty-');
+        const reportPath = node_path_1.default.join(dir, 'empty.json');
+        node_fs_1.default.writeFileSync(reportPath, JSON.stringify({ diff: { all: [] }, miracles: [] }), 'utf-8');
+        const loaded = (0, loadDiffReport_1.loadDiffReport)({
+            diffReport: reportPath,
+            logger: createLogger(),
+        });
+        node_assert_1.default.strictEqual(loaded, null);
+    });
+    (0, node_test_1.test)('returns null when report is older than input spec', async (t) => {
+        const dir = createTempDir(t, 'diff-report-stale-');
+        const reportPath = node_path_1.default.join(dir, 'report.json');
+        const inputPath = node_path_1.default.join(dir, 'spec.json');
+        node_fs_1.default.writeFileSync(reportPath, JSON.stringify({
+            diff: { all: [{ action: 'changed', path: '$.info.version', severity: 'info' }] },
+        }), 'utf-8');
+        const past = Date.now() - 60_000;
+        node_fs_1.default.utimesSync(reportPath, past / 1000, past / 1000);
+        node_fs_1.default.writeFileSync(inputPath, '{"openapi":"3.0.0"}', 'utf-8');
+        const loaded = (0, loadDiffReport_1.loadDiffReport)({
+            diffReport: reportPath,
+            inputPath,
+            logger: createLogger(),
+        });
+        node_assert_1.default.strictEqual(loaded, null);
+    });
+    (0, node_test_1.test)('returns null when report JSON is invalid', async (t) => {
+        const dir = createTempDir(t, 'diff-report-broken-');
+        const reportPath = node_path_1.default.join(dir, 'broken.json');
+        node_fs_1.default.writeFileSync(reportPath, '{ not-json', 'utf-8');
+        const loaded = (0, loadDiffReport_1.loadDiffReport)({
+            diffReport: reportPath,
+            logger: createLogger(),
+        });
+        node_assert_1.default.strictEqual(loaded, null);
+    });
+});

package/dist/core/utils/__tests__/templateRendering.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=templateRendering.test.d.ts.map

package/dist/core/utils/__tests__/templateRendering.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"templateRendering.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/templateRendering.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,119 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
+const ModelsMode_enum_1 = require("../../types/enums/ModelsMode.enum");
+const ValidationLibrary_enum_1 = require("../../types/enums/ValidationLibrary.enum");
+const registerHandlebarTemplates_1 = require("../registerHandlebarTemplates");
+const requestContext = {
+    httpClient: HttpClient_enum_1.HttpClient.FETCH,
+    server: 'https://api.example.com',
+    version: '1.0.0',
+    useCancelableRequest: false,
+    useSeparatedIndexes: false,
+};
+const schemaModel = {
+    name: 'UserSchema',
+    alias: '',
+    path: 'schemas',
+    export: 'interface',
+    type: 'UserSchema',
+    base: 'UserSchema',
+    template: null,
+    link: null,
+    description: null,
+    isDefinition: true,
+    isReadOnly: false,
+    isRequired: false,
+    isNullable: false,
+    imports: [],
+    enum: [],
+    enums: [],
+    properties: [
+        {
+            name: 'id',
+            alias: '',
+            path: 'schemas',
+            export: 'generic',
+            type: 'string',
+            base: 'string',
+            template: null,
+            link: null,
+            description: null,
+            isDefinition: false,
+            isReadOnly: false,
+            isRequired: true,
+            isNullable: false,
+            imports: [],
+            enum: [],
+            enums: [],
+            properties: [],
+        },
+    ],
+};
+const exportClientContext = {
+    outputCore: './generated/core',
+    useCustomRequest: false,
+    services: [],
+};
+const exportModelsContext = {
+    models: [schemaModel],
+    httpClient: HttpClient_enum_1.HttpClient.FETCH,
+    useUnionTypes: false,
+    useOptions: false,
+    outputCore: '../core',
+    modelsMode: ModelsMode_enum_1.ModelsMode.CLASSES,
+};
+(0, node_test_1.describe)('@unit: templateRendering', () => {
+    for (const httpClient of Object.values(HttpClient_enum_1.HttpClient)) {
+        for (const useCancelableRequest of [false, true]) {
+            (0, node_test_1.test)(`renders request template for ${httpClient} (cancelable=${useCancelableRequest})`, () => {
+                const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
+                    httpClient,
+                    useOptions: false,
+                    useUnionTypes: false,
+                    validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
+                });
+                const output = templates.core.request({
+                    ...requestContext,
+                    httpClient,
+                    useCancelableRequest,
+                });
+                node_assert_1.default.ok(output.length > 100);
+                node_assert_1.default.match(output, /function request/i);
+            });
+        }
+    }
+    (0, node_test_1.test)('renders exportClient and exportModels templates', () => {
+        const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
+            httpClient: HttpClient_enum_1.HttpClient.FETCH,
+            useOptions: false,
+            useUnionTypes: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
+        });
+        const clientOutput = templates.exports.client(exportClientContext);
+        const modelsOutput = templates.exports.models(exportModelsContext);
+        node_assert_1.default.match(clientOutput, /createClient|RequestExecutor/i);
+        node_assert_1.default.match(modelsOutput, /BaseDto|fromArray/);
+    });
+    (0, node_test_1.test)('renders schema export with validation library context', () => {
+        const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
+            httpClient: HttpClient_enum_1.HttpClient.FETCH,
+            useOptions: false,
+            useUnionTypes: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.ZOD,
+        });
+        const output = templates.exports.schema({
+            ...schemaModel,
+            httpClient: HttpClient_enum_1.HttpClient.FETCH,
+            useUnionTypes: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.ZOD,
+        });
+        node_assert_1.default.ok(output.length > 20);
+        node_assert_1.default.match(output, /UserSchema/i);
+    });
+});

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

@@ -38,6 +38,7 @@ const templates_1 = require("../__mocks__/templates");
             useUnionTypes: false,
             useOptions: false,
             useCancelableRequest: false,
+            useRequestRaw: true,
         });
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('MyService.ts') && content.toString().includes('service')), 'Expected writeFile to be called with service content for MyService.ts');
         // Restoring the original function

package/dist/core/utils/__tests__/writeFileIfChanged.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=writeFileIfChanged.test.d.ts.map

package/dist/core/utils/__tests__/writeFileIfChanged.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"writeFileIfChanged.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/writeFileIfChanged.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const strict_1 = __importDefault(require("node:assert/strict"));
+const promises_1 = require("node:fs/promises");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const node_test_1 = require("node:test");
+const writeFileIfChanged_1 = require("../writeFileIfChanged");
+(0, node_test_1.describe)('@unit: writeFileIfChanged', () => {
+    (0, node_test_1.test)('writes new file and skips unchanged content', async () => {
+        const dir = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'openapi-codegen-'));
+        const file = (0, node_path_1.join)(dir, 'index.ts');
+        try {
+            const firstResult = await (0, writeFileIfChanged_1.writeFileIfChanged)(file, 'export const a = 1;\n');
+            const secondResult = await (0, writeFileIfChanged_1.writeFileIfChanged)(file, 'export const a = 1;\n');
+            const thirdResult = await (0, writeFileIfChanged_1.writeFileIfChanged)(file, 'export const a = 2;\n');
+            const content = await (0, promises_1.readFile)(file, 'utf8');
+            strict_1.default.equal(firstResult, 'written');
+            strict_1.default.equal(secondResult, 'unchanged');
+            strict_1.default.equal(thirdResult, 'written');
+            strict_1.default.equal(content, 'export const a = 2;\n');
+        }
+        finally {
+            await (0, promises_1.rm)(dir, { recursive: true, force: true });
+        }
+    });
+});

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

@@ -10,6 +10,7 @@ import { WriteClient } from '../WriteClient';
  * @param httpClient The selected httpClient (fetch, xhr or node)
  * @param request: Path to custom request file
  * @param useCancelableRequest Use cancelable request type
+ * @param useRequestRaw Generate requestRaw and raw service methods
  */
 interface IWriteClientCore {
     client: Client;
@@ -18,6 +19,7 @@ interface IWriteClientCore {
     httpClient: HttpClient;
     request?: string;
     useCancelableRequest?: boolean;
+    useRequestRaw?: boolean;
     useSeparatedIndexes?: boolean;
     modelsMode?: ModelsMode;
 }

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

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

package/dist/core/utils/writeClientCore.js

@@ -14,12 +14,13 @@ const ModelsMode_enum_1 = require("../types/enums/ModelsMode.enum");
  * @param useCancelableRequest Use cancelable request type
  */
 async function writeClientCore(options) {
-    const { client, templates, outputCorePath, httpClient, request, useCancelableRequest, useSeparatedIndexes, modelsMode } = options;
+    const { client, templates, outputCorePath, httpClient, request, useCancelableRequest, useRequestRaw = true, useSeparatedIndexes, modelsMode } = options;
     const context = {
         httpClient,
         server: client.server,
         version: client.version,
         useCancelableRequest,
+        useRequestRaw,
         useSeparatedIndexes,
     };
     this.logger.info("The recording of the kernel files begins");
@@ -37,11 +38,11 @@ async function writeClientCore(options) {
     }
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'HttpStatusCode.ts'), templates.core.httpStatusCode({}));
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'request.ts'), templates.core.request(context));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/requestExecutor.ts'), templates.core.requestExecutor({}));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/createExecutorAdapter.ts'), templates.core.createExecutorAdapter({ useCustomRequest: hasCustomRequest }));
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/requestExecutor.ts'), templates.core.requestExecutor({ useRequestRaw }));
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/createExecutorAdapter.ts'), templates.core.createExecutorAdapter({ useCustomRequest: hasCustomRequest, useRequestRaw }));
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/interceptors.ts'), templates.core.interceptors({}));
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/apiErrorInterceptor.ts'), templates.core.apiErrorInterceptor({}));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/withInterceptors.ts'), templates.core.withInterceptors({}));
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/withInterceptors.ts'), templates.core.withInterceptors({ useRequestRaw }));
     if (hasCustomRequest) {
         const requestFile = (0, pathHelpers_1.resolveHelper)(process.cwd(), request);
         const requestFileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(requestFile);

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

@@ -12,6 +12,7 @@ type TServeceOutputsPath = Omit<OutputPaths, 'output' | 'outputSchemas'>;
  * @param useUnionTypes Use union types instead of enums
  * @param useOptions Use options or arguments functions
  * @param useCancelableRequest Use cancelable request type
+ * @param useRequestRaw Generate *Raw service methods
  */
 interface IWriteClientServices {
     services: Service[];
@@ -21,6 +22,7 @@ interface IWriteClientServices {
     useUnionTypes: boolean;
     useOptions: boolean;
     useCancelableRequest: boolean;
+    useRequestRaw: boolean;
     useProjectPrettier?: boolean;
     useEslintFix?: boolean;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientServices.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientServices.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,KAAK,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,eAAe,CAAC,CAAC;AAEzE;;;;;;;;GAQG;AACH,UAAU,oBAAoB;IAC1B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,mBAAmB,CAAC;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BzG"}
+{"version":3,"file":"writeClientServices.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientServices.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,KAAK,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,eAAe,CAAC,CAAC;AAEzE;;;;;;;;;GASG;AACH,UAAU,oBAAoB;IAC1B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,mBAAmB,CAAC;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BzG"}

package/dist/core/utils/writeClientServices.js

@@ -15,7 +15,7 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
  * @param useOptions Use options or arguments functions
  */
 async function writeClientServices(options) {
-    const { services, templates, outputPaths, httpClient, useUnionTypes, useOptions, useCancelableRequest, useProjectPrettier, useEslintFix } = options;
+    const { services, templates, outputPaths, httpClient, useUnionTypes, useOptions, useCancelableRequest, useRequestRaw, useProjectPrettier, useEslintFix } = options;
     this.logger.info('Recording of service files begins');
     for (const service of services) {
         const file = (0, pathHelpers_1.resolveHelper)(outputPaths.outputServices, `${service.name}.ts`);
@@ -28,6 +28,7 @@ async function writeClientServices(options) {
             outputCore: outputPaths.outputCore,
             outputModels: outputPaths.outputModels,
             useCancelableRequest,
+            useRequestRaw,
         });
         const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
         await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);

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

@@ -0,0 +1,3 @@
+export type WriteFileIfChangedResult = 'written' | 'unchanged';
+export declare function writeFileIfChanged(filePath: string, nextContent: string): Promise<WriteFileIfChangedResult>;
+//# sourceMappingURL=writeFileIfChanged.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"writeFileIfChanged.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeFileIfChanged.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,wBAAwB,GAAG,SAAS,GAAG,WAAW,CAAC;AAE/D,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAiBjH"}

package/dist/core/utils/writeFileIfChanged.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeFileIfChanged = writeFileIfChanged;
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+async function writeFileIfChanged(filePath, nextContent) {
+    try {
+        const fileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(filePath);
+        if (fileExists) {
+            const currentContent = await fileSystemHelpers_1.fileSystemHelpers.readFile(filePath, 'utf8');
+            if (currentContent === nextContent) {
+                return 'unchanged';
+            }
+        }
+    }
+    catch (error) {
+        if (error?.code !== 'ENOENT') {
+            throw error;
+        }
+    }
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile(filePath, nextContent);
+    return 'written';
+}

package/dist/templatesCompiled/cli/customRequest.d.ts

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

package/dist/templatesCompiled/cli/customRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customRequest.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequest.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBAmBmC"}
+{"version":3,"file":"customRequest.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,wBAyCmC"}

package/dist/templatesCompiled/cli/customRequest.js

@@ -7,11 +7,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { CancelablePromise } from './CancelablePromise';\n";
+        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 abortController = new AbortController();\n            \n            if (options?.timeout) {\n                const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                onCancel(() => clearTimeout(timeoutId));\n            }\n            \n            onCancel(() => abortController.abort());\n            \n            if (onCancel.isCancelled) {\n                return;\n            }\n            \n            // Ваша пользовательская логика запросов здесь\n            const response = await fetch(config.url, {\n                method: config.method,\n                headers: config.headers,\n                body: config.body ? JSON.stringify(config.body) : undefined,\n                signal: abortController.signal,\n            });\n            \n            if (!response.ok) {\n                throw new Error(`Request failed: ${response.statusText}`);\n            }\n            \n            const data = await response.json();\n            resolve(data);\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";
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.program(6, data, 0), "data": data, "loc": { "start": { "line": 15, "column": 0 }, "end": { "line": 77, "column": 7 } } })) != null ? stack1 : "");
+    }, "4": function (container, depth0, helpers, partials, data) {
+        return "export function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<ApiResult<T>> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            if (onCancel.isCancelled) {\n                return;\n            }\n\n            const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n            const response = await fetch(url, {\n                method: options.method,\n                headers: options.headers as Record<string, string> | undefined,\n                body: options.body ? JSON.stringify(options.body) : undefined,\n            });\n\n            const body = (await response.json()) as T;\n            resolve({\n                url,\n                ok: response.ok,\n                status: response.status,\n                statusText: response.statusText,\n                body,\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 result = await requestRaw<T>(options, config);\n            if (!onCancel.isCancelled) {\n                resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
+    }, "6": 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            if (onCancel.isCancelled) {\n                return;\n            }\n\n            const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n            const response = await fetch(url, {\n                method: options.method,\n                headers: options.headers as Record<string, string> | undefined,\n                body: options.body ? JSON.stringify(options.body) : undefined,\n            });\n\n            resolve((await response.json()) as T);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
+    }, "8": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.program(11, data, 0), "data": data, "loc": { "start": { "line": 79, "column": 0 }, "end": { "line": 113, "column": 7 } } })) != null ? stack1 : "");
+    }, "9": function (container, depth0, helpers, partials, data) {
+        return "export async function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<ApiResult<T>> {\n    const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n    const response = await fetch(url, {\n        method: options.method,\n        headers: options.headers as Record<string, string> | undefined,\n        body: options.body ? JSON.stringify(options.body) : undefined,\n    });\n\n    const body = (await response.json()) as T;\n    return {\n        url,\n        ok: response.ok,\n        status: response.status,\n        statusText: response.statusText,\n        body,\n    };\n}\n\nexport async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const result = await requestRaw<T>(options, config);\n    return result.body;\n}\n";
+    }, "11": function (container, depth0, helpers, partials, data) {
+        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n    const response = await fetch(url, {\n        method: options.method,\n        headers: options.headers as Record<string, string> | undefined,\n        body: options.body ? JSON.stringify(options.body) : undefined,\n    });\n\n    return (await response.json()) as T;\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)) {
@@ -20,8 +40,8 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nimport type { RequestExecutor, RequestConfig } from './request-executor';\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
-            + "\n/**\n * Определите свой тип опций (опционально)\n * Измените этот интерфейс в соответствии с вашими потребностями\n */\ninterface MyCustomOptions {\n    timeout?: number;\n    retries?: number;\n}\n\n/**\n * Создайте пользовательский executor\n * Реализуйте свою логику запросов здесь\n *\n * @example Пример использования:\n * \n * import { createLegacyExecutor } from './generated/core/legacy-request-adapter';\n * import { SimpleService } from './generated/services/SimpleService';\n *\n * const executorWithOptions = createLegacyExecutor<MyCustomOptions>(OpenAPI, (options) => {\n *  // Мапьте ваши пользовательские опции в ApiRequestOptions при необходимости\n *  return {\n *      // Добавьте любые поля ApiRequestOptions на основе options\n *  };\n * });\n * \n * const simpleService = new SimpleService(executorWithOptions);\n * await simpleService.getCallWithoutParametersAndResponse();\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 36, "column": 0 }, "end": { "line": 96, "column": 7 } } })) != null ? stack1 : "");
+            + "\nimport type { ApiRequestOptions } from './ApiRequestOptions';\nimport type { ApiResult } from './ApiResult';\nimport type { TOpenAPIConfig } from './OpenAPI';\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 6, "column": 0 }, "end": { "line": 8, "column": 7 } } })) != null ? stack1 : "")
+            + "\n/**\n * Custom request implementation.\n * Wire this file via `request` in openapi.config.json.\n */\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(8, data, 0), "data": data, "loc": { "start": { "line": 14, "column": 0 }, "end": { "line": 114, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/cli/customRequestExecutor.d.ts

@@ -2,6 +2,9 @@ declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "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;
+    "9": (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/cli/customRequestExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customRequestExecutor.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequestExecutor.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBAmBmC"}
+{"version":3,"file":"customRequestExecutor.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequestExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,wBA4CmC"}

package/dist/templatesCompiled/cli/customRequestExecutor.js

@@ -7,11 +7,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { CancelablePromise } from './CancelablePromise';\n";
+        return "import type { ApiResult } from './ApiResult';\n";
     }, "3": function (container, depth0, helpers, partials, data) {
-        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<TResponse> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n                \n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n                \n                onCancel(() => abortController.abort());\n                \n                if (onCancel.isCancelled) {\n                    return;\n                }\n                \n                // Ваша пользовательская логика запросов здесь\n                const response = await fetch(config.url, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n                \n                if (!response.ok) {\n                    throw new Error(`Request failed: ${response.statusText}`);\n                }\n                \n                const data = await response.json();\n                resolve(data);\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n};\n";
+        return "import type { CancelablePromise } from './CancelablePromise';\n";
     }, "5": function (container, depth0, helpers, partials, data) {
-        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {\n        // Ваша пользовательская логика запросов здесь\n        const response = await fetch(config.url, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n        \n        if (!response.ok) {\n            throw new Error(`Request failed: ${response.statusText}`);\n        }\n        \n        return response.json();\n    },\n};\n";
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(6, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 33, "column": 4 }, "end": { "line": 70, "column": 11 } } })) != null ? stack1 : "")
+            + "    request<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<TResponse> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n\n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n\n                onCancel(() => abortController.abort());\n\n                if (onCancel.isCancelled) {\n                    return;\n                }\n\n                const response = await fetch(`${config.path}`, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n\n                if (!response.ok) {\n                    throw new Error(`Request failed: ${response.statusText}`);\n                }\n\n                resolve((await response.json()) as TResponse);\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n};\n";
+    }, "6": function (container, depth0, helpers, partials, data) {
+        return "    requestRaw<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<ApiResult<TResponse>> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n\n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n\n                onCancel(() => abortController.abort());\n\n                if (onCancel.isCancelled) {\n                    return;\n                }\n\n                const response = await fetch(`${config.path}`, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n\n                const body = (await response.json()) as TResponse;\n                resolve({\n                    url: response.url,\n                    ok: response.ok,\n                    status: response.status,\n                    statusText: response.statusText,\n                    body,\n                });\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n";
+    }, "8": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
+            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+                return parent[propertyName];
+            }
+            return undefined;
+        };
+        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 107, "column": 4 }, "end": { "line": 125, "column": 11 } } })) != null ? stack1 : "")
+            + "    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {\n        const response = await fetch(`${config.path}`, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n\n        if (!response.ok) {\n            throw new Error(`Request failed: ${response.statusText}`);\n        }\n\n        return response.json();\n    },\n};\n";
+    }, "9": function (container, depth0, helpers, partials, data) {
+        return "    async requestRaw<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<ApiResult<TResponse>> {\n        const response = await fetch(`${config.path}`, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n\n        const body = (await response.json()) as TResponse;\n        return {\n            url: response.url,\n            ok: response.ok,\n            status: response.status,\n            statusText: response.statusText,\n            body,\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)) {
@@ -21,7 +43,8 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "\nimport type { RequestExecutor, RequestConfig } from './request-executor';\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 7, "column": 0 }, "end": { "line": 9, "column": 7 } } })) != null ? stack1 : "")
             + "\n/**\n * Определите свой тип опций (опционально)\n * Измените этот интерфейс в соответствии с вашими потребностями\n */\ninterface MyCustomOptions {\n    timeout?: number;\n    retries?: number;\n}\n\n/**\n * Создайте пользовательский executor\n * Реализуйте свою логику запросов здесь\n *\n * @example Пример использования:\n * \n * import { SimpleService } from './generated/services/SimpleService';\n * \n * const simpleService = new SimpleService<MyCustomOptions>(customExecutor);\n * await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 28, "column": 0 }, "end": { "line": 84, "column": 7 } } })) != null ? stack1 : "");
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(5, data, 0), "inverse": container.program(8, data, 0), "data": data, "loc": { "start": { "line": 31, "column": 0 }, "end": { "line": 141, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/axios/request.d.ts

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

package/dist/templatesCompiled/client/core/axios/request.d.ts.map

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