@intentius/chant 0.18.2 → 0.18.3

package/dist/discovery/collect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collect.d.ts","sourceRoot":"","sources":["../../src/discovery/collect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAM9D;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GACjE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAoEzB"}
+{"version":3,"file":"collect.d.ts","sourceRoot":"","sources":["../../src/discovery/collect.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAkB9D;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GACjE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAqEzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "description": "Declarative infrastructure-as-code toolkit — TypeScript on Node.js",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",

package/src/discovery/collect.test.ts

@@ -301,3 +301,25 @@ describe("collectEntities with composites", () => {
     expect(entities.has("myComp")).toBe(false);
   });
 });
+
+describe("collectEntities — default exports (op files)", () => {
+  test("two files with `export default` do not collide (keyed per file)", () => {
+    const apply = createMockEntity("Temporal::Op");
+    const reconcile = createMockEntity("Temporal::Op");
+    const result = collectEntities([
+      { file: "ops/apply.op.ts", exports: { default: apply } },
+      { file: "ops/reconcile.op.ts", exports: { default: reconcile } },
+    ]);
+    expect(result.size).toBe(2);
+    // keyed by file basename (sans .op.ts), not the literal "default"
+    expect(result.get("apply")).toBe(apply);
+    expect(result.get("reconcile")).toBe(reconcile);
+    expect(result.has("default")).toBe(false);
+  });
+
+  test("a single default export is collected (not dropped)", () => {
+    const op = createMockEntity("Temporal::Op");
+    const result = collectEntities([{ file: "ops/deploy.op.ts", exports: { default: op } }]);
+    expect(result.get("deploy")).toBe(op);
+  });
+});

package/src/discovery/collect.ts

@@ -1,9 +1,22 @@
+import { basename } from "node:path";
 import { isDeclarable, type Declarable } from "../declarable";
 import { isCompositeInstance, expandComposite } from "../composite";
 import { isLexiconOutput } from "../lexicon-output";
 import { DiscoveryError } from "../errors";
 import { setProvenance } from "../provenance";
 
+/**
+ * The entity key for an export. `export default` is per-module — the `Op` pattern
+ * (`export default op`) uses it, and two op files must not collide on the literal
+ * name "default". Key a default export by the file's basename so distinct files
+ * stay distinct; named exports keep their name. (Serializers that care about the
+ * declared name — e.g. the Op serializer — read it from the entity, not this key.)
+ */
+function exportKey(rawName: string, file: string): string {
+  if (rawName !== "default") return rawName;
+  return basename(file).replace(/\.ts$/, "").replace(/\.op$/, "");
+}
+
 /**
  * Collects all declarable entities from imported modules.
  * CompositeInstance exports are expanded into individual entities
@@ -21,7 +34,8 @@ export function collectEntities(
   const entities = new Map<string, Declarable>();
 
   for (const { file, exports } of modules) {
-    for (const [name, value] of Object.entries(exports)) {
+    for (const [rawName, value] of Object.entries(exports)) {
+      const name = exportKey(rawName, file);
       if (isDeclarable(value)) {
         if (entities.has(name)) {
           // Same object re-exported from multiple files (e.g. re-exports from multiple files) is fine