kubernetes-fluent-client 3.6.2 → 3.6.3

package/dist/generate.d.ts

@@ -1,11 +1,12 @@
-import { InputData, TargetLanguage } from "quicktype-core";
+import { InputData, TargetLanguage, quicktype } from "quicktype-core";
 import { CustomResourceDefinition } from "./upstream.js";
 import { LogFn } from "./types.js";
+export type QuicktypeLang = Parameters<typeof quicktype>[0]["lang"];
 export interface GenerateOptions {
     source: string;
     directory?: string;
     plain?: boolean;
-    language?: string | TargetLanguage;
+    language: QuicktypeLang;
     npmPackage?: string;
     logFn: LogFn;
     noPost?: boolean;
@@ -35,9 +36,10 @@ export declare function prepareInputData(name: string, schema: string): Promise<
  * Generates TypeScript types using quicktype.
  *
  * @param inputData - The input data for quicktype.
+ * @param opts - The options for generating the TypeScript types.
  * @returns A promise that resolves to an array of generated TypeScript type lines.
  */
-export declare function generateTypes(inputData: InputData): Promise<string[]>;
+export declare function generateTypes(inputData: InputData, opts: GenerateOptions): Promise<string[]>;
 /**
  * Writes the processed lines to the output file.
  *

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,EAEf,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IACnC,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,CAuCA;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAYvF;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW3E;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;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,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,CAuCA;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

@@ -32,7 +32,7 @@ export async function convertCRDtoTS(crd, opts) {
         const schema = JSON.stringify(match.schema.openAPIV3Schema);
         opts.logFn(`- Generating ${crd.spec.group}/${match.name} types for ${name}`);
         const inputData = await prepareInputData(name, schema);
-        const generatedTypes = await generateTypes(inputData);
+        const generatedTypes = await generateTypes(inputData, opts);
         const fileName = `${name.toLowerCase()}-${match.name.toLowerCase()}`;
         writeGeneratedFile(fileName, opts.directory || "", generatedTypes, opts.language || "ts");
         results[fileName] = generatedTypes;
@@ -61,14 +61,14 @@ export async function prepareInputData(name, schema) {
  * Generates TypeScript types using quicktype.
  *
  * @param inputData - The input data for quicktype.
+ * @param opts - The options for generating the TypeScript types.
  * @returns A promise that resolves to an array of generated TypeScript type lines.
  */
-export async function generateTypes(inputData) {
-    // If the language is not specified, default to TypeScript
+export async function generateTypes(inputData, opts) {
     // Generate the types
     const out = await quicktype({
         inputData,
-        lang: "ts",
+        lang: opts.language,
         rendererOptions: { "just-types": "true" },
     });
     return out.lines;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
@@ -40,7 +40,7 @@
     "semantic-release": "semantic-release",
     "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-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 && npx tsx src/cli.ts crd https://raw.githubusercontent.com/defenseunicorns/kubernetes-fluent-client/refs/heads/main/test/webapp.crd.yaml -l json-schema e2e/schemas/webapp",
     "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 && npm run test:e2e && npm run test:e2e:cleanup",
@@ -54,7 +54,7 @@
     "fast-json-patch": "3.1.1",
     "http-status-codes": "2.3.0",
     "node-fetch": "2.7.0",
-    "quicktype-core": "23.2.5",
+    "quicktype-core": "23.2.6",
     "type-fest": "^4.39.1",
     "undici": "^7.7.0",
     "yargs": "18.0.0"
@@ -65,6 +65,7 @@
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
     "@types/byline": "4.2.36",
+    "@types/command-line-args": "^5.2.3",
     "@types/readable-stream": "4.0.21",
     "@types/urijs": "^1.19.25",
     "@types/ws": "^8.18.1",
@@ -72,6 +73,7 @@
     "@typescript-eslint/eslint-plugin": "8.33.1",
     "@typescript-eslint/parser": "8.33.1",
     "@vitest/coverage-v8": "^3.2.1",
+    "command-line-args": "^6.0.1",
     "eslint-plugin-jsdoc": "50.7.1",
     "globals": "^16.0.0",
     "husky": "^9.1.6",

package/src/generate.ts

@@ -16,12 +16,12 @@ import { fetch } from "./fetch.js";
 import { K8s } from "./fluent/index.js";
 import { CustomResourceDefinition } from "./upstream.js";
 import { LogFn } from "./types.js";
-
+export type QuicktypeLang = Parameters<typeof quicktype>[0]["lang"];
 export interface GenerateOptions {
   source: string; // URL, file path, or K8s CRD name
   directory?: string; // Output directory path
   plain?: boolean; // Disable fluent client wrapping
-  language?: string | TargetLanguage;
+  language: QuicktypeLang; // Language for type generation (default: "ts")
   npmPackage?: string; // Override NPM package
   logFn: LogFn; // Log function callback
   noPost?: boolean; // Enable/disable post-processing
@@ -73,7 +73,7 @@ export async function convertCRDtoTS(
     opts.logFn(`- Generating ${crd.spec.group}/${match.name} types for ${name}`);
 
     const inputData = await prepareInputData(name, schema);
-    const generatedTypes = await generateTypes(inputData);
+    const generatedTypes = await generateTypes(inputData, opts);
 
     const fileName = `${name.toLowerCase()}-${match.name.toLowerCase()}`;
     writeGeneratedFile(fileName, opts.directory || "", generatedTypes, opts.language || "ts");
@@ -110,15 +110,17 @@ export async function prepareInputData(name: string, schema: string): Promise<In
  * Generates TypeScript types using quicktype.
  *
  * @param inputData - The input data for quicktype.
+ * @param opts - The options for generating the TypeScript types.
  * @returns A promise that resolves to an array of generated TypeScript type lines.
  */
-export async function generateTypes(inputData: InputData): Promise<string[]> {
-  // If the language is not specified, default to TypeScript
-
+export async function generateTypes(
+  inputData: InputData,
+  opts: GenerateOptions,
+): Promise<string[]> {
   // Generate the types
   const out = await quicktype({
     inputData,
-    lang: "ts",
+    lang: opts.language,
     rendererOptions: { "just-types": "true" },
   });