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

package/dist/common/utils/convertArrayToObject.js

@@ -5,7 +5,6 @@ function convertArrayToObject(optionsArr) {
     const emptyResult = {
         items: [],
         excludeCoreServiceFiles: undefined,
-        includeSchemasFiles: undefined,
         request: undefined,
         useOptions: undefined,
         useCancelableRequest: undefined,
@@ -31,7 +30,6 @@ function convertArrayToObject(optionsArr) {
             'useOptions',
             'useUnionTypes',
             'excludeCoreServiceFiles',
-            'includeSchemasFiles',
             'request',
             'interfacePrefix',
             'enumPrefix',
@@ -41,6 +39,7 @@ function convertArrayToObject(optionsArr) {
             'logTarget',
             'sortByRequired',
             'useSeparatedIndexes',
+            'validationLibrary',
         ];
         const extractedFields = fieldsToExtract.reduce((acc, field) => ({
             ...acc,

package/dist/common/utils/fileSystemHelpers.d.ts

@@ -1,4 +1,4 @@
-import { copyFile as __copyFile, exists as __exists, readFile as __readFile, writeFile as __writeFile } from 'fs';
+import { copyFile as __copyFile, exists as __exists, readdir as __readdir, readFile as __readFile, writeFile as __writeFile } from 'fs';
 declare function isDirectory(path: string): boolean;
 declare function isPathToFile(path: string): boolean;
 declare const fileSystemHelpers: {
@@ -6,10 +6,12 @@ declare const fileSystemHelpers: {
     writeFile: typeof __writeFile.__promisify__;
     copyFile: typeof __copyFile.__promisify__;
     exists: typeof __exists.__promisify__;
+    cp: (arg1: string | import("url").URL, arg2: string | import("url").URL) => Promise<void>;
     mkdir: (path: string) => Promise<void>;
     rmdir: (path: string) => Promise<void>;
     isDirectory: typeof isDirectory;
     isPathToFile: typeof isPathToFile;
+    readdir: typeof __readdir.__promisify__;
 };
 export { fileSystemHelpers };
 //# sourceMappingURL=fileSystemHelpers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fileSystemHelpers.d.ts","sourceRoot":"","sources":["../../../src/common/utils/fileSystemHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,IAAI,UAAU,EACtB,MAAM,IAAI,QAAQ,EAGlB,QAAQ,IAAI,UAAU,EAKtB,SAAS,IAAI,WAAW,EAC3B,MAAM,IAAI,CAAC;AAyDZ,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM1C;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM3C;AAED,QAAA,MAAM,iBAAiB;;;;;kBArDI,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAgBtB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;;;CA8ChD,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"fileSystemHelpers.d.ts","sourceRoot":"","sources":["../../../src/common/utils/fileSystemHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,IAAI,UAAU,EAEtB,MAAM,IAAI,QAAQ,EAElB,OAAO,IAAI,SAAS,EACpB,QAAQ,IAAI,UAAU,EAKtB,SAAS,IAAI,WAAW,EAC3B,MAAM,IAAI,CAAC;AA0DZ,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM1C;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM3C;AAED,QAAA,MAAM,iBAAiB;;;;;;kBArDI,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAgBtB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;;;;CAgDhD,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/common/utils/fileSystemHelpers.js

@@ -16,6 +16,7 @@ const readFile = (0, util_1.promisify)(fs_1.readFile);
 const writeFile = (0, util_1.promisify)(fs_1.writeFile);
 const copyFile = (0, util_1.promisify)(fs_1.copyFile);
 const exists = (0, util_1.promisify)(fs_1.exists);
+const cp = (0, util_1.promisify)(fs_1.cp);
 // Рекурсивное создание директорий (замена mkdirp)
 const mkdir = async (path) => {
     try {
@@ -77,9 +78,11 @@ const fileSystemHelpers = {
     writeFile,
     copyFile,
     exists,
+    cp,
     mkdir,
     rmdir,
     isDirectory,
     isPathToFile,
+    readdir,
 };
 exports.fileSystemHelpers = fileSystemHelpers;

package/dist/core/Context.d.ts

@@ -14,6 +14,15 @@ type RefsLike = {
     paths: (...args: any[]) => string[];
     exists: (...args: any[]) => boolean;
 };
+interface VirtualFile {
+    /** Абсолютный путь исходного файла (БЕЗ fragment) */
+    sourceFile: string;
+    /** Абсолютный путь output-файла (.ts) */
+    outputFile: string;
+    /** Все fragment'ы, которые встречались у этого файла */
+    fragments: Set<string>;
+}
+type VirtualFileMap = Map<string, VirtualFile>;
 /**
  * A Context wich can share a data between methods
  */
@@ -23,16 +32,30 @@ export declare class Context {
     private _output;
     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 walkSchemaForFragments;
+    initializeVirtualFileMap(rootSchema: unknown, entryFile: string): void;
+    getVirtualFiles(): VirtualFileMap;
+    getAllCanonicalRefs(): 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;AAGhF,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAIhD,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;;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;gBAE7B,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;CACJ"}
+{"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

@@ -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"}