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

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.templates = void 0;
+exports.templates = {
+    indexes: {
+        full: () => 'fullIndex',
+        simple: () => 'simpleIndex',
+        core: () => 'coreIndex',
+        models: () => 'modelsIndex',
+        schemas: () => 'schemasIndex',
+        services: () => 'servicesIndex',
+    },
+    exports: {
+        model: () => 'model',
+        schema: () => 'schema',
+        zodSchema: () => 'zodSchema',
+        yupSchema: () => 'yupSchema',
+        joiSchema: () => 'joiSchema',
+        jsonSchemaSchema: () => 'jsonSchemaSchema',
+        service: () => 'service',
+    },
+    core: {
+        settings: () => 'settings',
+        apiError: () => 'apiError',
+        apiRequestOptions: () => 'apiRequestOptions',
+        apiResult: () => 'apiResult',
+        request: () => 'request',
+        cancelablePromise: () => 'cancelablePromise',
+        httpStatusCode: () => 'httpStatusCode',
+        legacyRequestAdapter: () => 'legacyRequestAdapter',
+        requestExecutor: () => 'requestExecutor',
+    },
+};

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

@@ -8,6 +8,7 @@ const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientCore', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -22,33 +23,9 @@ const WriteClient_1 = require("../../WriteClient");
             models: [],
             services: [],
         };
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const useCancelableRequest = true;
         const writeClient = new WriteClient_1.WriteClient();
-        await writeClient.writeClientCore({ client, templates, outputCorePath: '/', httpClient: HttpClient_enum_1.HttpClient.FETCH, useCancelableRequest });
+        await writeClient.writeClientCore({ client, templates: templates_1.templates, outputCorePath: '/', httpClient: HttpClient_enum_1.HttpClient.FETCH, useCancelableRequest });
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('OpenAPI.ts') && content.toString().includes('settings')), 'Expected writeFile to be called with settings content for OpenAPI.ts');
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('ApiError.ts') && content.toString().includes('apiError')), 'Expected writeFile to be called with apiError content for ApiError.ts');
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('ApiRequestOptions.ts') && content.toString().includes('apiRequestOptions')), 'Expected writeFile to be called with apiRequestOptions content for ApiRequestOptions.ts');

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

@@ -7,6 +7,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientFullIndex', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -15,32 +16,8 @@ const WriteClient_1 = require("../../WriteClient");
         fileSystemHelpers_1.fileSystemHelpers.writeFile = async (path, content) => {
             writeFileCalls.push([path, content]);
         };
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const writeClient = new WriteClient_1.WriteClient();
-        await writeClient.writeClientFullIndex({ templates, outputPath: '/', core: [], models: [], schemas: [], services: [] });
+        await writeClient.writeClientFullIndex({ templates: templates_1.templates, outputPath: '/', core: [], models: [], schemas: [], services: [] });
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('index.ts') && content.toString().includes('fullIndex')), 'Expected writeFile to be called with index content for index.ts');
         // Restoring the original function
         fileSystemHelpers_1.fileSystemHelpers.writeFile = originalWriteFile;

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

@@ -8,6 +8,7 @@ const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientModels', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -37,34 +38,10 @@ const WriteClient_1 = require("../../WriteClient");
                 alias: '',
             },
         ];
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const writeClient = new WriteClient_1.WriteClient();
         await writeClient.writeClientModels({
             models,
-            templates,
+            templates: templates_1.templates,
             outputModelsPath: '/',
             httpClient: HttpClient_enum_1.HttpClient.FETCH,
             useUnionTypes: false,

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

@@ -7,7 +7,9 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
+const ValidationLibrary_enum_1 = require("../../types/enums/ValidationLibrary.enum");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientSchemas', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -37,37 +39,14 @@ const WriteClient_1 = require("../../WriteClient");
                 properties: [],
             },
         ];
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const writeClient = new WriteClient_1.WriteClient();
         await writeClient.writeClientSchemas({
             models,
-            templates,
+            templates: templates_1.templates,
             outputSchemasPath: '/',
             httpClient: HttpClient_enum_1.HttpClient.FETCH,
             useUnionTypes: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
         });
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('MyModelSchema.ts') && content.toString().includes('schema')), 'Expected writeFile to be called with schema content for MyModelSchema.ts');
         // Restoring the original function

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

@@ -8,6 +8,7 @@ const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientServices', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -24,34 +25,10 @@ const WriteClient_1 = require("../../WriteClient");
                 imports: [],
             },
         ];
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const writeClient = new WriteClient_1.WriteClient();
         await writeClient.writeClientServices({
             services,
-            templates,
+            templates: templates_1.templates,
             outputPaths: {
                 outputCore: '/',
                 outputModels: '/',

package/dist/core/utils/precompileTemplates.js

@@ -62,6 +62,12 @@ const precompileTemplates = () => {
                             containsSystemName: true,
                             normalizePath: true,
                             joinPath: true,
+                            isNumericEnum: true,
+                            isBasicType: true,
+                            yupBaseSchema: true,
+                            joiBaseSchema: true,
+                            getRequiredFields: true,
+                            getEnumType: true,
                         },
                     });
                     const tsContent = header + precompiled;

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

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA+E5H"}
+{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA6J5H"}

package/dist/core/utils/registerHandlebarHelpers.js

@@ -104,4 +104,78 @@ function registerHandlebarHelpers(root) {
         const cleanedSecondPath = secondPath.startsWith('./') ? secondPath.slice(2) : secondPath;
         return `${cleanedFirstPath}/${cleanedSecondPath}`.replace(Consts_1.REGEX_BACKSLASH, '/').replace(Consts_1.REGEX_MULTIPLE_SLASHES, '/');
     });
+    Handlebars.registerHelper('isNumericEnum', function (enumerators, options) {
+        if (!enumerators || enumerators.length === 0) {
+            return options.inverse(this);
+        }
+        const firstEnum = enumerators[0];
+        return firstEnum.type === 'number' ? options.fn(this) : options.inverse(this);
+    });
+    Handlebars.registerHelper('isBasicType', function (link) {
+        if (!link)
+            return false;
+        // Если есть imports, это реальная схема, а не базовый тип
+        if (link.imports && link.imports.length > 0)
+            return false;
+        // Если есть path и это не базовый тип, это схема
+        if (link.path && link.path !== link.base?.toLowerCase())
+            return false;
+        // Проверяем, является ли base базовым типом
+        const basicTypes = ['string', 'number', 'integer', 'int', 'boolean', 'file', 'File', 'any', 'null'];
+        return basicTypes.includes(link.base);
+    });
+    Handlebars.registerHelper('yupBaseSchema', function (base) {
+        if (!base)
+            return 'yup.mixed()';
+        const baseLower = base.toLowerCase();
+        switch (baseLower) {
+            case 'string':
+                return 'yup.string()';
+            case 'number':
+                return 'yup.number()';
+            case 'integer':
+            case 'int':
+                return 'yup.number().integer()';
+            case 'boolean':
+                return 'yup.boolean()';
+            case 'file':
+                return 'yup.mixed()';
+            default:
+                return 'yup.mixed()';
+        }
+    });
+    Handlebars.registerHelper('joiBaseSchema', function (base) {
+        if (!base)
+            return 'Joi.any()';
+        const baseLower = base.toLowerCase();
+        switch (baseLower) {
+            case 'string':
+                return 'Joi.string()';
+            case 'number':
+                return 'Joi.number()';
+            case 'integer':
+            case 'int':
+                return 'Joi.number().integer()';
+            case 'boolean':
+                return 'Joi.boolean()';
+            case 'file':
+                return 'Joi.any()';
+            default:
+                return 'Joi.any()';
+        }
+    });
+    Handlebars.registerHelper('getRequiredFields', function (properties) {
+        const required = properties
+            .filter(prop => prop.isRequired)
+            .map(prop => `'${prop.name}'`)
+            .join(', ');
+        return required ? `required: [${required}],` : '';
+    });
+    Handlebars.registerHelper('getEnumType', function (enumerators) {
+        if (!enumerators || enumerators.length === 0) {
+            return 'string';
+        }
+        const firstEnum = enumerators[0];
+        return firstEnum.type === 'number' ? 'number' : 'string';
+    });
 }

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

@@ -1,5 +1,6 @@
 import * as Handlebars from 'handlebars/runtime';
 import { HttpClient } from '../types/enums/HttpClient.enum';
+import { ValidationLibrary } from '../types/enums/ValidationLibrary.enum';
 export interface Templates {
     indexes: {
         full: Handlebars.TemplateDelegate;
@@ -12,6 +13,10 @@ export interface Templates {
     exports: {
         model: Handlebars.TemplateDelegate;
         schema: Handlebars.TemplateDelegate;
+        zodSchema: Handlebars.TemplateDelegate;
+        yupSchema: Handlebars.TemplateDelegate;
+        joiSchema: Handlebars.TemplateDelegate;
+        jsonSchemaSchema: Handlebars.TemplateDelegate;
         service: Handlebars.TemplateDelegate;
     };
     core: {
@@ -22,6 +27,8 @@ export interface Templates {
         request: Handlebars.TemplateDelegate;
         cancelablePromise: Handlebars.TemplateDelegate;
         httpStatusCode: Handlebars.TemplateDelegate;
+        requestExecutor: Handlebars.TemplateDelegate;
+        legacyRequestAdapter: Handlebars.TemplateDelegate;
     };
 }
 /**
@@ -32,5 +39,6 @@ export declare function registerHandlebarTemplates(root: {
     httpClient: HttpClient;
     useOptions: boolean;
     useUnionTypes: boolean;
+    validationLibrary?: ValidationLibrary;
 }): Templates;
 //# sourceMappingURL=registerHandlebarTemplates.d.ts.map

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;AAuFjD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,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,CAAA;IACD,OAAO,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,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;KAC/C,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CA4GnI"}
+{"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"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -77,6 +77,8 @@ const sendRequest_3 = __importDefault(require("../../templatesCompiled/client/co
 const OpenAPI_1 = __importDefault(require("../../templatesCompiled/client/core/OpenAPI"));
 const CancelablePromise_1 = __importDefault(require("../../templatesCompiled/client/core/CancelablePromise"));
 const request_4 = __importDefault(require("../../templatesCompiled/client/core/request"));
+const request_executor_1 = __importDefault(require("../../templatesCompiled/client/core/request-executor"));
+const legacy_request_adapter_1 = __importDefault(require("../../templatesCompiled/client/core/legacy-request-adapter"));
 const getHeaders_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getHeaders"));
 const getRequestBody_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getRequestBody"));
 const getResponseBody_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getResponseBody"));
@@ -124,6 +126,43 @@ const typeIntersection_1 = __importDefault(require("../../templatesCompiled/clie
 const typeReference_1 = __importDefault(require("../../templatesCompiled/client/partials/typeReference"));
 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 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"));
+const zodSchemaArray_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaArray"));
+const zodSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaDictionary"));
+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 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"));
+const yupSchemaArray_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaArray"));
+const yupSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaDictionary"));
+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 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"));
+const joiSchemaArray_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaArray"));
+const joiSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaDictionary"));
+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 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"));
+const jsonschemaSchemaArray_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaArray"));
+const jsonschemaSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaDictionary"));
+const jsonschemaSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaGeneric"));
+const jsonschemaSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaReference"));
+const jsonschemaSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaComposition"));
 /**
  * Read all the Handlebar templates that we need and return on wrapper object
  * so we can easily access the templates in out generator / write functions.
@@ -143,6 +182,10 @@ 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),
             service: Handlebars.template(exportService_1.default),
         },
         core: {
@@ -153,6 +196,8 @@ function registerHandlebarTemplates(root) {
             request: Handlebars.template(request_4.default),
             cancelablePromise: Handlebars.template(CancelablePromise_1.default),
             httpStatusCode: Handlebars.template(HttpStatusCode_1.default),
+            requestExecutor: Handlebars.template(request_executor_1.default),
+            legacyRequestAdapter: Handlebars.template(legacy_request_adapter_1.default),
         },
     };
     // Partials for the generations of the models, services, etc.
@@ -227,5 +272,48 @@ function registerHandlebarTemplates(root) {
     Handlebars.registerPartial('axios/getResponseHeader', Handlebars.template(getResponseHeader_1.default));
     Handlebars.registerPartial('axios/sendRequest', Handlebars.template(sendRequest_1.default));
     Handlebars.registerPartial('axios/request', Handlebars.template(request_1.default));
+    // Register Zod partials if validationLibrary is ZOD
+    if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.ZOD) {
+        Handlebars.registerPartial('zodSchema', Handlebars.template(zodSchema_1.default));
+        Handlebars.registerPartial('zodSchemaInterface', Handlebars.template(zodSchemaInterface_1.default));
+        Handlebars.registerPartial('zodSchemaEnum', Handlebars.template(zodSchemaEnum_1.default));
+        Handlebars.registerPartial('zodSchemaArray', Handlebars.template(zodSchemaArray_1.default));
+        Handlebars.registerPartial('zodSchemaDictionary', Handlebars.template(zodSchemaDictionary_1.default));
+        Handlebars.registerPartial('zodSchemaGeneric', Handlebars.template(zodSchemaGeneric_1.default));
+        Handlebars.registerPartial('zodSchemaReference', Handlebars.template(zodSchemaReference_1.default));
+        Handlebars.registerPartial('zodSchemaComposition', Handlebars.template(zodSchemaComposition_1.default));
+    }
+    // Register Yup partials if validationLibrary is YUP
+    if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.YUP) {
+        Handlebars.registerPartial('yupSchema', Handlebars.template(yupSchema_1.default));
+        Handlebars.registerPartial('yupSchemaInterface', Handlebars.template(yupSchemaInterface_1.default));
+        Handlebars.registerPartial('yupSchemaEnum', Handlebars.template(yupSchemaEnum_1.default));
+        Handlebars.registerPartial('yupSchemaArray', Handlebars.template(yupSchemaArray_1.default));
+        Handlebars.registerPartial('yupSchemaDictionary', Handlebars.template(yupSchemaDictionary_1.default));
+        Handlebars.registerPartial('yupSchemaGeneric', Handlebars.template(yupSchemaGeneric_1.default));
+        Handlebars.registerPartial('yupSchemaReference', Handlebars.template(yupSchemaReference_1.default));
+        Handlebars.registerPartial('yupSchemaComposition', Handlebars.template(yupSchemaComposition_1.default));
+    }
+    // Register Joi partials if validationLibrary is JOI
+    if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JOI) {
+        Handlebars.registerPartial('joiSchema', Handlebars.template(joiSchema_1.default));
+        Handlebars.registerPartial('joiSchemaInterface', Handlebars.template(joiSchemaInterface_1.default));
+        Handlebars.registerPartial('joiSchemaEnum', Handlebars.template(joiSchemaEnum_1.default));
+        Handlebars.registerPartial('joiSchemaArray', Handlebars.template(joiSchemaArray_1.default));
+        Handlebars.registerPartial('joiSchemaDictionary', Handlebars.template(joiSchemaDictionary_1.default));
+        Handlebars.registerPartial('joiSchemaGeneric', Handlebars.template(joiSchemaGeneric_1.default));
+        Handlebars.registerPartial('joiSchemaReference', Handlebars.template(joiSchemaReference_1.default));
+        Handlebars.registerPartial('joiSchemaComposition', Handlebars.template(joiSchemaComposition_1.default));
+    }
+    if (root.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JSONSCHEMA) {
+        Handlebars.registerPartial('jsonschemaSchema', Handlebars.template(jsonschemaSchema_1.default));
+        Handlebars.registerPartial('jsonschemaSchemaInterface', Handlebars.template(jsonschemaSchemaInterface_1.default));
+        Handlebars.registerPartial('jsonschemaSchemaEnum', Handlebars.template(jsonschemaSchemaEnum_1.default));
+        Handlebars.registerPartial('jsonschemaSchemaArray', Handlebars.template(jsonschemaSchemaArray_1.default));
+        Handlebars.registerPartial('jsonschemaSchemaDictionary', Handlebars.template(jsonschemaSchemaDictionary_1.default));
+        Handlebars.registerPartial('jsonschemaSchemaGeneric', Handlebars.template(jsonschemaSchemaGeneric_1.default));
+        Handlebars.registerPartial('jsonschemaSchemaReference', Handlebars.template(jsonschemaSchemaReference_1.default));
+        Handlebars.registerPartial('jsonschemaSchemaComposition', Handlebars.template(jsonschemaSchemaComposition_1.default));
+    }
     return templates;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCjG"}
+{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCjG"}

package/dist/core/utils/writeClientCore.js

@@ -31,6 +31,9 @@ async function writeClientCore(options) {
     }
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'HttpStatusCode.ts'), templates.core.httpStatusCode({}));
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'request.ts'), templates.core.request(context));
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'request-executor.ts'), templates.core.requestExecutor({}));
+    // TODO: Добавлять только, если не выбран custom-ный request
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'legacy-request-adapter.ts'), templates.core.legacyRequestAdapter({}));
     if (request) {
         const requestFile = (0, pathHelpers_1.resolveHelper)(process.cwd(), request);
         const requestFileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(requestFile);

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

@@ -1,4 +1,5 @@
 import { HttpClient } from '../types/enums/HttpClient.enum';
+import { ValidationLibrary } from '../types/enums/ValidationLibrary.enum';
 import type { Model } from '../types/shared/Model.model';
 import { WriteClient } from '../WriteClient';
 import { Templates } from './registerHandlebarTemplates';
@@ -15,6 +16,7 @@ interface IWriteClientSchemas {
     outputSchemasPath: string;
     httpClient: HttpClient;
     useUnionTypes: boolean;
+    validationLibrary?: ValidationLibrary;
 }
 /**
  * Generate Schemas using the Handlebar template and write to disk.

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,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;CAC1B;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BvG"}
+{"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"}

package/dist/core/utils/writeClientSchemas.js

@@ -5,6 +5,7 @@ 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
@@ -14,8 +15,18 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
  * @param useUnionTypes Use union types instead of enums
  */
 async function writeClientSchemas(options) {
-    const { models, templates, outputSchemasPath, httpClient, useUnionTypes } = 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);
@@ -26,10 +37,11 @@ async function writeClientSchemas(options) {
         }
         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({
+        const templateResult = schemaTemplate({
             ...model,
             httpClient,
             useUnionTypes,
+            validationLibrary,
         });
         const formattedValue = await (0, format_1.format)(templateResult);
         await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);

package/dist/templatesCompiled/client/core/legacy-request-adapter.d.ts

@@ -0,0 +1,8 @@
+declare const _default: {
+    compiler: (string | number)[];
+    main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    usePartial: boolean;
+    useData: boolean;
+};
+export default _default;
+//# sourceMappingURL=legacy-request-adapter.d.ts.map

package/dist/templatesCompiled/client/core/legacy-request-adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-request-adapter.d.ts","sourceRoot":"","sources":["../../../../src/templatesCompiled/client/core/legacy-request-adapter.ts"],"names":[],"mappings":";;;;;;AAMA,wBAUmC"}