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

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

@@ -1,3 +1,3 @@
 import { BuiltInParserName, LiteralUnion } from 'prettier';
-export declare function format(input: string, parser?: LiteralUnion<BuiltInParserName>): Promise<string>;
+export declare function format(input: string, parser?: LiteralUnion<BuiltInParserName>, useProjectConfig?: boolean): Promise<string>;
 //# sourceMappingURL=format.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../src/common/utils/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA2B,YAAY,EAAE,MAAM,UAAU,CAAC;AAEpF,wBAAsB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBrG"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../src/common/utils/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA4B,YAAY,EAA6C,MAAM,UAAU,CAAC;AAiBhI,wBAAsB,MAAM,CACxB,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,EACxC,gBAAgB,CAAC,EAAE,OAAO,GAC3B,OAAO,CAAC,MAAM,CAAC,CA6BjB"}

package/dist/common/utils/format.js

@@ -2,23 +2,47 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.format = format;
 const prettier_1 = require("prettier");
-async function format(input, parser) {
+const Consts_1 = require("../Consts");
+const LoggerMessages_1 = require("../LoggerMessages");
+const BUILTIN_PRETTIER_OPTIONS = {
+    tabWidth: 4,
+    printWidth: 120,
+    useTabs: false,
+    singleQuote: true,
+    quoteProps: 'as-needed',
+    trailingComma: 'all',
+    bracketSpacing: true,
+    arrowParens: 'avoid',
+    endOfLine: 'auto',
+};
+async function format(input, parser, useProjectConfig) {
+    let options = { ...BUILTIN_PRETTIER_OPTIONS, parser: parser ?? 'typescript' };
+    if (useProjectConfig) {
+        try {
+            const resolved = await (0, prettier_1.resolveConfig)(process.cwd(), { useCache: false });
+            if (resolved) {
+                Consts_1.APP_LOGGER.info(LoggerMessages_1.LOGGER_MESSAGES.FORMATTING.PRETTIER_PROJECT_CONFIG_RESOLVED(process.cwd()));
+                options = { ...resolved, parser: parser ?? resolved.parser ?? 'typescript' };
+            }
+            else {
+                Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.FORMATTING.PRETTIER_PROJECT_CONFIG_NOT_FOUND);
+            }
+        }
+        catch {
+            Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.FORMATTING.PRETTIER_PROJECT_CONFIG_NOT_FOUND);
+        }
+    }
     try {
-        const formatedCode = await (0, prettier_1.format)(input, {
-            parser: parser ?? 'typescript',
-            tabWidth: 4,
-            printWidth: 120,
-            useTabs: false,
-            singleQuote: true,
-            quoteProps: 'as-needed',
-            trailingComma: 'all',
-            bracketSpacing: true,
-            arrowParens: 'avoid',
-            endOfLine: 'auto',
-        });
+        const formatedCode = await (0, prettier_1.format)(input, options);
         return formatedCode;
     }
-    catch {
-        throw new Error('Could not to format the value via prettier');
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        Consts_1.APP_LOGGER.errorWithHint({
+            code: LoggerMessages_1.LOGGER_ERROR_CODES.PRETTIER_FORMAT_FAILED,
+            message: LoggerMessages_1.LOGGER_MESSAGES.FORMATTING.PRETTIER_FORMAT_FAILED('(generated content)', message),
+            error,
+        });
+        throw new Error(`Could not format the value via prettier: ${message}`);
     }
 }

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

@@ -0,0 +1,5 @@
+type JsonPathSegment = string | number;
+export declare const toJsonPath: (segments: JsonPathSegment[]) => string;
+export declare const parseJsonPath: (path: string) => string[];
+export {};
+//# sourceMappingURL=jsonPath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"jsonPath.d.ts","sourceRoot":"","sources":["../../../src/common/utils/jsonPath.ts"],"names":[],"mappings":"AAAA,KAAK,eAAe,GAAG,MAAM,GAAG,MAAM,CAAC;AAEvC,eAAO,MAAM,UAAU,GAAI,UAAU,eAAe,EAAE,KAAG,MAcxD,CAAC;AAIF,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,MAAM,EAQlD,CAAC"}

package/dist/common/utils/jsonPath.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseJsonPath = exports.toJsonPath = void 0;
+const toJsonPath = (segments) => {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    return segments.reduce((path, seg) => {
+        const segment = String(seg);
+        const needsBrackets = segment.includes('.') || segment.includes('/') || segment.includes('-') || segment.includes('[') || segment.includes(']');
+        if (segment === '') {
+            return path;
+        }
+        return path + (needsBrackets ? `['${segment}']` : `.${segment}`);
+    }, '$');
+};
+exports.toJsonPath = toJsonPath;
+const JSON_PATH_SEGMENT_REGEX = /\[['"]([^'"]+)['"]\]|\.([A-Za-z0-9_$]+)/g;
+const parseJsonPath = (path) => {
+    const segments = [];
+    JSON_PATH_SEGMENT_REGEX.lastIndex = 0;
+    let match;
+    while ((match = JSON_PATH_SEGMENT_REGEX.exec(path)) !== null) {
+        segments.push(match[1] ?? match[2]);
+    }
+    return segments.filter(segment => segment.length > 0);
+};
+exports.parseJsonPath = parseJsonPath;

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

@@ -0,0 +1,2 @@
+export declare const normalizeObject: (value: any) => any;
+//# sourceMappingURL=normalizeObject.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeObject.d.ts","sourceRoot":"","sources":["../../../src/common/utils/normalizeObject.ts"],"names":[],"mappings":"AAsCA,eAAO,MAAM,eAAe,GAAI,OAAO,GAAG,KAAG,GA2B5C,CAAC"}

package/dist/common/utils/normalizeObject.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeObject = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const isPlainObject = (value) => {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+};
+const mergeObjects = (base, next) => {
+    const result = { ...base };
+    for (const [key, value] of Object.entries(next)) {
+        const existing = result[key];
+        if (isPlainObject(existing) && isPlainObject(value)) {
+            result[key] = mergeObjects(existing, value);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+};
+const expandAllOf = (value) => {
+    const allOf = Array.isArray(value.allOf) ? value.allOf : null;
+    if (!allOf)
+        return value;
+    let merged = {};
+    for (const item of allOf) {
+        if (isPlainObject(item)) {
+            merged = mergeObjects(merged, item);
+        }
+    }
+    const rest = {};
+    for (const [key, val] of Object.entries(value)) {
+        if (key === 'allOf')
+            continue;
+        rest[key] = val;
+    }
+    return mergeObjects(merged, rest);
+};
+const normalizeObject = (value) => {
+    if (value === null || value === undefined) {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        return value.map(item => (0, exports.normalizeObject)(item));
+    }
+    if (typeof value !== 'object') {
+        return value;
+    }
+    const expanded = expandAllOf(value);
+    const entries = Object.entries(expanded).sort(([a], [b]) => {
+        if (a < b)
+            return -1;
+        if (a > b)
+            return 1;
+        return 0;
+    });
+    const result = {};
+    for (const [key, val] of entries) {
+        result[key] = (0, exports.normalizeObject)(val);
+    }
+    return result;
+};
+exports.normalizeObject = normalizeObject;

package/dist/core/Context.d.ts

@@ -1,4 +1,5 @@
 import { JSONSchema4Type, JSONSchema6Type, JSONSchema7Type } from 'json-schema';
+import { OpenApiGeneratorPlugin, SchemaTypeOverrideContext } from './plugins/GeneratorPlugin.model';
 import { OutputPaths } from './types/base/OutputPaths.model';
 import { PrefixArtifacts } from './types/base/PrefixArtifacts.model';
 import { $Root } from './types/base/Root.model';
@@ -7,6 +8,7 @@ type TContextProps = {
     output: OutputPaths;
     prefix?: PrefixArtifacts;
     sortByRequired?: boolean;
+    plugins?: OpenApiGeneratorPlugin[];
 };
 type RefsLike = {
     values: (...args: any[]) => Record<string, any>;
@@ -32,10 +34,11 @@ export declare class Context {
     private _output;
     prefix: PrefixArtifacts;
     private _sortByRequired;
+    private _plugins;
     private specRoot;
     private entryFile?;
     private virtualFiles;
-    constructor({ input, output, prefix, sortByRequired }: TContextProps);
+    constructor({ input, output, prefix, sortByRequired, plugins }: TContextProps);
     addRefs(refs: RefsLike): Context;
     values(...types: string[]): Record<string, any>;
     get($ref: string, parentSourceFile?: string): JSONSchema4Type | JSONSchema6Type | JSONSchema7Type;
@@ -45,6 +48,10 @@ export declare class Context {
     get output(): OutputPaths;
     get sortByRequired(): boolean;
     get root(): $Root | undefined;
+    /**
+     * Resolves custom type override for schema via registered plugins.
+     */
+    resolveSchemaTypeOverride(schema: Record<string, any>, context: SchemaTypeOverrideContext): string | undefined;
     private canonicalizeRef;
     private mapSourceToOutput;
     private walkSchemaForFragments;

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;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"}
+{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"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"}

package/dist/core/Context.js

@@ -20,10 +20,11 @@ class Context {
         type: 'T',
     };
     _sortByRequired = false;
+    _plugins = [];
     specRoot;
     entryFile;
     virtualFiles = new Map();
-    constructor({ input, output, prefix, sortByRequired }) {
+    constructor({ input, output, prefix, sortByRequired, plugins }) {
         this._output = output;
         this._refs = {};
         if ((0, isString_1.isString)(input)) {
@@ -38,6 +39,7 @@ class Context {
         if (sortByRequired !== undefined && sortByRequired !== null) {
             this._sortByRequired = sortByRequired;
         }
+        this._plugins = plugins || [];
         return this;
     }
     addRefs(refs) {
@@ -88,6 +90,18 @@ class Context {
     get root() {
         return this._root;
     }
+    /**
+     * Resolves custom type override for schema via registered plugins.
+     */
+    resolveSchemaTypeOverride(schema, context) {
+        for (const plugin of this._plugins) {
+            const override = plugin.resolveSchemaTypeOverride?.({ schema, context });
+            if (typeof override === 'string' && override.trim()) {
+                return override.trim();
+            }
+        }
+        return undefined;
+    }
     canonicalizeRef(ref, parentSourceFile) {
         const parsed = (0, parseRef_1.parseRef)(ref);
         // LOCAL_FRAGMENT → тот же файл
@@ -164,9 +178,14 @@ class Context {
         }
         // Обходим каждый файл чтобы найти $ref с фрагментами (#)
         for (const [sourceFile] of this.virtualFiles) {
-            const schema = this._refs?.get(sourceFile);
-            if (schema && typeof schema === 'object') {
-                this.walkSchemaForFragments(schema, sourceFile);
+            try {
+                const schema = this._refs?.get(sourceFile);
+                if (schema && typeof schema === 'object') {
+                    this.walkSchemaForFragments(schema, sourceFile);
+                }
+            }
+            catch {
+                // Skip unresolved entries from refs.paths().
             }
         }
     }

package/dist/core/OpenApiClient.d.ts

@@ -8,6 +8,8 @@ export declare class OpenApiClient {
     private cleanOutputDirectories;
     private generateCodeForItems;
     private generateSingle;
+    private loadDiffReportIfNeeded;
+    private applyDiffReportIfNeeded;
     generate(rawOptions: TRawOptions): Promise<void>;
 }
 //# sourceMappingURL=OpenApiClient.d.ts.map

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;AAgBtF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAA4B;IAEhD,IAAW,WAAW,gBAKrB;IAED,OAAO,CAAC,gBAAgB;IAuDxB,OAAO,CAAC,gBAAgB;YA4BV,sBAAsB;YAUtB,oBAAoB;YAmCpB,cAAc;IAwFtB,QAAQ,CAAC,UAAU,EAAE,WAAW;CAWzC"}
+{"version":3,"file":"OpenApiClient.d.ts","sourceRoot":"","sources":["../../src/core/OpenApiClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,WAAW,EAAsB,MAAM,uBAAuB,CAAC;AAwBtF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,aAAa;IACtB,OAAO,CAAC,YAAY,CAA4B;IAEhD,IAAW,WAAW,gBAKrB;IAED,OAAO,CAAC,gBAAgB;IAwExB,OAAO,CAAC,gBAAgB;YAwCV,sBAAsB;YAUtB,oBAAoB;YAoCpB,cAAc;YA2Jd,sBAAsB;IASpC,OAAO,CAAC,uBAAuB;IAczB,QAAQ,CAAC,UAAU,EAAE,WAAW;CAWzC"}

package/dist/core/OpenApiClient.js

@@ -9,12 +9,19 @@ 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 loadGovernanceConfig_1 = require("./governance/loadGovernanceConfig");
+const loadGeneratorPlugins_1 = require("./plugins/loadGeneratorPlugins");
+const validateOpenApiStrict_1 = require("./strict/validateOpenApiStrict");
 const EmptySchemaStrategy_enum_1 = require("./types/enums/EmptySchemaStrategy.enum");
+const ModelsMode_enum_1 = require("./types/enums/ModelsMode.enum");
 const ValidationLibrary_enum_1 = require("./types/enums/ValidationLibrary.enum");
+const applyDiffReportToClient_1 = require("./utils/applyDiffReportToClient");
 const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
 const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
 const getOutputPaths_1 = require("./utils/getOutputPaths");
+const loadDiffReport_1 = require("./utils/loadDiffReport");
 const postProcessClient_1 = require("./utils/postProcessClient");
+const prepareDtoModels_1 = require("./utils/prepareDtoModels");
 const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
 const WriteClient_1 = require("./WriteClient");
 class OpenApiClient {
@@ -26,12 +33,16 @@ class OpenApiClient {
         return this._writeClient;
     }
     normalizeOptions(rawOptions) {
+        const modelsMode = rawOptions.modelsMode ?? rawOptions.models?.mode;
+        const useHistory = rawOptions.useHistory ?? rawOptions.analyze?.useHistory;
+        const diffReport = rawOptions.diffReport ?? rawOptions.analyze?.reportPath;
         if (rawOptions.items && rawOptions.items.length > 0) {
             // Для items: Наследуем глобальный request, если не переопределён
             return rawOptions.items.map(item => ({
                 ...item,
                 httpClient: rawOptions.httpClient,
                 request: item.request ?? rawOptions.request, // ?? для fallback на глобальный
+                plugins: item.plugins ?? rawOptions.plugins,
                 customExecutorPath: rawOptions.customExecutorPath,
                 useOptions: rawOptions.useOptions,
                 useUnionTypes: rawOptions.useUnionTypes,
@@ -47,6 +58,12 @@ class OpenApiClient {
                 useSeparatedIndexes: rawOptions.useSeparatedIndexes,
                 validationLibrary: rawOptions.validationLibrary,
                 emptySchemaStrategy: rawOptions.emptySchemaStrategy,
+                useHistory: item.useHistory ?? useHistory,
+                diffReport: item.diffReport ?? diffReport,
+                modelsMode: item.modelsMode ?? modelsMode,
+                strictOpenapi: rawOptions.strictOpenapi,
+                reportFile: rawOptions.reportFile,
+                governanceConfig: rawOptions.governanceConfig,
             }));
         }
         else {
@@ -65,6 +82,7 @@ class OpenApiClient {
                     includeSchemasFiles: rawOptions.includeSchemasFiles,
                     excludeCoreServiceFiles: rawOptions.excludeCoreServiceFiles,
                     request: rawOptions.request,
+                    plugins: rawOptions.plugins,
                     customExecutorPath: rawOptions.customExecutorPath,
                     interfacePrefix: rawOptions.interfacePrefix,
                     enumPrefix: rawOptions.enumPrefix,
@@ -76,6 +94,12 @@ class OpenApiClient {
                     useSeparatedIndexes: rawOptions.useSeparatedIndexes,
                     validationLibrary: rawOptions.validationLibrary,
                     emptySchemaStrategy: rawOptions.emptySchemaStrategy,
+                    useHistory,
+                    diffReport,
+                    modelsMode,
+                    strictOpenapi: rawOptions.strictOpenapi,
+                    reportFile: rawOptions.reportFile,
+                    governanceConfig: rawOptions.governanceConfig,
                 },
             ];
         }
@@ -94,6 +118,7 @@ class OpenApiClient {
             includeSchemasFiles: item.includeSchemasFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.includeSchemasFiles,
             excludeCoreServiceFiles: item.excludeCoreServiceFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.excludeCoreServiceFiles,
             request: item.request || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.request,
+            plugins: item.plugins || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.plugins,
             customExecutorPath: item.customExecutorPath || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.customExecutorPath,
             interfacePrefix: item.interfacePrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
             enumPrefix: item.enumPrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.enumPrefix,
@@ -105,6 +130,17 @@ class OpenApiClient {
             useSeparatedIndexes: item.useSeparatedIndexes ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             validationLibrary: item.validationLibrary ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.validationLibrary,
             emptySchemaStrategy: item.emptySchemaStrategy ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.emptySchemaStrategy,
+            useHistory: item.useHistory ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+            diffReport: item.diffReport || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            modelsMode: item.modelsMode ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            models: item.models || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.models,
+            analyze: item.analyze || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.analyze,
+            miracles: item.miracles || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.miracles,
+            strictOpenapi: item.strictOpenapi ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.strictOpenapi,
+            reportFile: item.reportFile || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.reportFile,
+            useProjectPrettier: item.useProjectPrettier ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useProjectPrettier,
+            useEslintFix: item.useEslintFix ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useEslintFix,
+            governanceConfig: item.governanceConfig || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.governanceConfig,
         };
     }
     async cleanOutputDirectories(option) {
@@ -145,11 +181,12 @@ class OpenApiClient {
         }
         catch (error) {
             this.writeClient.logger.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(error.message));
+            throw error;
         }
         this.writeClient.logger.shutdownLogger();
     }
     async generateSingle(item) {
-        const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, request, customExecutorPath, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy = EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP, } = item;
+        const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, request, plugins, customExecutorPath, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy = EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP, useHistory, diffReport, modelsMode = ModelsMode_enum_1.ModelsMode.INTERFACES, strictOpenapi, reportFile, useProjectPrettier = false, useEslintFix = false, governanceConfig, } = item;
         const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
             output,
             outputCore,
@@ -158,8 +195,30 @@ class OpenApiClient {
             outputSchemas,
         });
         const absoluteInput = (0, pathHelpers_1.resolveHelper)(process.cwd(), input);
-        const context = new Context_1.Context({ input: absoluteInput, output: outputPaths, prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix }, sortByRequired });
+        const generatorPlugins = await (0, loadGeneratorPlugins_1.loadGeneratorPlugins)(plugins);
+        const context = new Context_1.Context({
+            input: absoluteInput,
+            output: outputPaths,
+            prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix },
+            sortByRequired,
+            plugins: generatorPlugins,
+        });
         const openApi = await (0, getOpenApiSpec_1.getOpenApiSpec)(context, absoluteInput);
+        if (strictOpenapi) {
+            const parserValidationIssues = await (0, validateOpenApiStrict_1.validateWithSwaggerParser)(absoluteInput);
+            const governancePolicy = await (0, loadGovernanceConfig_1.loadGovernanceConfig)(governanceConfig);
+            const strictReport = (0, validateOpenApiStrict_1.validateOpenApiStrict)({
+                openApi,
+                context,
+                preIssues: parserValidationIssues,
+                governanceConfig: governancePolicy,
+            });
+            const reportPath = await (0, validateOpenApiStrict_1.writeOpenApiStrictReport)(strictReport, reportFile);
+            this.writeClient.logger.forceInfo(`Strict OpenAPI report created: ${reportPath}`);
+            if (strictReport.summary.errors > 0) {
+                throw new Error(`Strict OpenAPI validation failed with ${strictReport.summary.errors} error(s). Report: ${reportPath}`);
+            }
+        }
         const openApiVersion = (0, getOpenApiVersion_1.getOpenApiVersion)(openApi);
         const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
             httpClient,
@@ -167,14 +226,29 @@ class OpenApiClient {
             useOptions,
             validationLibrary,
         });
+        const diffReportData = await this.loadDiffReportIfNeeded({
+            useHistory,
+            diffReport,
+            inputPath: absoluteInput,
+        });
         this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.DEFINING_VERSION);
         switch (openApiVersion) {
             case getOpenApiVersion_1.OpenApiVersion.V2: {
                 const client = new Parser_1.Parser(context).parse(openApi);
-                const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
+                const clientWithDiff = this.applyDiffReportIfNeeded({
+                    client,
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
+                    openApi,
+                    openApiVersion,
+                    diffReport: diffReportData,
+                    context,
+                });
+                const clientFinal = (0, postProcessClient_1.postProcessClient)(clientWithDiff);
+                const clientPrepared = modelsMode === ModelsMode_enum_1.ModelsMode.CLASSES ? (0, prepareDtoModels_1.prepareDtoModels)(clientFinal) : clientFinal;
                 this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.WRITING_V2);
                 await this.writeClient.writeClient({
-                    client: clientFinal,
+                    client: clientPrepared,
                     templates,
                     outputPaths,
                     httpClient,
@@ -187,15 +261,28 @@ class OpenApiClient {
                     useSeparatedIndexes,
                     validationLibrary,
                     emptySchemaStrategy,
+                    modelsMode,
+                    useProjectPrettier,
+                    useEslintFix,
                 });
                 break;
             }
             case getOpenApiVersion_1.OpenApiVersion.V3: {
                 const client = new Parser_2.Parser(context).parse(openApi);
-                const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
+                const clientWithDiff = this.applyDiffReportIfNeeded({
+                    client,
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
+                    openApi,
+                    openApiVersion,
+                    diffReport: diffReportData,
+                    context,
+                });
+                const clientFinal = (0, postProcessClient_1.postProcessClient)(clientWithDiff);
+                const clientPrepared = modelsMode === ModelsMode_enum_1.ModelsMode.CLASSES ? (0, prepareDtoModels_1.prepareDtoModels)(clientFinal) : clientFinal;
                 this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.WRITING_V3);
                 await this.writeClient.writeClient({
-                    client: clientFinal,
+                    client: clientPrepared,
                     templates,
                     outputPaths,
                     httpClient,
@@ -208,11 +295,34 @@ class OpenApiClient {
                     useSeparatedIndexes,
                     validationLibrary,
                     emptySchemaStrategy,
+                    modelsMode,
+                    useProjectPrettier,
+                    useEslintFix,
                 });
                 break;
             }
         }
     }
+    async loadDiffReportIfNeeded(params) {
+        return (0, loadDiffReport_1.loadDiffReport)({
+            useHistory: params.useHistory,
+            diffReport: params.diffReport,
+            inputPath: params.inputPath,
+            logger: this.writeClient.logger,
+        });
+    }
+    applyDiffReportIfNeeded(params) {
+        if (!params.diffReport) {
+            return params.client;
+        }
+        return (0, applyDiffReportToClient_1.applyDiffReportToClient)({
+            client: params.client,
+            openApi: params.openApi,
+            openApiVersion: params.openApiVersion,
+            diffReport: params.diffReport,
+            prefix: params.context.prefix,
+        });
+    }
     async generate(rawOptions) {
         const logger = new Logger_1.Logger({
             level: rawOptions.logLevel ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.logLevel,

package/dist/core/WriteClient.d.ts

@@ -3,6 +3,7 @@ import { OutputPaths } from './types/base/OutputPaths.model';
 import { Templates } from './types/base/Templates.model';
 import { EmptySchemaStrategy } from './types/enums/EmptySchemaStrategy.enum';
 import { HttpClient } from './types/enums/HttpClient.enum';
+import { ModelsMode } from './types/enums/ModelsMode.enum';
 import { ValidationLibrary } from './types/enums/ValidationLibrary.enum';
 import type { Client } from './types/shared/Client.model';
 import type { Model } from './types/shared/Model.model';
@@ -44,6 +45,9 @@ type TWriteClientProps = {
     useSeparatedIndexes?: boolean;
     validationLibrary?: ValidationLibrary;
     emptySchemaStrategy: EmptySchemaStrategy;
+    modelsMode?: ModelsMode;
+    useProjectPrettier?: boolean;
+    useEslintFix?: boolean;
 };
 type TAPIClientGeneratorConfig = Omit<TWriteClientProps, 'httpClient' | 'useOptions' | 'request' | 'useCancelableRequest' | 'useSeparatedIndexes'> & {
     schemaModels: Model[];

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

@@ -1 +1 @@
-{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"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"}