ts-openapi-codegen 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/cli/{generate/runGenerateOpenApi.d.ts → generateOpenApiClient/generateOpenApiClient.d.ts}

@@ -3,5 +3,5 @@ import { OptionValues } from 'commander';
  * Запускает генерацию OpenAPI клиента
  * Поддерживает как конфиг-файл, так и параметры из CLI
  */
-export declare function runGenerateOpenApi(options: OptionValues): Promise<void>;
-//# sourceMappingURL=runGenerateOpenApi.d.ts.map
+export declare function generateOpenApiClient(options: OptionValues): Promise<void>;
+//# sourceMappingURL=generateOpenApiClient.d.ts.map

package/dist/cli/generateOpenApiClient/generateOpenApiClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateOpenApiClient.d.ts","sourceRoot":"","sources":["../../../src/cli/generateOpenApiClient/generateOpenApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAgBzC;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA8DhF"}

package/dist/cli/{generate/runGenerateOpenApi.js → generateOpenApiClient/generateOpenApiClient.js}

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runGenerateOpenApi = runGenerateOpenApi;
+exports.generateOpenApiClient = generateOpenApiClient;
 const Consts_1 = require("../../common/Consts");
 const defaultOptions_1 = require("../../common/defaultOptions");
 const Enums_1 = require("../../common/Enums");
@@ -50,7 +50,7 @@ const validation_1 = require("../validation");
  * Запускает генерацию OpenAPI клиента
  * Поддерживает как конфиг-файл, так и параметры из CLI
  */
-async function runGenerateOpenApi(options) {
+async function generateOpenApiClient(options) {
     const { openapiConfig, ...clientOptions } = options;
     try {
         // Валидация опций через Zod

package/dist/cli/index.js

@@ -14,9 +14,10 @@ const HttpClient_enum_1 = require("../core/types/enums/HttpClient.enum");
 const ValidationLibrary_enum_1 = require("../core/types/enums/ValidationLibrary.enum");
 const checkConfig_1 = require("./checkAndUpdateConfig/checkConfig");
 const updateConfig_1 = require("./checkAndUpdateConfig/updateConfig");
-const runGenerateOpenApi_1 = require("./generate/runGenerateOpenApi");
+const generateOpenApiClient_1 = require("./generateOpenApiClient/generateOpenApiClient");
 const Enums_2 = require("./initOpenApiConfig/Enums");
 const runInitOpenapiConfig_1 = require("./initOpenApiConfig/runInitOpenapiConfig");
+const previewChanges_1 = require("./previewChanges/previewChanges");
 const utils_1 = require("./utils");
 const packageDetails = JSON.parse(fs_1.default.readFileSync((0, pathHelpers_1.joinHelper)(__dirname, '../../package.json'), 'utf-8'));
 const APP_NAME = packageDetails.name || 'ts-openapi-codegen-cli';
@@ -61,7 +62,7 @@ program
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, runGenerateOpenApi_1.runGenerateOpenApi)(options);
+    await (0, generateOpenApiClient_1.generateOpenApiClient)(options);
 });
 /**
  * check - Команда для проверки конфигурационного файла
@@ -106,6 +107,23 @@ program
     .action(async (options) => {
     await (0, runInitOpenapiConfig_1.runInitOpenapiConfig)(options);
 });
+/**
+ * preview-changes - Команда для предпросмотра изменений перед генерацией
+ */
+program
+    .command('preview-changes')
+    .description('Preview changes that will be made to generated code before applying them')
+    .addHelpText('before', (0, utils_1.getCLIName)(APP_NAME))
+    .option('-ocn, --openapi-config <value>', 'The path to the configuration file, listing the options', Consts_1.DEFAULT_OPENAPI_CONFIG_FILENAME)
+    .option('-gd, --generated-dir <value>', 'Directory with previously generated code (default: "generated")', './generated')
+    .option('-pd, --preview-dir <value>', 'Temporary directory for preview generation (default: "generated-preview")', './generated-preview')
+    .option('-dd, --diff-dir <value>', 'Directory to save diff files (default: "generated-diff")', './generated-diff')
+    .hook('preAction', async () => {
+    await updateNotifier.checkAndNotify();
+})
+    .action(async (options) => {
+    await (0, previewChanges_1.previewChanges)(options);
+});
 program.exitOverride();
 // TODO: Включить позже!
 // program.showSuggestionAfterError(false);

package/dist/cli/previewChanges/previewChanges.d.ts

@@ -0,0 +1,8 @@
+import { OptionValues } from 'commander';
+/**
+ * Основная функция для предпросмотра изменений
+ *
+ * TODO: Добавить проверку опций команды перед выполнением
+ */
+export declare function previewChanges(options: OptionValues): Promise<void>;
+//# sourceMappingURL=previewChanges.d.ts.map

package/dist/cli/previewChanges/previewChanges.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"previewChanges.d.ts","sourceRoot":"","sources":["../../../src/cli/previewChanges/previewChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AA0BzC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA0IzE"}

package/dist/cli/previewChanges/previewChanges.js

@@ -0,0 +1,182 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.previewChanges = previewChanges;
+const Consts_1 = require("../../common/Consts");
+const Enums_1 = require("../../common/Enums");
+const convertArrayToObject_1 = require("../../common/utils/convertArrayToObject");
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const loadConfigIfExists_1 = require("../../common/utils/loadConfigIfExists");
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const AllMigrationPlans_1 = require("../../common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans");
+const AllVersionedSchemas_1 = require("../../common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas");
+const migrateDataToLatestSchemaVersion_1 = require("../../common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion");
+const OpenAPI = __importStar(require("../../core"));
+const compareFiles_1 = require("./utils/compareFiles");
+const formatDiff_1 = require("./utils/formatDiff");
+const isDirectoryEmpty_1 = require("./utils/isDirectoryEmpty");
+const readDirectoryRecursive_1 = require("./utils/readDirectoryRecursive");
+const updateOutputPaths_1 = require("./utils/updateOutputPaths");
+/**
+ * Основная функция для предпросмотра изменений
+ *
+ * TODO: Добавить проверку опций команды перед выполнением
+ */
+async function previewChanges(options) {
+    const { openapiConfig, generatedDir = 'generated', previewDir = 'generated-preview', diffDir = 'generated-diff' } = options;
+    const resolvedGeneratedDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), generatedDir);
+    const resolvedPreviewDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), previewDir);
+    const resolvedDiffDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), diffDir);
+    let previewDirCreated = false;
+    try {
+        // 1. Проверка директории со сгенерированным кодом
+        if (await (0, isDirectoryEmpty_1.isDirectoryEmpty)(resolvedGeneratedDir)) {
+            Consts_1.APP_LOGGER.info(`Directory "${generatedDir}" is empty or does not exist. Nothing to compare.`);
+            process.exit(0);
+        }
+        // 2. Создание временной директории для preview
+        await fileSystemHelpers_1.fileSystemHelpers.mkdir(resolvedPreviewDir);
+        previewDirCreated = true;
+        // 3. Загрузка конфигурации
+        const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(openapiConfig);
+        if (!configData) {
+            Consts_1.APP_LOGGER.error('The configuration file is missing');
+            process.exit(1);
+        }
+        const preparedOptions = (0, convertArrayToObject_1.convertArrayToObject)(configData);
+        // Миграция опций
+        const migratedOptions = (0, migrateDataToLatestSchemaVersion_1.migrateDataToLatestSchemaVersion)({
+            rawInput: preparedOptions,
+            migrationPlans: AllMigrationPlans_1.allMigrationPlans,
+            versionedSchemas: AllVersionedSchemas_1.allVersionedSchemas,
+            migrationMode: Enums_1.EMigrationMode.GENERATE_OPENAPI,
+        });
+        if (!migratedOptions) {
+            Consts_1.APP_LOGGER.error("Couldn't convert the set of options to the current version");
+            process.exit(1);
+        }
+        // 4. Обновление путей output для генерации в preview директорию
+        const migratedValue = migratedOptions.value;
+        const previewOptions = (0, updateOutputPaths_1.updateOutputPaths)(migratedValue, previewDir, generatedDir);
+        // 5. Генерация кода в preview директорию
+        Consts_1.APP_LOGGER.info(`Generating code to preview directory: ${previewDir}`);
+        await OpenAPI.generate(previewOptions);
+        // 6. Сравнение файлов
+        Consts_1.APP_LOGGER.info('Comparing files...');
+        const oldFiles = await (0, readDirectoryRecursive_1.readDirectoryRecursive)(resolvedGeneratedDir);
+        const newFiles = await (0, readDirectoryRecursive_1.readDirectoryRecursive)(resolvedPreviewDir);
+        const allFiles = new Set([...oldFiles, ...newFiles]);
+        const changes = [];
+        for (const file of allFiles) {
+            const oldPath = (0, pathHelpers_1.joinHelper)(resolvedGeneratedDir, file);
+            const newPath = (0, pathHelpers_1.joinHelper)(resolvedPreviewDir, file);
+            const oldExists = await fileSystemHelpers_1.fileSystemHelpers.exists(oldPath);
+            const newExists = await fileSystemHelpers_1.fileSystemHelpers.exists(newPath);
+            if (oldExists && newExists) {
+                // Файл существует в обеих директориях - сравниваем
+                const fileDiff = await (0, compareFiles_1.compareFiles)(oldPath, newPath);
+                if (fileDiff) {
+                    changes.push({
+                        file,
+                        status: 'modified',
+                        diff: fileDiff,
+                    });
+                }
+                else {
+                    Consts_1.APP_LOGGER.info(`File "${file}" has no changes`);
+                }
+            }
+            else if (!oldExists && newExists) {
+                // Новый файл
+                changes.push({
+                    file,
+                    status: 'added',
+                });
+            }
+            else if (oldExists && !newExists) {
+                // Удаленный файл
+                changes.push({
+                    file,
+                    status: 'removed',
+                });
+            }
+        }
+        // 7. Сохранение результатов в diff директорию
+        if (changes.length > 0) {
+            await fileSystemHelpers_1.fileSystemHelpers.mkdir(resolvedDiffDir);
+            for (const change of changes) {
+                const diffFilePath = (0, pathHelpers_1.joinHelper)(resolvedDiffDir, `${change.file}.md`);
+                const diffDirPath = (0, pathHelpers_1.dirNameHelper)(diffFilePath);
+                await fileSystemHelpers_1.fileSystemHelpers.mkdir(diffDirPath);
+                let diffContent = '';
+                if (change.status === 'added') {
+                    diffContent = (0, formatDiff_1.formatDiff)(change.file, change.status);
+                }
+                else if (change.status === 'removed') {
+                    diffContent = (0, formatDiff_1.formatDiff)(change.file, change.status);
+                }
+                else if (change.diff) {
+                    diffContent = (0, formatDiff_1.formatDiff)(change.file, change.status, change.diff);
+                }
+                await fileSystemHelpers_1.fileSystemHelpers.writeFile(diffFilePath, diffContent, 'utf-8');
+                Consts_1.APP_LOGGER.info(`Diff saved: ${diffFilePath}`);
+            }
+            Consts_1.APP_LOGGER.info(`\nTotal changes: ${changes.length}`);
+            Consts_1.APP_LOGGER.info(`Diff files saved to: ${diffDir}`);
+        }
+        else {
+            Consts_1.APP_LOGGER.info('No changes detected. All files are identical.');
+        }
+        // 8. Удаление временной директории preview
+        Consts_1.APP_LOGGER.info(`Cleaning up preview directory: ${previewDir}`);
+        await fileSystemHelpers_1.fileSystemHelpers.rmdir(resolvedPreviewDir);
+        previewDirCreated = false;
+        process.exit(0);
+    }
+    catch (error) {
+        // Очистка preview директории в случае ошибки
+        if (previewDirCreated) {
+            try {
+                Consts_1.APP_LOGGER.info(`Cleaning up preview directory after error: ${previewDir}`);
+                await fileSystemHelpers_1.fileSystemHelpers.rmdir(resolvedPreviewDir);
+            }
+            catch (cleanupError) {
+                Consts_1.APP_LOGGER.error(`Failed to cleanup preview directory: ${cleanupError.message}`);
+            }
+        }
+        Consts_1.APP_LOGGER.error(error.message);
+        process.exit(1);
+    }
+}

package/dist/cli/previewChanges/utils/compareFiles.d.ts

@@ -0,0 +1,6 @@
+import * as diff from 'diff';
+/**
+ * Сравнивает два файла и возвращает diff
+ */
+export declare function compareFiles(oldPath: string, newPath: string): Promise<diff.Change[] | null>;
+//# sourceMappingURL=compareFiles.d.ts.map

package/dist/cli/previewChanges/utils/compareFiles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compareFiles.d.ts","sourceRoot":"","sources":["../../../../src/cli/previewChanges/utils/compareFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAI7B;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAUlG"}

package/dist/cli/previewChanges/utils/compareFiles.js

@@ -0,0 +1,50 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareFiles = compareFiles;
+const diff = __importStar(require("diff"));
+const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
+/**
+ * Сравнивает два файла и возвращает diff
+ */
+async function compareFiles(oldPath, newPath) {
+    const oldContent = await fileSystemHelpers_1.fileSystemHelpers.readFile(oldPath, 'utf-8');
+    const newContent = await fileSystemHelpers_1.fileSystemHelpers.readFile(newPath, 'utf-8');
+    const fileDiff = diff.diffLines(oldContent, newContent);
+    if (fileDiff.some(part => part.added || part.removed)) {
+        return fileDiff;
+    }
+    return null;
+}

package/dist/cli/previewChanges/utils/formatDiff.d.ts

@@ -0,0 +1,6 @@
+import * as diff from 'diff';
+/**
+ * Форматирует diff для сохранения в markdown файл
+ */
+export declare function formatDiff(filePath: string, status: 'added' | 'modified' | 'removed', fileDiff?: diff.Change[]): string;
+//# sourceMappingURL=formatDiff.d.ts.map

package/dist/cli/previewChanges/utils/formatDiff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatDiff.d.ts","sourceRoot":"","sources":["../../../../src/cli/previewChanges/utils/formatDiff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B;;GAEG;AACH,wBAAgB,UAAU,CACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,EACxC,QAAQ,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,GACzB,MAAM,CAyBR"}

package/dist/cli/previewChanges/utils/formatDiff.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDiff = formatDiff;
+/**
+ * Форматирует diff для сохранения в markdown файл
+ */
+function formatDiff(filePath, status, fileDiff) {
+    const lines = [`# ${filePath}`, '', `**Status:** ${status.toUpperCase()}`, ''];
+    if (status === 'added') {
+        lines.push('This is a new file.');
+    }
+    else if (status === 'removed') {
+        lines.push('This file was deleted.');
+    }
+    else if (fileDiff) {
+        lines.push('## Changes', '');
+        lines.push('```diff');
+        fileDiff.forEach(part => {
+            const prefix = part.added ? '+' : part.removed ? '-' : ' ';
+            const lines_ = part.value.split('\n');
+            lines_.forEach(line => {
+                if (line || lines_.length > 1) {
+                    lines.push(`${prefix} ${line}`);
+                }
+            });
+        });
+        lines.push('```');
+    }
+    return lines.join('\n');
+}

package/dist/cli/previewChanges/utils/isDirectoryEmpty.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Проверяет, пуста ли директория
+ */
+export declare function isDirectoryEmpty(dirPath: string): Promise<boolean>;
+//# sourceMappingURL=isDirectoryEmpty.d.ts.map

package/dist/cli/previewChanges/utils/isDirectoryEmpty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isDirectoryEmpty.d.ts","sourceRoot":"","sources":["../../../../src/cli/previewChanges/utils/isDirectoryEmpty.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAWxE"}

package/dist/cli/previewChanges/utils/isDirectoryEmpty.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDirectoryEmpty = isDirectoryEmpty;
+const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
+/**
+ * Проверяет, пуста ли директория
+ */
+async function isDirectoryEmpty(dirPath) {
+    if (!(await fileSystemHelpers_1.fileSystemHelpers.exists(dirPath))) {
+        return true;
+    }
+    if (!fileSystemHelpers_1.fileSystemHelpers.isDirectory(dirPath)) {
+        return true;
+    }
+    const entries = await fileSystemHelpers_1.fileSystemHelpers.readdir(dirPath);
+    return entries.length === 0;
+}

package/dist/cli/previewChanges/utils/readDirectoryRecursive.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Рекурсивно читает все файлы в директории
+ */
+export declare function readDirectoryRecursive(dirPath: string, basePath?: string): Promise<string[]>;
+//# sourceMappingURL=readDirectoryRecursive.d.ts.map

package/dist/cli/previewChanges/utils/readDirectoryRecursive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"readDirectoryRecursive.d.ts","sourceRoot":"","sources":["../../../../src/cli/previewChanges/utils/readDirectoryRecursive.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqB3G"}

package/dist/cli/previewChanges/utils/readDirectoryRecursive.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readDirectoryRecursive = readDirectoryRecursive;
+const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
+const pathHelpers_1 = require("../../../common/utils/pathHelpers");
+/**
+ * Рекурсивно читает все файлы в директории
+ */
+async function readDirectoryRecursive(dirPath, basePath = dirPath) {
+    const files = [];
+    const entries = await fileSystemHelpers_1.fileSystemHelpers.readdir(dirPath);
+    for (const entry of entries) {
+        const fullPath = (0, pathHelpers_1.joinHelper)(dirPath, entry);
+        let relativePath = (0, pathHelpers_1.relativeHelper)(basePath, fullPath);
+        // Убираем префикс ./ если он есть
+        if (relativePath.startsWith('./')) {
+            relativePath = relativePath.substring(2);
+        }
+        if (fileSystemHelpers_1.fileSystemHelpers.isDirectory(fullPath)) {
+            const subFiles = await readDirectoryRecursive(fullPath, basePath);
+            files.push(...subFiles);
+        }
+        else if (fileSystemHelpers_1.fileSystemHelpers.isPathToFile(fullPath)) {
+            files.push(relativePath);
+        }
+    }
+    return files;
+}

package/dist/cli/previewChanges/utils/updateOutputPaths.d.ts

@@ -0,0 +1,10 @@
+import { TRawOptions } from '../../../common/TRawOptions';
+/**
+ * Обновляет пути output в опциях для генерации в preview директорию
+ * Удаляет generatedDir из путей и заменяет на previewDir
+ *
+ * Пример: generatedDir = "./test/generated", output = "./test/generated/api"
+ * Результат: output = "./generated-preview/api"
+ */
+export declare function updateOutputPaths(options: TRawOptions, previewDir: string, generatedDir: string): TRawOptions;
+//# sourceMappingURL=updateOutputPaths.d.ts.map

package/dist/cli/previewChanges/utils/updateOutputPaths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateOutputPaths.d.ts","sourceRoot":"","sources":["../../../../src/cli/previewChanges/utils/updateOutputPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG1D;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACrB,WAAW,CAuIb"}

package/dist/cli/previewChanges/utils/updateOutputPaths.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateOutputPaths = updateOutputPaths;
+const pathHelpers_1 = require("../../../common/utils/pathHelpers");
+/**
+ * Обновляет пути output в опциях для генерации в preview директорию
+ * Удаляет generatedDir из путей и заменяет на previewDir
+ *
+ * Пример: generatedDir = "./test/generated", output = "./test/generated/api"
+ * Результат: output = "./generated-preview/api"
+ */
+function updateOutputPaths(options, previewDir, generatedDir) {
+    const resolvedGeneratedDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), generatedDir);
+    // const resolvedPreviewDir = resolveHelper(process.cwd(), previewDir);
+    /**
+     * Заменяет путь, удаляя generatedDir и добавляя previewDir
+     * Если путь находится внутри generatedDir, сохраняется относительная структура
+     */
+    const replacePath = (oldPath) => {
+        const resolvedOldPath = (0, pathHelpers_1.resolveHelper)(process.cwd(), oldPath);
+        let relativePath = (0, pathHelpers_1.relativeHelper)(resolvedGeneratedDir, resolvedOldPath);
+        // Убираем префикс ./ если он есть
+        if (relativePath.startsWith('./')) {
+            relativePath = relativePath.substring(2);
+        }
+        // Если путь пустой или равен текущей директории, возвращаем previewDir
+        if (!relativePath || relativePath === '' || relativePath === './') {
+            return previewDir;
+        }
+        // Используем previewDir (относительный путь) вместо resolvedPreviewDir
+        return (0, pathHelpers_1.joinHelper)(previewDir, relativePath);
+    };
+    /**
+     * Обновляет output* пути относительно нового output
+     * Если output* был указан явно, сохраняем его относительную структуру от старого output
+     */
+    const updateRelativePaths = (newOutput, oldOutput, oldOutputCore, oldOutputServices, oldOutputModels, oldOutputSchemas) => {
+        const resolvedOldOutput = (0, pathHelpers_1.resolveHelper)(process.cwd(), oldOutput);
+        const resolvedNewOutput = (0, pathHelpers_1.resolveHelper)(process.cwd(), newOutput);
+        const result = {};
+        // Для каждого output* пути, если он был указан, сохраняем относительную структуру
+        if (oldOutputCore) {
+            const resolvedOldCore = (0, pathHelpers_1.resolveHelper)(process.cwd(), oldOutputCore);
+            let relativeCore = (0, pathHelpers_1.relativeHelper)(resolvedOldOutput, resolvedOldCore);
+            if (relativeCore.startsWith('./')) {
+                relativeCore = relativeCore.substring(2);
+            }
+            // Если относительный путь пустой, используем стандартное имя 'core'
+            result.outputCore = relativeCore && relativeCore !== '' && relativeCore !== './'
+                ? (0, pathHelpers_1.joinHelper)(resolvedNewOutput, relativeCore)
+                : (0, pathHelpers_1.joinHelper)(resolvedNewOutput, 'core');
+        }
+        if (oldOutputServices) {
+            const resolvedOldServices = (0, pathHelpers_1.resolveHelper)(process.cwd(), oldOutputServices);
+            let relativeServices = (0, pathHelpers_1.relativeHelper)(resolvedOldOutput, resolvedOldServices);
+            if (relativeServices.startsWith('./')) {
+                relativeServices = relativeServices.substring(2);
+            }
+            result.outputServices = relativeServices && relativeServices !== '' && relativeServices !== './'
+                ? (0, pathHelpers_1.joinHelper)(resolvedNewOutput, relativeServices)
+                : (0, pathHelpers_1.joinHelper)(resolvedNewOutput, 'services');
+        }
+        if (oldOutputModels) {
+            const resolvedOldModels = (0, pathHelpers_1.resolveHelper)(process.cwd(), oldOutputModels);
+            let relativeModels = (0, pathHelpers_1.relativeHelper)(resolvedOldOutput, resolvedOldModels);
+            if (relativeModels.startsWith('./')) {
+                relativeModels = relativeModels.substring(2);
+            }
+            result.outputModels = relativeModels && relativeModels !== '' && relativeModels !== './'
+                ? (0, pathHelpers_1.joinHelper)(resolvedNewOutput, relativeModels)
+                : (0, pathHelpers_1.joinHelper)(resolvedNewOutput, 'models');
+        }
+        if (oldOutputSchemas) {
+            const resolvedOldSchemas = (0, pathHelpers_1.resolveHelper)(process.cwd(), oldOutputSchemas);
+            let relativeSchemas = (0, pathHelpers_1.relativeHelper)(resolvedOldOutput, resolvedOldSchemas);
+            if (relativeSchemas.startsWith('./')) {
+                relativeSchemas = relativeSchemas.substring(2);
+            }
+            result.outputSchemas = relativeSchemas && relativeSchemas !== '' && relativeSchemas !== './'
+                ? (0, pathHelpers_1.joinHelper)(resolvedNewOutput, relativeSchemas)
+                : (0, pathHelpers_1.joinHelper)(resolvedNewOutput, 'schemas');
+        }
+        return result;
+    };
+    if (options.items && Array.isArray(options.items)) {
+        return {
+            ...options,
+            items: options.items.map(item => {
+                const newOutput = replacePath(item.output);
+                const relativePaths = updateRelativePaths(newOutput, item.output, item.outputCore, item.outputServices, item.outputModels, item.outputSchemas);
+                return {
+                    ...item,
+                    output: newOutput,
+                    ...relativePaths,
+                };
+            }),
+        };
+    }
+    const newOutput = replacePath(options.output || '');
+    const relativePaths = updateRelativePaths(newOutput, options.output || '', options.outputCore, options.outputServices, options.outputModels, options.outputSchemas);
+    return {
+        ...options,
+        output: newOutput,
+        ...relativePaths,
+    };
+}

package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnifiedOptionsSchemaV1.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV1.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAqBtB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,uBA6BZ,CAAC"}
+{"version":3,"file":"UnifiedOptionsSchemaV1.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV1.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAgBtB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,uBA4BZ,CAAC"}

package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV1.js

@@ -10,7 +10,7 @@ const CommonSchemas_1 = require("../CommonSchemas");
 const mergeObjectSchemas_1 = require("../Utils/mergeObjectSchemas");
 const itemSchema = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
     input: joi_1.default.string().required().description('Путь, URL или строка OpenAPI спецификации'),
-    httpClient: joi_1.default.string().valid(...Object.values(HttpClient_enum_1.HttpClient)).optional(),
+    request: joi_1.default.string().optional(),
 }), CommonSchemas_1.outputPathsSchema, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2);
 /**
  * Unified options schema that supports both single and multi-item configurations.
@@ -18,11 +18,7 @@ const itemSchema = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.ob
  */
 exports.unifiedOptionsSchemaV1 = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
     // Multi-item configuration
-    items: joi_1.default.array()
-        .items(itemSchema)
-        .min(1)
-        .optional()
-        .description('Массив спецификаций для генерации'),
+    items: joi_1.default.array().items(itemSchema).min(1).optional().description('Массив спецификаций для генерации'),
     // Single-item configuration (mutually exclusive with items)
     input: joi_1.default.string()
         .when('items', {
@@ -38,5 +34,8 @@ exports.unifiedOptionsSchemaV1 = (0, mergeObjectSchemas_1.mergeObjectSchemas)(jo
         otherwise: joi_1.default.required(),
     })
         .description('Выходная директория'),
+    httpClient: joi_1.default.string()
+        .valid(...Object.values(HttpClient_enum_1.HttpClient))
+        .optional(),
 }), CommonSchemas_1.outputPathsSchema, // outputCore, outputServices, etc. for single-item mode
 CommonSchemas_1.specialParametersSchemasV2, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2).xor('items', 'input');

package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnifiedOptionsSchemaV2.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV2.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAqBtB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,uBA6BZ,CAAC"}
+{"version":3,"file":"UnifiedOptionsSchemaV2.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV2.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAgBtB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,uBA4BZ,CAAC"}

package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV2.js

@@ -10,7 +10,7 @@ const CommonSchemas_1 = require("../CommonSchemas");
 const mergeObjectSchemas_1 = require("../Utils/mergeObjectSchemas");
 const itemSchema = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
     input: joi_1.default.string().required().description('Путь, URL или строка OpenAPI спецификации'),
-    httpClient: joi_1.default.string().valid(...Object.values(HttpClient_enum_1.HttpClient)).optional(),
+    request: joi_1.default.string().optional(),
 }), CommonSchemas_1.outputPathsSchema, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2);
 /**
  * Unified options schema that supports both single and multi-item configurations.
@@ -18,11 +18,7 @@ const itemSchema = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.ob
  */
 exports.unifiedOptionsSchemaV2 = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
     // Multi-item configuration
-    items: joi_1.default.array()
-        .items(itemSchema)
-        .min(1)
-        .optional()
-        .description('Массив спецификаций для генерации'),
+    items: joi_1.default.array().items(itemSchema).min(1).optional().description('Массив спецификаций для генерации'),
     // Single-item configuration (mutually exclusive with items)
     input: joi_1.default.string()
         .when('items', {
@@ -38,5 +34,8 @@ exports.unifiedOptionsSchemaV2 = (0, mergeObjectSchemas_1.mergeObjectSchemas)(jo
         otherwise: joi_1.default.required(),
     })
         .description('Выходная директория'),
+    httpClient: joi_1.default.string()
+        .valid(...Object.values(HttpClient_enum_1.HttpClient))
+        .optional(),
 }), CommonSchemas_1.outputPathsSchema, // outputCore, outputServices, etc. for single-item mode
 CommonSchemas_1.specialParametersSchemasV3, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2).xor('items', 'input');

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/__tests__/WriteClient.test.js

@@ -42,10 +42,6 @@ const WriteClient_1 = require("../WriteClient");
             exports: {
                 model: () => 'model',
                 schema: () => 'schema',
-                zodSchema: () => 'zodSchema',
-                yupSchema: () => 'yupSchema',
-                joiSchema: () => 'joiSchema',
-                jsonSchemaSchema: () => 'jsonSchemaSchema',
                 service: () => 'service',
             },
             core: {

package/dist/core/utils/__mocks__/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__mocks__/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,eAAO,MAAM,SAAS,EAAE,SA6BvB,CAAC"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__mocks__/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,eAAO,MAAM,SAAS,EAAE,SAyBvB,CAAC"}

package/dist/core/utils/__mocks__/templates.js

@@ -13,10 +13,6 @@ exports.templates = {
     exports: {
         model: () => 'model',
         schema: () => 'schema',
-        zodSchema: () => 'zodSchema',
-        yupSchema: () => 'yupSchema',
-        joiSchema: () => 'joiSchema',
-        jsonSchemaSchema: () => 'jsonSchemaSchema',
         service: () => 'service',
     },
     core: {

package/dist/core/utils/__tests__/registerHandlebarTemplates.test.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = __importStar(require("node:test"));
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
+const ValidationLibrary_enum_1 = require("../../types/enums/ValidationLibrary.enum");
 const registerHandlebarTemplates_1 = require("../registerHandlebarTemplates");
 (0, node_test_1.describe)('@unit: registerHandlebarTemplates', () => {
     (0, node_test_1.default)('should return correct templates', () => {
@@ -46,6 +47,7 @@ const registerHandlebarTemplates_1 = require("../registerHandlebarTemplates");
             httpClient: HttpClient_enum_1.HttpClient.FETCH,
             useOptions: false,
             useUnionTypes: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.ZOD,
         });
         node_assert_1.default.notEqual(templates.indexes.full, undefined);
         node_assert_1.default.notEqual(templates.indexes.models, undefined);

package/dist/core/utils/registerHandlebarTemplates.d.ts

@@ -12,11 +12,7 @@ export interface Templates {
     };
     exports: {
         model: Handlebars.TemplateDelegate;
-        schema: Handlebars.TemplateDelegate;
-        zodSchema: Handlebars.TemplateDelegate;
-        yupSchema: Handlebars.TemplateDelegate;
-        joiSchema: Handlebars.TemplateDelegate;
-        jsonSchemaSchema: Handlebars.TemplateDelegate;
+        schema: Handlebars.TemplateDelegate | undefined;
         service: Handlebars.TemplateDelegate;
     };
     core: {

package/dist/core/utils/registerHandlebarTemplates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAyFjD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA0C1E,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAC;IACF,OAAO,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,CAAA;QAC7C,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,oBAAoB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACrD,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAiK1K"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAwFjD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA0C1E,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAC;IACF,OAAO,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAChD,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,oBAAoB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACrD,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAqK1K"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -86,7 +86,6 @@ const getResponseHeader_4 = __importDefault(require("../../templatesCompiled/cli
 const request_5 = __importDefault(require("../../templatesCompiled/client/core/xhr/request"));
 const sendRequest_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/sendRequest"));
 const exportModel_1 = __importDefault(require("../../templatesCompiled/client/exportModel"));
-const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/exportSchema"));
 const exportService_1 = __importDefault(require("../../templatesCompiled/client/exportService"));
 const indexFull_1 = __importDefault(require("../../templatesCompiled/client/indexFull"));
 const indexSimple_1 = __importDefault(require("../../templatesCompiled/client/indexSimple"));
@@ -127,7 +126,7 @@ const typeReference_1 = __importDefault(require("../../templatesCompiled/client/
 const typeUnion_1 = __importDefault(require("../../templatesCompiled/client/partials/typeUnion"));
 const registerHandlebarHelpers_1 = require("./registerHandlebarHelpers");
 const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum");
-const exportSchema_2 = __importDefault(require("../../templatesCompiled/client/zod/exportSchema"));
+const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/zod/exportSchema"));
 const zodSchema_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchema"));
 const zodSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaInterface"));
 const zodSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaEnum"));
@@ -136,7 +135,7 @@ const zodSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const zodSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaGeneric"));
 const zodSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaReference"));
 const zodSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaComposition"));
-const exportSchema_3 = __importDefault(require("../../templatesCompiled/client/yup/exportSchema"));
+const exportSchema_2 = __importDefault(require("../../templatesCompiled/client/yup/exportSchema"));
 const yupSchema_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchema"));
 const yupSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaInterface"));
 const yupSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaEnum"));
@@ -145,7 +144,7 @@ const yupSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const yupSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaGeneric"));
 const yupSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaReference"));
 const yupSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaComposition"));
-const exportSchema_4 = __importDefault(require("../../templatesCompiled/client/joi/exportSchema"));
+const exportSchema_3 = __importDefault(require("../../templatesCompiled/client/joi/exportSchema"));
 const joiSchema_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchema"));
 const joiSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaInterface"));
 const joiSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaEnum"));
@@ -154,7 +153,7 @@ const joiSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const joiSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaGeneric"));
 const joiSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaReference"));
 const joiSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaComposition"));
-const exportSchema_5 = __importDefault(require("../../templatesCompiled/client/jsonschema/exportSchema"));
+const exportSchema_4 = __importDefault(require("../../templatesCompiled/client/jsonschema/exportSchema"));
 const jsonschemaSchema_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchema"));
 const jsonschemaSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaInterface"));
 const jsonschemaSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaEnum"));
@@ -181,11 +180,7 @@ function registerHandlebarTemplates(root) {
         },
         exports: {
             model: Handlebars.template(exportModel_1.default),
-            schema: Handlebars.template(exportSchema_1.default),
-            zodSchema: Handlebars.template(exportSchema_2.default),
-            yupSchema: Handlebars.template(exportSchema_3.default),
-            joiSchema: Handlebars.template(exportSchema_4.default),
-            jsonSchemaSchema: Handlebars.template(exportSchema_5.default),
+            schema: undefined,
             service: Handlebars.template(exportService_1.default),
         },
         core: {
@@ -274,6 +269,7 @@ function registerHandlebarTemplates(root) {
     Handlebars.registerPartial('axios/request', Handlebars.template(request_1.default));
     // Register Zod partials if validationLibrary is ZOD
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.ZOD) {
+        templates.exports.schema = Handlebars.template(exportSchema_1.default);
         Handlebars.registerPartial('zodSchema', Handlebars.template(zodSchema_1.default));
         Handlebars.registerPartial('zodSchemaInterface', Handlebars.template(zodSchemaInterface_1.default));
         Handlebars.registerPartial('zodSchemaEnum', Handlebars.template(zodSchemaEnum_1.default));
@@ -285,6 +281,7 @@ function registerHandlebarTemplates(root) {
     }
     // Register Yup partials if validationLibrary is YUP
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.YUP) {
+        templates.exports.schema = Handlebars.template(exportSchema_2.default);
         Handlebars.registerPartial('yupSchema', Handlebars.template(yupSchema_1.default));
         Handlebars.registerPartial('yupSchemaInterface', Handlebars.template(yupSchemaInterface_1.default));
         Handlebars.registerPartial('yupSchemaEnum', Handlebars.template(yupSchemaEnum_1.default));
@@ -296,6 +293,7 @@ function registerHandlebarTemplates(root) {
     }
     // Register Joi partials if validationLibrary is JOI
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JOI) {
+        templates.exports.schema = Handlebars.template(exportSchema_3.default);
         Handlebars.registerPartial('joiSchema', Handlebars.template(joiSchema_1.default));
         Handlebars.registerPartial('joiSchemaInterface', Handlebars.template(joiSchemaInterface_1.default));
         Handlebars.registerPartial('joiSchemaEnum', Handlebars.template(joiSchemaEnum_1.default));
@@ -306,6 +304,7 @@ function registerHandlebarTemplates(root) {
         Handlebars.registerPartial('joiSchemaComposition', Handlebars.template(joiSchemaComposition_1.default));
     }
     if (root.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JSONSCHEMA) {
+        templates.exports.schema = Handlebars.template(exportSchema_4.default);
         Handlebars.registerPartial('jsonschemaSchema', Handlebars.template(jsonschemaSchema_1.default));
         Handlebars.registerPartial('jsonschemaSchemaInterface', Handlebars.template(jsonschemaSchemaInterface_1.default));
         Handlebars.registerPartial('jsonschemaSchemaEnum', Handlebars.template(jsonschemaSchemaEnum_1.default));

package/dist/core/utils/writeClientSchemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeClientSchemas.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemas.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;GAMG;AACH,UAAU,mBAAmB;IACzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CvG"}
+{"version":3,"file":"writeClientSchemas.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemas.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;GAMG;AACH,UAAU,mBAAmB;IACzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCvG"}

package/dist/core/utils/writeClientSchemas.js

@@ -5,7 +5,6 @@ const fs_1 = require("fs");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
-const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum");
 /**
  * Generate Schemas using the Handlebar template and write to disk.
  * @param models Array of Models to write
@@ -16,36 +15,28 @@ const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum"
  */
 async function writeClientSchemas(options) {
     const { models, templates, outputSchemasPath, httpClient, useUnionTypes, validationLibrary } = options;
-    this.logger.info('The recording of model validation schema files begins.');
-    // Choose template based on validation library
-    const schemaTemplate = validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.ZOD
-        ? templates.exports.zodSchema
-        : validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.YUP
-            ? templates.exports.yupSchema
-            : validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JOI
-                ? templates.exports.joiSchema
-                : validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JSONSCHEMA
-                    ? templates.exports.jsonSchemaSchema
-                    : templates.exports.schema;
-    for (const model of models) {
-        const modelFolderPath = model?.path;
-        const dir = (0, pathHelpers_1.dirNameHelper)(modelFolderPath);
-        if (dir) {
-            const directory = (0, pathHelpers_1.resolveHelper)(outputSchemasPath, dir);
-            this.logger.info(`A directory is being created: ${directory}`);
-            (0, fs_1.mkdirSync)(directory, { recursive: true });
+    if (templates.exports.schema) {
+        this.logger.info('The recording of model validation schema files begins.');
+        for (const model of models) {
+            const modelFolderPath = model?.path;
+            const dir = (0, pathHelpers_1.dirNameHelper)(modelFolderPath);
+            if (dir) {
+                const directory = (0, pathHelpers_1.resolveHelper)(outputSchemasPath, dir);
+                this.logger.info(`A directory is being created: ${directory}`);
+                (0, fs_1.mkdirSync)(directory, { recursive: true });
+            }
+            const file = (0, pathHelpers_1.resolveHelper)(outputSchemasPath, `${modelFolderPath}Schema.ts`);
+            this.logger.info(`The recording of the file data begins: ${file}`);
+            const templateResult = templates.exports.schema({
+                ...model,
+                httpClient,
+                useUnionTypes,
+                validationLibrary,
+            });
+            const formattedValue = await (0, format_1.format)(templateResult);
+            await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
+            this.logger.info(`File recording completed: ${file}`);
         }
-        const file = (0, pathHelpers_1.resolveHelper)(outputSchemasPath, `${modelFolderPath}Schema.ts`);
-        this.logger.info(`The recording of the file data begins: ${file}`);
-        const templateResult = schemaTemplate({
-            ...model,
-            httpClient,
-            useUnionTypes,
-            validationLibrary,
-        });
-        const formattedValue = await (0, format_1.format)(templateResult);
-        await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
-        this.logger.info(`File recording completed: ${file}`);
+        this.logger.info('The recording of model validation schema files has been completed successfully');
     }
-    this.logger.info('The recording of model validation schema files has been completed successfully');
 }

package/dist/templatesCompiled/client/core/request-executor.js

@@ -7,5 +7,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
-        return "export interface RequestConfig {\n  method: string;\n  url: string;\n  headers?: Record<string, string>;\n  query?: Record<string, any>;\n  body?: unknown;\n}\n\nexport interface RequestExecutor<TOptions = unknown> {\n  request<TResponse>(\n    config: RequestConfig,\n    options?: TOptions\n  ): Promise<TResponse>;\n}";
+        return "export interface RequestConfig {\n  method: string;\n  path: string;\n\n  headers?: Record<string, string>;\n  query?: Record<string, any>;\n  body?: unknown;\n\n  requestMediaType?: string;\n  cookies?: Record<string, string>;\n}\n\nexport interface RequestExecutor<TOptions = unknown> {\n  request<TResponse>(\n    config: RequestConfig,\n    options?: TOptions\n  ): Promise<TResponse>;\n}";
     }, "useData": true };

package/dist/templatesCompiled/client/partials/parameters.js

@@ -25,7 +25,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "parameters"), { "name": "each", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 11, "column": 9 } } })) != null ? stack1 : "")
             + "}: {\n"
             + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "parameters"), { "name": "each", "hash": {}, "fn": container.program(8, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 13, "column": 0 }, "end": { "line": 23, "column": 9 } } })) != null ? stack1 : "")
-            + "}";
+            + "},";
     }, "3": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {

package/dist/templatesCompiled/client/partials/serviceOption.d.ts

@@ -4,11 +4,8 @@ declare const _default: {
     "4": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "10": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "13": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "15": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "16": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     useData: boolean;

package/dist/templatesCompiled/client/partials/serviceOption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serviceOption.d.ts","sourceRoot":"","sources":["../../../../src/templatesCompiled/client/partials/serviceOption.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAMA,wBAwHiB"}
+{"version":3,"file":"serviceOption.d.ts","sourceRoot":"","sources":["../../../../src/templatesCompiled/client/partials/serviceOption.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,wBAiGiB"}

package/dist/templatesCompiled/client/partials/serviceOption.js

@@ -13,15 +13,15 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return "    cookies: {\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parametersCookie"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 5, "column": 4 }, "end": { "line": 7, "column": 13 } } })) != null ? stack1 : "")
+        return "    headers: {\n"
+            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parametersHeader"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 6, "column": 4 }, "end": { "line": 9, "column": 13 } } })) != null ? stack1 : "")
             + "    },\n";
     }, "2": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = container.strict, alias2 = container.lambda;
         return "        '"
-            + ((stack1 = alias2(alias1(depth0, "prop", { "start": { "line": 6, "column": 12 }, "end": { "line": 6, "column": 16 } }), depth0)) != null ? stack1 : "")
-            + "': "
-            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 6, "column": 25 }, "end": { "line": 6, "column": 29 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "prop", { "start": { "line": 7, "column": 12 }, "end": { "line": 7, "column": 16 } }), depth0)) != null ? stack1 : "")
+            + "':\n        "
+            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 8, "column": 11 }, "end": { "line": 8, "column": 15 } }), depth0)) != null ? stack1 : "")
             + ",\n";
     }, "4": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -30,8 +30,8 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return "    headers: {\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parametersHeader"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 12, "column": 4 }, "end": { "line": 14, "column": 13 } } })) != null ? stack1 : "")
+        return "    cookies: {\n"
+            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parametersCookie"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 15, "column": 4 }, "end": { "line": 18, "column": 13 } } })) != null ? stack1 : "")
             + "    },\n";
     }, "6": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -41,7 +41,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return "    query: {\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parametersQuery"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 19, "column": 4 }, "end": { "line": 21, "column": 13 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parametersQuery"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 24, "column": 4 }, "end": { "line": 27, "column": 13 } } })) != null ? stack1 : "")
             + "    },\n";
     }, "8": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -50,52 +50,30 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return "    formData: {\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parametersForm"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 26, "column": 4 }, "end": { "line": 28, "column": 13 } } })) != null ? stack1 : "")
-            + "    },\n";
-    }, "10": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return "    body: "
-            + ((stack1 = container.lambda(container.strict(lookupProperty(depth0, "parametersBody"), "name", { "start": { "line": 32, "column": 13 }, "end": { "line": 32, "column": 32 } }), depth0)) != null ? stack1 : "")
+        return "    body:\n    "
+            + ((stack1 = container.lambda(container.strict(lookupProperty(depth0, "parametersBody"), "name", { "start": { "line": 33, "column": 7 }, "end": { "line": 33, "column": 26 } }), depth0)) != null ? stack1 : "")
             + ",\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(depth0, "parametersBody"), "mediaType"), { "name": "if", "hash": {}, "fn": container.program(11, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 33, "column": 4 }, "end": { "line": 35, "column": 11 } } })) != null ? stack1 : "");
-    }, "11": function (container, depth0, helpers, partials, data) {
+            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(depth0, "parametersBody"), "mediaType"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 34, "column": 4 }, "end": { "line": 36, "column": 11 } } })) != null ? stack1 : "");
+    }, "9": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
                 return parent[propertyName];
             }
             return undefined;
         };
-        return "        mediaType: '"
-            + ((stack1 = container.lambda(container.strict(lookupProperty(depth0, "parametersBody"), "mediaType", { "start": { "line": 34, "column": 23 }, "end": { "line": 34, "column": 47 } }), depth0)) != null ? stack1 : "")
+        return "        requestMediaType: '"
+            + ((stack1 = container.lambda(container.strict(lookupProperty(depth0, "parametersBody"), "mediaType", { "start": { "line": 35, "column": 30 }, "end": { "line": 35, "column": 54 } }), depth0)) != null ? stack1 : "")
             + "',\n";
-    }, "13": function (container, depth0, helpers, partials, data) {
-        var stack1;
-        return "    responseHeader: '"
-            + ((stack1 = container.lambda(container.strict(depth0, "responseHeader", { "start": { "line": 38, "column": 24 }, "end": { "line": 38, "column": 38 } }), depth0)) != null ? stack1 : "")
-            + "',\n";
-    }, "15": function (container, depth0, helpers, partials, data) {
+    }, "11": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
                 return parent[propertyName];
             }
             return undefined;
         };
-        return "    errors: {\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "errors"), { "name": "each", "hash": {}, "fn": container.program(16, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 42, "column": 4 }, "end": { "line": 44, "column": 13 } } })) != null ? stack1 : "")
-            + "    },\n";
-    }, "16": function (container, depth0, helpers, partials, data) {
-        var stack1, alias1 = container.strict, alias2 = container.lambda;
-        return "        "
-            + ((stack1 = alias2(alias1(depth0, "code", { "start": { "line": 43, "column": 11 }, "end": { "line": 43, "column": 15 } }), depth0)) != null ? stack1 : "")
-            + ": `"
-            + ((stack1 = alias2(alias1(depth0, "description", { "start": { "line": 43, "column": 24 }, "end": { "line": 43, "column": 35 } }), depth0)) != null ? stack1 : "")
-            + "`,\n";
+        return "    body: {\n"
+            + ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parametersForm"), { "name": "each", "hash": {}, "fn": container.program(2, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 41, "column": 4 }, "end": { "line": 44, "column": 13 } } })) != null ? stack1 : "")
+            + "    }, requestMediaType: 'multipart/form-data',\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = container.strict, alias2 = container.lambda, alias3 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -107,12 +85,14 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + ((stack1 = alias2(alias1(depth0, "method", { "start": { "line": 1, "column": 12 }, "end": { "line": 1, "column": 18 } }), depth0)) != null ? stack1 : "")
             + "',\npath: `"
             + ((stack1 = alias2(alias1(depth0, "path", { "start": { "line": 2, "column": 10 }, "end": { "line": 2, "column": 14 } }), depth0)) != null ? stack1 : "")
-            + "`,\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersCookie"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 9, "column": 7 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersHeader"), { "name": "if", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 10, "column": 0 }, "end": { "line": 16, "column": 7 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersQuery"), { "name": "if", "hash": {}, "fn": container.program(6, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 17, "column": 0 }, "end": { "line": 23, "column": 7 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersForm"), { "name": "if", "hash": {}, "fn": container.program(8, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 24, "column": 0 }, "end": { "line": 30, "column": 7 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersBody"), { "name": "if", "hash": {}, "fn": container.program(10, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 31, "column": 0 }, "end": { "line": 36, "column": 7 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "responseHeader"), { "name": "if", "hash": {}, "fn": container.program(13, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 37, "column": 0 }, "end": { "line": 39, "column": 7 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "errors"), { "name": "if", "hash": {}, "fn": container.program(15, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 40, "column": 0 }, "end": { "line": 46, "column": 7 } } })) != null ? stack1 : "");
+            + "`,\n\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersHeader"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 11, "column": 7 } } })) != null ? stack1 : "")
+            + "\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersCookie"), { "name": "if", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 13, "column": 0 }, "end": { "line": 20, "column": 7 } } })) != null ? stack1 : "")
+            + "\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersQuery"), { "name": "if", "hash": {}, "fn": container.program(6, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 22, "column": 0 }, "end": { "line": 29, "column": 7 } } })) != null ? stack1 : "")
+            + "\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersBody"), { "name": "if", "hash": {}, "fn": container.program(8, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 31, "column": 0 }, "end": { "line": 37, "column": 7 } } })) != null ? stack1 : "")
+            + "\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias3, lookupProperty(depth0, "parametersForm"), { "name": "if", "hash": {}, "fn": container.program(11, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 39, "column": 0 }, "end": { "line": 46, "column": 7 } } })) != null ? stack1 : "");
     }, "useData": true };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-openapi-codegen",
-    "version": "2.0.0-beta.3",
+    "version": "2.0.0-beta.4",
     "description": "Library that generates Typescript clients based on the OpenAPI specification. It bases on openapi-typescript-codegen",
     "author": "Alexey Zverev",
     "homepage": "https://github.com/ozonophore/openapi-codegen.git",
@@ -69,6 +69,7 @@
         "chalk": "^4.1.2",
         "commander": "8.0.0",
         "configstore": "^5.0.1",
+        "diff": "^8.0.2",
         "enquirer": "^2.4.1",
         "fast-deep-equal": "^3.1.3",
         "figlet": "^1.8.0",

package/dist/cli/generate/runGenerateOpenApi.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"runGenerateOpenApi.d.ts","sourceRoot":"","sources":["../../../src/cli/generate/runGenerateOpenApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAgBzC;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA8D7E"}