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

package/dist/common/utils/__tests__/convertArrayToObject.test.js

@@ -7,67 +7,71 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const convertArrayToObject_1 = require("../convertArrayToObject");
 (0, node_test_1.describe)('@unit: convertArrayToObject', () => {
-    (0, node_test_1.test)('Empty array', () => {
-        const input = [];
-        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        const expected = {
+    (0, node_test_1.test)('returns default shape for null', () => {
+        const result = (0, convertArrayToObject_1.convertArrayToObject)(null);
+        node_assert_1.default.deepStrictEqual(result, {
             items: [],
             excludeCoreServiceFiles: undefined,
             request: undefined,
+            customExecutorPath: undefined,
             useOptions: undefined,
             useCancelableRequest: undefined,
-        };
-        node_assert_1.default.deepStrictEqual(result, expected);
+        });
+    });
+    (0, node_test_1.test)('returns default shape for empty array', () => {
+        const result = (0, convertArrayToObject_1.convertArrayToObject)([]);
+        node_assert_1.default.deepStrictEqual(result, {
+            items: [],
+            excludeCoreServiceFiles: undefined,
+            request: undefined,
+            customExecutorPath: undefined,
+            useOptions: undefined,
+            useCancelableRequest: undefined,
+        });
+    });
+    (0, node_test_1.test)('passes through object config unchanged', () => {
+        const input = { input: './spec.json', output: './generated', httpClient: 'axios' };
+        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
+        node_assert_1.default.strictEqual(result, input);
     });
-    (0, node_test_1.test)('An array with one element', () => {
+    (0, node_test_1.test)('converts legacy array and keeps per-item request/customExecutorPath', () => {
         const input = [
             {
                 input: 'url1',
                 output: 'res1',
-                exportCore: true,
                 request: 'req1',
+                customExecutorPath: 'exec-1',
+                httpClient: 'axios',
+                useOptions: true,
+            },
+            {
+                input: 'url2',
+                output: 'res2',
+                request: 'req2',
+                customExecutorPath: 'exec-2',
+                httpClient: 'axios',
                 useOptions: true,
             },
         ];
-        const expected = {
-            enumPrefix: undefined,
+        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
+        node_assert_1.default.deepStrictEqual(result, {
+            httpClient: 'axios',
+            useOptions: true,
+            useUnionTypes: undefined,
             excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
+            includeSchemasFiles: undefined,
             interfacePrefix: undefined,
-            items: [
-                {
-                    input: 'url1',
-                    output: 'res1',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-            ],
+            enumPrefix: undefined,
+            typePrefix: undefined,
+            useCancelableRequest: undefined,
             logLevel: undefined,
             logTarget: undefined,
-            request: 'req1',
             sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: true,
             useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
-        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
-    });
-    (0, node_test_1.test)('Multiple elements with the same outer margins', () => {
-        const input = [
-            { input: 'url1', output: 'res1', exportCore: true, request: 'req1', useOptions: true },
-            { input: 'url2', output: 'res2', exportCore: true, request: 'req1', useOptions: true },
-        ];
-        const expected = {
-            enumPrefix: undefined,
-            excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
-            interfacePrefix: undefined,
+            validationLibrary: undefined,
+            emptySchemaStrategy: undefined,
+            request: undefined,
+            customExecutorPath: undefined,
             items: [
                 {
                     input: 'url1',
@@ -76,6 +80,8 @@ const convertArrayToObject_1 = require("../convertArrayToObject");
                     outputServices: undefined,
                     outputModels: undefined,
                     outputSchemas: undefined,
+                    request: 'req1',
+                    customExecutorPath: 'exec-1',
                 },
                 {
                     input: 'url2',
@@ -84,146 +90,35 @@ const convertArrayToObject_1 = require("../convertArrayToObject");
                     outputServices: undefined,
                     outputModels: undefined,
                     outputSchemas: undefined,
+                    request: 'req2',
+                    customExecutorPath: 'exec-2',
                 },
             ],
-            logLevel: undefined,
-            logTarget: undefined,
-            request: 'req1',
-            sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: true,
-            useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
-        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
+        });
     });
-    (0, node_test_1.test)('Multiple elements with different external margins', () => {
+    (0, node_test_1.test)('promotes request/customExecutorPath to root when they are equal for all items', () => {
         const input = [
-            { input: 'url1', output: 'res1', exportCore: true, request: 'req1', useOptions: true },
-            { input: 'url2', output: 'res2', exportCore: false, request: 'req2', useOptions: false },
+            { input: 'url1', output: 'res1', request: 'req', customExecutorPath: 'exec' },
+            { input: 'url2', output: 'res2', request: 'req', customExecutorPath: 'exec' },
         ];
-        const expected = {
-            enumPrefix: undefined,
-            excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
-            interfacePrefix: undefined,
-            items: [
-                {
-                    input: 'url1',
-                    output: 'res1',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-                {
-                    input: 'url2',
-                    output: 'res2',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-            ],
-            logLevel: undefined,
-            logTarget: undefined,
-            request: 'req1',
-            sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: true,
-            useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
         const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
+        node_assert_1.default.strictEqual(result.request, 'req');
+        node_assert_1.default.strictEqual(result.customExecutorPath, 'exec');
     });
-    (0, node_test_1.test)('No optional fields', () => {
+    (0, node_test_1.test)('supports legacy "client" alias by normalizing it to httpClient', () => {
         const input = [
-            { input: 'url1', output: 'res1' },
-            { input: 'url2', output: 'res2' },
+            { input: 'url1', output: 'res1', client: 'axios', useOptions: true },
+            { input: 'url2', output: 'res2', client: 'axios', useOptions: true },
         ];
-        const expected = {
-            enumPrefix: undefined,
-            excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
-            interfacePrefix: undefined,
-            items: [
-                {
-                    input: 'url1',
-                    output: 'res1',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-                {
-                    input: 'url2',
-                    output: 'res2',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-            ],
-            logLevel: undefined,
-            logTarget: undefined,
-            request: undefined,
-            sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: undefined,
-            useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
         const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
+        node_assert_1.default.strictEqual(result.httpClient, 'axios');
+        node_assert_1.default.strictEqual(result.useOptions, true);
     });
-    (0, node_test_1.test)('Mixed presence of optional fields', () => {
+    (0, node_test_1.test)('throws on conflicting root-driven fields', () => {
         const input = [
-            { input: 'url1', output: 'res1', exportCore: true },
-            { input: 'url2', output: 'res2', request: 'req2' },
+            { input: 'url1', output: 'res1', useOptions: true },
+            { input: 'url2', output: 'res2', useOptions: false },
         ];
-        const expected = {
-            enumPrefix: undefined,
-            excludeCoreServiceFiles: undefined,
-            httpClient: undefined,
-            interfacePrefix: undefined,
-            items: [
-                {
-                    input: 'url1',
-                    output: 'res1',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-                {
-                    input: 'url2',
-                    output: 'res2',
-                    outputCore: undefined,
-                    outputServices: undefined,
-                    outputModels: undefined,
-                    outputSchemas: undefined,
-                },
-            ],
-            logLevel: undefined,
-            logTarget: undefined,
-            request: undefined,
-            sortByRequired: undefined,
-            typePrefix: undefined,
-            useCancelableRequest: undefined,
-            useOptions: undefined,
-            useSeparatedIndexes: undefined,
-            useUnionTypes: undefined,
-            validationLibrary: undefined
-        };
-        const result = (0, convertArrayToObject_1.convertArrayToObject)(input);
-        node_assert_1.default.deepStrictEqual(result, expected);
+        node_assert_1.default.throws(() => (0, convertArrayToObject_1.convertArrayToObject)(input), /conflicting "useOptions" values/);
     });
 });

package/dist/common/utils/convertArrayToObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertArrayToObject.d.ts","sourceRoot":"","sources":["../../../src/common/utils/convertArrayToObject.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA2DxH"}
+{"version":3,"file":"convertArrayToObject.d.ts","sourceRoot":"","sources":["../../../src/common/utils/convertArrayToObject.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA6GxH"}

package/dist/common/utils/convertArrayToObject.js

@@ -6,6 +6,7 @@ function convertArrayToObject(optionsArr) {
         items: [],
         excludeCoreServiceFiles: undefined,
         request: undefined,
+        customExecutorPath: undefined,
         useOptions: undefined,
         useCancelableRequest: undefined,
     };
@@ -16,21 +17,12 @@ function convertArrayToObject(optionsArr) {
         if (optionsArr.length === 0) {
             return emptyResult;
         }
-        const items = optionsArr.map(item => ({
-            input: item.input,
-            output: item.output,
-            outputCore: item.outputCore,
-            outputServices: item.outputServices,
-            outputModels: item.outputModels,
-            outputSchemas: item.outputSchemas,
-        }));
-        const firstItem = optionsArr[0];
-        const fieldsToExtract = [
+        const rootDrivenFields = [
             'httpClient',
             'useOptions',
             'useUnionTypes',
             'excludeCoreServiceFiles',
-            'request',
+            'includeSchemasFiles',
             'interfacePrefix',
             'enumPrefix',
             'typePrefix',
@@ -40,13 +32,58 @@ function convertArrayToObject(optionsArr) {
             'sortByRequired',
             'useSeparatedIndexes',
             'validationLibrary',
+            'emptySchemaStrategy',
         ];
-        const extractedFields = fieldsToExtract.reduce((acc, field) => ({
+        const getNormalizedFieldValue = (item, field) => {
+            if (field === 'httpClient') {
+                return item.httpClient ?? item.client;
+            }
+            return item[field];
+        };
+        const getRootValueOrThrow = (field) => {
+            const definedValues = optionsArr
+                .map(item => getNormalizedFieldValue(item, field))
+                .filter(value => value !== undefined);
+            if (definedValues.length === 0) {
+                return undefined;
+            }
+            const firstValue = definedValues[0];
+            const hasConflict = definedValues.some(value => value !== firstValue);
+            if (hasConflict) {
+                throw new Error(`Legacy array config has conflicting "${field}" values. ` +
+                    `This option must have the same value for all array items.`);
+            }
+            return firstValue;
+        };
+        const getCommonOptionalRootValue = (field) => {
+            const definedValues = optionsArr
+                .map(item => item[field])
+                .filter(value => value !== undefined);
+            if (definedValues.length === 0) {
+                return undefined;
+            }
+            const firstValue = definedValues[0];
+            const hasConflict = definedValues.some(value => value !== firstValue);
+            return hasConflict ? undefined : firstValue;
+        };
+        const items = optionsArr.map(item => ({
+            input: item.input,
+            output: item.output,
+            outputCore: item.outputCore,
+            outputServices: item.outputServices,
+            outputModels: item.outputModels,
+            outputSchemas: item.outputSchemas,
+            request: item.request,
+            customExecutorPath: item.customExecutorPath,
+        }));
+        const extractedRootFields = rootDrivenFields.reduce((acc, field) => ({
             ...acc,
-            [field]: firstItem[field],
+            [field]: getRootValueOrThrow(field),
         }), {});
         return {
-            ...extractedFields,
+            ...extractedRootFields,
+            request: getCommonOptionalRootValue('request'),
+            customExecutorPath: getCommonOptionalRootValue('customExecutorPath'),
             items,
         };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"OpenApiClient.d.ts","sourceRoot":"","sources":["../../src/core/OpenApiClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,WAAW,EAAsB,MAAM,uBAAuB,CAAC;AAetF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAA4B;IAEhD,IAAW,WAAW,gBAKrB;IAED,OAAO,CAAC,gBAAgB;IAmDxB,OAAO,CAAC,gBAAgB;YA0BV,sBAAsB;YAUtB,oBAAoB;YAmCpB,cAAc;IAkFtB,QAAQ,CAAC,UAAU,EAAE,WAAW;CAWzC"}
+{"version":3,"file":"OpenApiClient.d.ts","sourceRoot":"","sources":["../../src/core/OpenApiClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,WAAW,EAAsB,MAAM,uBAAuB,CAAC;AAgBtF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAA4B;IAEhD,IAAW,WAAW,gBAKrB;IAED,OAAO,CAAC,gBAAgB;IAuDxB,OAAO,CAAC,gBAAgB;YA4BV,sBAAsB;YAUtB,oBAAoB;YAmCpB,cAAc;IAwFtB,QAAQ,CAAC,UAAU,EAAE,WAAW;CAWzC"}

package/dist/core/OpenApiClient.js

@@ -9,6 +9,7 @@ const pathHelpers_1 = require("../common/utils/pathHelpers");
 const Parser_1 = require("./api/v2/Parser");
 const Parser_2 = require("./api/v3/Parser");
 const Context_1 = require("./Context");
+const EmptySchemaStrategy_enum_1 = require("./types/enums/EmptySchemaStrategy.enum");
 const ValidationLibrary_enum_1 = require("./types/enums/ValidationLibrary.enum");
 const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
 const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
@@ -31,6 +32,7 @@ class OpenApiClient {
                 ...item,
                 httpClient: rawOptions.httpClient,
                 request: item.request ?? rawOptions.request, // ?? для fallback на глобальный
+                customExecutorPath: rawOptions.customExecutorPath,
                 useOptions: rawOptions.useOptions,
                 useUnionTypes: rawOptions.useUnionTypes,
                 includeSchemasFiles: rawOptions.includeSchemasFiles,
@@ -44,6 +46,7 @@ class OpenApiClient {
                 sortByRequired: rawOptions.sortByRequired,
                 useSeparatedIndexes: rawOptions.useSeparatedIndexes,
                 validationLibrary: rawOptions.validationLibrary,
+                emptySchemaStrategy: rawOptions.emptySchemaStrategy,
             }));
         }
         else {
@@ -62,6 +65,7 @@ class OpenApiClient {
                     includeSchemasFiles: rawOptions.includeSchemasFiles,
                     excludeCoreServiceFiles: rawOptions.excludeCoreServiceFiles,
                     request: rawOptions.request,
+                    customExecutorPath: rawOptions.customExecutorPath,
                     interfacePrefix: rawOptions.interfacePrefix,
                     enumPrefix: rawOptions.enumPrefix,
                     typePrefix: rawOptions.typePrefix,
@@ -71,6 +75,7 @@ class OpenApiClient {
                     sortByRequired: rawOptions.sortByRequired,
                     useSeparatedIndexes: rawOptions.useSeparatedIndexes,
                     validationLibrary: rawOptions.validationLibrary,
+                    emptySchemaStrategy: rawOptions.emptySchemaStrategy,
                 },
             ];
         }
@@ -89,6 +94,7 @@ class OpenApiClient {
             includeSchemasFiles: item.includeSchemasFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.includeSchemasFiles,
             excludeCoreServiceFiles: item.excludeCoreServiceFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.excludeCoreServiceFiles,
             request: item.request || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.request,
+            customExecutorPath: item.customExecutorPath || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.customExecutorPath,
             interfacePrefix: item.interfacePrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
             enumPrefix: item.enumPrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.enumPrefix,
             typePrefix: item.typePrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.typePrefix,
@@ -98,6 +104,7 @@ class OpenApiClient {
             sortByRequired: item.sortByRequired ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.sortByRequired,
             useSeparatedIndexes: item.useSeparatedIndexes ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             validationLibrary: item.validationLibrary ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.validationLibrary,
+            emptySchemaStrategy: item.emptySchemaStrategy ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.emptySchemaStrategy,
         };
     }
     async cleanOutputDirectories(option) {
@@ -142,7 +149,7 @@ class OpenApiClient {
         this.writeClient.logger.shutdownLogger();
     }
     async generateSingle(item) {
-        const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, request, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, } = item;
+        const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, request, customExecutorPath, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy = EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP, } = item;
         const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
             output,
             outputCore,
@@ -175,9 +182,11 @@ class OpenApiClient {
                     useUnionTypes,
                     excludeCoreServiceFiles,
                     request,
+                    customExecutorPath,
                     useCancelableRequest,
                     useSeparatedIndexes,
                     validationLibrary,
+                    emptySchemaStrategy,
                 });
                 break;
             }
@@ -194,9 +203,11 @@ class OpenApiClient {
                     useUnionTypes,
                     excludeCoreServiceFiles,
                     request,
+                    customExecutorPath,
                     useCancelableRequest,
                     useSeparatedIndexes,
                     validationLibrary,
+                    emptySchemaStrategy,
                 });
                 break;
             }

package/dist/core/WriteClient.d.ts

@@ -1,9 +1,11 @@
 import { Logger } from '../common/Logger';
 import { OutputPaths } from './types/base/OutputPaths.model';
 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 { Client } from './types/shared/Client.model';
+import type { Model } from './types/shared/Model.model';
 import { writeClientCore } from './utils/writeClientCore';
 import { writeClientCoreIndex } from './utils/writeClientCoreIndex';
 import { writeClientExecutor } from './utils/writeClientExecutor';
@@ -37,11 +39,15 @@ type TWriteClientProps = {
     useUnionTypes: boolean;
     excludeCoreServiceFiles: boolean;
     request?: string;
+    customExecutorPath?: string;
     useCancelableRequest?: boolean;
     useSeparatedIndexes?: boolean;
     validationLibrary?: ValidationLibrary;
+    emptySchemaStrategy: EmptySchemaStrategy;
+};
+type TAPIClientGeneratorConfig = Omit<TWriteClientProps, 'httpClient' | 'useOptions' | 'request' | 'useCancelableRequest' | 'useSeparatedIndexes'> & {
+    schemaModels: Model[];
 };
-type TAPIClientGeneratorConfig = Omit<TWriteClientProps, 'httpClient' | 'useOptions' | 'request' | 'useCancelableRequest' | 'useSeparatedIndexes'>;
 /**
  * The client which is writing all items and keep the parameters to write index file
  */
@@ -53,6 +59,7 @@ export declare class WriteClient {
      * Write our OpenAPI client, using the given templates at the given output
      */
     writeClient(options: TWriteClientProps): Promise<void>;
+    private writeModelsAndFinalize;
     /**
      * Method keeps all options that is need to create index file
      * @param config

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

@@ -1 +1 @@
-{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAI1D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,sBAAsB,GAAG,qBAAqB,CAAC,CAAC;AAEnJ;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAuD;IACrE,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,CAAC,EAAE,MAAM;IAU3B;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0G5D;;;OAGG;IACH,6BAA6B,CAAC,MAAM,EAAE,yBAAyB;IAUzD,eAAe;IAKf,sBAAsB;IAK5B,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,yBAAyB;IAyCjC,OAAO,CAAC,mBAAmB;YA4Db,gBAAgB;YAUhB,uBAAuB;IAMrC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAId,eAAe,yBAAmB;IAClC,oBAAoB,8BAAwB;IAC5C,oBAAoB,8BAAwB;IAC5C,iBAAiB,2BAAqB;IACtC,sBAAsB,gCAA0B;IAChD,kBAAkB,4BAAsB;IACxC,uBAAuB,iCAA2B;IAClD,mBAAmB,6BAAuB;IAC1C,wBAAwB,kCAA4B;IACpD,sBAAsB,gCAA0B;IAChD,mBAAmB,6BAAuB;CACpD"}
+{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"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"}

package/dist/core/WriteClient.js

@@ -39,7 +39,7 @@ class WriteClient {
      * Write our OpenAPI client, using the given templates at the given output
      */
     async writeClient(options) {
-        const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, request, useCancelableRequest = false, useSeparatedIndexes = false, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, } = options;
+        const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, request, customExecutorPath, useCancelableRequest = false, useSeparatedIndexes = false, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy, } = options;
         if (!excludeCoreServiceFiles) {
             const executorPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'executor');
             const interceptorsPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'interceptors');
@@ -79,6 +79,8 @@ class WriteClient {
                 outputCorePath: (0, pathHelpers_1.relativeHelper)(outputPaths.output, outputCore),
                 services: client.services,
                 templates,
+                request,
+                customExecutorPath,
             });
         }
         /**
@@ -87,21 +89,58 @@ class WriteClient {
          */
         if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
             await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputSchemas);
-            await this.writeClientSchemas({
+            const schemaModels = await this.writeClientSchemas({
                 models: client.models,
                 templates,
                 outputSchemasPath: outputPaths.outputSchemas,
                 httpClient,
                 useUnionTypes,
                 validationLibrary,
+                emptySchemaStrategy,
             });
             await this.writeClientSchemasIndex({
-                models: client.models,
+                models: schemaModels,
                 templates,
                 outputSchemasPath: outputPaths.outputSchemas,
                 useSeparatedIndexes,
             });
+            await this.writeModelsAndFinalize({
+                client,
+                templates,
+                outputPaths,
+                httpClient,
+                useOptions,
+                useUnionTypes,
+                excludeCoreServiceFiles,
+                request,
+                customExecutorPath,
+                useCancelableRequest,
+                useSeparatedIndexes,
+                validationLibrary,
+                emptySchemaStrategy,
+                schemaModels,
+            });
+            return;
         }
+        await this.writeModelsAndFinalize({
+            client,
+            templates,
+            outputPaths,
+            httpClient,
+            useOptions,
+            useUnionTypes,
+            excludeCoreServiceFiles,
+            request,
+            customExecutorPath,
+            useCancelableRequest,
+            useSeparatedIndexes,
+            validationLibrary,
+            emptySchemaStrategy,
+            schemaModels: [],
+        });
+    }
+    async writeModelsAndFinalize(config) {
+        const { client, templates, outputPaths, httpClient, useUnionTypes, useSeparatedIndexes, excludeCoreServiceFiles, validationLibrary, emptySchemaStrategy, schemaModels } = config;
         await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputModels);
         await this.writeClientModels({
             models: client.models,
@@ -124,6 +163,8 @@ class WriteClient {
             useUnionTypes,
             excludeCoreServiceFiles,
             validationLibrary,
+            emptySchemaStrategy,
+            schemaModels,
         });
     }
     /**
@@ -155,7 +196,7 @@ class WriteClient {
         const result = new Map();
         for (const [key, value] of this.config.entries()) {
             for (const item of value) {
-                const { outputPaths, templates, excludeCoreServiceFiles, validationLibrary } = item;
+                const { outputPaths, templates, excludeCoreServiceFiles, validationLibrary, schemaModels } = item;
                 const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
                 const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
                 const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
@@ -175,7 +216,7 @@ class WriteClient {
                 if (!clientIndex.models.includes(relativePathModel)) {
                     clientIndex.models.push(relativePathModel);
                 }
-                if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
+                if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE && schemaModels.length > 0) {
                     const relativePathSchema = (0, pathHelpers_1.relativeHelper)(key, outputSchemas);
                     if (!clientIndex.schemas.includes(relativePathSchema)) {
                         clientIndex.schemas.push(relativePathSchema);
@@ -189,7 +230,7 @@ class WriteClient {
         const result = new Map();
         for (const [key, value] of this.config.entries()) {
             for (const item of value) {
-                const { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, validationLibrary } = item;
+                const { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, validationLibrary, schemaModels } = item;
                 const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
                 const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
                 const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
@@ -225,7 +266,7 @@ class WriteClient {
                     if (!clientIndex.models.some(m => this.isSameModel(m, modelFinal))) {
                         clientIndex.models.push(modelFinal);
                     }
-                    if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
+                    if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE && schemaModels.some(schemaModel => schemaModel.name === model.name && schemaModel.path === model.path)) {
                         const schema = { ...modelFinal, package: relativePathSchema };
                         if (!clientIndex.schemas.some(s => this.isSameShema(s, schema))) {
                             clientIndex.schemas.push(schema);