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

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

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const parseRef_1 = require("../parseRef");
+const resolveRefPath_1 = require("../resolveRefPath");
+(0, node_test_1.describe)('@unit: resolveRefPath', () => {
+    (0, node_test_1.test)('should keep repeated folder names in absolute path', () => {
+        const parsedRef = {
+            type: parseRef_1.RefType.EXTERNAL_FILE,
+            originalRef: 'schemas/base/ModelWithString.yml',
+            filePath: 'schemas/base/ModelWithString.yml',
+            fragment: undefined,
+        };
+        const parentFilePath = '/home/runner/work/openapi-codegen/openapi-codegen/test/spec/v3.withDifferentRefs.yml';
+        const result = (0, resolveRefPath_1.resolveRefPath)(parsedRef, parentFilePath);
+        node_assert_1.default.strictEqual(result, '/home/runner/work/openapi-codegen/openapi-codegen/test/spec/schemas/base/ModelWithString.yml');
+    });
+});

package/dist/core/utils/__tests__/serviceHelpers.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=serviceHelpers.test.d.ts.map

package/dist/core/utils/__tests__/serviceHelpers.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serviceHelpers.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/serviceHelpers.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,121 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const serviceHelpers_1 = require("../serviceHelpers");
+function createModel(overrides = {}) {
+    return {
+        name: 'Model',
+        alias: '',
+        path: 'Model',
+        export: 'reference',
+        type: 'Model',
+        base: 'Model',
+        template: null,
+        link: null,
+        description: null,
+        isDefinition: false,
+        isReadOnly: false,
+        isRequired: false,
+        isNullable: false,
+        imports: [],
+        enum: [],
+        enums: [],
+        properties: [],
+        ...overrides,
+    };
+}
+function createOperationParameter(overrides = {}) {
+    return {
+        ...createModel(overrides),
+        in: 'query',
+        prop: 'value',
+        mediaType: null,
+        ...overrides,
+    };
+}
+function createOperationResponse(overrides = {}) {
+    return {
+        ...createModel(overrides),
+        in: 'response',
+        code: 200,
+        ...overrides,
+    };
+}
+(0, node_test_1.describe)('@unit: serviceHelpers', () => {
+    (0, node_test_1.test)('finalizeServiceImports should assign duplicate aliases and propagate to params/results', () => {
+        const importFooA = { name: 'Foo', alias: '', path: 'models/a/Foo' };
+        const importFooB = { name: 'Foo', alias: '', path: 'models/b/Foo' };
+        const paramFooA = createOperationParameter({
+            name: 'paramFooA',
+            path: './models/a/Foo',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [{ ...importFooA }],
+        });
+        const paramFooBArray = createOperationParameter({
+            name: 'paramFooBArray',
+            export: 'array',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [{ ...importFooB }],
+            link: createModel({
+                path: './models/b/Foo',
+                type: 'Foo',
+                base: 'Foo',
+                imports: [{ ...importFooB }],
+            }),
+        });
+        const resultFooB = createOperationResponse({
+            name: 'resultFooB',
+            path: './models/b/Foo',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [{ ...importFooB }],
+        });
+        const operation = {
+            service: 'PetService',
+            name: 'getPet',
+            summary: null,
+            description: null,
+            deprecated: false,
+            method: 'GET',
+            path: '/pets/{id}',
+            imports: [],
+            parameters: [paramFooA, paramFooBArray],
+            parametersPath: [],
+            parametersQuery: [],
+            parametersForm: [],
+            parametersCookie: [],
+            parametersHeader: [],
+            parametersBody: null,
+            errors: [],
+            results: [resultFooB],
+            responseHeader: null,
+        };
+        const service = {
+            name: 'PetService',
+            originName: 'PetService',
+            operations: [operation],
+            imports: [importFooA, importFooB],
+        };
+        (0, serviceHelpers_1.finalizeServiceImports)(service);
+        const aliasByPath = new Map(service.imports.map(item => [item.path, item.alias]));
+        const aliasA = aliasByPath.get('models/a/Foo');
+        const aliasB = aliasByPath.get('models/b/Foo');
+        node_assert_1.default.ok(aliasA);
+        node_assert_1.default.ok(aliasB);
+        node_assert_1.default.notEqual(aliasA, aliasB);
+        node_assert_1.default.equal(paramFooA.base, aliasA);
+        node_assert_1.default.equal(paramFooA.type, aliasA);
+        node_assert_1.default.equal(paramFooBArray.base, aliasB);
+        node_assert_1.default.equal(paramFooBArray.type, aliasB);
+        node_assert_1.default.equal(paramFooBArray.link?.base, aliasB);
+        node_assert_1.default.equal(paramFooBArray.link?.type, aliasB);
+        node_assert_1.default.equal(operation.results[0].base, aliasB);
+        node_assert_1.default.equal(operation.results[0].type, aliasB);
+    });
+});

package/dist/core/utils/__tests__/writeClientExecutor.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=writeClientExecutor.test.d.ts.map

package/dist/core/utils/__tests__/writeClientExecutor.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"writeClientExecutor.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/writeClientExecutor.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const writeClientExecutor_1 = require("../writeClientExecutor");
+(0, node_test_1.describe)('@unit: writeClientExecutor', () => {
+    (0, node_test_1.test)('deduplicateServicesByName should keep first service by name', () => {
+        const services = [
+            { name: 'V2Service', originName: 'V2Service', operations: [], imports: [] },
+            { name: 'V2Service', originName: 'V2ServiceCopy', operations: [], imports: [] },
+            { name: 'SimpleService', originName: 'SimpleService', operations: [], imports: [] },
+        ];
+        const result = (0, writeClientExecutor_1.deduplicateServicesByName)(services);
+        node_assert_1.default.deepStrictEqual(result.map(item => item.name), ['V2Service', 'SimpleService']);
+        node_assert_1.default.equal(result[0].originName, 'V2Service');
+    });
+});

package/dist/core/utils/__tests__/writeClientSchemas.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 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', () => {
@@ -45,6 +46,7 @@ const templates_1 = require("../__mocks__/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/getOpenApiSpec.d.ts

@@ -1,10 +1,4 @@
 import { Context } from '../Context';
 import { CommonOpenApi } from '../types/shared/CommonOpenApi.model';
-/**
- * Load and parse te open api spec. If the file extension is ".yml" or ".yaml"
- * we will try to parse the file as a YAML spec, otherwise we will fallback
- * on parsing the file as JSON.
- * @param input
- */
 export declare function getOpenApiSpec(context: Context, input: string): Promise<CommonOpenApi>;
 //# sourceMappingURL=getOpenApiSpec.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getOpenApiSpec.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOpenApiSpec.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAIpE;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA6B5F"}
+{"version":3,"file":"getOpenApiSpec.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOpenApiSpec.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAqC5F"}

package/dist/core/utils/getOpenApiSpec.js

@@ -7,33 +7,36 @@ exports.getOpenApiSpec = getOpenApiSpec;
 const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
-const normalizeAllRefs_1 = require("./normalizeAllRefs");
-/**
- * Load and parse te open api spec. If the file extension is ".yml" or ".yaml"
- * we will try to parse the file as a YAML spec, otherwise we will fallback
- * on parsing the file as JSON.
- * @param input
- */
 async function getOpenApiSpec(context, input) {
     const absoluteInput = (0, pathHelpers_1.resolveHelper)(process.cwd(), input);
     if (!input) {
-        throw new Error(`Could not find OpenApi spec: "${absoluteInput}"`);
+        throw new Error(`OpenAPI spec path is empty`);
     }
-    const fileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(absoluteInput);
-    if (!fileExists) {
-        throw new Error(`Could not read OpenApi spec: "${absoluteInput}"`);
+    const exists = await fileSystemHelpers_1.fileSystemHelpers.exists(absoluteInput);
+    if (!exists) {
+        throw new Error(`OpenAPI spec not found: ${absoluteInput}`);
     }
-    // const isValidated = await SwaggerParser.validate(absoluteInput)
-    const resolvedRefs = await swagger_parser_1.default.resolve(absoluteInput, { validate: false });
-    // Coerce to the loose interface expected by Context
-    context.addRefs(resolvedRefs);
-    const raw = resolvedRefs.get(absoluteInput);
-    if (!raw || typeof raw !== 'object' || Array.isArray(raw) || !('paths' in raw)) {
-        throw new Error(`Schema at "${absoluteInput}" is not a valid OpenAPI object`);
+    const parser = new swagger_parser_1.default();
+    const previousCwd = process.cwd();
+    const inputDir = (0, pathHelpers_1.dirNameHelper)(absoluteInput);
+    if (previousCwd !== inputDir) {
+        process.chdir(inputDir);
     }
-    const mainSchema = raw;
-    // Normalize all $ref in the entire schema using the new comprehensive resolver
-    const normalizedSchema = (0, normalizeAllRefs_1.normalizeAllRefs)(mainSchema, context, absoluteInput);
-    // The schema is already fully normalized, so we can return it directly
-    return normalizedSchema;
+    let resolved;
+    try {
+        resolved = await parser.resolve(absoluteInput);
+    }
+    finally {
+        if (process.cwd() !== previousCwd) {
+            process.chdir(previousCwd);
+        }
+    }
+    context.addRefs(resolved);
+    // Получить основную схему
+    const raw = resolved.get(absoluteInput);
+    if (!raw || typeof raw !== 'object') {
+        throw new Error(`Invalid OpenAPI schema at ${absoluteInput}`);
+    }
+    context.initializeVirtualFileMap(raw, absoluteInput);
+    return raw;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CA+BrF"}
+{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CA4ErF"}

package/dist/core/utils/modelHelpers.js

@@ -52,8 +52,36 @@ function setDuplicateModelAliases(models) {
  * @returns the same array of models (modified)
  */
 function resolveModelImports(models, outputModelsDir) {
+    const normalizeImportPath = (value) => (value.startsWith('./') ? value.slice(2) : value);
+    const applyAliasToModel = (model, imprt) => {
+        const modelPath = normalizeImportPath(model.path);
+        const importPath = normalizeImportPath(imprt.path);
+        if (modelPath === importPath && model.type === imprt.name && imprt.alias) {
+            model.alias = imprt.alias;
+            model.base = imprt.alias;
+            model.type = imprt.alias;
+        }
+        if (imprt.alias && model.imports?.some(item => normalizeImportPath(item.path) === importPath && item.name === imprt.name)) {
+            if (model.base === imprt.name) {
+                model.base = imprt.alias;
+            }
+            if (model.type === imprt.name) {
+                model.type = imprt.alias;
+            }
+        }
+        if (model.link) {
+            applyAliasToModel(model.link, imprt);
+        }
+        if (model.properties?.length) {
+            model.properties.forEach(child => applyAliasToModel(child, imprt));
+        }
+        if (model.enums?.length) {
+            model.enums.forEach(child => applyAliasToModel(child, imprt));
+        }
+    };
     models.forEach(model => {
-        model.imports = model.imports.map(imprt => {
+        const importsWithSourcePath = model.imports.map(imprt => {
+            const sourcePath = imprt.path;
             const importModel = models.find(value => {
                 const normalizedPath = !value.path.startsWith('./') ? `./${value.path}` : value.path;
                 return normalizedPath === imprt.path && value.name === imprt.name;
@@ -69,16 +97,22 @@ function resolveModelImports(models, outputModelsDir) {
                     importPath = `./${file}`;
                 }
                 else if (relativePath.startsWith('./')) {
-                    importPath = `${relativePath}${file}`;
+                    importPath = `${relativePath}/${file}`;
                 }
                 else {
                     importPath = `${relativePath}/${file}`;
                 }
             }
-            return Object.assign(imprt, {
+            const mappedImport = Object.assign(imprt, {
                 alias: importAlias,
                 path: importPath,
             });
+            return { mappedImport, sourcePath };
+        });
+        model.imports = importsWithSourcePath.map(item => item.mappedImport);
+        importsWithSourcePath.forEach(item => {
+            applyAliasToModel(model, item.mappedImport);
+            applyAliasToModel(model, Object.assign({}, item.mappedImport, { path: item.sourcePath }));
         });
     });
     return models;

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

@@ -1 +1 @@
-{"version":3,"file":"postProcessModelImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessModelImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAIzD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE,CAK9D"}
+{"version":3,"file":"postProcessModelImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessModelImports.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAQzD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE,CAY9D"}

package/dist/core/utils/postProcessModelImports.js

@@ -1,15 +1,28 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postProcessModelImports = postProcessModelImports;
+const path_1 = __importDefault(require("path"));
 const sort_1 = require("./sort");
 const unique_1 = require("./unique");
+function normalizePath(value) {
+    return value.startsWith('./') ? value.slice(2) : value;
+}
 /**
  * Set unique imports, sorted by name
  * @param model The model that is post-processed
  */
 function postProcessModelImports(model) {
+    const currentModelPath = normalizePath(model.path);
+    const currentModelDir = path_1.default.posix.dirname(currentModelPath);
     return model?.imports
         ?.filter(unique_1.unique)
         ?.sort(sort_1.sort)
-        ?.filter(item => model.name !== item.name);
+        ?.filter(item => {
+        const importPath = normalizePath(item.path);
+        const resolvedFromCurrentModel = path_1.default.posix.normalize(path_1.default.posix.join(currentModelDir, importPath));
+        return resolvedFromCurrentModel !== currentModelPath;
+    });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"postProcessServiceImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessServiceImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAKpE"}
+{"version":3,"file":"postProcessServiceImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessServiceImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAIpE"}

package/dist/core/utils/postProcessServiceImports.js

@@ -10,6 +10,5 @@ const unique_1 = require("./unique");
 function postProcessServiceImports(service) {
     return service.imports
         .filter(unique_1.unique)
-        .sort(sort_1.sort)
-        .filter(item => service.name !== item.name);
+        .sort(sort_1.sort);
 }

package/dist/core/utils/precompileTemplates.js

@@ -62,6 +62,13 @@ const precompileTemplates = () => {
                             containsSystemName: true,
                             normalizePath: true,
                             joinPath: true,
+                            isNumericEnum: true,
+                            isBasicType: true,
+                            yupBaseSchema: true,
+                            joiBaseSchema: true,
+                            getRequiredFields: true,
+                            getEnumType: true,
+                            camelCase: 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":"AAIA,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,CAqK5H"}

package/dist/core/utils/registerHandlebarHelpers.js

@@ -32,8 +32,12 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerHandlebarHelpers = registerHandlebarHelpers;
+const camelcase_1 = __importDefault(require("camelcase"));
 const Handlebars = __importStar(require("handlebars/runtime"));
 const Consts_1 = require("../types/Consts");
 const unique_1 = require("./unique");
@@ -104,4 +108,85 @@ 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';
+    });
+    Handlebars.registerHelper('camelCase', function (value) {
+        const name = (0, camelcase_1.default)(value, { pascalCase: true });
+        if (name && !name.endsWith('Service')) {
+            return `${name}Service`;
+        }
+        return name;
+    });
 }

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

@@ -1,31 +1,6 @@
-import * as Handlebars from 'handlebars/runtime';
 import { HttpClient } from '../types/enums/HttpClient.enum';
-export interface Templates {
-    indexes: {
-        full: Handlebars.TemplateDelegate;
-        simple: Handlebars.TemplateDelegate;
-        core: Handlebars.TemplateDelegate;
-        models: Handlebars.TemplateDelegate;
-        schemas: Handlebars.TemplateDelegate;
-        services: Handlebars.TemplateDelegate;
-    };
-    exports: {
-        model: Handlebars.TemplateDelegate;
-        schema: Handlebars.TemplateDelegate;
-        service: Handlebars.TemplateDelegate;
-    };
-    core: {
-        settings: Handlebars.TemplateDelegate;
-        apiError: Handlebars.TemplateDelegate;
-        apiRequestOptions: Handlebars.TemplateDelegate;
-        apiResult: Handlebars.TemplateDelegate;
-        request: Handlebars.TemplateDelegate;
-        cancelablePromise: Handlebars.TemplateDelegate;
-        httpStatusCode: Handlebars.TemplateDelegate;
-        requestExecutor: Handlebars.TemplateDelegate;
-        legacyRequestAdapter: Handlebars.TemplateDelegate;
-    };
-}
+import { ValidationLibrary } from '../types/enums/ValidationLibrary.enum';
+import { Templates } from '../types/base/Templates.model';
 /**
  * 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.
@@ -34,5 +9,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;AAyFjD,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;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,CAAA;CAAE,GAAG,SAAS,CA8GnI"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AA6FA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;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,CAyK1K"}