@alloy-js/python 0.4.0-dev.5 → 0.4.0-dev.7

package/dist/dev/src/name-conflict-resolver.js

@@ -1,8 +1,12 @@
 export function pythonNameConflictResolver(_, symbols) {
+  if (symbols.length === 0) return;
+  // Clear any prior deconflict rename on the first symbol so it reverts to
+  // the plain name once a collision is resolved.
+  symbols[0].deconflictedName = undefined;
   for (let i = 1; i < symbols.length; i++) {
-    // Rename all but the first symbol to have a suffix of _2, _3, plus the scope name if available.
     const symbol = symbols[i];
-    symbol.name = symbol.originalName + "_" + (i + 1) + "_" + (symbols[i].aliasTarget?.scope?.name ?? symbol.module ?? "");
+    // Rename all but the first symbol to have a suffix of _2, _3, plus the scope name if available.
+    symbol.deconflictedName = symbol.originalName + "_" + (i + 1) + "_" + (symbol.aliasTarget?.scope?.name ?? symbol.module ?? "");
   }
 }
 //# sourceMappingURL=name-conflict-resolver.js.map

package/dist/dev/src/name-conflict-resolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["pythonNameConflictResolver","_","symbols","i","length","symbol","name","originalName","aliasTarget","scope","module"],"sources":["../../../src/name-conflict-resolver.ts"],"sourcesContent":[null],"mappings":"AAEA,OAAO,SAASA,0BAA0BA,CACxCC,CAAS,EACTC,OAA6B,EAC7B;EACA,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGD,OAAO,CAACE,MAAM,EAAED,CAAC,EAAE,EAAE;IACvC;IACA,MAAME,MAAM,GAAGH,OAAO,CAACC,CAAC,CAIvB;IACDE,MAAM,CAACC,IAAI,GACTD,MAAM,CAACE,YAAY,GACnB,GAAG,IACFJ,CAAC,GAAG,CAAC,CAAC,GACP,GAAG,IACFD,OAAO,CAACC,CAAC,CAAC,CAACK,WAAW,EAAEC,KAAK,EAAEH,IAAI,IAAID,MAAM,CAACK,MAAM,IAAI,EAAE,CAAC;EAChE;AACF","ignoreList":[]}
+{"version":3,"names":["pythonNameConflictResolver","_","symbols","length","deconflictedName","undefined","i","symbol","originalName","aliasTarget","scope","name","module"],"sources":["../../../src/name-conflict-resolver.ts"],"sourcesContent":[null],"mappings":"AAGA,OAAO,SAASA,0BAA0BA,CAACC,CAAS,EAAEC,OAAuB,EAAE;EAC7E,IAAIA,OAAO,CAACC,MAAM,KAAK,CAAC,EAAE;EAC1B;EACA;EACAD,OAAO,CAAC,CAAC,CAAC,CAACE,gBAAgB,GAAGC,SAAS;EACvC,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGJ,OAAO,CAACC,MAAM,EAAEG,CAAC,EAAE,EAAE;IACvC,MAAMC,MAAM,GAAGL,OAAO,CAACI,CAAC,CAAuB;IAC/C;IACAC,MAAM,CAACH,gBAAgB,GACrBG,MAAM,CAACC,YAAY,GACnB,GAAG,IACFF,CAAC,GAAG,CAAC,CAAC,GACP,GAAG,IACFC,MAAM,CAACE,WAAW,EAAEC,KAAK,EAAEC,IAAI,IAAIJ,MAAM,CAACK,MAAM,IAAI,EAAE,CAAC;EAC5D;AACF","ignoreList":[]}

package/dist/dev/test/name-conflict.test.js

@@ -0,0 +1,38 @@
+import { createOutputBinder } from "@alloy-js/core";
+import { expect, it } from "vitest";
+import { pythonNameConflictResolver } from "../src/name-conflict-resolver.js";
+import { createPythonSymbol } from "../src/symbol-creation.js";
+import { PythonModuleScope } from "../src/symbols/index.js";
+it("reverts Python's non-`_N` rename scheme when the conflict is removed", () => {
+  // Python renames via `foo_2_modulename` — the old regex-based revert would
+  // never match this pattern. The deconflictedName slot is pattern-agnostic,
+  // so invoking the resolver with the survivor alone clears the rename
+  // regardless of scheme.
+  const binder = createOutputBinder();
+  const scope = new PythonModuleScope("root", undefined, {
+    binder
+  });
+  const a = createPythonSymbol("foo", scope.symbols);
+  const b = createPythonSymbol("foo", scope.symbols);
+
+  // Simulate a conflict pass.
+  pythonNameConflictResolver("foo", [a, b]);
+  expect(a.name).toBe("foo");
+  expect(b.name).not.toBe("foo");
+  expect(b.deconflictedName).toBeDefined();
+
+  // Simulate the post-delete deconflict pass — the sole survivor must have
+  // its prior rename cleared, even though its "rename scheme" differs from
+  // the default `_N` shape.
+  b.deconflictedName = "foo_2_module"; // pretend b had been renamed using python scheme
+  pythonNameConflictResolver("foo", [a]);
+  expect(a.name).toBe("foo");
+  expect(a.deconflictedName).toBeUndefined();
+
+  // And if a was the one carrying the prior rename:
+  a.deconflictedName = "foo_3_other";
+  pythonNameConflictResolver("foo", [a]);
+  expect(a.name).toBe("foo");
+  expect(a.deconflictedName).toBeUndefined();
+});
+//# sourceMappingURL=name-conflict.test.js.map

package/dist/dev/test/name-conflict.test.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createOutputBinder","expect","it","pythonNameConflictResolver","createPythonSymbol","PythonModuleScope","binder","scope","undefined","a","symbols","b","name","toBe","not","deconflictedName","toBeDefined","toBeUndefined"],"sources":["../../../test/name-conflict.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,MAAM,EAAEC,EAAE,QAAQ,QAAQ;AACnC,SAASC,0BAA0B,QAAQ,kCAAkC;AAC7E,SAASC,kBAAkB,QAAQ,2BAA2B;AAC9D,SAASC,iBAAiB,QAAQ,yBAAyB;AAE3DH,EAAE,CAAC,sEAAsE,EAAE,MAAM;EAC/E;EACA;EACA;EACA;EACA,MAAMI,MAAM,GAAGN,kBAAkB,CAAC,CAAC;EACnC,MAAMO,KAAK,GAAG,IAAIF,iBAAiB,CAAC,MAAM,EAAEG,SAAS,EAAE;IAAEF;EAAO,CAAC,CAAC;EAElE,MAAMG,CAAC,GAAGL,kBAAkB,CAAC,KAAK,EAAEG,KAAK,CAACG,OAAO,CAAC;EAClD,MAAMC,CAAC,GAAGP,kBAAkB,CAAC,KAAK,EAAEG,KAAK,CAACG,OAAO,CAAC;;EAElD;EACAP,0BAA0B,CAAC,KAAK,EAAE,CAACM,CAAC,EAAEE,CAAC,CAAC,CAAC;EACzCV,MAAM,CAACQ,CAAC,CAACG,IAAI,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;EAC1BZ,MAAM,CAACU,CAAC,CAACC,IAAI,CAAC,CAACE,GAAG,CAACD,IAAI,CAAC,KAAK,CAAC;EAC9BZ,MAAM,CAACU,CAAC,CAACI,gBAAgB,CAAC,CAACC,WAAW,CAAC,CAAC;;EAExC;EACA;EACA;EACAL,CAAC,CAACI,gBAAgB,GAAG,cAAc,CAAC,CAAC;EACrCZ,0BAA0B,CAAC,KAAK,EAAE,CAACM,CAAC,CAAC,CAAC;EACtCR,MAAM,CAACQ,CAAC,CAACG,IAAI,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;EAC1BZ,MAAM,CAACQ,CAAC,CAACM,gBAAgB,CAAC,CAACE,aAAa,CAAC,CAAC;;EAE1C;EACAR,CAAC,CAACM,gBAAgB,GAAG,aAAa;EAClCZ,0BAA0B,CAAC,KAAK,EAAE,CAACM,CAAC,CAAC,CAAC;EACtCR,MAAM,CAACQ,CAAC,CAACG,IAAI,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;EAC1BZ,MAAM,CAACQ,CAAC,CAACM,gBAAgB,CAAC,CAACE,aAAa,CAAC,CAAC;AAC5C,CAAC,CAAC","ignoreList":[]}

package/dist/src/name-conflict-resolver.d.ts

@@ -1,3 +1,3 @@
-import { PythonOutputSymbol } from "./symbols/python-output-symbol.js";
-export declare function pythonNameConflictResolver(_: string, symbols: PythonOutputSymbol[]): void;
+import { OutputSymbol } from "@alloy-js/core";
+export declare function pythonNameConflictResolver(_: string, symbols: OutputSymbol[]): void;
 //# sourceMappingURL=name-conflict-resolver.d.ts.map

package/dist/src/name-conflict-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"name-conflict-resolver.d.ts","sourceRoot":"","sources":["../../src/name-conflict-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAEvE,wBAAgB,0BAA0B,CACxC,CAAC,EAAE,MAAM,EACT,OAAO,EAAE,kBAAkB,EAAE,QAgB9B"}
+{"version":3,"file":"name-conflict-resolver.d.ts","sourceRoot":"","sources":["../../src/name-conflict-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,QAe5E"}

package/dist/src/name-conflict-resolver.js

@@ -1,8 +1,12 @@
 export function pythonNameConflictResolver(_, symbols) {
+  if (symbols.length === 0) return;
+  // Clear any prior deconflict rename on the first symbol so it reverts to
+  // the plain name once a collision is resolved.
+  symbols[0].deconflictedName = undefined;
   for (let i = 1; i < symbols.length; i++) {
-    // Rename all but the first symbol to have a suffix of _2, _3, plus the scope name if available.
     const symbol = symbols[i];
-    symbol.name = symbol.originalName + "_" + (i + 1) + "_" + (symbols[i].aliasTarget?.scope?.name ?? symbol.module ?? "");
+    // Rename all but the first symbol to have a suffix of _2, _3, plus the scope name if available.
+    symbol.deconflictedName = symbol.originalName + "_" + (i + 1) + "_" + (symbol.aliasTarget?.scope?.name ?? symbol.module ?? "");
   }
 }
 //# sourceMappingURL=name-conflict-resolver.js.map

package/dist/src/name-conflict-resolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["pythonNameConflictResolver","_","symbols","i","length","symbol","name","originalName","aliasTarget","scope","module"],"sources":["../../src/name-conflict-resolver.ts"],"sourcesContent":[null],"mappings":"AAEA,OAAO,SAASA,0BAA0BA,CACxCC,CAAS,EACTC,OAA6B,EAC7B;EACA,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGD,OAAO,CAACE,MAAM,EAAED,CAAC,EAAE,EAAE;IACvC;IACA,MAAME,MAAM,GAAGH,OAAO,CAACC,CAAC,CAIvB;IACDE,MAAM,CAACC,IAAI,GACTD,MAAM,CAACE,YAAY,GACnB,GAAG,IACFJ,CAAC,GAAG,CAAC,CAAC,GACP,GAAG,IACFD,OAAO,CAACC,CAAC,CAAC,CAACK,WAAW,EAAEC,KAAK,EAAEH,IAAI,IAAID,MAAM,CAACK,MAAM,IAAI,EAAE,CAAC;EAChE;AACF","ignoreList":[]}
+{"version":3,"names":["pythonNameConflictResolver","_","symbols","length","deconflictedName","undefined","i","symbol","originalName","aliasTarget","scope","name","module"],"sources":["../../src/name-conflict-resolver.ts"],"sourcesContent":[null],"mappings":"AAGA,OAAO,SAASA,0BAA0BA,CAACC,CAAS,EAAEC,OAAuB,EAAE;EAC7E,IAAIA,OAAO,CAACC,MAAM,KAAK,CAAC,EAAE;EAC1B;EACA;EACAD,OAAO,CAAC,CAAC,CAAC,CAACE,gBAAgB,GAAGC,SAAS;EACvC,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGJ,OAAO,CAACC,MAAM,EAAEG,CAAC,EAAE,EAAE;IACvC,MAAMC,MAAM,GAAGL,OAAO,CAACI,CAAC,CAAuB;IAC/C;IACAC,MAAM,CAACH,gBAAgB,GACrBG,MAAM,CAACC,YAAY,GACnB,GAAG,IACFF,CAAC,GAAG,CAAC,CAAC,GACP,GAAG,IACFC,MAAM,CAACE,WAAW,EAAEC,KAAK,EAAEC,IAAI,IAAIJ,MAAM,CAACK,MAAM,IAAI,EAAE,CAAC;EAC5D;AACF","ignoreList":[]}

package/dist/test/name-conflict.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=name-conflict.test.d.ts.map

package/dist/test/name-conflict.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"name-conflict.test.d.ts","sourceRoot":"","sources":["../../test/name-conflict.test.ts"],"names":[],"mappings":""}

package/dist/test/name-conflict.test.js

@@ -0,0 +1,38 @@
+import { createOutputBinder } from "@alloy-js/core";
+import { expect, it } from "vitest";
+import { pythonNameConflictResolver } from "../src/name-conflict-resolver.js";
+import { createPythonSymbol } from "../src/symbol-creation.js";
+import { PythonModuleScope } from "../src/symbols/index.js";
+it("reverts Python's non-`_N` rename scheme when the conflict is removed", () => {
+  // Python renames via `foo_2_modulename` — the old regex-based revert would
+  // never match this pattern. The deconflictedName slot is pattern-agnostic,
+  // so invoking the resolver with the survivor alone clears the rename
+  // regardless of scheme.
+  const binder = createOutputBinder();
+  const scope = new PythonModuleScope("root", undefined, {
+    binder
+  });
+  const a = createPythonSymbol("foo", scope.symbols);
+  const b = createPythonSymbol("foo", scope.symbols);
+
+  // Simulate a conflict pass.
+  pythonNameConflictResolver("foo", [a, b]);
+  expect(a.name).toBe("foo");
+  expect(b.name).not.toBe("foo");
+  expect(b.deconflictedName).toBeDefined();
+
+  // Simulate the post-delete deconflict pass — the sole survivor must have
+  // its prior rename cleared, even though its "rename scheme" differs from
+  // the default `_N` shape.
+  b.deconflictedName = "foo_2_module"; // pretend b had been renamed using python scheme
+  pythonNameConflictResolver("foo", [a]);
+  expect(a.name).toBe("foo");
+  expect(a.deconflictedName).toBeUndefined();
+
+  // And if a was the one carrying the prior rename:
+  a.deconflictedName = "foo_3_other";
+  pythonNameConflictResolver("foo", [a]);
+  expect(a.name).toBe("foo");
+  expect(a.deconflictedName).toBeUndefined();
+});
+//# sourceMappingURL=name-conflict.test.js.map

package/dist/test/name-conflict.test.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createOutputBinder","expect","it","pythonNameConflictResolver","createPythonSymbol","PythonModuleScope","binder","scope","undefined","a","symbols","b","name","toBe","not","deconflictedName","toBeDefined","toBeUndefined"],"sources":["../../test/name-conflict.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,MAAM,EAAEC,EAAE,QAAQ,QAAQ;AACnC,SAASC,0BAA0B,QAAQ,kCAAkC;AAC7E,SAASC,kBAAkB,QAAQ,2BAA2B;AAC9D,SAASC,iBAAiB,QAAQ,yBAAyB;AAE3DH,EAAE,CAAC,sEAAsE,EAAE,MAAM;EAC/E;EACA;EACA;EACA;EACA,MAAMI,MAAM,GAAGN,kBAAkB,CAAC,CAAC;EACnC,MAAMO,KAAK,GAAG,IAAIF,iBAAiB,CAAC,MAAM,EAAEG,SAAS,EAAE;IAAEF;EAAO,CAAC,CAAC;EAElE,MAAMG,CAAC,GAAGL,kBAAkB,CAAC,KAAK,EAAEG,KAAK,CAACG,OAAO,CAAC;EAClD,MAAMC,CAAC,GAAGP,kBAAkB,CAAC,KAAK,EAAEG,KAAK,CAACG,OAAO,CAAC;;EAElD;EACAP,0BAA0B,CAAC,KAAK,EAAE,CAACM,CAAC,EAAEE,CAAC,CAAC,CAAC;EACzCV,MAAM,CAACQ,CAAC,CAACG,IAAI,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;EAC1BZ,MAAM,CAACU,CAAC,CAACC,IAAI,CAAC,CAACE,GAAG,CAACD,IAAI,CAAC,KAAK,CAAC;EAC9BZ,MAAM,CAACU,CAAC,CAACI,gBAAgB,CAAC,CAACC,WAAW,CAAC,CAAC;;EAExC;EACA;EACA;EACAL,CAAC,CAACI,gBAAgB,GAAG,cAAc,CAAC,CAAC;EACrCZ,0BAA0B,CAAC,KAAK,EAAE,CAACM,CAAC,CAAC,CAAC;EACtCR,MAAM,CAACQ,CAAC,CAACG,IAAI,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;EAC1BZ,MAAM,CAACQ,CAAC,CAACM,gBAAgB,CAAC,CAACE,aAAa,CAAC,CAAC;;EAE1C;EACAR,CAAC,CAACM,gBAAgB,GAAG,aAAa;EAClCZ,0BAA0B,CAAC,KAAK,EAAE,CAACM,CAAC,CAAC,CAAC;EACtCR,MAAM,CAACQ,CAAC,CAACG,IAAI,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;EAC1BZ,MAAM,CAACQ,CAAC,CAACM,gBAAgB,CAAC,CAACE,aAAa,CAAC,CAAC;AAC5C,CAAC,CAAC","ignoreList":[]}