kubernetes-fluent-client 3.10.4 → 3.10.5

package/dist/generate.d.ts

@@ -1,6 +1,15 @@
 import { InputData, TargetLanguage, quicktype } from "quicktype-core";
 import { CustomResourceDefinition } from "./upstream.js";
 import { LogFn } from "./types.js";
+/**
+ * Recursively fixes _enum properties to enum for quicktype compatibility.
+ * The Kubernetes client library converts 'enum' to '_enum' to avoid JS reserved keywords,
+ * but quicktype expects 'enum'.
+ *
+ * @param obj - The schema object to fix
+ * @returns The fixed schema object with enum properties restored
+ */
+export declare function fixEnumProperties(obj: unknown): unknown;
 export type QuicktypeLang = Parameters<typeof quicktype>[0]["lang"];
 export interface GenerateOptions {
     source: string;

package/dist/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,SAAS,EAET,cAAc,EACd,SAAS,EACV,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACpE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,eAAe,GACpB,OAAO,CACR;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CAwCA;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAYvF;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CASnB;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,cAAc,GAChC,IAAI,CAON;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CA0B/F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAMtD;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAC5D;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CA8BA"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,SAAS,EAET,cAAc,EACd,SAAS,EACV,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAqBvD;AACD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACpE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,eAAe,GACpB,OAAO,CACR;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CA0CA;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAYvF;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CASnB;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,cAAc,GAChC,IAAI,CAON;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CA0B/F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAMtD;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAC5D;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CA8BA"}

package/dist/generate.js

@@ -7,6 +7,34 @@ import { FetchingJSONSchemaStore, InputData, JSONSchemaInput, quicktype, } from
 import { fetch } from "./fetch.js";
 import { K8s } from "./fluent/index.js";
 import { CustomResourceDefinition } from "./upstream.js";
+/**
+ * Recursively fixes _enum properties to enum for quicktype compatibility.
+ * The Kubernetes client library converts 'enum' to '_enum' to avoid JS reserved keywords,
+ * but quicktype expects 'enum'.
+ *
+ * @param obj - The schema object to fix
+ * @returns The fixed schema object with enum properties restored
+ */
+export function fixEnumProperties(obj) {
+    if (!obj || typeof obj !== "object") {
+        return obj;
+    }
+    if (Array.isArray(obj)) {
+        return obj.map(fixEnumProperties);
+    }
+    const result = {};
+    for (const [key, value] of Object.entries(obj)) {
+        if (key === "_enum") {
+            // Convert _enum back to enum
+            result.enum = value;
+        }
+        else {
+            // Recursively fix nested objects
+            result[key] = fixEnumProperties(value);
+        }
+    }
+    return result;
+}
 /**
  * Converts a CustomResourceDefinition to TypeScript types
  *
@@ -30,7 +58,9 @@ export async function convertCRDtoTS(crd, opts) {
             opts.logFn(`Skipping ${crd.metadata?.name ?? "unknown"}, it does not appear to have a valid schema`);
             continue;
         }
-        const schema = JSON.stringify(match.schema.openAPIV3Schema);
+        // Fix _enum properties to enum for quicktype compatibility
+        const fixedSchema = fixEnumProperties(match.schema.openAPIV3Schema);
+        const schema = JSON.stringify(fixedSchema);
         opts.logFn(`- Generating ${crd.spec.group}/${match.name} types for ${name}`);
         const inputData = await prepareInputData(name, schema);
         const generatedTypes = await generateTypes(inputData, opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.10.4",
+  "version": "3.10.5",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
@@ -50,9 +50,10 @@
     "prepare": "if [ \"$NODE_ENV\" != 'production' ]; then husky; fi"
   },
   "dependencies": {
-    "@kubernetes/client-node": "1.3.0",
+    "@kubernetes/client-node": "1.4.0",
     "fast-json-patch": "3.1.1",
     "http-status-codes": "2.3.0",
+    "js-yaml": "^4.1.0",
     "node-fetch": "2.7.0",
     "quicktype-core": "23.2.6",
     "type-fest": "^5.0.0",
@@ -60,8 +61,8 @@
     "yargs": "18.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.8.1",
-    "@commitlint/config-conventional": "19.8.1",
+    "@commitlint/cli": "20.1.0",
+    "@commitlint/config-conventional": "20.0.0",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
     "@types/byline": "4.2.36",
@@ -70,17 +71,17 @@
     "@types/urijs": "^1.19.25",
     "@types/ws": "^8.18.1",
     "@types/yargs": "17.0.33",
-    "@typescript-eslint/eslint-plugin": "8.44.1",
-    "@typescript-eslint/parser": "8.44.1",
+    "@typescript-eslint/eslint-plugin": "8.45.0",
+    "@typescript-eslint/parser": "8.45.0",
     "@vitest/coverage-v8": "^3.2.1",
     "command-line-args": "^6.0.1",
-    "eslint-plugin-jsdoc": "60.2.0",
+    "eslint-plugin-jsdoc": "60.8.2",
     "globals": "^16.0.0",
     "husky": "^9.1.6",
     "lint-staged": "^16.0.0",
     "prettier": "3.6.2",
     "semantic-release": "24.2.9",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "vitest": "^3.2.1"
   },
   "overrides": {

package/src/generate.ts

@@ -16,6 +16,37 @@ import { fetch } from "./fetch.js";
 import { K8s } from "./fluent/index.js";
 import { CustomResourceDefinition } from "./upstream.js";
 import { LogFn } from "./types.js";
+
+/**
+ * Recursively fixes _enum properties to enum for quicktype compatibility.
+ * The Kubernetes client library converts 'enum' to '_enum' to avoid JS reserved keywords,
+ * but quicktype expects 'enum'.
+ *
+ * @param obj - The schema object to fix
+ * @returns The fixed schema object with enum properties restored
+ */
+export function fixEnumProperties(obj: unknown): unknown {
+  if (!obj || typeof obj !== "object") {
+    return obj;
+  }
+
+  if (Array.isArray(obj)) {
+    return obj.map(fixEnumProperties);
+  }
+
+  const result: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(obj as Record<string, unknown>)) {
+    if (key === "_enum") {
+      // Convert _enum back to enum
+      result.enum = value;
+    } else {
+      // Recursively fix nested objects
+      result[key] = fixEnumProperties(value);
+    }
+  }
+
+  return result;
+}
 export type QuicktypeLang = Parameters<typeof quicktype>[0]["lang"];
 export interface GenerateOptions {
   source: string; // URL, file path, or K8s CRD name
@@ -71,7 +102,9 @@ export async function convertCRDtoTS(
       continue;
     }
 
-    const schema = JSON.stringify(match.schema.openAPIV3Schema);
+    // Fix _enum properties to enum for quicktype compatibility
+    const fixedSchema = fixEnumProperties(match.schema.openAPIV3Schema);
+    const schema = JSON.stringify(fixedSchema);
     opts.logFn(`- Generating ${crd.spec.group}/${match.name} types for ${name}`);
 
     const inputData = await prepareInputData(name, schema);