kubernetes-fluent-client 3.10.8 → 3.10.9-nightly.0

package/dist/postProcessing.d.ts

@@ -121,5 +121,17 @@ export declare function processClassContext(line: string, insideClass: boolean,
  * @param logFn The logging function.
  */
 export declare function logError(error: Error, filePath: string, logFn: (msg: string) => void): void;
+/**
+ * Extends the generated Metadata interface with V1ObjectMeta when the CRD
+ * schema for this version defines a metadata property.
+ *
+ * This ensures that generated types keep the full Kubernetes ObjectMeta
+ * contract while still including CRD-specific constraints like name enums.
+ *
+ * @param lines
+ * @param crd
+ * @param version
+ */
+export declare function extendMetadataWithV1ObjectMeta(lines: string[], crd: CustomResourceDefinition, version: string): string[];
 export {};
 //# sourceMappingURL=postProcessing.d.ts.map

package/dist/postProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postProcessing.d.ts","sourceRoot":"","sources":["../src/postProcessing.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAMzD,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAIvF;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,eAAe,iBAalF;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAahF;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACxC,IAAI,EAAE,eAAe,iBAoBtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EACrB,IAAI,EAAE,eAAe,QA2BtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,eAAe,GACpB,MAAM,CAoBR;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,EAAE,CAWnD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAalE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAE7E;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,eAAe,GACpB,MAAM,EAAE,CAmBV;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,MAAM,EAAE,EACf,qBAAqB,EAAE,MAAM,EAAE,EAC/B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,MAAM,EAAE,CAiBV;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,MAAM,EACpB,qBAAqB,EAAE,MAAM,EAAE,EAC/B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,kBAAkB,CAgBpB;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,QAGpF"}
+{"version":3,"file":"postProcessing.d.ts","sourceRoot":"","sources":["../src/postProcessing.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAMzD,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAIvF;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,eAAe,iBAalF;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAahF;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACxC,IAAI,EAAE,eAAe,iBAoBtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EACrB,IAAI,EAAE,eAAe,QA2BtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,eAAe,GACpB,MAAM,CAwBR;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,EAAE,CAWnD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAalE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAE7E;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,eAAe,GACpB,MAAM,EAAE,CAmBV;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,MAAM,EAAE,EACf,qBAAqB,EAAE,MAAM,EAAE,EAC/B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,MAAM,EAAE,CAiBV;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,MAAM,EACpB,qBAAqB,EAAE,MAAM,EAAE,EAC/B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,kBAAkB,CAgBpB;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,QAGpF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,GACd,MAAM,EAAE,CAwEV"}

package/dist/postProcessing.js

@@ -121,7 +121,10 @@ export function applyCRDPostProcessing(content, name, crd, version, opts) {
         }
         const foundInterfaces = collectInterfaceNames(lines);
         // Process the lines, focusing on classes extending `GenericKind`
-        const processedLines = processLines(lines, genericKindProperties, foundInterfaces);
+        let processedLines = processLines(lines, genericKindProperties, foundInterfaces);
+        if (opts.language === "ts") {
+            processedLines = extendMetadataWithV1ObjectMeta(processedLines, crd, version);
+        }
         // Normalize the final output
         const normalizedLines = normalizeIndentationAndSpacing(processedLines, opts);
         return normalizedLines.join("\n");
@@ -254,3 +257,68 @@ export function logError(error, filePath, logFn) {
     logFn(`❌ Error processing file: ${filePath} - ${error.message}`);
     logFn(`Stack trace: ${error.stack}`);
 }
+/**
+ * Extends the generated Metadata interface with V1ObjectMeta when the CRD
+ * schema for this version defines a metadata property.
+ *
+ * This ensures that generated types keep the full Kubernetes ObjectMeta
+ * contract while still including CRD-specific constraints like name enums.
+ *
+ * @param lines
+ * @param crd
+ * @param version
+ */
+export function extendMetadataWithV1ObjectMeta(lines, crd, version) {
+    // Find the matching version in the CRD
+    const versionSchema = crd.spec?.versions?.find(v => v.name === version);
+    const openAPIV3Schema = versionSchema?.schema?.openAPIV3Schema;
+    // Only proceed if this version actually defines a metadata schema
+    const metadataSchema = openAPIV3Schema?.properties?.metadata;
+    if (!metadataSchema) {
+        return lines;
+    }
+    // Check if there's a Metadata interface at all
+    const metadataInterfaceRegex = /export interface Metadata\s*{/;
+    const hasMetadataInterface = lines.some(line => metadataInterfaceRegex.test(line));
+    if (!hasMetadataInterface) {
+        return lines;
+    }
+    // Avoid double-extending if we've already patched this file
+    const alreadyExtends = lines.some(line => /export interface Metadata\s+extends\s+V1ObjectMeta\s*{/.test(line));
+    let updatedLines = lines;
+    if (!alreadyExtends) {
+        updatedLines = updatedLines.map(line => line.replace(metadataInterfaceRegex, "export interface Metadata extends V1ObjectMeta {"));
+    }
+    // Ensure we import V1ObjectMeta from @kubernetes/client-node
+    const hasV1ObjectMetaImport = updatedLines.some(line => line.includes("V1ObjectMeta") &&
+        line.includes("@kubernetes/client-node") &&
+        line.includes("import"));
+    if (!hasV1ObjectMetaImport) {
+        const importStatement = 'import type { V1ObjectMeta } from "@kubernetes/client-node";';
+        // Insert after existing imports, if any; otherwise right after any auto-gen notice
+        let insertIndex = 0;
+        // Prefer to insert after the last import line at the top of the file
+        const firstImportIdx = updatedLines.findIndex(line => line.startsWith("import "));
+        if (firstImportIdx !== -1) {
+            let lastImportIdx = firstImportIdx;
+            for (let i = firstImportIdx + 1; i < updatedLines.length; i++) {
+                if (updatedLines[i].startsWith("import ")) {
+                    lastImportIdx = i;
+                }
+                else {
+                    break;
+                }
+            }
+            insertIndex = lastImportIdx + 1;
+        }
+        else {
+            // Otherwise, place after auto-gen notice if present
+            const autoGenIdx = updatedLines.findIndex(line => line.includes("auto-generated") || line.includes("auto generated"));
+            if (autoGenIdx !== -1) {
+                insertIndex = autoGenIdx + 1;
+            }
+        }
+        updatedLines.splice(insertIndex, 0, importStatement);
+    }
+    return updatedLines;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.10.8",
+  "version": "3.10.9-nightly.0",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
@@ -72,15 +72,15 @@
     "@types/urijs": "^1.19.25",
     "@types/ws": "^8.18.1",
     "@types/yargs": "17.0.35",
-    "@typescript-eslint/eslint-plugin": "8.47.0",
-    "@typescript-eslint/parser": "8.47.0",
+    "@typescript-eslint/eslint-plugin": "8.48.0",
+    "@typescript-eslint/parser": "8.48.0",
     "@vitest/coverage-v8": "^4.0.1",
     "command-line-args": "^6.0.1",
-    "eslint-plugin-jsdoc": "61.4.0",
+    "eslint-plugin-jsdoc": "61.4.1",
     "globals": "^16.0.0",
     "husky": "^9.1.6",
     "lint-staged": "^16.0.0",
-    "prettier": "3.6.2",
+    "prettier": "3.7.3",
     "semantic-release": "25.0.2",
     "typescript": "5.9.3",
     "vitest": "^4.0.1"

package/src/postProcessing.ts

@@ -164,7 +164,11 @@ export function applyCRDPostProcessing(
     const foundInterfaces = collectInterfaceNames(lines);
 
     // Process the lines, focusing on classes extending `GenericKind`
-    const processedLines = processLines(lines, genericKindProperties, foundInterfaces);
+    let processedLines = processLines(lines, genericKindProperties, foundInterfaces);
+
+    if (opts.language === "ts") {
+      processedLines = extendMetadataWithV1ObjectMeta(processedLines, crd, version);
+    }
 
     // Normalize the final output
     const normalizedLines = normalizeIndentationAndSpacing(processedLines, opts);
@@ -348,3 +352,92 @@ export function logError(error: Error, filePath: string, logFn: (msg: string) =>
   logFn(`❌ Error processing file: ${filePath} - ${error.message}`);
   logFn(`Stack trace: ${error.stack}`);
 }
+
+/**
+ * Extends the generated Metadata interface with V1ObjectMeta when the CRD
+ * schema for this version defines a metadata property.
+ *
+ * This ensures that generated types keep the full Kubernetes ObjectMeta
+ * contract while still including CRD-specific constraints like name enums.
+ *
+ * @param lines
+ * @param crd
+ * @param version
+ */
+export function extendMetadataWithV1ObjectMeta(
+  lines: string[],
+  crd: CustomResourceDefinition,
+  version: string,
+): string[] {
+  // Find the matching version in the CRD
+  const versionSchema = crd.spec?.versions?.find(v => v.name === version);
+  const openAPIV3Schema = versionSchema?.schema?.openAPIV3Schema as
+    | { properties?: Record<string, unknown> }
+    | undefined;
+
+  // Only proceed if this version actually defines a metadata schema
+  const metadataSchema = openAPIV3Schema?.properties?.metadata;
+  if (!metadataSchema) {
+    return lines;
+  }
+
+  // Check if there's a Metadata interface at all
+  const metadataInterfaceRegex = /export interface Metadata\s*{/;
+  const hasMetadataInterface = lines.some(line => metadataInterfaceRegex.test(line));
+  if (!hasMetadataInterface) {
+    return lines;
+  }
+
+  // Avoid double-extending if we've already patched this file
+  const alreadyExtends = lines.some(line =>
+    /export interface Metadata\s+extends\s+V1ObjectMeta\s*{/.test(line),
+  );
+  let updatedLines = lines;
+
+  if (!alreadyExtends) {
+    updatedLines = updatedLines.map(line =>
+      line.replace(metadataInterfaceRegex, "export interface Metadata extends V1ObjectMeta {"),
+    );
+  }
+
+  // Ensure we import V1ObjectMeta from @kubernetes/client-node
+  const hasV1ObjectMetaImport = updatedLines.some(
+    line =>
+      line.includes("V1ObjectMeta") &&
+      line.includes("@kubernetes/client-node") &&
+      line.includes("import"),
+  );
+
+  if (!hasV1ObjectMetaImport) {
+    const importStatement = 'import type { V1ObjectMeta } from "@kubernetes/client-node";';
+
+    // Insert after existing imports, if any; otherwise right after any auto-gen notice
+    let insertIndex = 0;
+
+    // Prefer to insert after the last import line at the top of the file
+    const firstImportIdx = updatedLines.findIndex(line => line.startsWith("import "));
+    if (firstImportIdx !== -1) {
+      let lastImportIdx = firstImportIdx;
+      for (let i = firstImportIdx + 1; i < updatedLines.length; i++) {
+        if (updatedLines[i].startsWith("import ")) {
+          lastImportIdx = i;
+        } else {
+          break;
+        }
+      }
+      insertIndex = lastImportIdx + 1;
+    } else {
+      // Otherwise, place after auto-gen notice if present
+      const autoGenIdx = updatedLines.findIndex(
+        line => line.includes("auto-generated") || line.includes("auto generated"),
+      );
+      if (autoGenIdx !== -1) {
+        insertIndex = autoGenIdx + 1;
+      }
+    }
+
+    updatedLines.splice(insertIndex, 0, importStatement);
+  }
+
+  return updatedLines;
+}