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

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineBestMatchingSchemaVersion = determineBestMatchingSchemaVersion;
-const getErrorFieldsFromValidation_1 = require("./getErrorFieldsFromValidation");
+const validateZodOptions_1 = require("../../Validation/validateZodOptions");
 const getUniqueKeysFromSchemas_1 = require("./getUniqueKeysFromSchemas");
 const getUniqueObjectKeys_1 = require("./getUniqueObjectKeys");
 // Determining the most appropriate schema version
@@ -12,8 +12,8 @@ function determineBestMatchingSchemaVersion(inputData, versionedSchemas) {
     const inputKeys = (0, getUniqueObjectKeys_1.getUniqueObjectKeys)(inputData);
     const matchingSchemas = versionedSchemas
         .map(({ schema, version }, idx) => {
-        const { error } = schema.validate(inputData, { allowUnknown: true });
-        const errorFields = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error).filter(err => err.type !== 'any.only');
+        const validationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(schema, inputData);
+        const errorFields = !validationResult.success ? validationResult.error.issues.filter(err => err.code !== 'invalid_value') : [];
         return errorFields.length === 0 ? { version, index: idx } : null;
     })
         .filter((match) => match !== null);
@@ -27,8 +27,8 @@ function determineBestMatchingSchemaVersion(inputData, versionedSchemas) {
     }
     const schemaMatches = versionedSchemas.map(({ schema, version }, idx) => {
         const schemaKeys = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)([schema]);
-        const { error } = schema.validate(inputData, { allowUnknown: true });
-        const errorFields = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error).filter(err => err.type !== 'any.only');
+        const validationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(schema, inputData);
+        const errorFields = !validationResult.success ? validationResult.error.issues.filter(err => err.code !== 'invalid_value') : [];
         const matchingKeys = inputKeys.filter(key => schemaKeys.has(key));
         return { index: idx, version, errorFields, matchingKeys };
     });

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

@@ -1,3 +1,3 @@
-import Joi from "joi";
-export declare function getCurrentErrorMessage(error: Joi.ValidationError, replaicingKeysMap: Map<string, string>): void;
+import { z } from 'zod';
+export declare function getCurrentErrorMessage(error: z.ZodError, replaicingKeysMap: Map<string, string>): void;
 //# sourceMappingURL=getCurrentErrorMessage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getCurrentErrorMessage.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getCurrentErrorMessage.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAKtB,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,QAQxG"}
+{"version":3,"file":"getCurrentErrorMessage.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getCurrentErrorMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,QAqB/F"}

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

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentErrorMessage = getCurrentErrorMessage;
-const getErrorFieldsFromValidation_1 = require("./getErrorFieldsFromValidation");
+const formatZodError_1 = require("../../Validation/formatZodError");
 const getKeyByMapValue_1 = require("./getKeyByMapValue");
 function getCurrentErrorMessage(error, replaicingKeysMap) {
-    const { path } = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error)[0];
-    const reverseKey = (0, getKeyByMapValue_1.getKeyByMapValue)(replaicingKeysMap, path);
-    let currentMessage = error.message;
-    if (reverseKey) {
-        currentMessage = error.message.replace(path, reverseKey);
+    if (!error || error.issues.length === 0) {
+        return;
     }
-    throw new Error(currentMessage);
+    const messages = new Set();
+    error.issues.forEach(issue => {
+        const path = (0, formatZodError_1.formatZodPath)(issue.path);
+        const reverseKey = (0, getKeyByMapValue_1.getKeyByMapValue)(replaicingKeysMap, path);
+        let currentMessage = issue.message;
+        if (reverseKey) {
+            currentMessage = error.message.replace(path, reverseKey);
+        }
+        messages.add(currentMessage);
+    });
+    const result = Array.from(messages.values());
+    throw new Error(result.join('\n'));
 }

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

@@ -1,8 +1,8 @@
-import Joi from 'joi';
+import { z } from 'zod';
 /**
  * Get all the unique parameter keys of all Joi schemes in the array
  * @param schemas array of joi schemes
  * @returns All the unique parameter keys of all Joi schemes in the array
  */
-export declare function getUniqueKeysFromSchemas(schemas: Joi.Schema[]): Set<string>;
+export declare function getUniqueKeysFromSchemas(schemas: z.ZodTypeAny[]): Set<string>;
 //# sourceMappingURL=getUniqueKeysFromSchemas.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getUniqueKeysFromSchemas.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAKtB;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,eAQ7D"}
+{"version":3,"file":"getUniqueKeysFromSchemas.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAqBxB;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAQ7E"}

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

@@ -1,8 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUniqueKeysFromSchemas = getUniqueKeysFromSchemas;
-const joiHandlers_1 = require("./joiHandlers");
-const traverseObjectStructure_1 = require("./traverseObjectStructure");
+const zod_1 = require("zod");
+function collectKeys(schema, result) {
+    if (!(schema instanceof zod_1.z.ZodObject)) {
+        return;
+    }
+    const shape = schema.shape;
+    for (const key of Object.keys(shape)) {
+        result.add(key);
+        const fieldSchema = shape[key];
+        // если поле — вложенный объект, идём глубже
+        if (fieldSchema instanceof zod_1.z.ZodObject) {
+            collectKeys(fieldSchema, result);
+        }
+    }
+}
 /**
  * Get all the unique parameter keys of all Joi schemes in the array
  * @param schemas array of joi schemes
@@ -11,7 +24,7 @@ const traverseObjectStructure_1 = require("./traverseObjectStructure");
 function getUniqueKeysFromSchemas(schemas) {
     const result = new Set();
     for (const schema of schemas) {
-        (0, traverseObjectStructure_1.traverseObjectStructure)(schema, [joiHandlers_1.handleJoiSchema, joiHandlers_1.handleJoiDescription], result);
+        collectKeys(schema, result);
     }
     return result;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"getUniqueObjectKeys.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueObjectKeys.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAKhE"}
+{"version":3,"file":"getUniqueObjectKeys.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueObjectKeys.ts"],"names":[],"mappings":"AAmBA;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAKhE"}

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

@@ -1,7 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUniqueObjectKeys = getUniqueObjectKeys;
-const traverseObjectStructure_1 = require("./traverseObjectStructure");
+function collectUniqueObjectKeys(root, result) {
+    const recurse = (v) => collectUniqueObjectKeys(v, result);
+    if (root && typeof root === 'object') {
+        if (Array.isArray(root)) {
+            for (const item of root) {
+                recurse(item);
+            }
+        }
+        else {
+            for (const key of Object.keys(root)) {
+                if (result instanceof Set) {
+                    result.add(key);
+                }
+                recurse(root[key]);
+            }
+        }
+    }
+}
 /**
  * Get unique keys from object properties (set of options)
  * @param rawInput object properties (set of options)
@@ -9,6 +26,6 @@ const traverseObjectStructure_1 = require("./traverseObjectStructure");
  */
 function getUniqueObjectKeys(rawInput) {
     const result = new Set();
-    (0, traverseObjectStructure_1.traverseObjectStructure)(rawInput, [], result);
+    collectUniqueObjectKeys(rawInput, result);
     return Array.from(result);
 }

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

@@ -1,10 +1,11 @@
+import { z } from 'zod';
 import { EMigrationMode } from '../../Enums';
 import { EVersionedSchemaType } from '../Enums';
 import { SchemaMigrationPlan, VersionedSchema, VersionMatchResult } from '../Types';
 type MigrateToLatestProps = {
     rawInput: Record<string, any>;
     migrationPlans: SchemaMigrationPlan<Record<string, any>, Record<string, any>>[];
-    versionedSchemas: VersionedSchema<Record<string, any>>[];
+    versionedSchemas: VersionedSchema<z.ZodTypeAny>[];
     migrationMode: EMigrationMode;
 };
 type MigrateToLatestResult = {

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

@@ -1 +1 @@
-{"version":3,"file":"migrateDataToLatestSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AASpF,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAChF,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IACzD,aAAa,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAiElK"}
+{"version":3,"file":"migrateDataToLatestSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AASpF,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAChF,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;IAClD,aAAa,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAiElK"}

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateDataToLatestSchemaVersion = migrateDataToLatestSchemaVersion;
 const Enums_1 = require("../../Enums");
+const validateZodOptions_1 = require("../../Validation/validateZodOptions");
 const determineBestMatchingSchemaVersion_1 = require("./determineBestMatchingSchemaVersion");
 const generateKeyMappingForInvalidKeys_1 = require("./generateKeyMappingForInvalidKeys");
 const getCurrentErrorMessage_1 = require("./getCurrentErrorMessage");
@@ -23,9 +24,9 @@ function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedS
     const actualSchema = versionedSchemas[actualVersionIndex];
     for (let idx = guessedVersion.lastVersionIndex; idx < versionedSchemas.length - 1; idx++) {
         const currentVersionSchema = versionedSchemas[idx];
-        const { error: firstError } = currentVersionSchema.schema.validate(currentData);
-        if (firstError) {
-            (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(firstError, replacingKeysMap);
+        const firstValidationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(currentVersionSchema.schema, currentData);
+        if (!firstValidationResult.success) {
+            (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(firstValidationResult.error, replacingKeysMap);
         }
         const fromVersion = currentVersionSchema.version;
         const migrationPlan = migrationPlans.find(p => p.fromVersion === fromVersion);
@@ -37,10 +38,10 @@ function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedS
         }
         const toVersion = versionedSchemas[idx + 1].version;
         const migratedRaw = migrationPlan.migrate(currentData);
-        const { error } = versionedSchemas[idx + 1].schema.validate(migratedRaw, { allowUnknown: false });
-        if (error) {
+        const validationResult = (0, validateZodOptions_1.validateZodOptions)(versionedSchemas[idx + 1].schema, migratedRaw);
+        if (!validationResult.success) {
             throw new Error(`Migration from ${fromVersion} to ${toVersion} failed validation. ` +
-                `Error: ${error.message}. ` +
+                `Error: ${validationResult.errors.join('\n')}. ` +
                 `Migration description: ${migrationPlan.description || 'No description provided'}.`);
         }
         currentData = { ...migratedRaw };
@@ -49,9 +50,9 @@ function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedS
             console.warn('Для выполнения генерации OpenApi потребовалось мигрировать схему Ваших данных на актуальную. Для обновленмя конфигурации в файле используйте команду `npm name_cli_tool update-config`');
         }
     }
-    const { error } = actualSchema.schema.validate(currentData, { allowUnknown: false });
-    if (error) {
-        (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(error, replacingKeysMap);
+    const validationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(actualSchema.schema, currentData);
+    if (!validationResult.success) {
+        (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(validationResult.error, replacingKeysMap);
     }
     return { value: currentData, guessedVersion, schemaVersion: actualSchema.version, schemaType: actualSchema.type };
 }

package/dist/common/VersionedSchema/refinements/dependentOptionsRefinement.d.ts

@@ -0,0 +1,4 @@
+import { z } from 'zod';
+import { TRawOptions } from "../../TRawOptions";
+export declare function dependentOptionsRefinement(data: TRawOptions, ctx: z.RefinementCtx): void;
+//# sourceMappingURL=dependentOptionsRefinement.d.ts.map

package/dist/common/VersionedSchema/refinements/dependentOptionsRefinement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependentOptionsRefinement.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/refinements/dependentOptionsRefinement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa,QA2C7E"}

package/dist/common/VersionedSchema/refinements/dependentOptionsRefinement.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dependentOptionsRefinement = dependentOptionsRefinement;
+function dependentOptionsRefinement(data, ctx) {
+    // Проверка: либо items, либо input+output должны быть указаны
+    const hasItems = data.items && data.items.length > 0;
+    const hasInputOutput = !!(data.input && data.output);
+    if (!hasItems && !hasInputOutput) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'Either "items" array or "input" + "output" must be provided',
+            path: [],
+        });
+    }
+    // Если есть items, то input и output в корне не должны быть указаны
+    if (hasItems && hasInputOutput) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'Cannot use both "items" array and "input"/"output" at the root level',
+            path: ['items'],
+        });
+    }
+    // Валидация: если excludeCoreServiceFiles === true, request не должен быть указан
+    if (data.excludeCoreServiceFiles === true && data.request) {
+        ctx.addIssue({
+            code: 'custom',
+            message: '"request" can only be used when "excludeCoreServiceFiles" is false',
+            path: ['request'],
+        });
+    }
+    // Валидация для каждого элемента в items
+    if (hasItems && data.items) {
+        data.items.forEach((item, index) => {
+            if (item.request && data.excludeCoreServiceFiles === true) {
+                ctx.addIssue({
+                    code: 'custom',
+                    message: '"request" in items can only be used when "excludeCoreServiceFiles" is false',
+                    path: ['items', index, 'request'],
+                });
+            }
+        });
+    }
+}

package/dist/common/VersionedSchema/refinements/singleOrMultiRefinement.d.ts

@@ -0,0 +1,4 @@
+import { z } from 'zod';
+import { unifiedOptionsShape } from '../AllVersionedSchemas/UnifiedBase';
+export declare function singleOrMultiRefinement(data: z.infer<typeof unifiedOptionsShape>, ctx: z.RefinementCtx): void;
+//# sourceMappingURL=singleOrMultiRefinement.d.ts.map

package/dist/common/VersionedSchema/refinements/singleOrMultiRefinement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"singleOrMultiRefinement.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/refinements/singleOrMultiRefinement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa,QAmBtG"}

package/dist/common/VersionedSchema/refinements/singleOrMultiRefinement.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.singleOrMultiRefinement = singleOrMultiRefinement;
+function singleOrMultiRefinement(data, ctx) {
+    const hasItems = !!data.items?.length;
+    const hasSingle = !!data.input;
+    if (hasItems && hasSingle) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'Use either items or input/output, but not both options.',
+            path: ['items'],
+        });
+    }
+    if (!hasItems && !hasSingle) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'You must specify either items or input/output',
+            path: ['input'],
+        });
+    }
+}

package/dist/core/Context.d.ts

@@ -33,28 +33,29 @@ export declare class Context {
     prefix: PrefixArtifacts;
     private _sortByRequired;
     private specRoot;
+    private entryFile?;
     private virtualFiles;
     constructor({ input, output, prefix, sortByRequired }: TContextProps);
     addRefs(refs: RefsLike): Context;
     values(...types: string[]): Record<string, any>;
-    get($ref: string): JSONSchema4Type | JSONSchema6Type | JSONSchema7Type;
+    get($ref: string, parentSourceFile?: string): JSONSchema4Type | JSONSchema6Type | JSONSchema7Type;
     paths(...types: string[]): string[];
-    exists($ref: string): boolean;
+    exists($ref: string, parentSourceFile?: string): boolean;
     fileName(): string;
     get output(): OutputPaths;
     get sortByRequired(): boolean;
     get root(): $Root | undefined;
     private canonicalizeRef;
     private mapSourceToOutput;
-    private registerRef;
-    private walkSchema;
+    private walkSchemaForFragments;
     initializeVirtualFileMap(rootSchema: unknown, entryFile: string): void;
     getVirtualFiles(): VirtualFileMap;
     getAllCanonicalRefs(): string[];
-    resolveCanonicalRef(canonicalRef: string): {
+    resolveCanonicalRef(canonicalRef: string, parentSourceFile?: string): {
         outputFile: string;
         fragment?: string;
     } | undefined;
+    private normalizeRefForLookup;
 }
 export {};
 //# sourceMappingURL=Context.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAIhF,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAKhD,KAAK,aAAa,GAAG;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChD,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC;IAC7E,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAAC;IACpC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACvC,CAAC;AAEF,UAAU,WAAW;IACjB,qDAAqD;IACrD,UAAU,EAAE,MAAM,CAAC;IAEnB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE/C;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAc;IACtB,MAAM,EAAE,eAAe,CAI5B;IAEF,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,YAAY,CAA6B;gBAErC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa;IAmB7D,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO;IAKhC,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAO/C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe;IAOtE,KAAK,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAOnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO7B,QAAQ,IAAI,MAAM;IAOzB,IAAW,MAAM,gBAKhB;IAED,IAAW,cAAc,YAExB;IAED,IAAW,IAAI,IAAI,KAAK,GAAG,SAAS,CAEnC;IAED,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,UAAU;IAiBX,wBAAwB,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAiB/D,eAAe,IAAI,cAAc;IAIjC,mBAAmB,IAAI,MAAM,EAAE;IAgB/B,mBAAmB,CAAC,YAAY,EAAE,MAAM,GACzC;QACI,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,GACD,SAAS;CAYlB"}
+{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAIhF,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAMhD,KAAK,aAAa,GAAG;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChD,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC;IAC7E,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAAC;IACpC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACvC,CAAC;AAEF,UAAU,WAAW;IACjB,qDAAqD;IACrD,UAAU,EAAE,MAAM,CAAC;IAEnB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE/C;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAc;IACtB,MAAM,EAAE,eAAe,CAI5B;IAEF,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,YAAY,CAA6B;gBAErC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa;IAmB7D,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO;IAKhC,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAO/C,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe;IAQjG,KAAK,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAOnC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO;IAQxD,QAAQ,IAAI,MAAM;IAOzB,IAAW,MAAM,gBAKhB;IAED,IAAW,cAAc,YAExB;IAED,IAAW,IAAI,IAAI,KAAK,GAAG,SAAS,CAEnC;IAED,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,sBAAsB;IA+BvB,wBAAwB,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAuC/D,eAAe,IAAI,cAAc;IAIjC,mBAAmB,IAAI,MAAM,EAAE;IAgB/B,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GACpE;QACI,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,GACD,SAAS;IAef,OAAO,CAAC,qBAAqB;CAyBhC"}

package/dist/core/Context.js

@@ -5,6 +5,7 @@ const path_1 = require("path");
 const pathHelpers_1 = require("../common/utils/pathHelpers");
 const getFileName_1 = require("./utils/getFileName");
 const isString_1 = require("./utils/isString");
+const normalizeRef_1 = require("./utils/normalizeRef");
 const parseRef_1 = require("./utils/parseRef");
 /**
  * A Context wich can share a data between methods
@@ -20,6 +21,7 @@ class Context {
     };
     _sortByRequired = false;
     specRoot;
+    entryFile;
     virtualFiles = new Map();
     constructor({ input, output, prefix, sortByRequired }) {
         this._output = output;
@@ -48,11 +50,12 @@ class Context {
         }
         return this._refs.values(...types);
     }
-    get($ref) {
+    get($ref, parentSourceFile) {
         if (!this._refs) {
             throw new Error('Context must be initialized');
         }
-        return this._refs.get($ref);
+        const normalizedRef = this.normalizeRefForLookup($ref, parentSourceFile);
+        return this._refs.get(normalizedRef);
     }
     paths(...types) {
         if (!this._refs) {
@@ -60,11 +63,12 @@ class Context {
         }
         return this._refs.paths(...types);
     }
-    exists($ref) {
+    exists($ref, parentSourceFile) {
         if (!this._refs) {
             throw new Error('Context must be initialized');
         }
-        return this._refs.exists($ref);
+        const normalizedRef = this.normalizeRefForLookup($ref, parentSourceFile);
+        return this._refs.exists(normalizedRef);
     }
     fileName() {
         if (!this._root) {
@@ -107,38 +111,36 @@ class Context {
         const baseName = (0, path_1.basename)(relative).replace(/\.(yaml|yml|json)$/i, '.ts');
         return (0, pathHelpers_1.resolveHelper)(this.output.outputModels, dir, baseName);
     }
-    registerRef(ref, parentSourceFile) {
-        const { sourceFile, fragment } = this.canonicalizeRef(ref, parentSourceFile);
-        let entry = this.virtualFiles.get(sourceFile);
-        if (!entry) {
-            entry = {
-                sourceFile,
-                outputFile: this.mapSourceToOutput(sourceFile),
-                fragments: new Set(),
-            };
-            this.virtualFiles.set(sourceFile, entry);
-        }
-        if (fragment) {
-            entry.fragments.add(fragment);
-        }
-    }
-    walkSchema(obj, parentSourceFile) {
+    walkSchemaForFragments(obj, parentSourceFile) {
         if (!obj || typeof obj !== 'object')
             return;
         if (typeof obj.$ref === 'string') {
-            this.registerRef(obj.$ref, parentSourceFile);
+            const { sourceFile, fragment } = this.canonicalizeRef(obj.$ref, parentSourceFile);
+            let entry = this.virtualFiles.get(sourceFile);
+            if (!entry) {
+                entry = {
+                    sourceFile,
+                    outputFile: this.mapSourceToOutput(sourceFile),
+                    fragments: new Set(),
+                };
+                this.virtualFiles.set(sourceFile, entry);
+            }
+            if (fragment) {
+                entry.fragments.add(fragment);
+            }
         }
         if (Array.isArray(obj)) {
-            obj.forEach(item => this.walkSchema(item, parentSourceFile));
+            obj.forEach(item => this.walkSchemaForFragments(item, parentSourceFile));
             return;
         }
         for (const value of Object.values(obj)) {
-            this.walkSchema(value, parentSourceFile);
+            this.walkSchemaForFragments(value, parentSourceFile);
         }
     }
     initializeVirtualFileMap(rootSchema, entryFile) {
         this.specRoot = (0, pathHelpers_1.normalizeHelper)((0, pathHelpers_1.dirNameHelper)(entryFile));
         const normalizedEntry = (0, pathHelpers_1.normalizeHelper)(entryFile);
+        this.entryFile = normalizedEntry;
         // Гарантируем, что entry файл тоже есть в карте
         if (!this.virtualFiles.has(normalizedEntry)) {
             this.virtualFiles.set(normalizedEntry, {
@@ -147,7 +149,26 @@ class Context {
                 fragments: new Set(),
             });
         }
-        this.walkSchema(rootSchema, normalizedEntry);
+        // 🔴 Вместо ручного обхода, использовать resolved.paths() от SwaggerParser
+        // это даст нам все файлы, которые парсер разрешил
+        const allPaths = this._refs?.paths() || [];
+        for (const refPath of allPaths) {
+            const normalizedPath = (0, pathHelpers_1.normalizeHelper)(refPath);
+            if (!this.virtualFiles.has(normalizedPath)) {
+                this.virtualFiles.set(normalizedPath, {
+                    sourceFile: normalizedPath,
+                    outputFile: this.mapSourceToOutput(normalizedPath),
+                    fragments: new Set(),
+                });
+            }
+        }
+        // Обходим каждый файл чтобы найти $ref с фрагментами (#)
+        for (const [sourceFile] of this.virtualFiles) {
+            const schema = this._refs?.get(sourceFile);
+            if (schema && typeof schema === 'object') {
+                this.walkSchemaForFragments(schema, sourceFile);
+            }
+        }
     }
     getVirtualFiles() {
         return this.virtualFiles;
@@ -166,8 +187,9 @@ class Context {
         }
         return result;
     }
-    resolveCanonicalRef(canonicalRef) {
-        const parsed = (0, parseRef_1.parseRef)(canonicalRef);
+    resolveCanonicalRef(canonicalRef, parentSourceFile) {
+        const normalizedRef = this.normalizeRefForLookup(canonicalRef, parentSourceFile);
+        const parsed = (0, parseRef_1.parseRef)(normalizedRef);
         const sourceFile = (0, pathHelpers_1.normalizeHelper)(parsed.filePath ?? '');
         const file = this.virtualFiles.get(sourceFile);
         if (!file)
@@ -177,5 +199,26 @@ class Context {
             fragment: parsed.fragment,
         };
     }
+    normalizeRefForLookup(ref, parentSourceFile) {
+        if (!ref)
+            return ref;
+        // Prefer explicit parent if provided
+        if (parentSourceFile) {
+            const normalizedParent = (0, path_1.isAbsolute)(parentSourceFile)
+                ? parentSourceFile
+                : (0, pathHelpers_1.resolveHelper)(this.specRoot, parentSourceFile);
+            return (0, normalizeRef_1.normalizeRef)(ref, normalizedParent);
+        }
+        // If we can fall back to entry file, normalize relative refs against it
+        if (this.entryFile) {
+            const parsed = (0, parseRef_1.parseRef)(ref);
+            if (parsed.type === parseRef_1.RefType.LOCAL_FRAGMENT ||
+                parsed.type === parseRef_1.RefType.EXTERNAL_FILE ||
+                parsed.type === parseRef_1.RefType.EXTERNAL_FILE_FRAGMENT) {
+                return (0, normalizeRef_1.normalizeRef)(ref, this.entryFile);
+            }
+        }
+        return ref;
+    }
 }
 exports.Context = Context;

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;IAgDxB,OAAO,CAAC,gBAAgB;YAyBV,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;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"}

package/dist/core/OpenApiClient.js

@@ -29,9 +29,11 @@ class OpenApiClient {
             // Для items: Наследуем глобальный request, если не переопределён
             return rawOptions.items.map(item => ({
                 ...item,
+                httpClient: rawOptions.httpClient,
                 request: item.request ?? rawOptions.request, // ?? для fallback на глобальный
                 useOptions: rawOptions.useOptions,
                 useUnionTypes: rawOptions.useUnionTypes,
+                includeSchemasFiles: rawOptions.includeSchemasFiles,
                 excludeCoreServiceFiles: rawOptions.excludeCoreServiceFiles,
                 interfacePrefix: rawOptions.interfacePrefix,
                 enumPrefix: rawOptions.enumPrefix,
@@ -57,6 +59,7 @@ class OpenApiClient {
                     httpClient: rawOptions.httpClient,
                     useOptions: rawOptions.useOptions,
                     useUnionTypes: rawOptions.useUnionTypes,
+                    includeSchemasFiles: rawOptions.includeSchemasFiles,
                     excludeCoreServiceFiles: rawOptions.excludeCoreServiceFiles,
                     request: rawOptions.request,
                     interfacePrefix: rawOptions.interfacePrefix,
@@ -83,6 +86,7 @@ class OpenApiClient {
             httpClient: item.httpClient || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.httpClient,
             useOptions: item.useOptions ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useUnionTypes: item.useUnionTypes ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
+            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,
             interfacePrefix: item.interfacePrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
@@ -110,16 +114,16 @@ class OpenApiClient {
         }
         this.writeClient.logger.forceInfo(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.STARTED(items.length));
         try {
-            const start = process.hrtime();
+            const start = process.hrtime.bigint();
             for (const option of items) {
                 await this.cleanOutputDirectories(option);
             }
             for (const option of items) {
-                const fileStart = process.hrtime();
+                const fileStart = process.hrtime.bigint();
                 await this.generateSingle(option);
-                const [fileSeconds, fileNanoseconds] = process.hrtime(fileStart);
-                const fileDuration = fileSeconds + fileNanoseconds / 1e6;
-                this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.DURATION_FOR_FILE(option.input, fileDuration.toFixed(2)));
+                const fileEnd = process.hrtime.bigint();
+                const fileDurationInSeconds = Number(fileEnd - fileStart) / 1e9;
+                this.writeClient.logger.forceInfo(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.DURATION_FOR_FILE(option.input, fileDurationInSeconds.toFixed(3)));
             }
             if (items[0]?.useSeparatedIndexes) {
                 await this.writeClient.combineAndWrightSimple();
@@ -128,9 +132,9 @@ class OpenApiClient {
                 await this.writeClient.combineAndWrite();
             }
             this.writeClient.logger.forceInfo(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.FINISHED);
-            const [seconds, nanoseconds] = process.hrtime(start);
-            const durationInMs = seconds + nanoseconds / 1e6;
-            this.writeClient.logger.forceInfo(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.FINISHED_WITH_DURATION(durationInMs.toFixed(2)));
+            const end = process.hrtime.bigint();
+            const durationInSeconds = Number(end - start) / 1e9;
+            this.writeClient.logger.forceInfo(LoggerMessages_1.LOGGER_MESSAGES.GENERATION.FINISHED_WITH_DURATION(durationInSeconds.toFixed(3)));
         }
         catch (error) {
             this.writeClient.logger.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(error.message));

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;IAsG5D;;;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":"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"}

package/dist/core/WriteClient.js

@@ -41,7 +41,11 @@ class WriteClient {
     async writeClient(options) {
         const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, request, useCancelableRequest = false, useSeparatedIndexes = false, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, } = options;
         if (!excludeCoreServiceFiles) {
+            const executorPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'executor');
+            const interceptorsPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'interceptors');
             await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputCore);
+            await fileSystemHelpers_1.fileSystemHelpers.mkdir(executorPath);
+            await fileSystemHelpers_1.fileSystemHelpers.mkdir(interceptorsPath);
             await this.writeClientCore({ client, templates, outputCorePath: outputPaths.outputCore, httpClient, request, useCancelableRequest });
             await this.writeClientCoreIndex({
                 templates,