klasik 2.4.2 → 2.5.0

package/dist/plugins/zod-validator-plugin.js

@@ -0,0 +1,446 @@
+"use strict";
+/**
+ * Zod Validator Plugin
+ *
+ * Generates Zod validation schemas as separate .zod.ts files
+ * alongside the generated class models.
+ */
+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.ZodValidatorPlugin = void 0;
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+const name_utils_1 = require("../utils/name-utils");
+/**
+ * Plugin that generates Zod validation schemas
+ *
+ * Generates:
+ * - {model}.zod.ts files with Zod schema definitions
+ * - Type exports using z.infer<typeof schema>
+ */
+class ZodValidatorPlugin {
+    constructor() {
+        this.name = 'zod-validator';
+        this.priority = 85; // Same priority as AjvValidator
+    }
+    /**
+     * Generate .zod.ts files after model generation
+     */
+    afterGeneration(context, ir) {
+        const modelsDir = context.options.bare
+            ? context.options.outputDir
+            : path.join(context.options.outputDir, 'models');
+        // Ensure models directory exists
+        if (!fs.existsSync(modelsDir)) {
+            fs.mkdirSync(modelsDir, { recursive: true });
+        }
+        // Generate Zod file for each schema
+        for (const [_name, schema] of ir.schemas) {
+            this.generateZodFile(schema, context, modelsDir, ir);
+        }
+        // Update index.ts to include Zod exports
+        this.updateIndexFile(ir, context, modelsDir);
+    }
+    /**
+     * Add zod dependency to package.json
+     */
+    modifyPackageJson(packageJson, _context) {
+        if (!packageJson.dependencies) {
+            packageJson.dependencies = {};
+        }
+        packageJson.dependencies['zod'] = '^3.23.0';
+    }
+    /**
+     * Generate a .zod.ts file for a schema
+     */
+    generateZodFile(schema, context, modelsDir, ir) {
+        const fileName = this.getSchemaFileName(schema, context) + '.zod.ts';
+        const filePath = path.join(modelsDir, fileName);
+        // Collect imports needed
+        const imports = this.collectImports(schema, context, ir);
+        // Build the Zod schema
+        const zodSchema = this.buildZodSchema(schema);
+        // Generate file content
+        const lines = [];
+        // Import zod
+        lines.push("import { z } from 'zod';");
+        // Import referenced schemas
+        if (imports.length > 0) {
+            lines.push('');
+            for (const imp of imports) {
+                const importPath = context.options.esm
+                    ? `./${imp.fileName}.zod.js`
+                    : `./${imp.fileName}.zod`;
+                lines.push(`import { ${imp.schemaName}Schema } from '${importPath}';`);
+            }
+        }
+        lines.push('');
+        // Add JSDoc for schema
+        if (schema.description) {
+            lines.push('/**');
+            lines.push(` * ${schema.description.replace(/\n/g, '\n * ')}`);
+            lines.push(' */');
+        }
+        // Export the schema
+        lines.push(`export const ${schema.name}Schema = ${zodSchema};`);
+        lines.push('');
+        // Export the inferred type
+        lines.push(`export type ${schema.name} = z.infer<typeof ${schema.name}Schema>;`);
+        lines.push('');
+        // Write file
+        fs.writeFileSync(filePath, lines.join('\n'), 'utf-8');
+    }
+    /**
+     * Build the Zod schema string from a SchemaDefinition
+     */
+    buildZodSchema(schema) {
+        // Handle enum schemas
+        if (schema.type === 'enum' && schema.enumValues && schema.enumValues.length > 0) {
+            const enumValues = schema.enumValues
+                .map(v => typeof v === 'string' ? `'${this.escapeString(v)}'` : String(v))
+                .join(', ');
+            return `z.enum([${enumValues}])`;
+        }
+        // Build object schema
+        const properties = [];
+        for (const [_propName, propDef] of schema.properties) {
+            const propSchema = this.buildPropertySchema(propDef);
+            properties.push(`  ${propDef.name}: ${propSchema}`);
+        }
+        if (properties.length === 0) {
+            return 'z.object({})';
+        }
+        return `z.object({\n${properties.join(',\n')},\n})`;
+    }
+    /**
+     * Build a Zod schema for a property
+     */
+    buildPropertySchema(propDef) {
+        let schema = this.buildTypeSchema(propDef.type, propDef.constraints);
+        // Add format-specific validations
+        schema = this.applyFormatValidations(schema, propDef.format, propDef.type);
+        // Add constraint validations
+        schema = this.applyConstraintValidations(schema, propDef.constraints, propDef.type);
+        // Add description if present
+        if (propDef.description) {
+            schema += `.describe('${this.escapeString(propDef.description)}')`;
+        }
+        // Handle nullable
+        if (propDef.nullable && propDef.required) {
+            schema += '.nullable()';
+        }
+        else if (propDef.nullable && !propDef.required) {
+            schema += '.nullish()';
+        }
+        else if (!propDef.required) {
+            schema += '.optional()';
+        }
+        return schema;
+    }
+    /**
+     * Build Zod schema for a type
+     */
+    buildTypeSchema(type, constraints) {
+        switch (type.kind) {
+            case 'primitive':
+                return this.buildPrimitiveSchema(type.name, constraints);
+            case 'array':
+                if (!type.elementType) {
+                    return 'z.array(z.unknown())';
+                }
+                const elementSchema = this.buildTypeSchema(type.elementType);
+                return `z.array(${elementSchema})`;
+            case 'reference':
+            case 'object':
+                if (type.name) {
+                    return `${type.name}Schema`;
+                }
+                return 'z.object({})';
+            case 'union':
+                if (!type.unionTypes || type.unionTypes.length === 0) {
+                    return 'z.unknown()';
+                }
+                if (type.unionTypes.length === 1) {
+                    return this.buildTypeSchema(type.unionTypes[0]);
+                }
+                const unionSchemas = type.unionTypes.map(t => this.buildTypeSchema(t));
+                return `z.union([${unionSchemas.join(', ')}])`;
+            case 'dictionary':
+                const valueSchema = type.additionalProperties
+                    ? this.buildTypeSchema(type.additionalProperties)
+                    : 'z.unknown()';
+                return `z.record(z.string(), ${valueSchema})`;
+            case 'unknown':
+            default:
+                return 'z.unknown()';
+        }
+    }
+    /**
+     * Build Zod schema for primitive types
+     */
+    buildPrimitiveSchema(name, constraints) {
+        // Check for enum first
+        if (constraints?.enum && constraints.enum.length > 0) {
+            const enumValues = constraints.enum
+                .map(v => typeof v === 'string' ? `'${this.escapeString(v)}'` : String(v))
+                .join(', ');
+            return `z.enum([${enumValues}])`;
+        }
+        switch (name) {
+            case 'string':
+                return 'z.string()';
+            case 'number':
+                return 'z.number()';
+            case 'integer':
+                return 'z.number().int()';
+            case 'boolean':
+                return 'z.boolean()';
+            default:
+                return 'z.string()';
+        }
+    }
+    /**
+     * Apply format-specific validations
+     */
+    applyFormatValidations(schema, format, type) {
+        if (!format)
+            return schema;
+        // Only apply to string types
+        if (type.kind !== 'primitive' || type.name !== 'string') {
+            return schema;
+        }
+        switch (format) {
+            case 'email':
+                return schema + '.email()';
+            case 'url':
+            case 'uri':
+                return schema + '.url()';
+            case 'uuid':
+                return schema + '.uuid()';
+            case 'date-time':
+                return schema + '.datetime()';
+            case 'date':
+                return schema + '.date()';
+            case 'ipv4':
+                return schema + ".ip({ version: 'v4' })";
+            case 'ipv6':
+                return schema + ".ip({ version: 'v6' })";
+            case 'cuid':
+                return schema + '.cuid()';
+            case 'cuid2':
+                return schema + '.cuid2()';
+            case 'ulid':
+                return schema + '.ulid()';
+            default:
+                return schema;
+        }
+    }
+    /**
+     * Apply constraint validations
+     */
+    applyConstraintValidations(schema, constraints, type) {
+        if (!constraints)
+            return schema;
+        // Skip if enum was already applied
+        if (constraints.enum && constraints.enum.length > 0) {
+            return schema;
+        }
+        let result = schema;
+        // String constraints
+        if (type.kind === 'primitive' && type.name === 'string') {
+            if (constraints.minLength !== undefined) {
+                result += `.min(${constraints.minLength})`;
+            }
+            if (constraints.maxLength !== undefined) {
+                result += `.max(${constraints.maxLength})`;
+            }
+            if (constraints.pattern) {
+                result += `.regex(/${this.escapeRegex(constraints.pattern)}/)`;
+            }
+        }
+        // Numeric constraints
+        if (type.kind === 'primitive' && (type.name === 'number' || type.name === 'integer')) {
+            if (constraints.minimum !== undefined) {
+                if (constraints.exclusiveMinimum) {
+                    result += `.gt(${constraints.minimum})`;
+                }
+                else {
+                    result += `.min(${constraints.minimum})`;
+                }
+            }
+            if (constraints.maximum !== undefined) {
+                if (constraints.exclusiveMaximum) {
+                    result += `.lt(${constraints.maximum})`;
+                }
+                else {
+                    result += `.max(${constraints.maximum})`;
+                }
+            }
+            if (constraints.multipleOf !== undefined) {
+                result += `.multipleOf(${constraints.multipleOf})`;
+            }
+        }
+        // Array constraints
+        if (type.kind === 'array') {
+            if (constraints.minItems !== undefined) {
+                result += `.min(${constraints.minItems})`;
+            }
+            if (constraints.maxItems !== undefined) {
+                result += `.max(${constraints.maxItems})`;
+            }
+        }
+        return result;
+    }
+    /**
+     * Collect imports needed for a schema
+     */
+    collectImports(schema, context, ir) {
+        const imports = [];
+        const importedNames = new Set();
+        for (const [_propName, propDef] of schema.properties) {
+            this.collectTypeImports(propDef.type, importedNames, ir);
+        }
+        // Remove self-reference
+        importedNames.delete(schema.name);
+        // Build import entries
+        for (const name of importedNames) {
+            const referencedSchema = ir.schemas.get(name);
+            if (referencedSchema) {
+                imports.push({
+                    schemaName: name,
+                    fileName: this.getSchemaFileName(referencedSchema, context),
+                });
+            }
+        }
+        return imports.sort((a, b) => a.schemaName.localeCompare(b.schemaName));
+    }
+    /**
+     * Recursively collect type names that need to be imported
+     */
+    collectTypeImports(type, collected, ir) {
+        if (!type)
+            return;
+        switch (type.kind) {
+            case 'reference':
+            case 'object':
+                if (type.name && ir.schemas.has(type.name)) {
+                    collected.add(type.name);
+                }
+                break;
+            case 'array':
+                if (type.elementType) {
+                    this.collectTypeImports(type.elementType, collected, ir);
+                }
+                break;
+            case 'union':
+                if (type.unionTypes) {
+                    for (const t of type.unionTypes) {
+                        this.collectTypeImports(t, collected, ir);
+                    }
+                }
+                break;
+            case 'dictionary':
+                if (type.additionalProperties) {
+                    this.collectTypeImports(type.additionalProperties, collected, ir);
+                }
+                break;
+        }
+    }
+    /**
+     * Update index.ts to include Zod exports
+     */
+    updateIndexFile(ir, context, modelsDir) {
+        // Create a separate index.zod.ts file
+        const indexPath = path.join(modelsDir, 'index.zod.ts');
+        const lines = [];
+        // Sort schemas alphabetically
+        const schemas = Array.from(ir.schemas.values()).sort((a, b) => a.name.localeCompare(b.name));
+        // Export all Zod schemas
+        for (const schema of schemas) {
+            const fileName = this.getSchemaFileName(schema, context);
+            const importPath = context.options.esm
+                ? `./${fileName}.zod.js`
+                : `./${fileName}.zod`;
+            lines.push(`export * from '${importPath}';`);
+        }
+        fs.writeFileSync(indexPath, lines.join('\n') + '\n', 'utf-8');
+    }
+    /**
+     * Get the file name for a schema (without extension)
+     */
+    getSchemaFileName(schema, context) {
+        if (context.options.crdKindCase && schema.metadata.kind) {
+            return this.applyCaseTransform(schema.metadata.kind, context.options.crdKindCase);
+        }
+        return (0, name_utils_1.toKebabCase)(schema.name);
+    }
+    /**
+     * Apply case transformation
+     */
+    applyCaseTransform(name, caseType) {
+        switch (caseType) {
+            case 'kebab':
+                return (0, name_utils_1.toKebabCase)(name);
+            case 'snake':
+                return name.replace(/([A-Z])/g, '_$1').toLowerCase().replace(/^_/, '');
+            case 'pascal':
+                return name.charAt(0).toUpperCase() + name.slice(1);
+            case 'camel':
+                return name.charAt(0).toLowerCase() + name.slice(1);
+            case 'none':
+            default:
+                return name;
+        }
+    }
+    /**
+     * Escape a string for use in generated code
+     */
+    escapeString(str) {
+        return str
+            .replace(/\\/g, '\\\\')
+            .replace(/'/g, "\\'")
+            .replace(/\n/g, '\\n')
+            .replace(/\r/g, '\\r');
+    }
+    /**
+     * Escape a regex pattern for use in generated code
+     */
+    escapeRegex(pattern) {
+        // Escape forward slashes for regex literal
+        return pattern.replace(/\//g, '\\/');
+    }
+}
+exports.ZodValidatorPlugin = ZodValidatorPlugin;
+//# sourceMappingURL=zod-validator-plugin.js.map

package/dist/plugins/zod-validator-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zod-validator-plugin.js","sourceRoot":"","sources":["../../src/plugins/zod-validator-plugin.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,2CAA6B;AAC7B,uCAAyB;AAUzB,oDAAkD;AAElD;;;;;;GAMG;AACH,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,eAAe,CAAC;QACvB,aAAQ,GAAG,EAAE,CAAC,CAAC,gCAAgC;IA4djD,CAAC;IA1dC;;OAEG;IACH,eAAe,CAAC,OAA0B,EAAE,EAAY;QACtD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI;YACpC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS;YAC3B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEnD,iCAAiC;QACjC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,oCAAoC;QACpC,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACzC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,yCAAyC;QACzC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,WAAgB,EAAE,QAA2B;QAC7D,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YAC9B,WAAW,CAAC,YAAY,GAAG,EAAE,CAAC;QAChC,CAAC;QACD,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAC9C,CAAC;IAED;;OAEG;IACK,eAAe,CACrB,MAAwB,EACxB,OAA0B,EAC1B,SAAiB,EACjB,EAAY;QAEZ,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;QACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEhD,yBAAyB;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAEzD,uBAAuB;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAE9C,wBAAwB;QACxB,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,aAAa;QACb,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEvC,4BAA4B;QAC5B,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACf,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG;oBACpC,CAAC,CAAC,KAAK,GAAG,CAAC,QAAQ,SAAS;oBAC5B,CAAC,CAAC,KAAK,GAAG,CAAC,QAAQ,MAAM,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,UAAU,kBAAkB,UAAU,IAAI,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEf,uBAAuB;QACvB,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC/D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;QAED,oBAAoB;QACpB,KAAK,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,IAAI,YAAY,SAAS,GAAG,CAAC,CAAC;QAChE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEf,2BAA2B;QAC3B,KAAK,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,IAAI,qBAAqB,MAAM,CAAC,IAAI,UAAU,CAAC,CAAC;QACjF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEf,aAAa;QACb,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,MAAwB;QAC7C,sBAAsB;QACtB,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChF,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU;iBACjC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;iBACzE,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,OAAO,WAAW,UAAU,IAAI,CAAC;QACnC,CAAC;QAED,sBAAsB;QACtB,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACrD,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACrD,UAAU,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,eAAe,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IACtD,CAAC;IAED;;OAEG;IACK,mBAAmB,CAAC,OAA2B;QACrD,IAAI,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAErE,kCAAkC;QAClC,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAE3E,6BAA6B;QAC7B,MAAM,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEpF,6BAA6B;QAC7B,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,MAAM,IAAI,cAAc,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;QACrE,CAAC;QAED,kBAAkB;QAClB,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACzC,MAAM,IAAI,aAAa,CAAC;QAC1B,CAAC;aAAM,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACjD,MAAM,IAAI,YAAY,CAAC;QACzB,CAAC;aAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,aAAa,CAAC;QAC1B,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,eAAe,CAAC,IAAmB,EAAE,WAAyB;QACpE,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,WAAW;gBACd,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAK,EAAE,WAAW,CAAC,CAAC;YAE5D,KAAK,OAAO;gBACV,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACtB,OAAO,sBAAsB,CAAC;gBAChC,CAAC;gBACD,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC7D,OAAO,WAAW,aAAa,GAAG,CAAC;YAErC,KAAK,WAAW,CAAC;YACjB,KAAK,QAAQ;gBACX,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,OAAO,GAAG,IAAI,CAAC,IAAI,QAAQ,CAAC;gBAC9B,CAAC;gBACD,OAAO,cAAc,CAAC;YAExB,KAAK,OAAO;gBACV,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACrD,OAAO,aAAa,CAAC;gBACvB,CAAC;gBACD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClD,CAAC;gBACD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvE,OAAO,YAAY,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAEjD,KAAK,YAAY;gBACf,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB;oBAC3C,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,oBAAoB,CAAC;oBACjD,CAAC,CAAC,aAAa,CAAC;gBAClB,OAAO,wBAAwB,WAAW,GAAG,CAAC;YAEhD,KAAK,SAAS,CAAC;YACf;gBACE,OAAO,aAAa,CAAC;QACzB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,IAAY,EAAE,WAAyB;QAClE,uBAAuB;QACvB,IAAI,WAAW,EAAE,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrD,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI;iBAChC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;iBACzE,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,OAAO,WAAW,UAAU,IAAI,CAAC;QACnC,CAAC;QAED,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,QAAQ;gBACX,OAAO,YAAY,CAAC;YACtB,KAAK,QAAQ;gBACX,OAAO,YAAY,CAAC;YACtB,KAAK,SAAS;gBACZ,OAAO,kBAAkB,CAAC;YAC5B,KAAK,SAAS;gBACZ,OAAO,aAAa,CAAC;YACvB;gBACE,OAAO,YAAY,CAAC;QACxB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,sBAAsB,CAC5B,MAAc,EACd,MAA0B,EAC1B,IAAmB;QAEnB,IAAI,CAAC,MAAM;YAAE,OAAO,MAAM,CAAC;QAE3B,6BAA6B;QAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,OAAO;gBACV,OAAO,MAAM,GAAG,UAAU,CAAC;YAC7B,KAAK,KAAK,CAAC;YACX,KAAK,KAAK;gBACR,OAAO,MAAM,GAAG,QAAQ,CAAC;YAC3B,KAAK,MAAM;gBACT,OAAO,MAAM,GAAG,SAAS,CAAC;YAC5B,KAAK,WAAW;gBACd,OAAO,MAAM,GAAG,aAAa,CAAC;YAChC,KAAK,MAAM;gBACT,OAAO,MAAM,GAAG,SAAS,CAAC;YAC5B,KAAK,MAAM;gBACT,OAAO,MAAM,GAAG,wBAAwB,CAAC;YAC3C,KAAK,MAAM;gBACT,OAAO,MAAM,GAAG,wBAAwB,CAAC;YAC3C,KAAK,MAAM;gBACT,OAAO,MAAM,GAAG,SAAS,CAAC;YAC5B,KAAK,OAAO;gBACV,OAAO,MAAM,GAAG,UAAU,CAAC;YAC7B,KAAK,MAAM;gBACT,OAAO,MAAM,GAAG,SAAS,CAAC;YAC5B;gBACE,OAAO,MAAM,CAAC;QAClB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,0BAA0B,CAChC,MAAc,EACd,WAAoC,EACpC,IAAmB;QAEnB,IAAI,CAAC,WAAW;YAAE,OAAO,MAAM,CAAC;QAEhC,mCAAmC;QACnC,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,MAAM,GAAG,MAAM,CAAC;QAEpB,qBAAqB;QACrB,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxD,IAAI,WAAW,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,IAAI,QAAQ,WAAW,CAAC,SAAS,GAAG,CAAC;YAC7C,CAAC;YACD,IAAI,WAAW,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,IAAI,QAAQ,WAAW,CAAC,SAAS,GAAG,CAAC;YAC7C,CAAC;YACD,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACxB,MAAM,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACjE,CAAC;QACH,CAAC;QAED,sBAAsB;QACtB,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE,CAAC;YACrF,IAAI,WAAW,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBACtC,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;oBACjC,MAAM,IAAI,OAAO,WAAW,CAAC,OAAO,GAAG,CAAC;gBAC1C,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,QAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;gBAC3C,CAAC;YACH,CAAC;YACD,IAAI,WAAW,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBACtC,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;oBACjC,MAAM,IAAI,OAAO,WAAW,CAAC,OAAO,GAAG,CAAC;gBAC1C,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,QAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;gBAC3C,CAAC;YACH,CAAC;YACD,IAAI,WAAW,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;gBACzC,MAAM,IAAI,eAAe,WAAW,CAAC,UAAU,GAAG,CAAC;YACrD,CAAC;QACH,CAAC;QAED,oBAAoB;QACpB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC1B,IAAI,WAAW,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACvC,MAAM,IAAI,QAAQ,WAAW,CAAC,QAAQ,GAAG,CAAC;YAC5C,CAAC;YACD,IAAI,WAAW,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACvC,MAAM,IAAI,QAAQ,WAAW,CAAC,QAAQ,GAAG,CAAC;YAC5C,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,cAAc,CACpB,MAAwB,EACxB,OAA0B,EAC1B,EAAY;QAEZ,MAAM,OAAO,GAAoD,EAAE,CAAC;QACpE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QAExC,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACrD,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,wBAAwB;QACxB,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAElC,uBAAuB;QACvB,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,gBAAgB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,gBAAgB,EAAE,CAAC;gBACrB,OAAO,CAAC,IAAI,CAAC;oBACX,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,OAAO,CAAC;iBAC5D,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IACK,kBAAkB,CACxB,IAAmB,EACnB,SAAsB,EACtB,EAAY;QAEZ,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,WAAW,CAAC;YACjB,KAAK,QAAQ;gBACX,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC3C,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3B,CAAC;gBACD,MAAM;YAER,KAAK,OAAO;gBACV,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACrB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;gBAC3D,CAAC;gBACD,MAAM;YAER,KAAK,OAAO;gBACV,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;oBAC5C,CAAC;gBACH,CAAC;gBACD,MAAM;YAER,KAAK,YAAY;gBACf,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAC9B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;gBACpE,CAAC;gBACD,MAAM;QACV,CAAC;IACH,CAAC;IAED;;OAEG;IACK,eAAe,CACrB,EAAY,EACZ,OAA0B,EAC1B,SAAiB;QAEjB,sCAAsC;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACvD,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,8BAA8B;QAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC5D,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAC7B,CAAC;QAEF,yBAAyB;QACzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACzD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG;gBACpC,CAAC,CAAC,KAAK,QAAQ,SAAS;gBACxB,CAAC,CAAC,KAAK,QAAQ,MAAM,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,kBAAkB,UAAU,IAAI,CAAC,CAAC;QAC/C,CAAC;QAED,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACK,iBAAiB,CACvB,MAAwB,EACxB,OAA0B;QAE1B,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,IAAA,wBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,kBAAkB,CACxB,IAAY,EACZ,QAAyD;QAEzD,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,OAAO;gBACV,OAAO,IAAA,wBAAW,EAAC,IAAI,CAAC,CAAC;YAC3B,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzE,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACtD,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACtD,KAAK,MAAM,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,YAAY,CAAC,GAAW;QAC9B,OAAO,GAAG;aACP,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;aACtB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;aACpB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;aACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED;;OAEG;IACK,WAAW,CAAC,OAAe;QACjC,2CAA2C;QAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;CACF;AA9dD,gDA8dC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klasik",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "description": "TypeScript code generator from OpenAPI/CRD/JSON Schema/Go structs - rebuilt from ground up with AST-based generation",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,6 +46,7 @@
     "js-yaml": "^4.1.0",
     "mustache": "^4.2.0",
     "ora": "^5.4.1",
+    "swagger2openapi": "^7.0.8",
     "ts-morph": "^21.0.0"
   },
   "devDependencies": {