klasik 1.0.23 → 1.0.25

package/.claude/settings.local.json

@@ -14,7 +14,9 @@
       "Bash(node test-disc-code.js:*)",
       "Bash(node test-new-validators.js:*)",
       "Bash(node dist/cli.js generate-crd:*)",
-      "Bash(node test-programmatic-api.js:*)"
+      "Bash(node test-programmatic-api.js:*)",
+      "WebFetch(domain:www.schemastore.org)",
+      "WebFetch(domain:json.schemastore.org)"
     ]
   }
 }

package/README.md

@@ -101,6 +101,12 @@ npx klasik generate-crd \
   --url https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/appproject-crd.yaml \
   --output ./generated
 
+# From multiple CRD URLs (merged into single output)
+npx klasik generate-crd \
+  -u https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/application-crd.yaml \
+  -u https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/appproject-crd.yaml \
+  --output ./generated
+
 # From a local CRD file
 npx klasik generate-crd \
   --url ./my-crd.yaml \
@@ -123,6 +129,7 @@ npx klasik generate-crd \
 ### CRD Features
 
 - ✅ **Automatic schema extraction** from `openAPIV3Schema`
+- ✅ **Multiple URL support** - Generate from multiple CRD sources in one command
 - ✅ **Version-based organization** - Each CRD version gets its own folder (e.g., `v1alpha1/`, `v1beta1/`)
 - ✅ **Multi-document YAML support** - Process multiple CRDs from a single file
 - ✅ **Nested type extraction** - Complex nested objects become separate TypeScript interfaces
@@ -181,13 +188,26 @@ import { CRDGenerator } from 'klasik';
 
 const generator = new CRDGenerator();
 
+// Single URL
 await generator.generate({
-  url: './crds/my-resource.yaml',
+  urls: './crds/my-resource.yaml',
   outputDir: './generated',
   includeStatus: true,
   nestJsSwagger: true,
   classValidator: true
 });
+
+// Multiple URLs (merged into single output)
+await generator.generate({
+  urls: [
+    'https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/application-crd.yaml',
+    'https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/appproject-crd.yaml',
+    './local/my-crd.yaml'
+  ],
+  outputDir: './generated',
+  includeStatus: true,
+  nestJsSwagger: true
+});
 ```
 
 ### Multi-CRD YAML Files
@@ -344,7 +364,9 @@ klasik download \
 Generate TypeScript models from Kubernetes CustomResourceDefinition (CRD) YAML files.
 
 **Options:**
-- `-u, --url <url>` - URL or file path to CRD YAML (required)
+- `-u, --url <url...>` - URL(s) or file path(s) to CRD YAML files (required)
+  - Can be specified multiple times: `-u url1 -u url2 -u url3`
+  - All CRDs from all URLs are merged into a single output directory
   - Supports: `https://...`, `http://...`, `file://...`, `/absolute/path`, `./relative/path`
 - `-o, --output <dir>` - Output directory for generated models (required)
 - `--include-status` - Generate status schemas in addition to spec schemas (default: false)
@@ -366,6 +388,19 @@ klasik generate-crd \
   --url https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/appproject-crd.yaml \
   --output ./generated/crds
 
+# Generate from multiple CRD URLs (merged into single output)
+klasik generate-crd \
+  -u https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/application-crd.yaml \
+  -u https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/appproject-crd.yaml \
+  --output ./generated/argocd
+
+# Mix remote and local CRDs
+klasik generate-crd \
+  -u https://example.com/crd1.yaml \
+  -u ./crds/crd2.yaml \
+  -u ./crds/crd3.yaml \
+  --output ./src/generated
+
 # Generate with status models
 klasik generate-crd \
   --url ./my-crd.yaml \

package/dist/cli.js

@@ -137,7 +137,7 @@ program
 program
     .command('generate-crd')
     .description('Generate TypeScript models from Kubernetes CRD YAML files')
-    .requiredOption('-u, --url <url>', 'URL or file path to CRD YAML')
+    .requiredOption('-u, --url <url...>', 'URL(s) or file path(s) to CRD YAML files (can be specified multiple times)')
     .requiredOption('-o, --output <dir>', 'Output directory for generated models')
     .option('--include-status', 'Generate status schemas in addition to spec schemas', false)
     .option('--nestjs-swagger', 'Include NestJS Swagger @ApiProperty decorators in generated models', false)
@@ -164,8 +164,10 @@ program
         const outputDir = path.resolve(options.output);
         const { CRDGenerator } = await Promise.resolve().then(() => __importStar(require('./crd/crd-generator')));
         const generator = new CRDGenerator();
+        // Handle both single URL (backwards compat) and multiple URLs
+        const urls = Array.isArray(options.url) ? options.url : [options.url];
         await generator.generate({
-            url: options.url,
+            urls,
             outputDir,
             includeStatus: options.includeStatus,
             headers: Object.keys(headers).length > 0 ? headers : undefined,

package/dist/crd/crd-generator.d.ts

@@ -3,9 +3,10 @@
  */
 export interface CRDGeneratorOptions {
     /**
-     * URL or file path to CRD YAML file(s)
+     * URL(s) or file path(s) to CRD YAML file(s)
+     * Can be a single URL string or array of URLs
      */
-    url: string;
+    urls: string | string[];
     /**
      * Output directory for generated models
      */

package/dist/crd/crd-generator.js

@@ -57,36 +57,65 @@ class CRDGenerator {
      * @param options Generation options
      */
     async generate(options) {
-        const { url, outputDir, includeStatus = false, headers, timeout, fixEsmImports = false, nestJsSwagger = false, classValidator = false, skipJsExtensions = false, templateDir, keepSpec = false, } = options;
+        const { urls: urlsInput, outputDir, includeStatus = false, headers, timeout, fixEsmImports = false, nestJsSwagger = false, classValidator = false, skipJsExtensions = false, templateDir, keepSpec = false, } = options;
+        // Normalize to array
+        const urls = Array.isArray(urlsInput) ? urlsInput : [urlsInput];
         try {
-            // Step 1: Download/load CRD file
-            console.log('Step 1: Loading CRD file...');
-            const crdContent = await this.loadCRDFile(url, headers, timeout);
-            // Step 2: Parse CRDs
-            console.log('Step 2: Parsing CRD definitions...');
-            const parseResult = this.parser.parseContent(crdContent, {
-                includeStatus,
-            });
-            // Check for errors
-            if (parseResult.errors.length > 0) {
-                console.error('Errors encountered during parsing:');
-                parseResult.errors.forEach(err => console.error(`  ❌ ${err}`));
-                throw new Error('CRD parsing failed');
+            const allCRDs = [];
+            const errors = [];
+            // Process each URL
+            for (let i = 0; i < urls.length; i++) {
+                const url = urls[i];
+                console.log(`\n[${i + 1}/${urls.length}] Processing URL: ${url}`);
+                try {
+                    // Step 1: Download/load CRD file
+                    console.log('  Loading CRD file...');
+                    const crdContent = await this.loadCRDFile(url, headers, timeout);
+                    // Step 2: Parse CRDs
+                    console.log('  Parsing CRD definitions...');
+                    const parseResult = this.parser.parseContent(crdContent, {
+                        includeStatus,
+                    });
+                    // Check for errors
+                    if (parseResult.errors.length > 0) {
+                        const errorMsg = parseResult.errors.join(', ');
+                        errors.push({ url, error: errorMsg });
+                        console.error(`  ❌ Errors: ${errorMsg}`);
+                        continue; // Skip to next URL
+                    }
+                    // Show warnings
+                    if (parseResult.warnings.length > 0) {
+                        parseResult.warnings.forEach(warn => console.warn(`  ⚠️  ${warn}`));
+                    }
+                    console.log(`  Found ${parseResult.crds.length} CRD(s)`);
+                    allCRDs.push(...parseResult.crds);
+                }
+                catch (error) {
+                    const errorMsg = error instanceof Error ? error.message : String(error);
+                    errors.push({ url, error: errorMsg });
+                    console.error(`  ❌ Failed to process URL: ${errorMsg}`);
+                    // Continue with next URL
+                }
             }
-            // Show warnings
-            if (parseResult.warnings.length > 0) {
-                console.warn('Warnings:');
-                parseResult.warnings.forEach(warn => console.warn(`  ⚠️  ${warn}`));
+            // Check if any CRDs were successfully loaded
+            if (allCRDs.length === 0) {
+                if (errors.length > 0) {
+                    throw new Error(`Failed to load CRDs from all URLs:\n${errors.map(e => `  - ${e.url}: ${e.error}`).join('\n')}`);
+                }
+                throw new Error('No valid CRDs found in any of the provided URLs');
             }
-            if (parseResult.crds.length === 0) {
-                throw new Error('No valid CRDs found in the file');
+            // Show summary
+            console.log(`\n✅ Successfully loaded ${allCRDs.length} CRD(s) from ${urls.length - errors.length}/${urls.length} URL(s)`);
+            if (errors.length > 0) {
+                console.warn(`\n⚠️  Failed to load from ${errors.length} URL(s):`);
+                errors.forEach(e => console.warn(`  - ${e.url}: ${e.error}`));
             }
-            console.log(`Found ${parseResult.crds.length} CRD(s)`);
-            // Step 3: Process each CRD
-            for (const crd of parseResult.crds) {
+            // Step 3: Process all CRDs
+            console.log('\nGenerating TypeScript models...');
+            for (const crd of allCRDs) {
                 console.log(`\nProcessing CRD: ${crd.spec.names.kind}`);
                 // Determine output directory structure
-                const crdOutputDir = parseResult.crds.length > 1
+                const crdOutputDir = allCRDs.length > 1
                     ? path.join(outputDir, crd.spec.names.kind)
                     : outputDir;
                 const versionDirs = await this.processCRD(crd, crdOutputDir, {
@@ -101,18 +130,18 @@ class CRDGenerator {
                     keepSpec,
                 });
                 // Generate index file for this CRD if multiple CRDs
-                if (parseResult.crds.length > 1) {
+                if (allCRDs.length > 1) {
                     this.generateCRDIndex(crdOutputDir, versionDirs);
                 }
             }
             // Step 4: Generate main index file
-            console.log('\nStep 4: Generating index files...');
-            if (parseResult.crds.length > 1) {
-                this.generateMainIndex(outputDir, parseResult.crds.map(c => c.spec.names.kind));
+            console.log('\nGenerating index files...');
+            if (allCRDs.length > 1) {
+                this.generateMainIndex(outputDir, allCRDs.map(c => c.spec.names.kind));
             }
             else {
                 // For single CRD, generate version index
-                const versionNames = parseResult.crds[0].spec.versions.map(v => v.name);
+                const versionNames = allCRDs[0].spec.versions.map(v => v.name);
                 this.generateVersionIndex(outputDir, versionNames);
             }
             console.log('\n✅ CRD client generation completed successfully!');

package/dist/enum-order-fixer.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Fixes enum declaration order in TypeScript files generated with NestJS decorators
+ *
+ * When openapi-class-transformer generates files with @ApiProperty decorators,
+ * enum constants are defined at the end of the file but referenced in decorators
+ * at the beginning, causing "used before initialization" errors.
+ *
+ * This utility moves enum declarations to after imports, before class definitions.
+ */
+export declare class EnumOrderFixer {
+    /**
+     * Fix all TypeScript files in a directory recursively
+     */
+    fixDirectory(directory: string): Promise<void>;
+    /**
+     * Fix enum declarations in a single file
+     * @returns true if file was modified, false otherwise
+     */
+    private fixFile;
+    /**
+     * Move enum declarations from end of file to after imports
+     */
+    private moveEnumsToTop;
+    /**
+     * Get all TypeScript files in a directory recursively
+     */
+    private getAllTsFiles;
+}

package/dist/enum-order-fixer.js

@@ -0,0 +1,141 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnumOrderFixer = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+/**
+ * Fixes enum declaration order in TypeScript files generated with NestJS decorators
+ *
+ * When openapi-class-transformer generates files with @ApiProperty decorators,
+ * enum constants are defined at the end of the file but referenced in decorators
+ * at the beginning, causing "used before initialization" errors.
+ *
+ * This utility moves enum declarations to after imports, before class definitions.
+ */
+class EnumOrderFixer {
+    /**
+     * Fix all TypeScript files in a directory recursively
+     */
+    async fixDirectory(directory) {
+        console.log('Fixing enum declaration order...');
+        const files = this.getAllTsFiles(directory);
+        let fixedCount = 0;
+        for (const file of files) {
+            const fixed = await this.fixFile(file);
+            if (fixed) {
+                fixedCount++;
+            }
+        }
+        console.log(`✅ Fixed enum order in ${fixedCount} file(s)`);
+    }
+    /**
+     * Fix enum declarations in a single file
+     * @returns true if file was modified, false otherwise
+     */
+    async fixFile(filePath) {
+        let content = fs.readFileSync(filePath, 'utf8');
+        const originalContent = content;
+        // Move enums to after imports
+        content = this.moveEnumsToTop(content);
+        // Only write if content changed
+        if (content !== originalContent) {
+            fs.writeFileSync(filePath, content, 'utf8');
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Move enum declarations from end of file to after imports
+     */
+    moveEnumsToTop(content) {
+        // Pattern to match enum declarations at end of file
+        // Matches pairs like:
+        //   export const FooEnum = { ... } as const;
+        //   export type FooEnum = typeof FooEnum[keyof typeof FooEnum];
+        const enumPattern = /\n\nexport const (\w+Enum) = \{[^}]+\} as const;\n\nexport type \1 = typeof \1\[keyof typeof \1\];/g;
+        const enumBlocks = [];
+        let match;
+        // Extract all enum blocks
+        while ((match = enumPattern.exec(content)) !== null) {
+            enumBlocks.push(match[0]);
+        }
+        // If no enums found, return unchanged
+        if (enumBlocks.length === 0) {
+            return content;
+        }
+        // Remove enum blocks from original location
+        let newContent = content.replace(enumPattern, '');
+        // Find last import statement
+        const importMatches = newContent.match(/^import\s+.*$/gm);
+        if (!importMatches || importMatches.length === 0) {
+            // No imports found, don't modify
+            return content;
+        }
+        const lastImport = importMatches[importMatches.length - 1];
+        const lastImportIndex = newContent.indexOf(lastImport);
+        const insertPoint = lastImportIndex + lastImport.length;
+        // Build the new content with enums after imports
+        const beforeInsert = newContent.substring(0, insertPoint);
+        const afterInsert = newContent.substring(insertPoint);
+        // Create enum block with proper spacing
+        const enumsBlock = '\n\n' + enumBlocks.map(block => block.trim()).join('\n\n') + '\n';
+        return beforeInsert + enumsBlock + afterInsert;
+    }
+    /**
+     * Get all TypeScript files in a directory recursively
+     */
+    getAllTsFiles(directory) {
+        const files = [];
+        const walk = (dir) => {
+            const entries = fs.readdirSync(dir, { withFileTypes: true });
+            for (const entry of entries) {
+                const fullPath = path.join(dir, entry.name);
+                if (entry.isDirectory()) {
+                    // Skip node_modules and hidden directories
+                    if (entry.name !== 'node_modules' && !entry.name.startsWith('.')) {
+                        walk(fullPath);
+                    }
+                }
+                else if (entry.isFile() && entry.name.endsWith('.ts')) {
+                    files.push(fullPath);
+                }
+            }
+        };
+        walk(directory);
+        return files;
+    }
+}
+exports.EnumOrderFixer = EnumOrderFixer;

package/dist/k8s-client-generator.js

@@ -88,9 +88,16 @@ class K8sClientGenerator {
                 console.log('Step 3.5: Adding decorator dependencies to package.json...');
                 this.addDecoratorDependencies(outputDir, nestJsSwagger, classValidator);
             }
-            // Step 4: Fix ESM imports if requested
+            // Step 4: Fix enum declaration order if NestJS decorators enabled
+            if (nestJsSwagger) {
+                console.log('Step 4: Fixing enum declaration order...');
+                const { EnumOrderFixer } = await Promise.resolve().then(() => __importStar(require('./enum-order-fixer')));
+                const enumFixer = new EnumOrderFixer();
+                await enumFixer.fixDirectory(outputDir);
+            }
+            // Step 5: Fix ESM imports if requested
             if (fixEsmImports) {
-                console.log('Step 4: Fixing ESM imports...');
+                console.log('Step 5: Fixing ESM imports...');
                 const esmFixer = new esm_fixer_1.EsmFixer();
                 await esmFixer.fixDirectory(outputDir);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klasik",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "Download OpenAPI specs from remote URLs and generate TypeScript clients with class-transformer support - support yaml, json, CustomResourceDefinition formats",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",