kubernetes-fluent-client 3.5.6 → 3.6.1

package/dist/postProcessing.js

@@ -1,89 +1,25 @@
-"use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-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.postProcessing = postProcessing;
-exports.mapFilesToCRD = mapFilesToCRD;
-exports.processFiles = processFiles;
-exports.processAndModifySingleFile = processAndModifySingleFile;
-exports.applyCRDPostProcessing = applyCRDPostProcessing;
-exports.readFile = readFile;
-exports.writeFile = writeFile;
-exports.getGenericKindProperties = getGenericKindProperties;
-exports.collectInterfaceNames = collectInterfaceNames;
-exports.isClassExtendingGenericKind = isClassExtendingGenericKind;
-exports.updateBraceBalance = updateBraceBalance;
-exports.getPropertyPattern = getPropertyPattern;
-exports.modifyPropertiesAndAddEslintDirective = modifyPropertiesAndAddEslintDirective;
-exports.addDeclareAndOptionalModifiersToProperties = addDeclareAndOptionalModifiersToProperties;
-exports.addDeclareToGenericKindProperties = addDeclareToGenericKindProperties;
-exports.makePropertiesOptional = makePropertiesOptional;
-exports.processEslintDisable = processEslintDisable;
-exports.wrapWithFluentClient = wrapWithFluentClient;
-exports.normalizeIndentation = normalizeIndentation;
-exports.normalizeLineIndentation = normalizeLineIndentation;
-exports.normalizePropertySpacing = normalizePropertySpacing;
-exports.removePropertyStringAny = removePropertyStringAny;
-exports.shouldWrapWithFluentClient = shouldWrapWithFluentClient;
-exports.processLines = processLines;
-exports.processClassContext = processClassContext;
-exports.modifyAndNormalizeClassProperties = modifyAndNormalizeClassProperties;
-exports.normalizeIndentationAndSpacing = normalizeIndentationAndSpacing;
-exports.logError = logError;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const types_1 = require("./types");
-const fileSystem_1 = require("./fileSystem");
+import * as fs from "fs";
+import * as path from "path";
+import { GenericKind } from "./types.js";
+import { modifyAndNormalizeClassProperties, normalizeIndentationAndSpacing, } from "./normalization.js";
 const genericKindProperties = getGenericKindProperties();
 /**
  * Performs post-processing on generated TypeScript files.
  *
  * @param allResults The array of CRD results.
  * @param opts The options for post-processing.
- * @param fileSystem The file system interface for reading and writing files.
  */
-async function postProcessing(allResults, opts, fileSystem = new fileSystem_1.NodeFileSystem()) {
+export async function postProcessing(allResults, opts) {
     if (!opts.directory) {
         opts.logFn("⚠️ Error: Directory is not defined.");
         return;
     }
-    const files = fileSystem.readdirSync(opts.directory);
+    const files = fs.readdirSync(opts.directory);
     opts.logFn("\n🔧 Post-processing started...");
     const fileResultMap = mapFilesToCRD(allResults);
-    await processFiles(files, fileResultMap, opts, fileSystem);
+    await processFiles(files, fileResultMap, opts);
     opts.logFn("🔧 Post-processing completed.\n");
 }
 /**
@@ -92,7 +28,7 @@ async function postProcessing(allResults, opts, fileSystem = new fileSystem_1.No
  * @param allResults - The array of CRD results.
  * @returns A map linking file names to their corresponding CRD results.
  */
-function mapFilesToCRD(allResults) {
+export function mapFilesToCRD(allResults) {
     const fileResultMap = {};
     for (const { name, crd, version } of allResults) {
         const expectedFileName = `${name.toLowerCase()}-${version.toLowerCase()}.ts`;
@@ -109,9 +45,8 @@ function mapFilesToCRD(allResults) {
  * @param files - The list of file names to process.
  * @param fileResultMap - A map linking file names to their corresponding CRD results.
  * @param opts - Options for the generation process.
- * @param fileSystem - The file system interface for reading and writing files.
  */
-async function processFiles(files, fileResultMap, opts, fileSystem) {
+export async function processFiles(files, fileResultMap, opts) {
     for (const file of files) {
         if (!opts.directory) {
             throw new Error("Directory is not defined.");
@@ -123,7 +58,7 @@ async function processFiles(files, fileResultMap, opts, fileSystem) {
             continue;
         }
         try {
-            processAndModifySingleFile(filePath, fileResult, opts, fileSystem);
+            processAndModifySingleFile(filePath, fileResult, opts);
         }
         catch (error) {
             logError(error, filePath, opts.logFn);
@@ -139,14 +74,13 @@ async function processFiles(files, fileResultMap, opts, fileSystem) {
  * @param fileResult.crd - The CustomResourceDefinition object.
  * @param fileResult.version - The version of the CRD.
  * @param opts - Options for the generation process.
- * @param fileSystem - The file system interface for reading and writing files.
  */
-function processAndModifySingleFile(filePath, fileResult, opts, fileSystem) {
+export function processAndModifySingleFile(filePath, fileResult, opts) {
     opts.logFn(`🔍 Processing file: ${filePath}`);
     const { name, crd, version } = fileResult;
     let fileContent;
     try {
-        fileContent = fileSystem.readFile(filePath);
+        fileContent = fs.readFileSync(filePath, "utf8");
     }
     catch (error) {
         logError(error, filePath, opts.logFn);
@@ -161,7 +95,7 @@ function processAndModifySingleFile(filePath, fileResult, opts, fileSystem) {
         return;
     }
     try {
-        fileSystem.writeFile(filePath, modifiedContent);
+        fs.writeFileSync(filePath, modifiedContent);
         opts.logFn(`✅ Successfully processed and wrote file: ${filePath}`);
     }
     catch (error) {
@@ -178,11 +112,11 @@ function processAndModifySingleFile(filePath, fileResult, opts, fileSystem) {
  * @param opts The options for processing.
  * @returns The processed TypeScript file content.
  */
-function applyCRDPostProcessing(content, name, crd, version, opts) {
+export function applyCRDPostProcessing(content, name, crd, version, opts) {
     try {
         let lines = content.split("\n");
         // Wraps with the fluent client if needed
-        if (shouldWrapWithFluentClient(opts)) {
+        if (opts.language === "ts" && !opts.plain) {
             lines = wrapWithFluentClient(lines, name, crd, version, opts.npmPackage);
         }
         const foundInterfaces = collectInterfaceNames(lines);
@@ -196,42 +130,18 @@ function applyCRDPostProcessing(content, name, crd, version, opts) {
         throw new Error(`Error while applying post-processing for ${name}: ${error.message}`);
     }
 }
-/**
- * Reads the content of a file from disk.
- *
- * @param filePath The path to the file.
- * @returns The file contents as a string.
- */
-function readFile(filePath) {
-    try {
-        return fs.readFileSync(filePath, "utf8");
-    }
-    catch (error) {
-        throw new Error(`Failed to read file at ${filePath}: ${error.message}`);
-    }
-}
-/**
- * Writes the modified content back to the file.
- *
- * @param filePath The path to the file.
- * @param content The modified content to write.
- */
-function writeFile(filePath, content) {
-    try {
-        fs.writeFileSync(filePath, content, "utf8");
-    }
-    catch (error) {
-        throw new Error(`Failed to write file at ${filePath}: ${error.message}`);
-    }
-}
 /**
  * Retrieves the properties of the `GenericKind` class, excluding dynamic properties like `[key: string]: any`.
  *
  * @returns An array of property names that belong to `GenericKind`.
  */
-function getGenericKindProperties() {
-    const properties = Object.getOwnPropertyNames(new types_1.GenericKind());
-    return properties.filter(prop => prop !== "[key: string]");
+export function getGenericKindProperties() {
+    // Ensure we always include standard Kubernetes resource properties
+    const standardProperties = ["kind", "apiVersion", "metadata"];
+    // Get actual properties from GenericKind
+    const instanceProperties = Object.getOwnPropertyNames(new GenericKind()).filter(prop => prop !== "[key: string]");
+    // Combine both sets of properties, removing duplicates
+    return Array.from(new Set([...standardProperties, ...instanceProperties]));
 }
 /**
  * Collects interface names from TypeScript file lines.
@@ -239,7 +149,7 @@ function getGenericKindProperties() {
  * @param lines The lines of the file content.
  * @returns A set of found interface names.
  */
-function collectInterfaceNames(lines) {
+export function collectInterfaceNames(lines) {
     // https://regex101.com/r/S6w8pW/1
     const interfacePattern = /export interface (?<interfaceName>\w+)/;
     const foundInterfaces = new Set();
@@ -257,7 +167,7 @@ function collectInterfaceNames(lines) {
  * @param line The current line of code.
  * @returns True if the line defines a class that extends `GenericKind`, false otherwise.
  */
-function isClassExtendingGenericKind(line) {
+export function isClassExtendingGenericKind(line) {
     return line.includes("class") && line.includes("extends GenericKind");
 }
 /**
@@ -267,95 +177,9 @@ function isClassExtendingGenericKind(line) {
  * @param braceBalance The current balance of curly braces.
  * @returns The updated brace balance.
  */
-function updateBraceBalance(line, braceBalance) {
+export function updateBraceBalance(line, braceBalance) {
     return braceBalance + (line.includes("{") ? 1 : 0) - (line.includes("}") ? 1 : 0);
 }
-/**
- * Generates a regular expression to match a property pattern in TypeScript.
- *
- * @param prop The property name to match.
- * @returns A regular expression to match the property pattern.
- */
-function getPropertyPattern(prop) {
-    // For prop="kind", the pattern will match "kind ? :" or "kind :"
-    // https://regex101.com/r/mF8kXn/1
-    return new RegExp(`\\b${prop}\\b\\s*\\?\\s*:|\\b${prop}\\b\\s*:`);
-}
-/**
- * Applies ESLint and property modifiers to a line of code.
- *
- * @param line - The current line of code.
- * @param genericKindProperties - The list of properties from `GenericKind`.
- * @param foundInterfaces - The set of found interfaces in the file.
- * @returns The modified line.
- */
-function modifyPropertiesAndAddEslintDirective(line, genericKindProperties, foundInterfaces) {
-    line = addDeclareAndOptionalModifiersToProperties(line, genericKindProperties, foundInterfaces);
-    line = processEslintDisable(line, genericKindProperties);
-    return line;
-}
-/**
- * Applies property modifiers to a line of code.
- *
- * @param line The current line of code.
- * @param genericKindProperties The list of properties from `GenericKind`.
- * @param foundInterfaces The set of found interfaces in the file.
- * @returns The modified line.
- */
-function addDeclareAndOptionalModifiersToProperties(line, genericKindProperties, foundInterfaces) {
-    line = addDeclareToGenericKindProperties(line, genericKindProperties);
-    line = makePropertiesOptional(line, foundInterfaces);
-    line = normalizeLineIndentation(line);
-    return line;
-}
-/**
- * Adds the `declare` keyword to `GenericKind` properties.
- *
- * @param line The current line of code.
- * @param genericKindProperties The list of properties from `GenericKind`.
- * @returns The modified line with the `declare` keyword, if applicable.
- */
-function addDeclareToGenericKindProperties(line, genericKindProperties) {
-    for (const prop of genericKindProperties) {
-        const propertyPattern = getPropertyPattern(prop);
-        if (propertyPattern.test(line)) {
-            return line.replace(prop, `declare ${prop}`);
-        }
-    }
-    return line;
-}
-/**
- * Makes a property optional if its type matches one of the found interfaces and it is not already optional.
- *
- * @param line The current line of code.
- * @param foundInterfaces The set of found interfaces in the file.
- * @returns The modified line with the optional `?` symbol.
- */
-function makePropertiesOptional(line, foundInterfaces) {
-    // https://regex101.com/r/kX8TCj/1
-    const propertyTypePattern = /:\s*(?<propertyType>\w+)\s*;/;
-    const match = line.match(propertyTypePattern);
-    if (match?.groups?.propertyType) {
-        const { propertyType } = match.groups;
-        if (foundInterfaces.has(propertyType) && !line.includes("?")) {
-            return line.replace(":", "?:");
-        }
-    }
-    return line;
-}
-/**
- * Adds an ESLint disable comment for `[key: string]: any` if it's not part of `GenericKind`.
- *
- * @param line The current line of code.
- * @param genericKindProperties The list of properties from `GenericKind`.
- * @returns The modified line with the ESLint disable comment.
- */
-function processEslintDisable(line, genericKindProperties) {
-    if (line.includes("[key: string]: any") && !genericKindProperties.includes("[key: string]")) {
-        return `  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n${line}`;
-    }
-    return line;
-}
 /**
  * Wraps the generated TypeScript file with fluent client elements (`GenericKind` and `RegisterKind`).
  *
@@ -366,7 +190,7 @@ function processEslintDisable(line, genericKindProperties) {
  * @param npmPackage The NPM package name for the fluent client.
  * @returns The processed TypeScript lines.
  */
-function wrapWithFluentClient(lines, name, crd, version, npmPackage = "kubernetes-fluent-client") {
+export function wrapWithFluentClient(lines, name, crd, version, npmPackage = "kubernetes-fluent-client") {
     const autoGenNotice = `// This file is auto-generated by ${npmPackage}, do not edit manually`;
     const imports = `import { GenericKind, RegisterKind } from "${npmPackage}";`;
     const classIndex = lines.findIndex(line => line.includes(`export interface ${name} {`));
@@ -377,56 +201,6 @@ function wrapWithFluentClient(lines, name, crd, version, npmPackage = "kubernete
     lines.push(`RegisterKind(${name}, {`, `  group: "${crd.spec.group}",`, `  version: "${version}",`, `  kind: "${name}",`, `  plural: "${crd.spec.names.plural}",`, `});`);
     return lines;
 }
-/**
- * Normalizes indentation for TypeScript lines to a consistent format.
- *
- * @param lines The generated TypeScript lines.
- * @returns The lines with normalized indentation.
- */
-function normalizeIndentation(lines) {
-    return lines.map(line => line.replace(/^ {4}/, "  "));
-}
-/**
- * Normalizes the indentation of a single line to use two spaces instead of four.
- *
- * @param line The line of code to normalize.
- * @returns The line with normalized indentation.
- */
-function normalizeLineIndentation(line) {
-    return line.replace(/^ {4}/, "  ");
-}
-/**
- * Normalizes spacing between property names and types in TypeScript lines.
- *
- * @param lines The generated TypeScript lines.
- * @returns The lines with normalized property spacing.
- */
-function normalizePropertySpacing(lines) {
-    // https://regex101.com/r/XEv3pL/1
-    return lines.map(line => line.replace(/\s*\?\s*:\s*/, "?: "));
-}
-/**
- * Removes lines containing `[property: string]: any;` from TypeScript files.
- *
- * @param lines The generated TypeScript lines.
- * @param opts The options for processing.
- * @returns The lines with `[property: string]: any;` removed.
- */
-function removePropertyStringAny(lines, opts) {
-    if (opts.language === "ts" || opts.language === "typescript") {
-        return lines.filter(line => !line.includes("[property: string]: any;"));
-    }
-    return lines;
-}
-/**
- * Determines if the content should be wrapped with the fluent client.
- *
- * @param opts The options for generating the content.
- * @returns True if the content should be wrapped with the fluent client, false otherwise.
- */
-function shouldWrapWithFluentClient(opts) {
-    return opts.language === "ts" && !opts.plain;
-}
 /**
  * Processes the lines of the TypeScript file, focusing on classes extending `GenericKind`.
  *
@@ -435,7 +209,7 @@ function shouldWrapWithFluentClient(opts) {
  * @param foundInterfaces The set of found interfaces in the file.
  * @returns The processed lines.
  */
-function processLines(lines, genericKindProperties, foundInterfaces) {
+export function processLines(lines, genericKindProperties, foundInterfaces) {
     let insideClass = false;
     let braceBalance = 0;
     return lines.map(line => {
@@ -455,7 +229,7 @@ function processLines(lines, genericKindProperties, foundInterfaces) {
  * @param foundInterfaces The set of found interfaces in the file.
  * @returns An object containing the updated line, updated insideClass flag, and braceBalance.
  */
-function processClassContext(line, insideClass, braceBalance, genericKindProperties, foundInterfaces) {
+export function processClassContext(line, insideClass, braceBalance, genericKindProperties, foundInterfaces) {
     if (isClassExtendingGenericKind(line)) {
         insideClass = true;
         braceBalance = 0;
@@ -469,31 +243,6 @@ function processClassContext(line, insideClass, braceBalance, genericKindPropert
     }
     return { line, insideClass, braceBalance };
 }
-/**
- * Processes a single line inside a class extending `GenericKind`.
- *
- * @param line The current line of code.
- * @param genericKindProperties The list of properties from `GenericKind`.
- * @param foundInterfaces The set of found interfaces in the file.
- * @returns The modified line.
- */
-function modifyAndNormalizeClassProperties(line, genericKindProperties, foundInterfaces) {
-    line = modifyPropertiesAndAddEslintDirective(line, genericKindProperties, foundInterfaces);
-    line = normalizeLineIndentation(line);
-    return line;
-}
-/**
- * Normalizes lines after processing, including indentation, spacing, and removing unnecessary lines.
- *
- * @param lines The lines of the file content.
- * @param opts The options for processing.
- * @returns The normalized lines.
- */
-function normalizeIndentationAndSpacing(lines, opts) {
-    let normalizedLines = normalizeIndentation(lines);
-    normalizedLines = normalizePropertySpacing(normalizedLines);
-    return removePropertyStringAny(normalizedLines, opts);
-}
 /**
  * Handles logging for errors with stack trace.
  *
@@ -501,7 +250,7 @@ function normalizeIndentationAndSpacing(lines, opts) {
  * @param filePath The path of the file being processed.
  * @param logFn The logging function.
  */
-function logError(error, filePath, logFn) {
+export function logError(error, filePath, logFn) {
     logFn(`❌ Error processing file: ${filePath} - ${error.message}`);
     logFn(`Stack trace: ${error.stack}`);
 }

package/dist/types.d.ts

@@ -1,5 +1,6 @@
-import { KubernetesObject, V1ObjectMeta } from "@kubernetes/client-node";
-export { KubernetesObject, KubernetesListObject } from "@kubernetes/client-node";
+import { V1ObjectMeta } from "@kubernetes/client-node";
+import type { KubernetesListObject, KubernetesObject } from "@kubernetes/client-node";
+export type { KubernetesListObject, KubernetesObject };
 export type GenericClass = abstract new () => any;
 /**
  * GenericKind is a generic Kubernetes object that can be used to represent any Kubernetes object

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAGjF,MAAM,MAAM,YAAY,GAAG,QAAQ,WAAW,GAAG,CAAC;AAElD;;;;GAIG;AACH,qBAAa,WAAY,YAAW,gBAAgB;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,yCAAyC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,6EAA6E;IAC7E,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,KAAK;IAEpB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACjE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACrD,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;CACvC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACtF,YAAY,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG,QAAQ,WAAW,GAAG,CAAC;AAElD;;;;GAIG;AACH,qBAAa,WAAY,YAAW,gBAAgB;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,yCAAyC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,6EAA6E;IAC7E,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,KAAK;IAEpB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACjE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACrD,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;CACvC"}

package/dist/types.js

@@ -1,16 +1,12 @@
-"use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenericKind = void 0;
 /**
  * GenericKind is a generic Kubernetes object that can be used to represent any Kubernetes object
  * that is not explicitly supported. This can be used on its own or as a base class for
  * other types.
  */
-class GenericKind {
+export class GenericKind {
     apiVersion;
     kind;
     metadata;
 }
-exports.GenericKind = GenericKind;

package/dist/upstream.d.ts

@@ -1,4 +1,4 @@
 /** a is a collection of K8s types to be used within an action: `When(a.Configmap)` */
 export { CoreV1Event as CoreEvent, EventsV1Event as Event, V1APIService as APIService, V1CSIDriver as CSIDriver, V1CertificateSigningRequest as CertificateSigningRequest, V1ClusterRole as ClusterRole, V1ClusterRoleBinding as ClusterRoleBinding, V1ConfigMap as ConfigMap, V1ControllerRevision as ControllerRevision, V1CronJob as CronJob, V1CustomResourceDefinition as CustomResourceDefinition, V1DaemonSet as DaemonSet, V1Deployment as Deployment, V1EndpointSlice as EndpointSlice, V1Endpoints as Endpoints, V1HorizontalPodAutoscaler as HorizontalPodAutoscaler, V1Ingress as Ingress, V1IngressClass as IngressClass, V1Job as Job, V1LimitRange as LimitRange, V1LocalSubjectAccessReview as LocalSubjectAccessReview, V1MutatingWebhookConfiguration as MutatingWebhookConfiguration, V1Namespace as Namespace, V1NetworkPolicy as NetworkPolicy, V1Node as Node, V1PersistentVolume as PersistentVolume, V1PersistentVolumeClaim as PersistentVolumeClaim, V1Pod as Pod, V1PodDisruptionBudget as PodDisruptionBudget, V1PodTemplate as PodTemplate, V1ReplicaSet as ReplicaSet, V1ReplicationController as ReplicationController, V1ResourceQuota as ResourceQuota, V1Role as Role, V1RoleBinding as RoleBinding, V1RuntimeClass as RuntimeClass, V1Secret as Secret, V1SelfSubjectAccessReview as SelfSubjectAccessReview, V1SelfSubjectRulesReview as SelfSubjectRulesReview, V1Service as Service, V1ServiceAccount as ServiceAccount, V1StatefulSet as StatefulSet, V1StorageClass as StorageClass, V1SubjectAccessReview as SubjectAccessReview, V1TokenReview as TokenReview, V1ValidatingWebhookConfiguration as ValidatingWebhookConfiguration, V1VolumeAttachment as VolumeAttachment, } from "@kubernetes/client-node";
-export { GenericKind } from "./types";
+export { GenericKind } from "./types.js";
 //# sourceMappingURL=upstream.d.ts.map

package/dist/upstream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upstream.d.ts","sourceRoot":"","sources":["../src/upstream.ts"],"names":[],"mappings":"AAGA,sFAAsF;AACtF,OAAO,EACL,WAAW,IAAI,SAAS,EACxB,aAAa,IAAI,KAAK,EACtB,YAAY,IAAI,UAAU,EAC1B,WAAW,IAAI,SAAS,EACxB,2BAA2B,IAAI,yBAAyB,EACxD,aAAa,IAAI,WAAW,EAC5B,oBAAoB,IAAI,kBAAkB,EAC1C,WAAW,IAAI,SAAS,EACxB,oBAAoB,IAAI,kBAAkB,EAC1C,SAAS,IAAI,OAAO,EACpB,0BAA0B,IAAI,wBAAwB,EACtD,WAAW,IAAI,SAAS,EACxB,YAAY,IAAI,UAAU,EAC1B,eAAe,IAAI,aAAa,EAChC,WAAW,IAAI,SAAS,EACxB,yBAAyB,IAAI,uBAAuB,EACpD,SAAS,IAAI,OAAO,EACpB,cAAc,IAAI,YAAY,EAC9B,KAAK,IAAI,GAAG,EACZ,YAAY,IAAI,UAAU,EAC1B,0BAA0B,IAAI,wBAAwB,EACtD,8BAA8B,IAAI,4BAA4B,EAC9D,WAAW,IAAI,SAAS,EACxB,eAAe,IAAI,aAAa,EAChC,MAAM,IAAI,IAAI,EACd,kBAAkB,IAAI,gBAAgB,EACtC,uBAAuB,IAAI,qBAAqB,EAChD,KAAK,IAAI,GAAG,EACZ,qBAAqB,IAAI,mBAAmB,EAC5C,aAAa,IAAI,WAAW,EAC5B,YAAY,IAAI,UAAU,EAC1B,uBAAuB,IAAI,qBAAqB,EAChD,eAAe,IAAI,aAAa,EAChC,MAAM,IAAI,IAAI,EACd,aAAa,IAAI,WAAW,EAC5B,cAAc,IAAI,YAAY,EAC9B,QAAQ,IAAI,MAAM,EAClB,yBAAyB,IAAI,uBAAuB,EACpD,wBAAwB,IAAI,sBAAsB,EAClD,SAAS,IAAI,OAAO,EACpB,gBAAgB,IAAI,cAAc,EAClC,aAAa,IAAI,WAAW,EAC5B,cAAc,IAAI,YAAY,EAC9B,qBAAqB,IAAI,mBAAmB,EAC5C,aAAa,IAAI,WAAW,EAC5B,gCAAgC,IAAI,8BAA8B,EAClE,kBAAkB,IAAI,gBAAgB,GACvC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"upstream.d.ts","sourceRoot":"","sources":["../src/upstream.ts"],"names":[],"mappings":"AAGA,sFAAsF;AACtF,OAAO,EACL,WAAW,IAAI,SAAS,EACxB,aAAa,IAAI,KAAK,EACtB,YAAY,IAAI,UAAU,EAC1B,WAAW,IAAI,SAAS,EACxB,2BAA2B,IAAI,yBAAyB,EACxD,aAAa,IAAI,WAAW,EAC5B,oBAAoB,IAAI,kBAAkB,EAC1C,WAAW,IAAI,SAAS,EACxB,oBAAoB,IAAI,kBAAkB,EAC1C,SAAS,IAAI,OAAO,EACpB,0BAA0B,IAAI,wBAAwB,EACtD,WAAW,IAAI,SAAS,EACxB,YAAY,IAAI,UAAU,EAC1B,eAAe,IAAI,aAAa,EAChC,WAAW,IAAI,SAAS,EACxB,yBAAyB,IAAI,uBAAuB,EACpD,SAAS,IAAI,OAAO,EACpB,cAAc,IAAI,YAAY,EAC9B,KAAK,IAAI,GAAG,EACZ,YAAY,IAAI,UAAU,EAC1B,0BAA0B,IAAI,wBAAwB,EACtD,8BAA8B,IAAI,4BAA4B,EAC9D,WAAW,IAAI,SAAS,EACxB,eAAe,IAAI,aAAa,EAChC,MAAM,IAAI,IAAI,EACd,kBAAkB,IAAI,gBAAgB,EACtC,uBAAuB,IAAI,qBAAqB,EAChD,KAAK,IAAI,GAAG,EACZ,qBAAqB,IAAI,mBAAmB,EAC5C,aAAa,IAAI,WAAW,EAC5B,YAAY,IAAI,UAAU,EAC1B,uBAAuB,IAAI,qBAAqB,EAChD,eAAe,IAAI,aAAa,EAChC,MAAM,IAAI,IAAI,EACd,aAAa,IAAI,WAAW,EAC5B,cAAc,IAAI,YAAY,EAC9B,QAAQ,IAAI,MAAM,EAClB,yBAAyB,IAAI,uBAAuB,EACpD,wBAAwB,IAAI,sBAAsB,EAClD,SAAS,IAAI,OAAO,EACpB,gBAAgB,IAAI,cAAc,EAClC,aAAa,IAAI,WAAW,EAC5B,cAAc,IAAI,YAAY,EAC9B,qBAAqB,IAAI,mBAAmB,EAC5C,aAAa,IAAI,WAAW,EAC5B,gCAAgC,IAAI,8BAA8B,EAClE,kBAAkB,IAAI,gBAAgB,GACvC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC"}

package/dist/upstream.js

@@ -1,56 +1,5 @@
-"use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenericKind = exports.VolumeAttachment = exports.ValidatingWebhookConfiguration = exports.TokenReview = exports.SubjectAccessReview = exports.StorageClass = exports.StatefulSet = exports.ServiceAccount = exports.Service = exports.SelfSubjectRulesReview = exports.SelfSubjectAccessReview = exports.Secret = exports.RuntimeClass = exports.RoleBinding = exports.Role = exports.ResourceQuota = exports.ReplicationController = exports.ReplicaSet = exports.PodTemplate = exports.PodDisruptionBudget = exports.Pod = exports.PersistentVolumeClaim = exports.PersistentVolume = exports.Node = exports.NetworkPolicy = exports.Namespace = exports.MutatingWebhookConfiguration = exports.LocalSubjectAccessReview = exports.LimitRange = exports.Job = exports.IngressClass = exports.Ingress = exports.HorizontalPodAutoscaler = exports.Endpoints = exports.EndpointSlice = exports.Deployment = exports.DaemonSet = exports.CustomResourceDefinition = exports.CronJob = exports.ControllerRevision = exports.ConfigMap = exports.ClusterRoleBinding = exports.ClusterRole = exports.CertificateSigningRequest = exports.CSIDriver = exports.APIService = exports.Event = exports.CoreEvent = void 0;
 /** a is a collection of K8s types to be used within an action: `When(a.Configmap)` */
-var client_node_1 = require("@kubernetes/client-node");
-Object.defineProperty(exports, "CoreEvent", { enumerable: true, get: function () { return client_node_1.CoreV1Event; } });
-Object.defineProperty(exports, "Event", { enumerable: true, get: function () { return client_node_1.EventsV1Event; } });
-Object.defineProperty(exports, "APIService", { enumerable: true, get: function () { return client_node_1.V1APIService; } });
-Object.defineProperty(exports, "CSIDriver", { enumerable: true, get: function () { return client_node_1.V1CSIDriver; } });
-Object.defineProperty(exports, "CertificateSigningRequest", { enumerable: true, get: function () { return client_node_1.V1CertificateSigningRequest; } });
-Object.defineProperty(exports, "ClusterRole", { enumerable: true, get: function () { return client_node_1.V1ClusterRole; } });
-Object.defineProperty(exports, "ClusterRoleBinding", { enumerable: true, get: function () { return client_node_1.V1ClusterRoleBinding; } });
-Object.defineProperty(exports, "ConfigMap", { enumerable: true, get: function () { return client_node_1.V1ConfigMap; } });
-Object.defineProperty(exports, "ControllerRevision", { enumerable: true, get: function () { return client_node_1.V1ControllerRevision; } });
-Object.defineProperty(exports, "CronJob", { enumerable: true, get: function () { return client_node_1.V1CronJob; } });
-Object.defineProperty(exports, "CustomResourceDefinition", { enumerable: true, get: function () { return client_node_1.V1CustomResourceDefinition; } });
-Object.defineProperty(exports, "DaemonSet", { enumerable: true, get: function () { return client_node_1.V1DaemonSet; } });
-Object.defineProperty(exports, "Deployment", { enumerable: true, get: function () { return client_node_1.V1Deployment; } });
-Object.defineProperty(exports, "EndpointSlice", { enumerable: true, get: function () { return client_node_1.V1EndpointSlice; } });
-Object.defineProperty(exports, "Endpoints", { enumerable: true, get: function () { return client_node_1.V1Endpoints; } });
-Object.defineProperty(exports, "HorizontalPodAutoscaler", { enumerable: true, get: function () { return client_node_1.V1HorizontalPodAutoscaler; } });
-Object.defineProperty(exports, "Ingress", { enumerable: true, get: function () { return client_node_1.V1Ingress; } });
-Object.defineProperty(exports, "IngressClass", { enumerable: true, get: function () { return client_node_1.V1IngressClass; } });
-Object.defineProperty(exports, "Job", { enumerable: true, get: function () { return client_node_1.V1Job; } });
-Object.defineProperty(exports, "LimitRange", { enumerable: true, get: function () { return client_node_1.V1LimitRange; } });
-Object.defineProperty(exports, "LocalSubjectAccessReview", { enumerable: true, get: function () { return client_node_1.V1LocalSubjectAccessReview; } });
-Object.defineProperty(exports, "MutatingWebhookConfiguration", { enumerable: true, get: function () { return client_node_1.V1MutatingWebhookConfiguration; } });
-Object.defineProperty(exports, "Namespace", { enumerable: true, get: function () { return client_node_1.V1Namespace; } });
-Object.defineProperty(exports, "NetworkPolicy", { enumerable: true, get: function () { return client_node_1.V1NetworkPolicy; } });
-Object.defineProperty(exports, "Node", { enumerable: true, get: function () { return client_node_1.V1Node; } });
-Object.defineProperty(exports, "PersistentVolume", { enumerable: true, get: function () { return client_node_1.V1PersistentVolume; } });
-Object.defineProperty(exports, "PersistentVolumeClaim", { enumerable: true, get: function () { return client_node_1.V1PersistentVolumeClaim; } });
-Object.defineProperty(exports, "Pod", { enumerable: true, get: function () { return client_node_1.V1Pod; } });
-Object.defineProperty(exports, "PodDisruptionBudget", { enumerable: true, get: function () { return client_node_1.V1PodDisruptionBudget; } });
-Object.defineProperty(exports, "PodTemplate", { enumerable: true, get: function () { return client_node_1.V1PodTemplate; } });
-Object.defineProperty(exports, "ReplicaSet", { enumerable: true, get: function () { return client_node_1.V1ReplicaSet; } });
-Object.defineProperty(exports, "ReplicationController", { enumerable: true, get: function () { return client_node_1.V1ReplicationController; } });
-Object.defineProperty(exports, "ResourceQuota", { enumerable: true, get: function () { return client_node_1.V1ResourceQuota; } });
-Object.defineProperty(exports, "Role", { enumerable: true, get: function () { return client_node_1.V1Role; } });
-Object.defineProperty(exports, "RoleBinding", { enumerable: true, get: function () { return client_node_1.V1RoleBinding; } });
-Object.defineProperty(exports, "RuntimeClass", { enumerable: true, get: function () { return client_node_1.V1RuntimeClass; } });
-Object.defineProperty(exports, "Secret", { enumerable: true, get: function () { return client_node_1.V1Secret; } });
-Object.defineProperty(exports, "SelfSubjectAccessReview", { enumerable: true, get: function () { return client_node_1.V1SelfSubjectAccessReview; } });
-Object.defineProperty(exports, "SelfSubjectRulesReview", { enumerable: true, get: function () { return client_node_1.V1SelfSubjectRulesReview; } });
-Object.defineProperty(exports, "Service", { enumerable: true, get: function () { return client_node_1.V1Service; } });
-Object.defineProperty(exports, "ServiceAccount", { enumerable: true, get: function () { return client_node_1.V1ServiceAccount; } });
-Object.defineProperty(exports, "StatefulSet", { enumerable: true, get: function () { return client_node_1.V1StatefulSet; } });
-Object.defineProperty(exports, "StorageClass", { enumerable: true, get: function () { return client_node_1.V1StorageClass; } });
-Object.defineProperty(exports, "SubjectAccessReview", { enumerable: true, get: function () { return client_node_1.V1SubjectAccessReview; } });
-Object.defineProperty(exports, "TokenReview", { enumerable: true, get: function () { return client_node_1.V1TokenReview; } });
-Object.defineProperty(exports, "ValidatingWebhookConfiguration", { enumerable: true, get: function () { return client_node_1.V1ValidatingWebhookConfiguration; } });
-Object.defineProperty(exports, "VolumeAttachment", { enumerable: true, get: function () { return client_node_1.V1VolumeAttachment; } });
-var types_1 = require("./types");
-Object.defineProperty(exports, "GenericKind", { enumerable: true, get: function () { return types_1.GenericKind; } });
+export { CoreV1Event as CoreEvent, EventsV1Event as Event, V1APIService as APIService, V1CSIDriver as CSIDriver, V1CertificateSigningRequest as CertificateSigningRequest, V1ClusterRole as ClusterRole, V1ClusterRoleBinding as ClusterRoleBinding, V1ConfigMap as ConfigMap, V1ControllerRevision as ControllerRevision, V1CronJob as CronJob, V1CustomResourceDefinition as CustomResourceDefinition, V1DaemonSet as DaemonSet, V1Deployment as Deployment, V1EndpointSlice as EndpointSlice, V1Endpoints as Endpoints, V1HorizontalPodAutoscaler as HorizontalPodAutoscaler, V1Ingress as Ingress, V1IngressClass as IngressClass, V1Job as Job, V1LimitRange as LimitRange, V1LocalSubjectAccessReview as LocalSubjectAccessReview, V1MutatingWebhookConfiguration as MutatingWebhookConfiguration, V1Namespace as Namespace, V1NetworkPolicy as NetworkPolicy, V1Node as Node, V1PersistentVolume as PersistentVolume, V1PersistentVolumeClaim as PersistentVolumeClaim, V1Pod as Pod, V1PodDisruptionBudget as PodDisruptionBudget, V1PodTemplate as PodTemplate, V1ReplicaSet as ReplicaSet, V1ReplicationController as ReplicationController, V1ResourceQuota as ResourceQuota, V1Role as Role, V1RoleBinding as RoleBinding, V1RuntimeClass as RuntimeClass, V1Secret as Secret, V1SelfSubjectAccessReview as SelfSubjectAccessReview, V1SelfSubjectRulesReview as SelfSubjectRulesReview, V1Service as Service, V1ServiceAccount as ServiceAccount, V1StatefulSet as StatefulSet, V1StorageClass as StorageClass, V1SubjectAccessReview as SubjectAccessReview, V1TokenReview as TokenReview, V1ValidatingWebhookConfiguration as ValidatingWebhookConfiguration, V1VolumeAttachment as VolumeAttachment, } from "@kubernetes/client-node";
+export { GenericKind } from "./types.js";

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.5.6",
+  "version": "3.6.1",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "type": "module",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -37,19 +38,19 @@
     "prebuild": "rm -rf dist",
     "build": "tsc",
     "semantic-release": "semantic-release",
-    "test": "jest src --coverage",
-    "test:e2e": "jest e2e --runInBand",
-    "test:e2e:prep-crds": "kubectl apply -f test/ && npx ts-node src/cli.ts crd ./test/datastore.crd.yaml e2e && npx ts-node src/cli.ts crd https://raw.githubusercontent.com/defenseunicorns/kubernetes-fluent-client/refs/heads/main/test/webapp.crd.yaml e2e",
+    "test": "vitest src run --coverage",
+    "test:e2e": "vitest run e2e/",
+    "test:e2e:prep-crds": "kubectl apply -f test/ && npx tsx src/cli.ts crd ./test/datastore.crd.yaml e2e && npx tsx src/cli.ts crd https://raw.githubusercontent.com/defenseunicorns/kubernetes-fluent-client/refs/heads/main/test/webapp.crd.yaml e2e",
     "test:e2e:prep-cluster": "k3d cluster create kfc-dev --k3s-arg '--debug@server:0' --wait && kubectl rollout status deployment -n kube-system",
     "test:e2e:prep-image": "npm run build && npm pack && npm i kubernetes-fluent-client-0.0.0-development.tgz --no-save",
-    "test:e2e:run": "npm run test:e2e:prep-cluster && npm run test:e2e:prep-crds && npm run test:e2e:prep-image && jest e2e --runInBand && npm run test:e2e:cleanup",
+    "test:e2e:run": "npm run test:e2e:prep-cluster && npm run test:e2e:prep-crds && npm run test:e2e:prep-image && npm run test:e2e && npm run test:e2e:cleanup",
     "test:e2e:cleanup": "k3d cluster delete kfc-dev",
     "format:check": "eslint src e2e && prettier . --check",
     "format:fix": "eslint --fix src e2e && prettier . --write",
     "prepare": "if [ \"$NODE_ENV\" != 'production' ]; then husky; fi"
   },
   "dependencies": {
-    "@kubernetes/client-node": "1.0.0-rc7",
+    "@kubernetes/client-node": "1.3.0",
     "fast-json-patch": "3.1.1",
     "http-status-codes": "2.3.0",
     "node-fetch": "2.7.0",
@@ -63,22 +64,22 @@
     "@commitlint/config-conventional": "19.8.1",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
-    "@jest/globals": "29.7.0",
     "@types/byline": "4.2.36",
-    "@types/readable-stream": "4.0.20",
+    "@types/readable-stream": "4.0.21",
     "@types/urijs": "^1.19.25",
+    "@types/ws": "^8.18.1",
     "@types/yargs": "17.0.33",
-    "@typescript-eslint/eslint-plugin": "8.33.0",
-    "@typescript-eslint/parser": "8.33.0",
-    "eslint-plugin-jsdoc": "50.6.17",
+    "@typescript-eslint/eslint-plugin": "8.33.1",
+    "@typescript-eslint/parser": "8.33.1",
+    "@vitest/coverage-v8": "^3.2.1",
+    "eslint-plugin-jsdoc": "50.7.1",
     "globals": "^16.0.0",
     "husky": "^9.1.6",
-    "jest": "29.7.0",
     "lint-staged": "^16.0.0",
     "prettier": "3.5.3",
     "semantic-release": "24.2.5",
-    "ts-jest": "29.3.4",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "vitest": "^3.2.1"
   },
   "overrides": {
     "semantic-release@24.2.0": {