ts-openapi-codegen 2.0.0-beta.0 → 2.0.0-beta.10

package/dist/core/Context.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
+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
  */
@@ -17,6 +20,9 @@ class Context {
         type: 'T',
     };
     _sortByRequired = false;
+    specRoot;
+    entryFile;
+    virtualFiles = new Map();
     constructor({ input, output, prefix, sortByRequired }) {
         this._output = output;
         this._refs = {};
@@ -44,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) {
@@ -56,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) {
@@ -80,5 +88,137 @@ class Context {
     get root() {
         return this._root;
     }
+    canonicalizeRef(ref, parentSourceFile) {
+        const parsed = (0, parseRef_1.parseRef)(ref);
+        // LOCAL_FRAGMENT → тот же файл
+        if (parsed.type === parseRef_1.RefType.LOCAL_FRAGMENT) {
+            return {
+                sourceFile: (0, pathHelpers_1.normalizeHelper)(parentSourceFile),
+                fragment: parsed.fragment,
+            };
+        }
+        // Внешний ref
+        const parentDir = (0, pathHelpers_1.dirNameHelper)(parentSourceFile);
+        const absSource = (0, pathHelpers_1.resolveHelper)(parentDir, parsed.filePath);
+        return {
+            sourceFile: (0, pathHelpers_1.normalizeHelper)(absSource),
+            fragment: parsed.fragment,
+        };
+    }
+    mapSourceToOutput(sourceFile) {
+        const relative = (0, pathHelpers_1.relativeHelper)(this.specRoot, sourceFile);
+        const dir = (0, pathHelpers_1.dirNameHelper)(relative);
+        const baseName = (0, path_1.basename)(relative).replace(/\.(yaml|yml|json)$/i, '.ts');
+        return (0, pathHelpers_1.resolveHelper)(this.output.outputModels, dir, baseName);
+    }
+    walkSchemaForFragments(obj, parentSourceFile) {
+        if (!obj || typeof obj !== 'object')
+            return;
+        if (typeof obj.$ref === 'string') {
+            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.walkSchemaForFragments(item, parentSourceFile));
+            return;
+        }
+        for (const value of Object.values(obj)) {
+            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, {
+                sourceFile: normalizedEntry,
+                outputFile: this.mapSourceToOutput(normalizedEntry),
+                fragments: new Set(),
+            });
+        }
+        // 🔴 Вместо ручного обхода, использовать 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;
+    }
+    getAllCanonicalRefs() {
+        const result = [];
+        for (const file of this.virtualFiles.values()) {
+            if (file.fragments.size > 0) {
+                for (const fragment of file.fragments) {
+                    result.push(`${file.sourceFile}${fragment}`);
+                }
+            }
+            else {
+                result.push(file.sourceFile);
+            }
+        }
+        return result;
+    }
+    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)
+            return undefined;
+        return {
+            outputFile: file.outputFile,
+            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;AActF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAA4B;IAEhD,IAAW,WAAW,gBAKrB;IAED,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,gBAAgB;YAyBV,sBAAsB;YAUtB,oBAAoB;YAmCpB,cAAc;IAiFtB,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;AAG5C,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

@@ -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 ValidationLibrary_enum_1 = require("./types/enums/ValidationLibrary.enum");
 const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
 const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
 const getOutputPaths_1 = require("./utils/getOutputPaths");
@@ -28,12 +29,50 @@ 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,
+                typePrefix: rawOptions.typePrefix,
+                useCancelableRequest: rawOptions.useCancelableRequest,
+                logLevel: rawOptions.logLevel,
+                logTarget: rawOptions.logTarget,
+                sortByRequired: rawOptions.sortByRequired,
+                useSeparatedIndexes: rawOptions.useSeparatedIndexes,
+                validationLibrary: rawOptions.validationLibrary,
             }));
         }
         else {
             // Плоский формат (из CLI или старого конфига): Один item с глобальным request
-            return [rawOptions];
+            return [
+                {
+                    input: rawOptions.input ?? '',
+                    output: rawOptions.output ?? '',
+                    outputCore: rawOptions.outputCore,
+                    outputServices: rawOptions.outputServices,
+                    outputModels: rawOptions.outputModels,
+                    outputSchemas: rawOptions.outputSchemas,
+                    httpClient: rawOptions.httpClient,
+                    useOptions: rawOptions.useOptions,
+                    useUnionTypes: rawOptions.useUnionTypes,
+                    includeSchemasFiles: rawOptions.includeSchemasFiles,
+                    excludeCoreServiceFiles: rawOptions.excludeCoreServiceFiles,
+                    request: rawOptions.request,
+                    interfacePrefix: rawOptions.interfacePrefix,
+                    enumPrefix: rawOptions.enumPrefix,
+                    typePrefix: rawOptions.typePrefix,
+                    useCancelableRequest: rawOptions.useCancelableRequest,
+                    logLevel: rawOptions.logLevel,
+                    logTarget: rawOptions.logTarget,
+                    sortByRequired: rawOptions.sortByRequired,
+                    useSeparatedIndexes: rawOptions.useSeparatedIndexes,
+                    validationLibrary: rawOptions.validationLibrary,
+                },
+            ];
         }
     }
     addDefaultValues(item) {
@@ -47,8 +86,8 @@ 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,
-            excludeCoreServiceFiles: item.excludeCoreServiceFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.excludeCoreServiceFiles,
             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,
             enumPrefix: item.enumPrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.enumPrefix,
@@ -58,6 +97,7 @@ class OpenApiClient {
             logTarget: item.logTarget || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.logTarget,
             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,
         };
     }
     async cleanOutputDirectories(option) {
@@ -74,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();
@@ -92,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));
@@ -102,7 +142,7 @@ class OpenApiClient {
         this.writeClient.logger.shutdownLogger();
     }
     async generateSingle(item) {
-        const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, includeSchemasFiles, request, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, } = 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 outputPaths = (0, getOutputPaths_1.getOutputPaths)({
             output,
             outputCore,
@@ -118,6 +158,7 @@ class OpenApiClient {
             httpClient,
             useUnionTypes,
             useOptions,
+            validationLibrary,
         });
         this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.DEFINING_VERSION);
         switch (openApiVersion) {
@@ -133,10 +174,10 @@ class OpenApiClient {
                     useOptions,
                     useUnionTypes,
                     excludeCoreServiceFiles,
-                    includeSchemasFiles,
                     request,
                     useCancelableRequest,
                     useSeparatedIndexes,
+                    validationLibrary,
                 });
                 break;
             }
@@ -152,10 +193,10 @@ class OpenApiClient {
                     useOptions,
                     useUnionTypes,
                     excludeCoreServiceFiles,
-                    includeSchemasFiles,
                     request,
                     useCancelableRequest,
                     useSeparatedIndexes,
+                    validationLibrary,
                 });
                 break;
             }

package/dist/core/WriteClient.d.ts

@@ -1,10 +1,12 @@
 import { Logger } from '../common/Logger';
 import { OutputPaths } from './types/base/OutputPaths.model';
+import { Templates } from './types/base/Templates.model';
 import { HttpClient } from './types/enums/HttpClient.enum';
+import { ValidationLibrary } from './types/enums/ValidationLibrary.enum';
 import type { Client } from './types/shared/Client.model';
-import { Templates } from './utils/registerHandlebarTemplates';
 import { writeClientCore } from './utils/writeClientCore';
 import { writeClientCoreIndex } from './utils/writeClientCoreIndex';
+import { writeClientExecutor } from './utils/writeClientExecutor';
 import { writeClientFullIndex } from './utils/writeClientFullIndex';
 import { writeClientModels } from './utils/writeClientModels';
 import { writeClientModelsIndex } from './utils/writeClientModelsIndex';
@@ -21,10 +23,10 @@ import { writeClientSimpleIndex } from './utils/writeClientSimpleIndex';
  * @param useOptions Use options or arguments functions
  * @param useUnionTypes Use union types instead of enums
  * @param excludeCoreServiceFiles The generation of the core and services is excluded
- * @param includeSchemasFiles The generation of model validation schemes is enabled
  * @param request: Path to custom request file
  * @param useCancelableRequest Use cancelable request type.
  * @param useSeparatedIndexes Use separate index files for the core, models, schemas, and services
+ * @param validationLibrary Validation library to use for schema validation
  */
 type TWriteClientProps = {
     client: Client;
@@ -34,10 +36,10 @@ type TWriteClientProps = {
     useOptions: boolean;
     useUnionTypes: boolean;
     excludeCoreServiceFiles: boolean;
-    includeSchemasFiles: boolean;
     request?: string;
     useCancelableRequest?: boolean;
     useSeparatedIndexes?: boolean;
+    validationLibrary?: ValidationLibrary;
 };
 type TAPIClientGeneratorConfig = Omit<TWriteClientProps, 'httpClient' | 'useOptions' | 'request' | 'useCancelableRequest' | 'useSeparatedIndexes'>;
 /**
@@ -49,16 +51,6 @@ export declare class WriteClient {
     constructor(logger?: Logger);
     /**
      * Write our OpenAPI client, using the given templates at the given output
-     * @param client Client object with all the models, services, etc.
-     * @param templates Templates wrapper with all loaded Handlebars templates
-     * @param outputPaths A set of parameters with paths for generating main sections (folders)
-     * @param httpClient The selected httpClient (fetch, xhr or node)
-     * @param useOptions Use options or arguments functions
-     * @param useUnionTypes Use union types instead of enums
-     * @param excludeCoreServiceFiles:
-     * @param includeSchemasFiles:
-     * @param request: Path to custom request file
-     * @param useCancelableRequest Use cancelable request type.
      */
     writeClient(options: TWriteClientProps): Promise<void>;
     /**
@@ -89,6 +81,7 @@ export declare class WriteClient {
     writeClientServices: typeof writeClientServices;
     writeClientServicesIndex: typeof writeClientServicesIndex;
     writeClientSimpleIndex: typeof writeClientSimpleIndex;
+    writeClientExecutor: typeof writeClientExecutor;
 }
 export {};
 //# sourceMappingURL=WriteClient.d.ts.map

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,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,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,mBAAmB,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC,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;IAQ3B;;;;;;;;;;;;OAYG;IACG,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2F5D;;;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;CAC1D"}
+{"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

@@ -5,11 +5,13 @@ const Enums_1 = require("../common/Enums");
 const Logger_1 = require("../common/Logger");
 const fileSystemHelpers_1 = require("../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../common/utils/pathHelpers");
+const ValidationLibrary_enum_1 = require("./types/enums/ValidationLibrary.enum");
 const prepareAlias_1 = require("./utils/prepareAlias");
 const sortModelByName_1 = require("./utils/sortModelByName");
 const unique_1 = require("./utils/unique");
 const writeClientCore_1 = require("./utils/writeClientCore");
 const writeClientCoreIndex_1 = require("./utils/writeClientCoreIndex");
+const writeClientExecutor_1 = require("./utils/writeClientExecutor");
 const writeClientFullIndex_1 = require("./utils/writeClientFullIndex");
 const writeClientModels_1 = require("./utils/writeClientModels");
 const writeClientModelsIndex_1 = require("./utils/writeClientModelsIndex");
@@ -25,29 +27,25 @@ class WriteClient {
     config = new Map();
     _logger;
     constructor(logger) {
-        this._logger = logger || new Logger_1.Logger({
-            level: Enums_1.ELogLevel.ERROR,
-            instanceId: 'client',
-            logOutput: Enums_1.ELogOutput.CONSOLE,
-        });
+        this._logger =
+            logger ||
+                new Logger_1.Logger({
+                    level: Enums_1.ELogLevel.ERROR,
+                    instanceId: 'client',
+                    logOutput: Enums_1.ELogOutput.CONSOLE,
+                });
     }
     /**
      * Write our OpenAPI client, using the given templates at the given output
-     * @param client Client object with all the models, services, etc.
-     * @param templates Templates wrapper with all loaded Handlebars templates
-     * @param outputPaths A set of parameters with paths for generating main sections (folders)
-     * @param httpClient The selected httpClient (fetch, xhr or node)
-     * @param useOptions Use options or arguments functions
-     * @param useUnionTypes Use union types instead of enums
-     * @param excludeCoreServiceFiles:
-     * @param includeSchemasFiles:
-     * @param request: Path to custom request file
-     * @param useCancelableRequest Use cancelable request type.
      */
     async writeClient(options) {
-        const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, includeSchemasFiles = false, request, useCancelableRequest = false, useSeparatedIndexes = false, } = 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,
@@ -76,8 +74,18 @@ class WriteClient {
                 outputServices,
                 useSeparatedIndexes,
             });
+            await this.writeClientExecutor({
+                outputPath: outputPaths.output,
+                outputCorePath: (0, pathHelpers_1.relativeHelper)(outputPaths.output, outputCore),
+                services: client.services,
+                templates,
+            });
         }
-        if (includeSchemasFiles) {
+        /**
+         * TODO: Нужно собирать импорты из всех вложенных моделей (link, properties в composition и т.д.) и передавать их в шаблон.
+         * Это делается в writeClientSchemas или в парсере моделей.
+         */
+        if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
             await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputSchemas);
             await this.writeClientSchemas({
                 models: client.models,
@@ -85,6 +93,7 @@ class WriteClient {
                 outputSchemasPath: outputPaths.outputSchemas,
                 httpClient,
                 useUnionTypes,
+                validationLibrary,
             });
             await this.writeClientSchemasIndex({
                 models: client.models,
@@ -114,7 +123,7 @@ class WriteClient {
             outputPaths,
             useUnionTypes,
             excludeCoreServiceFiles,
-            includeSchemasFiles,
+            validationLibrary,
         });
     }
     /**
@@ -146,7 +155,7 @@ class WriteClient {
         const result = new Map();
         for (const [key, value] of this.config.entries()) {
             for (const item of value) {
-                const { outputPaths, templates, excludeCoreServiceFiles, includeSchemasFiles } = item;
+                const { outputPaths, templates, excludeCoreServiceFiles, validationLibrary } = 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');
@@ -166,7 +175,7 @@ class WriteClient {
                 if (!clientIndex.models.includes(relativePathModel)) {
                     clientIndex.models.push(relativePathModel);
                 }
-                if (includeSchemasFiles) {
+                if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
                     const relativePathSchema = (0, pathHelpers_1.relativeHelper)(key, outputSchemas);
                     if (!clientIndex.schemas.includes(relativePathSchema)) {
                         clientIndex.schemas.push(relativePathSchema);
@@ -180,7 +189,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, includeSchemasFiles } = item;
+                const { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, validationLibrary } = 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');
@@ -216,7 +225,7 @@ class WriteClient {
                     if (!clientIndex.models.some(m => this.isSameModel(m, modelFinal))) {
                         clientIndex.models.push(modelFinal);
                     }
-                    if (includeSchemasFiles) {
+                    if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
                         const schema = { ...modelFinal, package: relativePathSchema };
                         if (!clientIndex.schemas.some(s => this.isSameShema(s, schema))) {
                             clientIndex.schemas.push(schema);
@@ -289,5 +298,6 @@ class WriteClient {
     writeClientServices = writeClientServices_1.writeClientServices;
     writeClientServicesIndex = writeClientServicesIndex_1.writeClientServicesIndex;
     writeClientSimpleIndex = writeClientSimpleIndex_1.writeClientSimpleIndex;
+    writeClientExecutor = writeClientExecutor_1.writeClientExecutor;
 }
 exports.WriteClient = WriteClient;

package/dist/core/__tests__/WriteClient.test.js

@@ -7,6 +7,7 @@ const strict_1 = __importDefault(require("node:assert/strict"));
 const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../types/enums/HttpClient.enum");
+const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum");
 const getOutputPaths_1 = require("../utils/getOutputPaths");
 const WriteClient_1 = require("../WriteClient");
 (0, node_test_1.describe)('@unit: writeClient', () => {
@@ -39,6 +40,7 @@ const WriteClient_1 = require("../WriteClient");
                 services: () => 'servicesIndex',
             },
             exports: {
+                client: () => 'client',
                 model: () => 'model',
                 schema: () => 'schema',
                 service: () => 'service',
@@ -51,6 +53,11 @@ const WriteClient_1 = require("../WriteClient");
                 request: () => 'request',
                 cancelablePromise: () => 'cancelablePromise',
                 httpStatusCode: () => 'httpStatusCode',
+                createExecutorAdapter: () => 'createExecutorAdapter',
+                requestExecutor: () => 'requestExecutor',
+                apiErrorInterceptor: () => 'apiErrorInterceptor',
+                interceptors: () => 'interceptors',
+                withInterceptors: () => 'withInterceptors'
             },
         };
         const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });
@@ -62,7 +69,7 @@ const WriteClient_1 = require("../WriteClient");
             useOptions: false,
             useUnionTypes: false,
             excludeCoreServiceFiles: false,
-            includeSchemasFiles: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
         });
         strict_1.default.ok(mkdirCalls.length > 0, 'mkdir should be called at least once');
         strict_1.default.ok(writeFileCalls.length > 0, 'writeFile should be called at least once');

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

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

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

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

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

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

package/dist/core/api/v2/parser/getModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAO/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CA2JjE"}
+{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CAyJjE"}