klasik 1.0.35 → 1.0.38

package/README.md

@@ -502,9 +502,10 @@ Generate TypeScript models from Kubernetes CustomResourceDefinition (CRD) YAML f
 - `-H, --header <header...>` - Custom headers for HTTP requests (format: "Key: Value")
 - `-t, --template <dir>` - Custom template directory
 - `-k, --keep-spec` - Keep the generated OpenAPI spec files (for debugging)
-- `--crd-kind-snake-case` - Convert CRD kind names to snake_case for folder names (default: false)
-  - When enabled: `AppProject` → `app_project`
-  - When disabled (default): `AppProject` → `AppProject`
+- `--crd-kind-case <format>` - Format for CRD kind names in folder names (default: pascal)
+  - `pascal`: `AppProject` (default)
+  - `snake`: `app_project`
+  - `kebab`: `app-project`
 - `--timeout <ms>` - Request timeout in milliseconds (default: 30000)
 
 **Examples:**
@@ -558,13 +559,13 @@ klasik generate-crd \
 klasik generate-crd \
   --url https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/appproject-crd.yaml \
   --output ./generated \
-  --crd-kind-snake-case
-# Output structure:
-# generated/
-# └── app_project/  # Instead of AppProject/
-#     └── v1alpha1/
-#         └── models/
-#             └── app-project.ts
+  --crd-kind-case snake
+
+# Generate with kebab-case folder names
+klasik generate-crd \
+  --url https://raw.githubusercontent.com/argoproj/argo-cd/master/manifests/crds/appproject-crd.yaml \
+  --output ./generated \
+  --crd-kind-case kebab
 ```
 
 **Output Structure:**
@@ -581,7 +582,7 @@ output/
 └── index.ts
 ```
 
-For multiple CRDs (default):
+For multiple CRDs with `--crd-kind-case pascal` (default):
 ```
 output/
 ├── AppProject/
@@ -593,7 +594,7 @@ output/
 └── index.ts
 ```
 
-With `--crd-kind-snake-case`:
+With `--crd-kind-case snake`:
 ```
 output/
 ├── app_project/
@@ -605,6 +606,18 @@ output/
 └── index.ts
 ```
 
+With `--crd-kind-case kebab`:
+```
+output/
+├── app-project/
+│   ├── v1alpha1/
+│   └── index.ts
+├── application/
+│   ├── v1alpha1/
+│   └── index.ts
+└── index.ts
+```
+
 ### `generate-jsonschema`
 
 Generate TypeScript models from JSON Schema files.

package/dist/cli.js

@@ -147,7 +147,7 @@ program
     .option('--timeout <ms>', 'Request timeout in milliseconds', '30000')
     .option('-t, --template <dir>', 'Custom template directory')
     .option('-k, --keep-spec', 'Keep the generated OpenAPI spec files', false)
-    .option('--crd-kind-snake-case', 'Convert CRD kind names to snake_case for folder names', false)
+    .option('--crd-kind-case <format>', 'Format for CRD kind in folder names: pascal (default), snake, kebab', 'pascal')
     .action(async (options) => {
     try {
         // Parse headers if provided
@@ -167,6 +167,11 @@ program
         const generator = new CRDGenerator();
         // Handle both single URL (backwards compat) and multiple URLs
         const urls = Array.isArray(options.url) ? options.url : [options.url];
+        // Validate crdKindCase format
+        const crdKindCase = options.crdKindCase;
+        if (!['pascal', 'snake', 'kebab'].includes(crdKindCase)) {
+            throw new Error(`Invalid --crd-kind-case format: ${crdKindCase}. Must be one of: pascal, snake, kebab`);
+        }
         await generator.generate({
             urls,
             outputDir,
@@ -178,7 +183,7 @@ program
             classValidator: options.classValidator,
             templateDir: options.template,
             keepSpec: options.keepSpec,
-            crdKindSnakeCase: options.crdKindSnakeCase,
+            crdKindCase,
         });
         process.exit(0);
     }

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

@@ -55,10 +55,10 @@ export interface CRDGeneratorOptions {
      */
     keepSpec?: boolean;
     /**
-     * Convert CRD kind names to snake_case for folder names
-     * @default false
+     * Format for CRD kind names in folder names
+     * @default 'pascal'
      */
-    crdKindSnakeCase?: boolean;
+    crdKindCase?: 'pascal' | 'snake' | 'kebab';
 }
 /**
  * Main orchestrator for generating TypeScript models from Kubernetes CRDs
@@ -84,10 +84,16 @@ export declare class CRDGenerator {
     /**
      * Format CRD kind name for use as folder name
      * @param kind The CRD kind name (e.g., "AppProject")
-     * @param useSnakeCase Whether to convert to snake_case
-     * @returns Formatted name (e.g., "app_project" if useSnakeCase, otherwise "AppProject")
+     * @param format The case format to use
+     * @returns Formatted name (e.g., "app_project" for snake, "app-project" for kebab, "AppProject" for pascal)
      */
     private formatKindName;
+    /**
+     * Convert a folder name to a valid JavaScript identifier for exports
+     * @param folderName The folder name (may contain dashes)
+     * @returns Valid JavaScript identifier (dashes replaced with underscores)
+     */
+    private toValidIdentifier;
     /**
      * Generate index file for a CRD (when multiple CRDs in one file)
      * @param crdDir CRD directory

package/dist/crd/crd-generator.js

@@ -57,7 +57,7 @@ class CRDGenerator {
      * @param options Generation options
      */
     async generate(options) {
-        const { urls: urlsInput, outputDir, includeStatus = false, headers, timeout, fixEsmImports = false, nestJsSwagger = false, classValidator = false, skipJsExtensions = false, templateDir, keepSpec = false, crdKindSnakeCase = false, } = options;
+        const { urls: urlsInput, outputDir, includeStatus = false, headers, timeout, fixEsmImports = false, nestJsSwagger = false, classValidator = false, skipJsExtensions = false, templateDir, keepSpec = false, crdKindCase = 'pascal', } = options;
         // Normalize to array
         const urls = Array.isArray(urlsInput) ? urlsInput : [urlsInput];
         try {
@@ -115,7 +115,7 @@ class CRDGenerator {
             for (const crd of allCRDs) {
                 console.log(`\nProcessing CRD: ${crd.spec.names.kind}`);
                 // Determine output directory structure
-                const formattedKind = this.formatKindName(crd.spec.names.kind, crdKindSnakeCase);
+                const formattedKind = this.formatKindName(crd.spec.names.kind, crdKindCase);
                 const crdOutputDir = allCRDs.length > 1
                     ? path.join(outputDir, formattedKind)
                     : outputDir;
@@ -138,7 +138,7 @@ class CRDGenerator {
             // Step 4: Generate main index file
             console.log('\nGenerating index files...');
             if (allCRDs.length > 1) {
-                const formattedKindNames = allCRDs.map(c => this.formatKindName(c.spec.names.kind, crdKindSnakeCase));
+                const formattedKindNames = allCRDs.map(c => this.formatKindName(c.spec.names.kind, crdKindCase));
                 this.generateMainIndex(outputDir, formattedKindNames, skipJsExtensions);
             }
             else {
@@ -216,21 +216,32 @@ class CRDGenerator {
     /**
      * Format CRD kind name for use as folder name
      * @param kind The CRD kind name (e.g., "AppProject")
-     * @param useSnakeCase Whether to convert to snake_case
-     * @returns Formatted name (e.g., "app_project" if useSnakeCase, otherwise "AppProject")
+     * @param format The case format to use
+     * @returns Formatted name (e.g., "app_project" for snake, "app-project" for kebab, "AppProject" for pascal)
      */
-    formatKindName(kind, useSnakeCase) {
-        if (!useSnakeCase) {
+    formatKindName(kind, format) {
+        if (format === 'pascal') {
             return kind;
         }
-        // Convert PascalCase to snake_case
-        // AppProject -> app_project
-        // HTTPServer -> http_server
+        // Convert PascalCase to snake_case or kebab-case
+        // AppProject -> app_project or app-project
+        // HTTPServer -> http_server or http-server
+        const separator = format === 'snake' ? '_' : '-';
         return kind
-            .replace(/([a-z0-9])([A-Z])/g, '$1_$2') // Add underscore between lowercase and uppercase
-            .replace(/([A-Z])([A-Z][a-z])/g, '$1_$2') // Handle consecutive capitals (HTTPServer -> HTTP_Server)
+            .replace(/([a-z0-9])([A-Z])/g, `$1${separator}$2`) // Add separator between lowercase and uppercase
+            .replace(/([A-Z])([A-Z][a-z])/g, `$1${separator}$2`) // Handle consecutive capitals (HTTPServer -> HTTP_Server)
             .toLowerCase();
     }
+    /**
+     * Convert a folder name to a valid JavaScript identifier for exports
+     * @param folderName The folder name (may contain dashes)
+     * @returns Valid JavaScript identifier (dashes replaced with underscores)
+     */
+    toValidIdentifier(folderName) {
+        // Replace dashes with underscores to create valid JavaScript identifiers
+        // app-project -> app_project
+        return folderName.replace(/-/g, '_');
+    }
     /**
      * Generate index file for a CRD (when multiple CRDs in one file)
      * @param crdDir CRD directory
@@ -285,7 +296,7 @@ class CRDGenerator {
     generateMainIndex(outputDir, crdNames, skipJsExtensions = false) {
         const extension = skipJsExtensions ? '' : '.js';
         const exports = crdNames
-            .map(name => `export * as ${name} from './${name}/index${extension}';`)
+            .map(name => `export * as ${this.toValidIdentifier(name)} from './${name}/index${extension}';`)
             .join('\n');
         const indexContent = `// Auto-generated main index\n${exports}\n`;
         const indexPath = path.join(outputDir, 'index.ts');

package/dist/openapi-client-generator.js

@@ -76,6 +76,7 @@ class OpenAPIClientGenerator {
                 modelsOnly: mode === 'models-only',
                 nestJsSwagger,
                 skipJsExtensions,
+                classValidator,
             };
             // Only add templateDir if it's provided
             if (templateDir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klasik",
-  "version": "1.0.35",
+  "version": "1.0.38",
   "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",
@@ -33,7 +33,7 @@
     "class-transformer": "^0.5.1",
     "commander": "^11.0.0",
     "js-yaml": "^4.1.0",
-    "openapi-class-transformer": "^1.0.22",
+    "openapi-class-transformer": "^1.1.0",
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {

package/test-kebab-case/app-project/index.ts

@@ -0,0 +1,2 @@
+// Auto-generated index for CRD
+export * as v1alpha1 from './v1alpha1/index.js';

package/test-kebab-case/app-project/v1alpha1/index.ts

@@ -0,0 +1,2 @@
+// Auto-generated version index
+export * from './models/index.js';

package/test-kebab-case/app-project/v1alpha1/models/app-project-spec-cluster-resource-blacklist-item.ts

@@ -0,0 +1,66 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * AppProject
+ * Generated from CustomResourceDefinition: appprojects.argoproj.io
+ *
+ * The version of the OpenAPI document: v1alpha1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+
+import { Expose, Type } from 'class-transformer';
+/**
+ * ClusterResourceRestrictionItem is a cluster resource that is restricted by the project\'s whitelist or blacklist
+ */
+export class AppProjectSpecClusterResourceBlacklistItem {
+    /**
+     * group
+     */
+    @Expose()
+    'group': string;
+    /**
+     * kind
+     */
+    @Expose()
+    'kind': string;
+    /**
+     * Name is the name of the restricted resource. Glob patterns using Go\'s filepath.Match syntax are supported. Unlike the group and kind fields, if no name is specified, all resources of the specified group/kind are matched.
+     */
+    @Expose()
+    'name'?: string;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string, description?: string, vendorExtensions?: any, modelClass?: any}> = [
+        {
+            "name": "group",
+            "baseName": "group",
+            "type": "string",
+            "format": "",
+            "description": undefined,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "kind",
+            "baseName": "kind",
+            "type": "string",
+            "format": "",
+            "description": undefined,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": "",
+            "description": `Name is the name of the restricted resource. Glob patterns using Go\&#39;s filepath.Match syntax are supported. Unlike the group and kind fields, if no name is specified, all resources of the specified group/kind are matched.`,
+            "vendorExtensions": {}
+        }
+    ];
+}
+

package/test-kebab-case/app-project/v1alpha1/models/app-project-spec-cluster-resource-whitelist-item.ts

@@ -0,0 +1,66 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * AppProject
+ * Generated from CustomResourceDefinition: appprojects.argoproj.io
+ *
+ * The version of the OpenAPI document: v1alpha1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+
+import { Expose, Type } from 'class-transformer';
+/**
+ * ClusterResourceRestrictionItem is a cluster resource that is restricted by the project\'s whitelist or blacklist
+ */
+export class AppProjectSpecClusterResourceWhitelistItem {
+    /**
+     * group
+     */
+    @Expose()
+    'group': string;
+    /**
+     * kind
+     */
+    @Expose()
+    'kind': string;
+    /**
+     * Name is the name of the restricted resource. Glob patterns using Go\'s filepath.Match syntax are supported. Unlike the group and kind fields, if no name is specified, all resources of the specified group/kind are matched.
+     */
+    @Expose()
+    'name'?: string;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string, description?: string, vendorExtensions?: any, modelClass?: any}> = [
+        {
+            "name": "group",
+            "baseName": "group",
+            "type": "string",
+            "format": "",
+            "description": undefined,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "kind",
+            "baseName": "kind",
+            "type": "string",
+            "format": "",
+            "description": undefined,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": "",
+            "description": `Name is the name of the restricted resource. Glob patterns using Go\&#39;s filepath.Match syntax are supported. Unlike the group and kind fields, if no name is specified, all resources of the specified group/kind are matched.`,
+            "vendorExtensions": {}
+        }
+    ];
+}
+

package/test-kebab-case/app-project/v1alpha1/models/app-project-spec-destination-service-accounts-item.ts

@@ -0,0 +1,66 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * AppProject
+ * Generated from CustomResourceDefinition: appprojects.argoproj.io
+ *
+ * The version of the OpenAPI document: v1alpha1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+
+import { Expose, Type } from 'class-transformer';
+/**
+ * ApplicationDestinationServiceAccount holds information about the service account to be impersonated for the application sync operation.
+ */
+export class AppProjectSpecDestinationServiceAccountsItem {
+    /**
+     * DefaultServiceAccount to be used for impersonation during the sync operation
+     */
+    @Expose()
+    'defaultServiceAccount': string;
+    /**
+     * Namespace specifies the target namespace for the application\'s resources.
+     */
+    @Expose()
+    'namespace'?: string;
+    /**
+     * Server specifies the URL of the target cluster\'s Kubernetes control plane API.
+     */
+    @Expose()
+    'server': string;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string, description?: string, vendorExtensions?: any, modelClass?: any}> = [
+        {
+            "name": "defaultServiceAccount",
+            "baseName": "defaultServiceAccount",
+            "type": "string",
+            "format": "",
+            "description": `DefaultServiceAccount to be used for impersonation during the sync operation`,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "namespace",
+            "baseName": "namespace",
+            "type": "string",
+            "format": "",
+            "description": `Namespace specifies the target namespace for the application\&#39;s resources.`,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "server",
+            "baseName": "server",
+            "type": "string",
+            "format": "",
+            "description": `Server specifies the URL of the target cluster\&#39;s Kubernetes control plane API.`,
+            "vendorExtensions": {}
+        }
+    ];
+}
+

package/test-kebab-case/app-project/v1alpha1/models/app-project-spec-destinations-item.ts

@@ -0,0 +1,66 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * AppProject
+ * Generated from CustomResourceDefinition: appprojects.argoproj.io
+ *
+ * The version of the OpenAPI document: v1alpha1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+
+import { Expose, Type } from 'class-transformer';
+/**
+ * ApplicationDestination holds information about the application\'s destination
+ */
+export class AppProjectSpecDestinationsItem {
+    /**
+     * Name is an alternate way of specifying the target cluster by its symbolic name. This must be set if Server is not set.
+     */
+    @Expose()
+    'name'?: string;
+    /**
+     * Namespace specifies the target namespace for the application\'s resources. The namespace will only be set for namespace-scoped resources that have not set a value for .metadata.namespace
+     */
+    @Expose()
+    'namespace'?: string;
+    /**
+     * Server specifies the URL of the target cluster\'s Kubernetes control plane API. This must be set if Name is not set.
+     */
+    @Expose()
+    'server'?: string;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string, description?: string, vendorExtensions?: any, modelClass?: any}> = [
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": "",
+            "description": `Name is an alternate way of specifying the target cluster by its symbolic name. This must be set if Server is not set.`,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "namespace",
+            "baseName": "namespace",
+            "type": "string",
+            "format": "",
+            "description": `Namespace specifies the target namespace for the application\&#39;s resources. The namespace will only be set for namespace-scoped resources that have not set a value for .metadata.namespace`,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "server",
+            "baseName": "server",
+            "type": "string",
+            "format": "",
+            "description": `Server specifies the URL of the target cluster\&#39;s Kubernetes control plane API. This must be set if Name is not set.`,
+            "vendorExtensions": {}
+        }
+    ];
+}
+

package/test-kebab-case/app-project/v1alpha1/models/app-project-spec-namespace-resource-blacklist-item.ts

@@ -0,0 +1,53 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * AppProject
+ * Generated from CustomResourceDefinition: appprojects.argoproj.io
+ *
+ * The version of the OpenAPI document: v1alpha1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+
+import { Expose, Type } from 'class-transformer';
+/**
+ * GroupKind specifies a Group and a Kind, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types
+ */
+export class AppProjectSpecNamespaceResourceBlacklistItem {
+    /**
+     * group
+     */
+    @Expose()
+    'group': string;
+    /**
+     * kind
+     */
+    @Expose()
+    'kind': string;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string, description?: string, vendorExtensions?: any, modelClass?: any}> = [
+        {
+            "name": "group",
+            "baseName": "group",
+            "type": "string",
+            "format": "",
+            "description": undefined,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "kind",
+            "baseName": "kind",
+            "type": "string",
+            "format": "",
+            "description": undefined,
+            "vendorExtensions": {}
+        }
+    ];
+}
+

package/test-kebab-case/app-project/v1alpha1/models/app-project-spec-namespace-resource-whitelist-item.ts

@@ -0,0 +1,53 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * AppProject
+ * Generated from CustomResourceDefinition: appprojects.argoproj.io
+ *
+ * The version of the OpenAPI document: v1alpha1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+
+import { Expose, Type } from 'class-transformer';
+/**
+ * GroupKind specifies a Group and a Kind, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types
+ */
+export class AppProjectSpecNamespaceResourceWhitelistItem {
+    /**
+     * group
+     */
+    @Expose()
+    'group': string;
+    /**
+     * kind
+     */
+    @Expose()
+    'kind': string;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string, description?: string, vendorExtensions?: any, modelClass?: any}> = [
+        {
+            "name": "group",
+            "baseName": "group",
+            "type": "string",
+            "format": "",
+            "description": undefined,
+            "vendorExtensions": {}
+        },
+        {
+            "name": "kind",
+            "baseName": "kind",
+            "type": "string",
+            "format": "",
+            "description": undefined,
+            "vendorExtensions": {}
+        }
+    ];
+}
+