@intentius/chant-lexicon-k8s 0.109.0 → 0.111.0

package/dist/import/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/import/parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAc,YAAY,EAAE,MAAM,gCAAgC,CAAC;AA2H3G;;;;;GAKG;AACH,qBAAa,SAAU,YAAW,cAAc;IAC9C;;;;;OAKG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,UAAU,CAkCzD;IAED,OAAO,CAAC,aAAa;CAgCtB"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/import/parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAc,YAAY,EAAE,MAAM,gCAAgC,CAAC;AA2I3G;;;;;GAKG;AACH,qBAAa,SAAU,YAAW,cAAc;IAC9C;;;;;OAKG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,UAAU,CAkCzD;IAED,OAAO,CAAC,aAAa;CAiCtB"}

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "4011502a4c4482f6136dfbd519c5fc45a4a468b9fbf08cea8df2a37f833964e9",
+    "manifest.json": "9c80ddcd8b7780b98224d896b20f42c0af2d7752de404a6b0e692735d1cd14a1",
     "meta.json": "c1831ac15083f5e0e45b29698d7b77f1c01646240fe6de5d6320753188594f69",
     "types/index.d.ts": "5c5340046d090ae9db5553039d923cf92a8b2eb57aa4dc941273ed5bcfb5bc9d",
     "rules/argo-appset-single-project.ts": "afa9f310753aa2d475f35012b13135b2dfaebed2a35d44edbe185ebc07673674",
@@ -78,5 +78,5 @@
     "skills/chant-k8s-argo.md": "24c9a85b78a2fc5c6657424baac9cc6d6caff6f47605b8146b2c0082133181cf",
     "skills/chant-k8s-flux.md": "9670efc2e9854bd14686b5adeb707396b9030a4dcaee6529b30abf56efe2c50c"
   },
-  "composite": "86e54eabeb0deb4d47207b029ab9d49364773a81c8abfb2cdabefd04b80ca04d"
+  "composite": "e90b3b5dd9dadede9d876b773e442554859ae799232033bf8099f70cd48b2968"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "k8s",
-  "version": "0.109.0",
+  "version": "0.111.0",
   "chantVersion": ">=0.1.0",
   "namespace": "K8s",
   "intrinsics": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-k8s",
-  "version": "0.109.0",
+  "version": "0.111.0",
   "description": "Kubernetes lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -78,7 +78,7 @@
     "@types/js-yaml": "^4.0.9"
   },
   "optionalDependencies": {
-    "@intentius/chant-k8s-client": "^0.109.0"
+    "@intentius/chant-k8s-client": "^0.111.0"
   },
   "devDependencies": {
     "@intentius/chant": "*",
@@ -86,7 +86,7 @@
   },
   "peerDependencies": {
     "zod": "^4.3.6",
-    "@intentius/chant": "^0.109.0",
+    "@intentius/chant": "^0.111.0",
     "typescript": "^5.9.3"
   }
 }

package/src/import/parser.ts

@@ -77,6 +77,22 @@ const GVK_TYPE_MAP: Record<string, string> = {
  * Resolve apiVersion + kind to a K8s type name.
  * Falls back to constructing from the apiVersion group.
  */
+/**
+ * `<apiVersion>/<kind>` keys that map to a type another key maps to first.
+ * The build writes the first key's apiVersion for that type, so a document
+ * written against a later key (`autoscaling/v1` HorizontalPodAutoscaler)
+ * keeps its own apiVersion as a property.
+ */
+const ALIASED_GVKS: ReadonlySet<string> = (() => {
+  const firstForType = new Set<string>();
+  const aliased = new Set<string>();
+  for (const [key, type] of Object.entries(GVK_TYPE_MAP)) {
+    if (firstForType.has(type)) aliased.add(key);
+    else firstForType.add(type);
+  }
+  return aliased;
+})();
+
 function resolveTypeName(apiVersion: string, kind: string): string {
   // Try exact match
   const key = `${apiVersion}/${kind}`;
@@ -192,7 +208,8 @@ export class K8sParser implements TemplateParser {
     // Extract the user-configurable properties (skip apiVersion, kind)
     const properties: Record<string, unknown> = {};
     for (const [key, value] of Object.entries(doc)) {
-      if (key === "apiVersion" || key === "kind") continue;
+      if (key === "kind") continue;
+      if (key === "apiVersion" && !ALIASED_GVKS.has(`${apiVersion}/${kind}`)) continue;
       properties[key] = value;
     }
 

package/src/import/roundtrip-build.test.ts

@@ -0,0 +1,87 @@
+/**
+ * Import a manifest, build the generated source, and compare the documents.
+ * Each case is a manifest from the Kubernetes documentation examples that did
+ * not come back.
+ */
+import { describe, expect, test } from "vitest";
+import { loadAll } from "js-yaml";
+import { build } from "@intentius/chant/build";
+import type { SerializerResult } from "@intentius/chant/serializer";
+import { k8sSerializer } from "../serializer";
+import { importManifest, removeDir } from "./testdata/embedded/fixtures";
+
+function primary(out: string | SerializerResult | undefined): string {
+  if (out === undefined) return "";
+  return typeof out === "string" ? out : out.primary;
+}
+
+async function roundTrip(yaml: string): Promise<unknown[]> {
+  const imported = await importManifest(yaml);
+  try {
+    expect(imported.result.error).toBeUndefined();
+    const result = await build(imported.srcDir, [k8sSerializer]);
+    expect(result.errors).toEqual([]);
+    return (loadAll(primary(result.outputs.get("k8s"))) as unknown[]).filter((d) => d);
+  } finally {
+    removeDir(imported.dir);
+  }
+}
+
+describe("k8s import round trip", () => {
+  test("a NetworkPolicy's egress: [{}] comes back as one empty rule", async () => {
+    const yaml = [
+      "apiVersion: networking.k8s.io/v1",
+      "kind: NetworkPolicy",
+      "metadata:",
+      "  name: allow-all-egress",
+      "spec:",
+      "  podSelector: {}",
+      "  egress:",
+      "  - {}",
+      "  policyTypes:",
+      "  - Egress",
+    ].join("\n");
+    expect(await roundTrip(yaml)).toEqual(loadAll(yaml));
+  });
+
+  test("an autoscaling/v1 HorizontalPodAutoscaler keeps its apiVersion", async () => {
+    const yaml = [
+      "apiVersion: autoscaling/v1",
+      "kind: HorizontalPodAutoscaler",
+      "metadata:",
+      "  name: frontend-scaler",
+      "spec:",
+      "  scaleTargetRef:",
+      "    kind: ReplicaSet",
+      "    name: frontend",
+      "  minReplicas: 3",
+      "  maxReplicas: 10",
+      "  targetCPUUtilizationPercentage: 50",
+    ].join("\n");
+    expect(await roundTrip(yaml)).toEqual(loadAll(yaml));
+  });
+
+  test("an autoscaling/v2 HorizontalPodAutoscaler is generated without an apiVersion property", async () => {
+    const yaml = [
+      "apiVersion: autoscaling/v2",
+      "kind: HorizontalPodAutoscaler",
+      "metadata:",
+      "  name: web",
+      "spec:",
+      "  scaleTargetRef:",
+      "    apiVersion: apps/v1",
+      "    kind: Deployment",
+      "    name: web",
+      "  minReplicas: 1",
+      "  maxReplicas: 3",
+    ].join("\n");
+    const imported = await importManifest(yaml);
+    try {
+      const source = Object.values(imported.files).join("\n");
+      expect(source).not.toContain('apiVersion: "autoscaling/v2"');
+    } finally {
+      removeDir(imported.dir);
+    }
+    expect(await roundTrip(yaml)).toEqual(loadAll(yaml));
+  });
+});