@intentius/chant-lexicon-k8s 0.38.0 → 0.41.0

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "e1b9c06ba0f93f43759899498d03e5d7b897feffa6fa6eb46c37d0b3efecb540",
+    "manifest.json": "4c4e0afb787bdb40c3ecae9bcb1018002a85bcd41dcbf5ac12478d1ba092c3d6",
     "meta.json": "c0b141b882c51483c1d1aead748a0eb171aceca7432edd2a0404b062bf6d7831",
     "types/index.d.ts": "3be2af7494aca94adfa16269cb9c4e7a155529872207a3d70b0c4d39914f9eec",
     "rules/argo-appset-single-project.ts": "afa9f310753aa2d475f35012b13135b2dfaebed2a35d44edbe185ebc07673674",
@@ -50,5 +50,5 @@
     "skills/chant-k8s-aks.md": "e18f0e2b055f72cd7a37deaf258d7027c2d4d3e286e8fd4975b27a1f981a3ad9",
     "skills/chant-k8s-argo.md": "b1a0b826559d8c5033a479c5781efaf650320f0aee4419d8841170bd3393cea5"
   },
-  "composite": "a5edc9fe263c66fd77cc3306db813050c864e270564bcd50b0e1a1ae9109c84f"
+  "composite": "5f8423c25fc4a50e91f0e7f2a8a8064fc8cc36b150f4b0c630a6cc56e0924995"
 }

package/dist/manifest.json

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

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAqC,MAAM,0BAA0B,CAAC;AAuBjG,eAAO,MAAM,SAAS,EAAE,aA4mBvB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAqC,MAAM,0BAA0B,CAAC;AAwBjG,eAAO,MAAM,SAAS,EAAE,aA6mBvB,CAAC"}

package/dist/spec/parse.d.ts

@@ -15,6 +15,10 @@ export interface ParsedProperty {
     description?: string;
     enum?: string[];
     constraints: PropertyConstraints;
+    /** `x-kubernetes-list-type` — `map`, `set` or `atomic`. Absent when the spec does not say (chant #1441). */
+    listType?: string;
+    /** `x-kubernetes-list-map-keys` — the fields that jointly identify one element. Present only alongside `listType: "map"`. */
+    listMapKeys?: string[];
 }
 export interface ParsedPropertyType {
     name: string;
@@ -81,6 +85,19 @@ type SwaggerPathItem = Record<string, SwaggerOperation | unknown>;
  */
 export declare function parseK8sSwagger(data: string | Buffer): K8sParseResult[];
 /** Stable key for a GVK, used to join the `paths` pass onto the `definitions` pass. */
+/**
+ * Every `(property name, list-map keys)` pair the spec declares, across ALL
+ * definitions (chant #1441).
+ *
+ * Deliberately independent of {@link parseK8sSwagger}'s resource/property-type
+ * extraction. That extraction keeps 257 resources and 320 property types out
+ * of roughly a thousand definitions, so collecting merge keys from its output
+ * alone finds 18 of the 32 properties the spec annotates — and misses
+ * `ServicePort.port`, whose absence would silently demote every Service port
+ * list to the hand-written fallback. A definition is worth reading for its
+ * merge semantics whether or not chant emits a type for it.
+ */
+export declare function specListMapKeyPairs(data: string | Buffer): Array<[string, string[]]>;
 export declare function gvkKey(gvk: GroupVersionKind): string;
 /**
  * Derive the operation surface from the OpenAPI `paths` — chant #1074.

package/dist/spec/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/spec/parse.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAShF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,mBAAmB,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,UAAU,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,eAAe;IAC9B,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IAChC,8EAA8E;IAC9E,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,aAAa,EAAE,kBAAkB,EAAE,CAAC;IACpC,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,GAAG,EAAE,gBAAgB,CAAC;IACtB,uEAAuE;IACvE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sEAAsE;IACtE,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAkCD,UAAU,gBAAgB;IACxB,iCAAiC,CAAC,EAAE,gBAAgB,CAAC;IACrD,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC;AA+DlE;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,cAAc,EAAE,CAoCvE;AAED,uFAAuF;AACvF,wBAAgB,MAAM,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,CAEpD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAqChH;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,CAG3D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,CAK7D;AA6PD;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGvD"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/spec/parse.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-k8s",
-  "version": "0.38.0",
+  "version": "0.41.0",
   "description": "Kubernetes lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -78,7 +78,8 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.38.0",
+    "zod": "^4.3.6",
+    "@intentius/chant": "^0.41.0",
     "typescript": "^5.9.3"
   }
 }

package/src/codegen/generate-list-map-keys.test.ts

@@ -0,0 +1,112 @@
+import { describe, test, expect } from "vitest";
+import { buildListMapKeyTable, parsedListMapKeyPairs, generateListMapKeysJSON } from "./generate-list-map-keys";
+import type { K8sParseResult, ParsedProperty } from "../spec/parse";
+
+/**
+ * chant #1441 — the table the drift engine reads instead of six hardcoded
+ * property names.
+ */
+
+function prop(name: string, over: Partial<ParsedProperty> = {}): ParsedProperty {
+  return { name, tsType: "any[]", required: false, constraints: {}, ...over };
+}
+
+function result(properties: ParsedProperty[], propertyTypeProps: ParsedProperty[] = []): K8sParseResult {
+  return {
+    resource: { typeName: "K8s::Test", properties, attributes: [], deprecatedProperties: [] },
+    propertyTypes: propertyTypeProps.length
+      ? [{ name: "Nested", defType: "io.k8s.Nested", properties: propertyTypeProps }]
+      : [],
+    enums: [],
+    gvk: { group: "", version: "v1", kind: "Test" },
+  };
+}
+
+describe("buildListMapKeyTable", () => {
+  test("folds pairs into a by-name table with sorted key fields", () => {
+    expect(buildListMapKeyTable([["ports", ["protocol", "containerPort"]]])).toEqual({
+      ports: [["containerPort", "protocol"]],
+    });
+  });
+
+  test("keeps both variants when one name is keyed two ways", () => {
+    // The real case: container ports vs Service ports. Collapsing these would
+    // silently mis-identify one of them.
+    const table = buildListMapKeyTable([
+      ["ports", ["containerPort", "protocol"]],
+      ["ports", ["port", "protocol"]],
+    ]);
+    expect(table.ports).toEqual([
+      ["containerPort", "protocol"],
+      ["port", "protocol"],
+    ]);
+  });
+
+  test("deduplicates the same key set seen on many definitions", () => {
+    // `conditions` is keyed by `type` at 31 sites in v1.36.2.
+    const pairs: Array<[string, string[]]> = Array.from({ length: 31 }, () => ["conditions", ["type"]]);
+    expect(buildListMapKeyTable(pairs)).toEqual({ conditions: [["type"]] });
+  });
+
+  test("orders candidates longest-first, so a specific set is tried before a shorter one", () => {
+    const table = buildListMapKeyTable([
+      ["devices", ["driver"]],
+      ["devices", ["device", "driver", "pool", "shareID"]],
+    ]);
+    expect(table.devices[0]).toHaveLength(4);
+  });
+
+  test("merges independent sources", () => {
+    const table = buildListMapKeyTable([["containers", ["name"]]], [["conditions", ["type"]]]);
+    expect(Object.keys(table).sort()).toEqual(["conditions", "containers"]);
+  });
+
+  test("names are emitted in sorted order, so regeneration produces a stable file", () => {
+    const table = buildListMapKeyTable([
+      ["zeta", ["name"]],
+      ["alpha", ["name"]],
+    ]);
+    expect(Object.keys(table)).toEqual(["alpha", "zeta"]);
+  });
+});
+
+describe("parsedListMapKeyPairs", () => {
+  test("collects from resource properties and nested property types alike", () => {
+    const pairs = parsedListMapKeyPairs([
+      result(
+        [prop("conditions", { listType: "map", listMapKeys: ["type"] })],
+        [prop("containers", { listType: "map", listMapKeys: ["name"] })],
+      ),
+    ]);
+    expect(pairs).toEqual([
+      ["conditions", ["type"]],
+      ["containers", ["name"]],
+    ]);
+  });
+
+  test("ignores atomic and set lists, and map lists with no keys", () => {
+    const pairs = parsedListMapKeyPairs([
+      result([
+        prop("args", { listType: "atomic" }),
+        prop("finalizers", { listType: "set" }),
+        prop("broken", { listType: "map" }),
+        prop("plain"),
+      ]),
+    ]);
+    expect(pairs).toEqual([]);
+  });
+});
+
+describe("generateListMapKeysJSON", () => {
+  test("emits both sources and ends with a newline", () => {
+    const json = generateListMapKeysJSON(
+      [["ports", ["port", "protocol"]]],
+      [result([prop("myItems", { listType: "map", listMapKeys: ["id"] })])],
+    );
+    expect(json.endsWith("\n")).toBe(true);
+    expect(JSON.parse(json)).toEqual({
+      myItems: [["id"]],
+      ports: [["port", "protocol"]],
+    });
+  });
+});

package/src/codegen/generate-list-map-keys.ts

@@ -0,0 +1,99 @@
+/**
+ * Associative-list key table, derived from the spec rather than hardcoded
+ * (chant #1441).
+ *
+ * The Kubernetes OpenAPI spec states, per property, how the API server merges
+ * a list: `x-kubernetes-list-type: map` plus `x-kubernetes-list-map-keys`
+ * naming the fields that jointly identify one element. chant's drift engine
+ * needs exactly that to compare `containers` by name rather than by index.
+ * Before this, `k8sListMapOrderKey` (core's `managed-fields.ts`) hardcoded six
+ * properties; the spec annotates 32.
+ *
+ * ## Why the table is keyed by property name
+ *
+ * The consumer is `DeepNormalizationHooks.orderKey`, which receives an
+ * index-erased `pattern` (`spec.template.spec.containers`) and keys off its
+ * LAST segment. A by-name table matches that lookup exactly and needs no
+ * resolution of the definition graph at generation time.
+ *
+ * The cost is that two definitions declaring the same property name with
+ * different keys collapse into one entry. That is real but small, and it is
+ * represented rather than lost: each name maps to a LIST of candidate key
+ * sets, and the consumer picks the first whose fields are all present on the
+ * element. In v1.36.2 exactly one property needs it — `ports`, keyed
+ * `(containerPort, protocol)` on a container and `(port, protocol)` on a
+ * Service — which is the same dual shape the hardcoded implementation already
+ * special-cased by hand.
+ *
+ * ## Two sources
+ *
+ * The whole spec is read directly, because chant emits types for 257 of
+ * roughly a thousand definitions and the merge semantics of a definition are
+ * worth having whether or not it becomes a type. Reading only the parsed
+ * results finds 18 of the 32 properties and misses `ServicePort.port`.
+ *
+ * Parsed results are read too, because CRDs arrive that way — an operator CRD
+ * that declares these extensions contributes its keys for free.
+ */
+
+import type { K8sParseResult, ParsedProperty } from "../spec/parse";
+
+/** Property name → candidate key-field sets, most-specific first. */
+export type ListMapKeyTable = Record<string, string[][]>;
+
+function everyProperty(results: K8sParseResult[]): ParsedProperty[] {
+  const out: ParsedProperty[] = [];
+  for (const r of results) {
+    out.push(...r.resource.properties);
+    for (const pt of r.propertyTypes) out.push(...pt.properties);
+  }
+  return out;
+}
+
+/** The `(name, keys)` pairs carried on parsed properties — core types and every CRD. */
+export function parsedListMapKeyPairs(results: K8sParseResult[]): Array<[string, string[]]> {
+  const pairs: Array<[string, string[]]> = [];
+  for (const p of everyProperty(results)) {
+    if (p.listType === "map" && p.listMapKeys?.length) pairs.push([p.name, p.listMapKeys]);
+  }
+  return pairs;
+}
+
+/**
+ * Fold `(name, keys)` pairs into a by-name table.
+ *
+ * Candidate sets are deduplicated by content and ordered longest-first, so a
+ * more specific key set is tried before a shorter one whose fields a longer
+ * element would also satisfy.
+ */
+export function buildListMapKeyTable(...sources: Array<Array<[string, string[]]>>): ListMapKeyTable {
+  const byName = new Map<string, Map<string, string[]>>();
+
+  for (const pairs of sources) {
+    for (const [name, rawKeys] of pairs) {
+      const keys = [...rawKeys].sort();
+      const seen = byName.get(name) ?? new Map<string, string[]>();
+      seen.set(keys.join(" "), keys);
+      byName.set(name, seen);
+    }
+  }
+
+  const table: ListMapKeyTable = {};
+  for (const name of [...byName.keys()].sort()) {
+    const variants = byName.get(name);
+    if (!variants) continue;
+    const sets = [...variants.values()];
+    sets.sort((a, b) => b.length - a.length || a.join().localeCompare(b.join()));
+    table[name] = sets;
+  }
+  return table;
+}
+
+/** Serialize the `list-map-keys.json` generated artifact. */
+export function generateListMapKeysJSON(
+  specPairs: Array<[string, string[]]>,
+  results: K8sParseResult[],
+): string {
+  const table = buildListMapKeyTable(specPairs, parsedListMapKeyPairs(results));
+  return `${JSON.stringify(table, null, 2)}\n`;
+}

package/src/codegen/generate.ts

@@ -12,12 +12,13 @@ import {
   type GeneratePipelineConfig,
 } from "@intentius/chant/codegen/generate";
 import { fetchSchemas } from "../spec/fetch";
-import { parseK8sSwagger, k8sShortName, type K8sParseResult } from "../spec/parse";
+import { parseK8sSwagger, specListMapKeyPairs, k8sShortName, type K8sParseResult } from "../spec/parse";
 import { loadMultipleCRDs } from "../crd/loader";
 import { CRD_SOURCES } from "../crd/crd-sources";
 import { NamingStrategy, propertyTypeName, extractDefName } from "./naming";
 import { generateLexiconJSON } from "./generate-lexicon";
 import { generateOperationsJSON } from "./generate-operations";
+import { generateListMapKeysJSON } from "./generate-list-map-keys";
 import { generateTypeScriptDeclarations } from "./generate-typescript";
 import {
   generateRuntimeIndex as coreGenerateRuntimeIndex,
@@ -38,6 +39,9 @@ export interface K8sGenerateOptions extends GenerateOptions {
 export async function generate(opts: K8sGenerateOptions = {}): Promise<GenerateResult> {
   // Pipeline state captured in closure — no module-level mutation
   let pendingResults: K8sParseResult[] = [];
+  // chant #1441 — read off the raw document in `parseSchema`, since the
+  // result set covers only the definitions chant emits types for.
+  let specPairs: Array<[string, string[]]> = [];
 
   const config: GeneratePipelineConfig<K8sParseResult> = {
     fetchSchemas: async (fetchOpts) => {
@@ -49,6 +53,7 @@ export async function generate(opts: K8sGenerateOptions = {}): Promise<GenerateR
       // The pipeline calls this once per schema entry. We return the first result
       // and use augmentResults to inject the rest.
       const results = parseK8sSwagger(data);
+      specPairs = specListMapKeyPairs(data);
       if (results.length === 0) return null;
       // Return the first result; stash the rest for augmentResults
       pendingResults = results.slice(1);
@@ -105,6 +110,9 @@ export async function generate(opts: K8sGenerateOptions = {}): Promise<GenerateR
     // differently from how the declarable surface names it.
     generateExtraArtifacts: (results) => ({
       "operations.json": generateOperationsJSON(results),
+      // chant #1441 — the spec's own associative-list keys, so drift compares
+      // list elements by identity instead of by index.
+      "list-map-keys.json": generateListMapKeysJSON(specPairs, results),
     }),
   };
 

package/src/composites/adot-collector.ts

@@ -67,7 +67,7 @@ export interface AdotCollectorResult {
  * });
  * ```
  */
-export const AdotCollector = Composite<AdotCollectorProps>((props) => {
+export const AdotCollector = Composite((props: AdotCollectorProps) => {
   const {
     region,
     clusterName,

package/src/composites/agic-ingress.ts

@@ -75,7 +75,7 @@ export interface AgicIngressResult {
  * });
  * ```
  */
-export const AgicIngress = Composite<AgicIngressProps>((props) => {
+export const AgicIngress = Composite((props: AgicIngressProps) => {
   const {
     name,
     hosts,

package/src/composites/aks-external-dns-agent.ts

@@ -66,7 +66,7 @@ export interface AksExternalDnsAgentResult {
  * });
  * ```
  */
-export const AksExternalDnsAgent = Composite<AksExternalDnsAgentProps>((props) => {
+export const AksExternalDnsAgent = Composite((props: AksExternalDnsAgentProps) => {
   const {
     clientId,
     resourceGroup,

package/src/composites/alb-ingress.ts

@@ -79,7 +79,7 @@ export interface AlbIngressResult {
  * });
  * ```
  */
-export const AlbIngress = Composite<AlbIngressProps>((props) => {
+export const AlbIngress = Composite((props: AlbIngressProps) => {
   const {
     name,
     hosts,

package/src/composites/autoscaled-service.ts

@@ -104,7 +104,7 @@ export interface AutoscaledServiceResult {
  * });
  * ```
  */
-export const AutoscaledService = Composite<AutoscaledServiceProps>((props) => {
+export const AutoscaledService = Composite((props: AutoscaledServiceProps) => {
   const {
     name,
     image,

package/src/composites/azure-disk-storage-class.ts

@@ -49,7 +49,7 @@ export interface AzureDiskStorageClassResult {
  * });
  * ```
  */
-export const AzureDiskStorageClass = Composite<AzureDiskStorageClassProps>((props) => {
+export const AzureDiskStorageClass = Composite((props: AzureDiskStorageClassProps) => {
   const {
     name,
     skuName = "Premium_LRS",

package/src/composites/azure-file-storage-class.ts

@@ -47,7 +47,7 @@ export interface AzureFileStorageClassResult {
  * });
  * ```
  */
-export const AzureFileStorageClass = Composite<AzureFileStorageClassProps>((props) => {
+export const AzureFileStorageClass = Composite((props: AzureFileStorageClassProps) => {
   const {
     name,
     skuName = "Premium_LRS",

package/src/composites/azure-monitor-collector.ts

@@ -64,7 +64,7 @@ export interface AzureMonitorCollectorResult {
  * });
  * ```
  */
-export const AzureMonitorCollector = Composite<AzureMonitorCollectorProps>((props) => {
+export const AzureMonitorCollector = Composite((props: AzureMonitorCollectorProps) => {
   const {
     workspaceId,
     clusterName,

package/src/composites/batch-job.ts

@@ -103,7 +103,7 @@ export interface BatchJobResult {
  * });
  * ```
  */
-export const BatchJob = Composite<BatchJobProps>((props) => {
+export const BatchJob = Composite((props: BatchJobProps) => {
   const {
     name,
     image,

package/src/composites/cockroachdb-cluster.ts

@@ -133,7 +133,7 @@ export interface CockroachDbClusterResult {
  * });
  * ```
  */
-export const CockroachDbCluster = Composite<CockroachDbClusterProps>((props) => {
+export const CockroachDbCluster = Composite((props: CockroachDbClusterProps) => {
   const {
     name,
     namespace,

package/src/composites/config-connector-context.ts

@@ -42,7 +42,7 @@ export interface ConfigConnectorContextResult {
  * });
  * ```
  */
-export const ConfigConnectorContext = Composite<ConfigConnectorContextProps>((props) => {
+export const ConfigConnectorContext = Composite((props: ConfigConnectorContextProps) => {
   const {
     name = "configconnectorcontext.core.cnrm.cloud.google.com",
     googleServiceAccountEmail,

package/src/composites/configured-app.ts

@@ -89,7 +89,7 @@ export interface ConfiguredAppResult {
  * });
  * ```
  */
-export const ConfiguredApp = Composite<ConfiguredAppProps>((props) => {
+export const ConfiguredApp = Composite((props: ConfiguredAppProps) => {
   const {
     name,
     image,

package/src/composites/cron-workload.ts

@@ -74,7 +74,7 @@ export interface CronWorkloadResult {
  * });
  * ```
  */
-export const CronWorkload = Composite<CronWorkloadProps>((props) => {
+export const CronWorkload = Composite((props: CronWorkloadProps) => {
   const {
     name,
     image,

package/src/composites/ebs-storage-class.ts

@@ -56,7 +56,7 @@ export interface EbsStorageClassResult {
  * });
  * ```
  */
-export const EbsStorageClass = Composite<EbsStorageClassProps>((props) => {
+export const EbsStorageClass = Composite((props: EbsStorageClassProps) => {
   const {
     name,
     type = "gp3",

package/src/composites/efs-storage-class.ts

@@ -48,7 +48,7 @@ export interface EfsStorageClassResult {
  * });
  * ```
  */
-export const EfsStorageClass = Composite<EfsStorageClassProps>((props) => {
+export const EfsStorageClass = Composite((props: EfsStorageClassProps) => {
   const {
     name,
     fileSystemId,

package/src/composites/external-dns-agent.ts

@@ -59,7 +59,7 @@ export interface ExternalDnsAgentResult {
  * });
  * ```
  */
-export const ExternalDnsAgent = Composite<ExternalDnsAgentProps>((props) => {
+export const ExternalDnsAgent = Composite((props: ExternalDnsAgentProps) => {
   const {
     iamRoleArn,
     domainFilters,

package/src/composites/filestore-storage-class.ts

@@ -47,7 +47,7 @@ export interface FilestoreStorageClassResult {
  * });
  * ```
  */
-export const FilestoreStorageClass = Composite<FilestoreStorageClassProps>((props) => {
+export const FilestoreStorageClass = Composite((props: FilestoreStorageClassProps) => {
   const {
     name,
     tier = "standard",

package/src/composites/fluent-bit-agent.ts

@@ -67,7 +67,7 @@ export interface FluentBitAgentResult {
  * });
  * ```
  */
-export const FluentBitAgent = Composite<FluentBitAgentProps>((props) => {
+export const FluentBitAgent = Composite((props: FluentBitAgentProps) => {
   const {
     name = "fluent-bit",
     image = "public.ecr.aws/aws-observability/aws-for-fluent-bit:stable",

package/src/composites/gce-ingress.ts

@@ -74,7 +74,7 @@ export interface GceIngressResult {
  * });
  * ```
  */
-export const GceIngress = Composite<GceIngressProps>((props) => {
+export const GceIngress = Composite((props: GceIngressProps) => {
   const {
     name,
     hosts,

package/src/composites/gce-pd-storage-class.ts

@@ -49,7 +49,7 @@ export interface GcePdStorageClassResult {
  * });
  * ```
  */
-export const GcePdStorageClass = Composite<GcePdStorageClassProps>((props) => {
+export const GcePdStorageClass = Composite((props: GcePdStorageClassProps) => {
   const {
     name,
     type = "pd-balanced",

package/src/composites/gke-external-dns-agent.ts

@@ -60,7 +60,7 @@ export interface GkeExternalDnsAgentResult {
  * });
  * ```
  */
-export const GkeExternalDnsAgent = Composite<GkeExternalDnsAgentProps>((props) => {
+export const GkeExternalDnsAgent = Composite((props: GkeExternalDnsAgentProps) => {
   const {
     gcpServiceAccountEmail,
     gcpProjectId,

package/src/composites/gke-fluent-bit-agent.ts

@@ -65,7 +65,7 @@ export interface GkeFluentBitAgentResult {
  * });
  * ```
  */
-export const GkeFluentBitAgent = Composite<GkeFluentBitAgentProps>((props) => {
+export const GkeFluentBitAgent = Composite((props: GkeFluentBitAgentProps) => {
   const {
     clusterName,
     projectId,

package/src/composites/gke-gateway.ts

@@ -68,7 +68,7 @@ export interface GkeGatewayResult {
  * });
  * ```
  */
-export const GkeGateway = Composite<GkeGatewayProps>((props) => {
+export const GkeGateway = Composite((props: GkeGatewayProps) => {
   const {
     name,
     gatewayClassName = "gke-l7-global-external-managed",

package/src/composites/gke-otel-collector.ts

@@ -65,7 +65,7 @@ export interface GkeOtelCollectorResult {
  * });
  * ```
  */
-export const GkeOtelCollector = Composite<GkeOtelCollectorProps>((props) => {
+export const GkeOtelCollector = Composite((props: GkeOtelCollectorProps) => {
   const {
     clusterName,
     projectId,

package/src/composites/irsa-service-account.ts

@@ -55,7 +55,7 @@ export interface IrsaServiceAccountResult {
  * });
  * ```
  */
-export const IrsaServiceAccount = Composite<IrsaServiceAccountProps>((props) => {
+export const IrsaServiceAccount = Composite((props: IrsaServiceAccountProps) => {
   const {
     name,
     iamRoleArn,

package/src/composites/metrics-server.ts

@@ -57,7 +57,7 @@ export interface MetricsServerResult {
  * const ms = MetricsServer({});
  * ```
  */
-export const MetricsServer = Composite<MetricsServerProps>((props) => {
+export const MetricsServer = Composite((props: MetricsServerProps) => {
   const {
     name = "metrics-server",
     image = "registry.k8s.io/metrics-server/metrics-server:v0.7.2",

package/src/composites/monitored-service.ts

@@ -91,7 +91,7 @@ export interface MonitoredServiceResult {
  * });
  * ```
  */
-export const MonitoredService = Composite<MonitoredServiceProps>((props) => {
+export const MonitoredService = Composite((props: MonitoredServiceProps) => {
   const {
     name,
     image,

package/src/composites/namespace-env.ts

@@ -65,7 +65,7 @@ export interface NamespaceEnvResult {
  * });
  * ```
  */
-export const NamespaceEnv = Composite<NamespaceEnvProps>((props) => {
+export const NamespaceEnv = Composite((props: NamespaceEnvProps) => {
   const {
     name,
     cpuQuota,

package/src/composites/network-isolated-app.ts

@@ -85,7 +85,7 @@ export interface NetworkIsolatedAppResult {
  * });
  * ```
  */
-export const NetworkIsolatedApp = Composite<NetworkIsolatedAppProps>((props) => {
+export const NetworkIsolatedApp = Composite((props: NetworkIsolatedAppProps) => {
   const {
     name,
     image,