@shepherdjerred/helm-types 1.3.0-dev.3866 → 1.3.0-dev.3954

package/dist/cli.js

@@ -21877,27 +21877,61 @@ async function runCommand(command, args) {
     throw new Error(`Failed to spawn command "${command} ${args.join(" ")}": ${errorMessage}`, { cause: error51 });
   }
 }
+async function resolveUntarredChartDir(tempDir, fallbackName) {
+  const fallback = `${tempDir}/${fallbackName}`;
+  if (await Bun.file(`${fallback}/Chart.yaml`).exists()) {
+    return fallback;
+  }
+  const lsOutput = await runCommand("ls", ["-1", tempDir]);
+  for (const entry of lsOutput.split(`
+`).map((s) => s.trim())) {
+    if (entry === "") {
+      continue;
+    }
+    if (await Bun.file(`${tempDir}/${entry}/Chart.yaml`).exists()) {
+      return `${tempDir}/${entry}`;
+    }
+  }
+  return fallback;
+}
 async function fetchHelmChart(chart) {
   const pwd = Bun.env["PWD"] ?? process.cwd();
   const tempDir = `${pwd}/temp/helm-${chart.name}`;
   const repoName = `temp-repo-${chart.name}-${String(Date.now())}`;
   try {
     await Bun.$`mkdir -p ${tempDir}`.quiet();
-    console.log(`  \uD83D\uDCE6 Adding Helm repo: ${chart.repoUrl}`);
-    await runCommand("helm", ["repo", "add", repoName, chart.repoUrl]);
-    console.log(`  \uD83D\uDD04 Updating Helm repos...`);
-    await runCommand("helm", ["repo", "update"]);
-    console.log(`  ⬇️  Pulling chart ${chart.chartName}:${chart.version}...`);
-    await runCommand("helm", [
-      "pull",
-      `${repoName}/${chart.chartName}`,
-      "--version",
-      chart.version,
-      "--destination",
-      tempDir,
-      "--untar"
-    ]);
-    const valuesPath = `${tempDir}/${chart.chartName}/values.yaml`;
+    let chartDir;
+    if (chart.oci === true) {
+      const ociRef = `oci://${chart.repoUrl}/${chart.chartName}`;
+      console.log(`  ⬇️  Pulling OCI chart ${ociRef}:${chart.version}...`);
+      await runCommand("helm", [
+        "pull",
+        ociRef,
+        "--version",
+        chart.version,
+        "--destination",
+        tempDir,
+        "--untar"
+      ]);
+      chartDir = await resolveUntarredChartDir(tempDir, chart.name);
+    } else {
+      console.log(`  \uD83D\uDCE6 Adding Helm repo: ${chart.repoUrl}`);
+      await runCommand("helm", ["repo", "add", repoName, chart.repoUrl]);
+      console.log(`  \uD83D\uDD04 Updating Helm repo ${repoName}...`);
+      await runCommand("helm", ["repo", "update", repoName]);
+      console.log(`  ⬇️  Pulling chart ${chart.chartName}:${chart.version}...`);
+      await runCommand("helm", [
+        "pull",
+        `${repoName}/${chart.chartName}`,
+        "--version",
+        chart.version,
+        "--destination",
+        tempDir,
+        "--untar"
+      ]);
+      chartDir = `${tempDir}/${chart.chartName}`;
+    }
+    const valuesPath = `${chartDir}/values.yaml`;
     console.log(`  \uD83D\uDCD6 Reading values.yaml from ${valuesPath}`);
     try {
       const valuesContent = await Bun.file(valuesPath).text();
@@ -21914,8 +21948,7 @@ async function fetchHelmChart(chart) {
         return { values: {}, schema: null, yamlComments: new Map };
       }
       const parseResult = HelmValueSchema.safeParse(recordParseResult.data);
-      const chartPath = `${tempDir}/${chart.chartName}`;
-      const schema = await loadJSONSchema(chartPath);
+      const schema = await loadJSONSchema(chartDir);
       if (parseResult.success) {
         console.log(`  ✅ Zod validation successful`);
         return { values: parseResult.data, schema, yamlComments };
@@ -21932,7 +21965,9 @@ async function fetchHelmChart(chart) {
   } finally {
     try {
       console.log(`  \uD83E\uDDF9 Cleaning up...`);
-      await runCommand("helm", ["repo", "remove", repoName]);
+      if (chart.oci !== true) {
+        await runCommand("helm", ["repo", "remove", repoName]);
+      }
       await Bun.$`rm -rf ${tempDir}`.quiet();
     } catch (cleanupError) {
       console.warn(`Cleanup failed for ${chart.name}:`, String(cleanupError));
@@ -21941,12 +21976,40 @@ async function fetchHelmChart(chart) {
 }
 
 // src/config.ts
-var K8S_RESOURCE_SPEC_PATTERN = {
-  resourceSpecNames: ["resources"],
-  resourceSpecFields: ["requests", "limits"]
+var K8S_WELL_KNOWN_FIELDS = {
+  resources: {
+    type: "{ requests?: Record<string, string | number>; limits?: Record<string, string | number> }",
+    allowedShapes: ["object"],
+    description: "Kubernetes container resources (standard ResourceRequirements: arbitrary resource names, string or numeric quantities)"
+  },
+  nodeselector: {
+    type: "Record<string, string>",
+    allowedShapes: ["object"],
+    description: "Kubernetes nodeSelector (arbitrary label key/value pairs)"
+  },
+  tolerations: {
+    type: "unknown[]",
+    allowedShapes: ["array"],
+    description: "Kubernetes tolerations (standard Toleration objects)"
+  },
+  affinity: {
+    type: "Record<string, unknown>",
+    allowedShapes: ["object"],
+    description: "Kubernetes affinity (standard Affinity object)"
+  }
 };
-function isK8sResourceSpec(propertyName) {
-  return K8S_RESOURCE_SPEC_PATTERN.resourceSpecNames.includes(propertyName.toLowerCase());
+function getWellKnownK8sFieldType(propertyName, value) {
+  const field = K8S_WELL_KNOWN_FIELDS[propertyName.toLowerCase()];
+  if (!field) {
+    return;
+  }
+  if (value != null) {
+    const shape = Array.isArray(value) ? "array" : typeof value === "object" ? "object" : "primitive";
+    if (shape === "primitive" || !field.allowedShapes.includes(shape)) {
+      return;
+    }
+  }
+  return { type: field.type, description: field.description };
 }
 var EXTENSIBLE_TYPE_PATTERNS = {
   "argo-cd": [
@@ -21989,6 +22052,12 @@ var EXTENSIBLE_TYPE_PATTERNS = {
   ],
   seaweedfs: [
     "volume.dataDirs"
+  ],
+  "dagger-helm": [
+    "engine"
+  ],
+  "agent-stack-k8s": [
+    "config"
   ]
 };
 function shouldAllowArbitraryProps(keyPath, chartName, propertyName, yamlComment) {
@@ -22150,60 +22219,6 @@ function inferPrimitiveType(value, yamlComment) {
   console.warn(`Unrecognized value type for: ${String(value)}, using 'unknown'`);
   return { type: "unknown", optional: true, description: yamlComment };
 }
-function augmentK8sResourceSpec(iface) {
-  const hasRequests = "requests" in iface.properties;
-  const hasLimits = "limits" in iface.properties;
-  if (hasRequests && !hasLimits) {
-    const requestsProp = iface.properties["requests"];
-    if (requestsProp) {
-      const limitsTypeName = requestsProp.type.replace("Requests", "Limits");
-      if (requestsProp.nested) {
-        const limitsNested = {
-          name: limitsTypeName,
-          properties: { ...requestsProp.nested.properties },
-          allowArbitraryProps: requestsProp.nested.allowArbitraryProps
-        };
-        iface.properties["limits"] = {
-          type: limitsTypeName,
-          optional: true,
-          nested: limitsNested,
-          description: "Kubernetes resource limits (memory, cpu, etc.)"
-        };
-      } else {
-        iface.properties["limits"] = {
-          type: requestsProp.type,
-          optional: true,
-          description: "Kubernetes resource limits (memory, cpu, etc.)"
-        };
-      }
-    }
-  }
-  if (hasLimits && !hasRequests) {
-    const limitsProp = iface.properties["limits"];
-    if (limitsProp) {
-      const requestsTypeName = limitsProp.type.replace("Limits", "Requests");
-      if (limitsProp.nested) {
-        const requestsNested = {
-          name: requestsTypeName,
-          properties: { ...limitsProp.nested.properties },
-          allowArbitraryProps: limitsProp.nested.allowArbitraryProps
-        };
-        iface.properties["requests"] = {
-          type: requestsTypeName,
-          optional: true,
-          nested: requestsNested,
-          description: "Kubernetes resource requests (memory, cpu, etc.)"
-        };
-      } else {
-        iface.properties["requests"] = {
-          type: limitsProp.type,
-          optional: true,
-          description: "Kubernetes resource requests (memory, cpu, etc.)"
-        };
-      }
-    }
-  }
-}
 
 // src/type-converter.ts
 function jsonSchemaToTypeScript(schema) {
@@ -22484,6 +22499,16 @@ function convertValueToProperty(opts) {
   if (NullSchema.safeParse(value).success || UndefinedSchema.safeParse(value).success) {
     return { type: "unknown", optional: true };
   }
+  if (propertyName != null && propertyName !== "") {
+    const wellKnown = getWellKnownK8sFieldType(propertyName, value);
+    if (wellKnown) {
+      return {
+        type: wellKnown.type,
+        optional: true,
+        description: yamlComment ?? wellKnown.description
+      };
+    }
+  }
   const arrayResult = ArraySchema.safeParse(value);
   if (arrayResult.success) {
     return inferArrayType(opts, arrayResult.data);
@@ -22497,9 +22522,6 @@ function convertValueToProperty(opts) {
       keyPrefix: fullKey,
       chartName
     });
-    if (propertyName != null && propertyName !== "" && isK8sResourceSpec(propertyName)) {
-      augmentK8sResourceSpec(nestedInterface);
-    }
     return {
       type: nestedTypeName,
       optional: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shepherdjerred/helm-types",
-  "version": "1.3.0-dev.3866",
+  "version": "1.3.0-dev.3954",
   "description": "Generate TypeScript types from Helm chart values.yaml and values.schema.json",
   "type": "module",
   "main": "dist/index.js",

package/src/chart-fetcher.ts

@@ -62,6 +62,32 @@ async function runCommand(command: string, args: string[]): Promise<string> {
   }
 }
 
+/**
+ * Locate the directory `helm pull --untar` created. helm names it after the
+ * Chart.yaml `name`, which can differ from the OCI artifact path (e.g.
+ * `kueue/charts/kueue` untars to `kueue/`), so prefer the version-key fallback
+ * but fall back to scanning for the extracted Chart.yaml.
+ */
+async function resolveUntarredChartDir(
+  tempDir: string,
+  fallbackName: string,
+): Promise<string> {
+  const fallback = `${tempDir}/${fallbackName}`;
+  if (await Bun.file(`${fallback}/Chart.yaml`).exists()) {
+    return fallback;
+  }
+  const lsOutput = await runCommand("ls", ["-1", tempDir]);
+  for (const entry of lsOutput.split("\n").map((s) => s.trim())) {
+    if (entry === "") {
+      continue;
+    }
+    if (await Bun.file(`${tempDir}/${entry}/Chart.yaml`).exists()) {
+      return `${tempDir}/${entry}`;
+    }
+  }
+  return fallback;
+}
+
 /**
  * Fetch a Helm chart and extract its values.yaml and optional schema
  */
@@ -78,28 +104,49 @@ export async function fetchHelmChart(chart: ChartInfo): Promise<{
     // Ensure temp directory exists
     await Bun.$`mkdir -p ${tempDir}`.quiet();
 
-    console.log(`  📦 Adding Helm repo: ${chart.repoUrl}`);
-    // Add the helm repo
-    await runCommand("helm", ["repo", "add", repoName, chart.repoUrl]);
-
-    console.log(`  🔄 Updating Helm repos...`);
-    // Update repo
-    await runCommand("helm", ["repo", "update"]);
-
-    console.log(`  ⬇️  Pulling chart ${chart.chartName}:${chart.version}...`);
-    // Pull the chart
-    await runCommand("helm", [
-      "pull",
-      `${repoName}/${chart.chartName}`,
-      "--version",
-      chart.version,
-      "--destination",
-      tempDir,
-      "--untar",
-    ]);
+    let chartDir: string;
+    if (chart.oci === true) {
+      // OCI registry: pull directly, no `helm repo add` needed.
+      const ociRef = `oci://${chart.repoUrl}/${chart.chartName}`;
+      console.log(`  ⬇️  Pulling OCI chart ${ociRef}:${chart.version}...`);
+      await runCommand("helm", [
+        "pull",
+        ociRef,
+        "--version",
+        chart.version,
+        "--destination",
+        tempDir,
+        "--untar",
+      ]);
+      chartDir = await resolveUntarredChartDir(tempDir, chart.name);
+    } else {
+      console.log(`  📦 Adding Helm repo: ${chart.repoUrl}`);
+      // Add the helm repo
+      await runCommand("helm", ["repo", "add", repoName, chart.repoUrl]);
+
+      console.log(`  🔄 Updating Helm repo ${repoName}...`);
+      // Update ONLY the repo we just added. `helm repo update` with no args
+      // refreshes every repo in the local helm config — including unrelated
+      // stale entries (e.g. the retired public bitnami repo) whose failure
+      // would abort an otherwise-fine fetch.
+      await runCommand("helm", ["repo", "update", repoName]);
+
+      console.log(`  ⬇️  Pulling chart ${chart.chartName}:${chart.version}...`);
+      // Pull the chart
+      await runCommand("helm", [
+        "pull",
+        `${repoName}/${chart.chartName}`,
+        "--version",
+        chart.version,
+        "--destination",
+        tempDir,
+        "--untar",
+      ]);
+      chartDir = `${tempDir}/${chart.chartName}`;
+    }
 
     // Read values.yaml
-    const valuesPath = `${tempDir}/${chart.chartName}/values.yaml`;
+    const valuesPath = `${chartDir}/values.yaml`;
     console.log(`  📖 Reading values.yaml from ${valuesPath}`);
 
     try {
@@ -137,8 +184,7 @@ export async function fetchHelmChart(chart: ChartInfo): Promise<{
       const parseResult = HelmValueSchema.safeParse(recordParseResult.data);
 
       // Try to load JSON schema
-      const chartPath = `${tempDir}/${chart.chartName}`;
-      const schema = await loadJSONSchema(chartPath);
+      const schema = await loadJSONSchema(chartDir);
 
       if (parseResult.success) {
         console.log(`  ✅ Zod validation successful`);
@@ -163,7 +209,10 @@ export async function fetchHelmChart(chart: ChartInfo): Promise<{
     // Cleanup
     try {
       console.log(`  🧹 Cleaning up...`);
-      await runCommand("helm", ["repo", "remove", repoName]);
+      // OCI charts never added a named repo, so only remove for HTTP repos.
+      if (chart.oci !== true) {
+        await runCommand("helm", ["repo", "remove", repoName]);
+      }
       await Bun.$`rm -rf ${tempDir}`.quiet();
     } catch (cleanupError) {
       console.warn(`Cleanup failed for ${chart.name}:`, String(cleanupError));

package/src/config.ts

@@ -1,25 +1,68 @@
 /**
- * Well-known Kubernetes resource patterns.
- * When a property matches these patterns, we augment the type with standard K8s fields.
+ * Well-known Kubernetes fields whose shape is defined by the Kubernetes API,
+ * not by whatever subset a chart's values.yaml happens to set as defaults.
+ *
+ * Inferring these from defaults produces types that are too narrow — e.g. a
+ * chart defaulting `resources: {requests: {cpu: 0.2}}` would otherwise forbid
+ * setting a memory request at all. When a property matches one of these names
+ * AND its default value has a compatible shape, the canonical permissive type
+ * is emitted instead of a defaults-derived interface.
  */
-export const K8S_RESOURCE_SPEC_PATTERN = {
-  /**
-   * Property names that indicate a Kubernetes resource spec (requests/limits pattern)
-   */
-  resourceSpecNames: ["resources"],
-  /**
-   * Required sibling properties for a valid resource spec
-   */
-  resourceSpecFields: ["requests", "limits"] as const,
+const K8S_WELL_KNOWN_FIELDS: Record<
+  string,
+  { type: string; allowedShapes: ("object" | "array")[]; description: string }
+> = {
+  resources: {
+    type: "{ requests?: Record<string, string | number>; limits?: Record<string, string | number> }",
+    // RBAC rules also use a key named `resources`, but as an array of strings —
+    // the object guard keeps those out.
+    allowedShapes: ["object"],
+    description:
+      "Kubernetes container resources (standard ResourceRequirements: arbitrary resource names, string or numeric quantities)",
+  },
+  nodeselector: {
+    type: "Record<string, string>",
+    allowedShapes: ["object"],
+    description: "Kubernetes nodeSelector (arbitrary label key/value pairs)",
+  },
+  tolerations: {
+    type: "unknown[]",
+    allowedShapes: ["array"],
+    description: "Kubernetes tolerations (standard Toleration objects)",
+  },
+  affinity: {
+    type: "Record<string, unknown>",
+    allowedShapes: ["object"],
+    description: "Kubernetes affinity (standard Affinity object)",
+  },
 };
 
 /**
- * Check if a property name indicates a Kubernetes resource spec.
+ * Return the canonical type for a well-known Kubernetes field, or undefined if
+ * the property name doesn't match or the default value's shape is incompatible
+ * (e.g. an RBAC `resources: ["secrets"]` array, which must NOT become
+ * ResourceRequirements).
  */
-export function isK8sResourceSpec(propertyName: string): boolean {
-  return K8S_RESOURCE_SPEC_PATTERN.resourceSpecNames.includes(
-    propertyName.toLowerCase(),
-  );
+export function getWellKnownK8sFieldType(
+  propertyName: string,
+  value: unknown,
+): { type: string; description: string } | undefined {
+  const field = K8S_WELL_KNOWN_FIELDS[propertyName.toLowerCase()];
+  if (!field) {
+    return undefined;
+  }
+  // A null/undefined default carries no shape signal — trust the name.
+  if (value != null) {
+    const shape: "object" | "array" | "primitive" = Array.isArray(value)
+      ? "array"
+      : typeof value === "object"
+        ? "object"
+        : "primitive";
+    if (shape === "primitive" || !field.allowedShapes.includes(shape)) {
+      return undefined;
+    }
+  }
+  return { type: field.type, description: field.description };
 }
 
 /**
@@ -72,6 +115,14 @@ export const EXTENSIBLE_TYPE_PATTERNS: Record<string, string[]> = {
   seaweedfs: [
     "volume.dataDirs", // dataDirs elements support size, storageClass when type is persistentVolumeClaim
   ],
+  // OCI charts that document config keys only as commented-out examples in
+  // values.yaml, so inference from active defaults misses valid keys.
+  "dagger-helm": [
+    "engine", // engine.port / engine.configJson / engine.config are commented-out chart examples
+  ],
+  "agent-stack-k8s": [
+    "config", // config.queue / max-in-flight / empty-job-grace-period / default-checkout-params are valid but not defaulted
+  ],
 };
 
 /**

package/src/type-converter-helpers.ts

@@ -1,8 +1,4 @@
-import type {
-  JSONSchemaProperty,
-  TypeScriptInterface,
-  TypeProperty,
-} from "./types.ts";
+import type { JSONSchemaProperty, TypeProperty } from "./types.ts";
 import {
   StringSchema,
   ActualNumberSchema,
@@ -110,71 +106,3 @@ export function inferPrimitiveType(
   );
   return { type: "unknown", optional: true, description: yamlComment };
 }
-
-/**
- * Augment a Kubernetes resource spec interface with both requests and limits.
- * If only one is present, copy its type structure to the other.
- */
-export function augmentK8sResourceSpec(iface: TypeScriptInterface): void {
-  const hasRequests = "requests" in iface.properties;
-  const hasLimits = "limits" in iface.properties;
-
-  // If we have requests but not limits, add limits with the same structure
-  if (hasRequests && !hasLimits) {
-    const requestsProp = iface.properties["requests"];
-    if (requestsProp) {
-      // Create limits property with the same type but different name for the nested interface
-      const limitsTypeName = requestsProp.type.replace("Requests", "Limits");
-
-      // If there's a nested interface, create a copy for limits
-      if (requestsProp.nested) {
-        const limitsNested: TypeScriptInterface = {
-          name: limitsTypeName,
-          properties: { ...requestsProp.nested.properties },
-          allowArbitraryProps: requestsProp.nested.allowArbitraryProps,
-        };
-        iface.properties["limits"] = {
-          type: limitsTypeName,
-          optional: true,
-          nested: limitsNested,
-          description: "Kubernetes resource limits (memory, cpu, etc.)",
-        };
-      } else {
-        // No nested interface, just copy the type
-        iface.properties["limits"] = {
-          type: requestsProp.type,
-          optional: true,
-          description: "Kubernetes resource limits (memory, cpu, etc.)",
-        };
-      }
-    }
-  }
-
-  // If we have limits but not requests, add requests with the same structure
-  if (hasLimits && !hasRequests) {
-    const limitsProp = iface.properties["limits"];
-    if (limitsProp) {
-      const requestsTypeName = limitsProp.type.replace("Limits", "Requests");
-
-      if (limitsProp.nested) {
-        const requestsNested: TypeScriptInterface = {
-          name: requestsTypeName,
-          properties: { ...limitsProp.nested.properties },
-          allowArbitraryProps: limitsProp.nested.allowArbitraryProps,
-        };
-        iface.properties["requests"] = {
-          type: requestsTypeName,
-          optional: true,
-          nested: requestsNested,
-          description: "Kubernetes resource requests (memory, cpu, etc.)",
-        };
-      } else {
-        iface.properties["requests"] = {
-          type: limitsProp.type,
-          optional: true,
-          description: "Kubernetes resource requests (memory, cpu, etc.)",
-        };
-      }
-    }
-  }
-}

package/src/type-converter.ts

@@ -14,7 +14,10 @@ import {
   ActualNumberSchema,
   StringBooleanSchema,
 } from "./schemas.ts";
-import { shouldAllowArbitraryProps, isK8sResourceSpec } from "./config.ts";
+import {
+  shouldAllowArbitraryProps,
+  getWellKnownK8sFieldType,
+} from "./config.ts";
 import {
   sanitizePropertyName,
   sanitizeTypeName,
@@ -24,7 +27,6 @@ import type { PropertyConversionContext } from "./type-converter-helpers.ts";
 import {
   mergeDescriptions,
   inferPrimitiveType,
-  augmentK8sResourceSpec,
 } from "./type-converter-helpers.ts";
 
 /**
@@ -470,6 +472,23 @@ function convertValueToProperty(opts: PropertyConversionContext): TypeProperty {
     return { type: "unknown", optional: true };
   }
 
+  // Well-known Kubernetes fields (resources, nodeSelector, tolerations,
+  // affinity) have an API-defined shape. Inferring them from a chart's default
+  // subset produces types that are too narrow (e.g. resources.requests that
+  // only allow cpu). Emit the canonical permissive type instead — but only
+  // when the default value's shape is compatible, so RBAC `resources:
+  // ["secrets"]` arrays stay arrays.
+  if (propertyName != null && propertyName !== "") {
+    const wellKnown = getWellKnownK8sFieldType(propertyName, value);
+    if (wellKnown) {
+      return {
+        type: wellKnown.type,
+        optional: true,
+        description: yamlComment ?? wellKnown.description,
+      };
+    }
+  }
+
   // Check for array (before coercion checks)
   const arrayResult = ArraySchema.safeParse(value);
   if (arrayResult.success) {
@@ -487,14 +506,6 @@ function convertValueToProperty(opts: PropertyConversionContext): TypeProperty {
       chartName,
     });
 
-    if (
-      propertyName != null &&
-      propertyName !== "" &&
-      isK8sResourceSpec(propertyName)
-    ) {
-      augmentK8sResourceSpec(nestedInterface);
-    }
-
     return {
       type: nestedTypeName,
       optional: true,

package/src/types.ts

@@ -5,6 +5,9 @@ export type ChartInfo = {
   repoUrl: string;
   version: string;
   chartName: string; // The actual chart name (may differ from versions.ts key)
+  // When true, the chart is served from an OCI registry: fetch via
+  // `helm pull oci://<repoUrl>/<chartName>` instead of `helm repo add` + pull.
+  oci?: boolean;
 };
 
 export type JSONSchemaProperty = {