@alloy-js/core 0.23.0-dev.17 → 0.23.0-dev.18

package/dist/dev/src/symbols/output-symbol.js

@@ -67,25 +67,95 @@ export class OutputSymbol {
     return this.#originalName;
   }
 
-  // this field is set by calling the name accessor.
-  #name;
+  // The user-assigned name (as set by constructor or direct `.name =`
+  // assignments). Always defined after construction.
+  #userName;
+
+  // The name assigned by a name-conflict resolver, if any. When present, this
+  // takes precedence over `#userName` in the computed `name` getter. Resolvers
+  // assign via the `deconflictedName` setter; clearing (setting to undefined)
+  // causes the symbol to fall back to its user-assigned name.
+  #deconflictedName;
+
   /**
    * The name of this symbol. Assigning to this property applies the active
    * name policy (unless `ignoreNamePolicy` is true) before storing the value.
    *
+   * The effective name is computed as `deconflictedName ?? userName`, so if a
+   * name-conflict resolver has assigned a {@link OutputSymbol.deconflictedName | deconflictedName}, that value
+   * is returned here; otherwise the value most recently assigned to `name` is
+   * returned.
+   *
    * @reactive
    */
   get name() {
     track(this, TrackOpTypes.GET, "name");
-    return this.#name;
+    return this.#deconflictedName ?? this.#userName;
   }
   set name(name) {
-    const old = this.#name;
-    if (old === name) {
+    const policyApplied = this.#namePolicy && !this.#ignoreNamePolicy ? this.#namePolicy(name) : name;
+    if (this.#userName === policyApplied) {
+      return;
+    }
+    const old = this.#deconflictedName ?? this.#userName;
+    this.#userName = policyApplied;
+    const next = this.#deconflictedName ?? this.#userName;
+    if (next !== old) {
+      trigger(this, TriggerOpTypes.SET, "name", next, old);
+    }
+  }
+
+  /**
+   * The name assigned by a name-conflict resolver, or `undefined` when the
+   * symbol is not currently renamed by conflict resolution.
+   *
+   * Resolvers should assign to this slot (rather than `name`) to record that a
+   * rename exists only because of a conflict. On re-deconfliction (e.g. after
+   * a conflicting symbol is removed), resolvers clear this slot by assigning
+   * `undefined`; the effective {@link OutputSymbol.name | name} then falls back to the
+   * user-assigned name, which in turn falls back to the original name.
+   *
+   * Name policy is applied to values written here (unless `ignoreNamePolicy`
+   * is true), matching `name`'s behavior.
+   *
+   * @reactive
+   */
+  get deconflictedName() {
+    track(this, TrackOpTypes.GET, "deconflictedName");
+    return this.#deconflictedName;
+  }
+  set deconflictedName(value) {
+    const policyApplied = value !== undefined && this.#namePolicy && !this.#ignoreNamePolicy ? this.#namePolicy(value) : value;
+    if (this.#deconflictedName === policyApplied) {
       return;
     }
-    this.#name = this.#namePolicy && !this.#ignoreNamePolicy ? this.#namePolicy(name) : name;
-    trigger(this, TriggerOpTypes.SET, "name", name, old);
+    const oldName = this.#deconflictedName ?? this.#userName;
+    const oldDeconflicted = this.#deconflictedName;
+    this.#deconflictedName = policyApplied;
+    trigger(this, TriggerOpTypes.SET, "deconflictedName", policyApplied, oldDeconflicted);
+    const nextName = this.#deconflictedName ?? this.#userName;
+    if (nextName !== oldName) {
+      trigger(this, TriggerOpTypes.SET, "name", nextName, oldName);
+    }
+  }
+
+  /**
+   * The canonical requested name for this symbol: the result of applying the
+   * symbol's name policy to its {@link OutputSymbol.originalName | originalName}, or the original name
+   * itself when no policy applies. This is the name the symbol would carry if
+   * there were no conflicts, and is stable across the symbol's lifetime (it
+   * depends only on the immutable `originalName` and the name policy).
+   *
+   * Used by {@link SymbolTable} as the grouping key for name-conflict
+   * resolution, so that symbols whose original names normalize to the same
+   * policy-applied name (e.g. `foo_bar` and `fooBar` under camelCase) are
+   * recognized as conflicting.
+   */
+  get canonicalName() {
+    if (this.#ignoreNamePolicy || !this.#namePolicy) {
+      return this.originalName;
+    }
+    return this.#namePolicy(this.originalName);
   }
   #id;
   /**

package/dist/dev/src/symbols/output-symbol.js.map

@@ -1 +1 @@
-{"version":3,"names":["isRef","reactive","ReactiveFlags","track","TrackOpTypes","trigger","TriggerOpTypes","watch","useBinder","debug","TracePhase","inspect","shallowReactive","untrack","isMemberRefkey","isNamekey","isSymbolRefkey","toRefkey","formatSymbolName","OutputMemberSpace","symbolCount","OutputSymbol","memberSpaces","originalName","name","GET","old","namePolicy","ignoreNamePolicy","SET","id","ignoreNameConflict","Object","values","memberSpaceFor","spaceKey","scope","isMemberSymbol","undefined","spaces","length","spacesArray","Array","isArray","handleNewSpaces","#handleNewSpaces","newSpaces","oldSpaces","forEach","oldSpace","delete","newSpace","add","binder","refkeys","aliasTarget","dealias","isAlias","metadata","copyToSpace","space","copy","ownerSymbol","symbol","isTransient","movedTo","setMovedTo","#setMovedTo","value","isMoved","type","newValue","hasTypeSymbol","isTyped","debugInfo","lazyMemberInitializer","lazyMembersInitialized","initializeMembers","#initializeMembers","resolveMemberByName","member","symbolNames","get","SKIP","constructor","options","normalizeRefkeyOption","transient","fromEntries","map","notifySymbolCreated","#normalizeRefkeyOption","trace","notifySymbolDeleted","moveMembersTo","targetSymbol","Error","sourceSpace","targetSpace","key","moveTo","copyMembersTo","copyTo","getCopyOptions","initializeCopy","newName","custom","toString","_formatRefkey","refkey","base"],"sources":["../../../../src/symbols/output-symbol.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isRef","reactive","ReactiveFlags","track","TrackOpTypes","trigger","TriggerOpTypes","watch","useBinder","debug","TracePhase","inspect","shallowReactive","untrack","isMemberRefkey","isNamekey","isSymbolRefkey","toRefkey","formatSymbolName","OutputMemberSpace","symbolCount","OutputSymbol","memberSpaces","originalName","userName","deconflictedName","name","GET","policyApplied","namePolicy","ignoreNamePolicy","old","next","SET","value","undefined","oldName","oldDeconflicted","nextName","canonicalName","id","ignoreNameConflict","Object","values","memberSpaceFor","spaceKey","scope","isMemberSymbol","spaces","length","spacesArray","Array","isArray","handleNewSpaces","#handleNewSpaces","newSpaces","oldSpaces","forEach","oldSpace","delete","newSpace","add","binder","refkeys","aliasTarget","dealias","isAlias","metadata","copyToSpace","space","copy","ownerSymbol","symbol","isTransient","movedTo","setMovedTo","#setMovedTo","isMoved","type","newValue","hasTypeSymbol","isTyped","debugInfo","lazyMemberInitializer","lazyMembersInitialized","initializeMembers","#initializeMembers","resolveMemberByName","member","symbolNames","get","SKIP","constructor","options","normalizeRefkeyOption","transient","fromEntries","map","notifySymbolCreated","#normalizeRefkeyOption","trace","notifySymbolDeleted","moveMembersTo","targetSymbol","Error","sourceSpace","targetSpace","key","moveTo","copyMembersTo","copyTo","getCopyOptions","initializeCopy","newName","custom","toString","_formatRefkey","refkey","base"],"sources":["../../../../src/symbols/output-symbol.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/dev/src/symbols/symbol-table.js

@@ -7,7 +7,7 @@ export class SymbolTable extends ReactiveUnionSet {
   #nameConflictResolver;
   #deconflictNames = () => {
     for (const name of this.#namesToDeconflict) {
-      const conflictedSymbols = [...this].filter(sym => sym.originalName === name && !sym.ignoreNameConflict);
+      const conflictedSymbols = [...this].filter(sym => sym.canonicalName === name && !sym.ignoreNameConflict);
       if (this.#nameConflictResolver) {
         this.#nameConflictResolver(name, conflictedSymbols);
       } else {
@@ -43,12 +43,18 @@ export class SymbolTable extends ReactiveUnionSet {
     super({
       onAdd: symbol => {
         debug.trace(TracePhase.symbol.addToScope, () => `${formatSymbolName(symbol)} added to ${formatSymbolTableName(this)}`);
-        this.#namesToDeconflict.add(symbol.name);
+        this.#namesToDeconflict.add(symbol.canonicalName);
         queueJob(this.#deconflictNames);
         return symbol;
       },
       onDelete: symbol => {
         debug.trace(TracePhase.symbol.removeFromScope, () => `${formatSymbolName(symbol)} removed from ${formatSymbolTableName(this)}`);
+        // Re-run conflict resolution for the deleted symbol's canonical name
+        // so survivors in the same cohort (those that share the canonical
+        // name) can clear any prior `deconflictedName` rename now that the
+        // collision is reduced.
+        this.#namesToDeconflict.add(symbol.canonicalName);
+        queueJob(this.#deconflictNames);
       }
     });
     this.#nameConflictResolver = options.nameConflictResolver ?? binder?.nameConflictResolver;
@@ -86,8 +92,12 @@ export class SymbolTable extends ReactiveUnionSet {
  * to have a suffix of _2, _3, etc.
  */
 function defaultConflictHandler(_, conflictedSymbols) {
+  if (conflictedSymbols.length === 0) return;
+  // The first symbol keeps its original name; clear any prior deconflict
+  // rename so it reverts after a collision is resolved.
+  conflictedSymbols[0].deconflictedName = undefined;
   for (let i = 1; i < conflictedSymbols.length; i++) {
-    conflictedSymbols[i].name = conflictedSymbols[i].originalName + "_" + (i + 1);
+    conflictedSymbols[i].deconflictedName = conflictedSymbols[i].originalName + "_" + (i + 1);
   }
 }
 //# sourceMappingURL=symbol-table.js.map

package/dist/dev/src/symbols/symbol-table.js.map

@@ -1 +1 @@
-{"version":3,"names":["debug","TracePhase","ReactiveUnionSet","queueJob","formatSymbolName","formatSymbolTableName","SymbolTable","namesToDeconflict","Set","nameConflictResolver","deconflictNames","#deconflictNames","name","conflictedSymbols","filter","sym","originalName","ignoreNameConflict","defaultConflictHandler","delete","binder","key","symbolsByRefkey","symbolNames","constructor","options","onAdd","symbol","trace","addToScope","add","onDelete","removeFromScope","createIndex","s","refkeys","moveTo","target","scope","moveSymbols","addSubset","spaces","copyTo","copySymbols","copy","createRefkeys","_","i","length"],"sources":["../../../../src/symbols/symbol-table.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["debug","TracePhase","ReactiveUnionSet","queueJob","formatSymbolName","formatSymbolTableName","SymbolTable","namesToDeconflict","Set","nameConflictResolver","deconflictNames","#deconflictNames","name","conflictedSymbols","filter","sym","canonicalName","ignoreNameConflict","defaultConflictHandler","delete","binder","key","symbolsByRefkey","symbolNames","constructor","options","onAdd","symbol","trace","addToScope","add","onDelete","removeFromScope","createIndex","s","refkeys","moveTo","target","scope","moveSymbols","addSubset","spaces","copyTo","copySymbols","copy","createRefkeys","_","length","deconflictedName","undefined","i","originalName"],"sources":["../../../../src/symbols/symbol-table.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/dev/test/symbols/deconflicted-name.test.js

@@ -0,0 +1,120 @@
+import { describe, expect, it } from "vitest";
+import { createOutputBinder } from "../../src/binder.js";
+import { flushJobs } from "../../src/scheduler.js";
+import { BasicScope } from "../../src/symbols/basic-scope.js";
+import { BasicSymbol } from "../../src/symbols/basic-symbol.js";
+function setup(nameConflictResolver) {
+  const binder = createOutputBinder({
+    nameConflictResolver
+  });
+  const scope = new BasicScope("root", undefined, {
+    binder
+  });
+  return {
+    binder,
+    scope
+  };
+}
+describe("deconflictedName", () => {
+  it("default resolver renames losers via deconflictedName and reverts on removal", () => {
+    const {
+      scope
+    } = setup();
+    const a = new BasicSymbol("foo", scope.symbols, {});
+    const b = new BasicSymbol("foo", scope.symbols, {});
+    flushJobs();
+    expect(a.name).toBe("foo");
+    expect(b.name).toBe("foo_2");
+    expect(a.deconflictedName).toBeUndefined();
+    expect(b.deconflictedName).toBe("foo_2");
+    b.delete();
+    flushJobs();
+    expect(a.name).toBe("foo");
+    expect(a.deconflictedName).toBeUndefined();
+  });
+  it("works with a custom rename scheme that doesn't match the default _N pattern", () => {
+    // Resolver uses a `$foo` prefix instead of `foo_N` suffix — the old
+    // isAutoAlias regex would never match this.
+    const customResolver = (_, symbols) => {
+      if (symbols.length === 0) return;
+      symbols[0].deconflictedName = undefined;
+      for (let i = 1; i < symbols.length; i++) {
+        symbols[i].deconflictedName = "$" + symbols[i].originalName;
+      }
+    };
+    const {
+      scope
+    } = setup(customResolver);
+    const a = new BasicSymbol("foo", scope.symbols, {});
+    const b = new BasicSymbol("foo", scope.symbols, {});
+    flushJobs();
+    expect(a.name).toBe("foo");
+    expect(b.name).toBe("$foo");
+    b.delete();
+    flushJobs();
+    // Survivor reverts to the original name regardless of scheme.
+    expect(a.name).toBe("foo");
+    expect(a.deconflictedName).toBeUndefined();
+  });
+  it("direct .name assignment does not clear an active deconflictedName", () => {
+    const {
+      scope
+    } = setup();
+    const a = new BasicSymbol("foo", scope.symbols, {});
+    const b = new BasicSymbol("foo", scope.symbols, {});
+    flushJobs();
+    expect(b.name).toBe("foo_2");
+
+    // User-assigns the name while a conflict rename is active.
+    b.name = "bar";
+    // Effective name still shows the deconflict rename (resolver wins while active).
+    expect(b.name).toBe("foo_2");
+
+    // Once the collision clears, the user-assigned name takes effect.
+    a.delete();
+    flushJobs();
+    expect(b.deconflictedName).toBeUndefined();
+    expect(b.name).toBe("bar");
+  });
+  it("detects conflict when different original names normalize to the same policy name", () => {
+    // Mirrors PR #394: under camelCase, `foo_bar` and `fooBar` both become
+    // `fooBar` — they collide on the rendered name and should be deconflicted.
+    const toCamel = n => n.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
+    const {
+      scope
+    } = setup();
+    const a = new BasicSymbol("foo_bar", scope.symbols, {
+      namePolicy: toCamel
+    });
+    const b = new BasicSymbol("fooBar", scope.symbols, {
+      namePolicy: toCamel
+    });
+    flushJobs();
+    expect(a.name).toBe("fooBar");
+    // Without canonical-name grouping, `b` would keep its original `fooBar`
+    // and silently collide with `a`'s policy-applied name.
+    expect(b.name).not.toBe("fooBar");
+    expect(b.name).toMatch(/^fooBar/);
+  });
+  it("survivor reverts when the winner is removed (canonical-name cohort lookup)", () => {
+    // After `a` is removed, the delete hook must find `b` as a member of the
+    // same canonical-name cohort so it can clear its deconflictedName.
+    const toCamel = n => n.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
+    const {
+      scope
+    } = setup();
+    const a = new BasicSymbol("foo_bar", scope.symbols, {
+      namePolicy: toCamel
+    });
+    const b = new BasicSymbol("fooBar", scope.symbols, {
+      namePolicy: toCamel
+    });
+    flushJobs();
+    expect(b.deconflictedName).toBeDefined();
+    a.delete();
+    flushJobs();
+    expect(b.deconflictedName).toBeUndefined();
+    expect(b.name).toBe("fooBar");
+  });
+});
+//# sourceMappingURL=deconflicted-name.test.js.map

package/dist/dev/test/symbols/deconflicted-name.test.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["describe","expect","it","createOutputBinder","flushJobs","BasicScope","BasicSymbol","setup","nameConflictResolver","binder","scope","undefined","a","symbols","b","name","toBe","deconflictedName","toBeUndefined","delete","customResolver","_","length","i","originalName","toCamel","n","replace","c","toUpperCase","namePolicy","not","toMatch","toBeDefined"],"sources":["../../../../test/symbols/deconflicted-name.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/dev/test/symbols/output-scope.test.js

@@ -177,4 +177,45 @@ describe("OutputScope#children", () => {
     expect(child2.parent).toBe(parentScope);
   });
 });
+describe("symbol name deduplication with name policy", () => {
+  it("deduplicates symbols whose names collide after name policy", () => {
+    const scope = createScope("scope");
+    const policy = name => name.toUpperCase();
+    const [s1] = createSymbol("foo", scope, {
+      namePolicy: policy
+    });
+    const [s2] = createSymbol("FOO", scope, {
+      namePolicy: policy
+    });
+    flushJobs();
+    expect(s1.name).toBe("FOO");
+    expect(s2.name).toBe("FOO_2");
+  });
+  it("deduplicates symbols when policy adds a prefix", () => {
+    const scope = createScope("scope");
+    const policy = name => name === "reserved" ? `@${name}` : name;
+    const [s1] = createSymbol("reserved", scope, {
+      namePolicy: policy
+    });
+    const [s2] = createSymbol("reserved", scope, {
+      namePolicy: policy
+    });
+    flushJobs();
+    expect(s1.name).toBe("@reserved");
+    expect(s2.name).toBe("reserved_2");
+  });
+  it("does not deduplicates symbols with different names after policy", () => {
+    const scope = createScope("scope");
+    const policy = name => `prefix_${name}`;
+    const [s1] = createSymbol("foo", scope, {
+      namePolicy: policy
+    });
+    const [s2] = createSymbol("bar", scope, {
+      namePolicy: policy
+    });
+    flushJobs();
+    expect(s1.name).toBe("prefix_foo");
+    expect(s2.name).toBe("prefix_bar");
+  });
+});
 //# sourceMappingURL=output-scope.test.js.map

package/dist/dev/test/symbols/output-scope.test.js.map

@@ -1 +1 @@
-{"version":3,"names":["reactive","watch","describe","expect","it","vi","refkey","flushJobs","BasicScope","SymbolTable","binder","createScope","createSymbol","scope","name","toBe","id","toEqual","any","Number","metadata","symbols","toBeInstanceOf","symbolNames","size","children","parentScope","foo","parent","has","nameSpy","fn","toHaveBeenCalled","symbolNamesSpy","symbol","symbolNamesTracker","hasOld","hasNew","deep","rScope","sym1","sym2","s1","s2","s3","sym","delete","scope1","scope2","spaces","key1","key2a","key2b","refkeys","symbolsByRefkey","get","child1","child2"],"sources":["../../../../test/symbols/output-scope.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["reactive","watch","describe","expect","it","vi","refkey","flushJobs","BasicScope","SymbolTable","binder","createScope","createSymbol","scope","name","toBe","id","toEqual","any","Number","metadata","symbols","toBeInstanceOf","symbolNames","size","children","parentScope","foo","parent","has","nameSpy","fn","toHaveBeenCalled","symbolNamesSpy","symbol","symbolNamesTracker","hasOld","hasNew","deep","rScope","sym1","sym2","s1","s2","s3","sym","delete","scope1","scope2","spaces","key1","key2a","key2b","refkeys","symbolsByRefkey","get","child1","child2","policy","toUpperCase","namePolicy"],"sources":["../../../../test/symbols/output-scope.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/src/symbols/output-symbol.d.ts

@@ -139,10 +139,45 @@ export declare abstract class OutputSymbol {
      * The name of this symbol. Assigning to this property applies the active
      * name policy (unless `ignoreNamePolicy` is true) before storing the value.
      *
+     * The effective name is computed as `deconflictedName ?? userName`, so if a
+     * name-conflict resolver has assigned a {@link OutputSymbol.deconflictedName | deconflictedName}, that value
+     * is returned here; otherwise the value most recently assigned to `name` is
+     * returned.
+     *
      * @reactive
      */
     get name(): string;
     set name(name: string);
+    /**
+     * The name assigned by a name-conflict resolver, or `undefined` when the
+     * symbol is not currently renamed by conflict resolution.
+     *
+     * Resolvers should assign to this slot (rather than `name`) to record that a
+     * rename exists only because of a conflict. On re-deconfliction (e.g. after
+     * a conflicting symbol is removed), resolvers clear this slot by assigning
+     * `undefined`; the effective {@link OutputSymbol.name | name} then falls back to the
+     * user-assigned name, which in turn falls back to the original name.
+     *
+     * Name policy is applied to values written here (unless `ignoreNamePolicy`
+     * is true), matching `name`'s behavior.
+     *
+     * @reactive
+     */
+    get deconflictedName(): string | undefined;
+    set deconflictedName(value: string | undefined);
+    /**
+     * The canonical requested name for this symbol: the result of applying the
+     * symbol's name policy to its {@link OutputSymbol.originalName | originalName}, or the original name
+     * itself when no policy applies. This is the name the symbol would carry if
+     * there were no conflicts, and is stable across the symbol's lifetime (it
+     * depends only on the immutable `originalName` and the name policy).
+     *
+     * Used by {@link SymbolTable} as the grouping key for name-conflict
+     * resolution, so that symbols whose original names normalize to the same
+     * policy-applied name (e.g. `foo_bar` and `fooBar` under camelCase) are
+     * recognized as conflicting.
+     */
+    get canonicalName(): string;
     /**
      * The unique id of this symbol.
      *

package/dist/src/symbols/output-symbol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output-symbol.d.ts","sourceRoot":"","sources":["../../../src/symbols/output-symbol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"output-symbol.d.ts","sourceRoot":"","sources":["../../../src/symbols/output-symbol.ts"],"names":[],"mappings":"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"}

package/dist/src/symbols/output-symbol.js

@@ -67,25 +67,95 @@ export class OutputSymbol {
     return this.#originalName;
   }
 
-  // this field is set by calling the name accessor.
-  #name;
+  // The user-assigned name (as set by constructor or direct `.name =`
+  // assignments). Always defined after construction.
+  #userName;
+
+  // The name assigned by a name-conflict resolver, if any. When present, this
+  // takes precedence over `#userName` in the computed `name` getter. Resolvers
+  // assign via the `deconflictedName` setter; clearing (setting to undefined)
+  // causes the symbol to fall back to its user-assigned name.
+  #deconflictedName;
+
   /**
    * The name of this symbol. Assigning to this property applies the active
    * name policy (unless `ignoreNamePolicy` is true) before storing the value.
    *
+   * The effective name is computed as `deconflictedName ?? userName`, so if a
+   * name-conflict resolver has assigned a {@link OutputSymbol.deconflictedName | deconflictedName}, that value
+   * is returned here; otherwise the value most recently assigned to `name` is
+   * returned.
+   *
    * @reactive
    */
   get name() {
     track(this, TrackOpTypes.GET, "name");
-    return this.#name;
+    return this.#deconflictedName ?? this.#userName;
   }
   set name(name) {
-    const old = this.#name;
-    if (old === name) {
+    const policyApplied = this.#namePolicy && !this.#ignoreNamePolicy ? this.#namePolicy(name) : name;
+    if (this.#userName === policyApplied) {
+      return;
+    }
+    const old = this.#deconflictedName ?? this.#userName;
+    this.#userName = policyApplied;
+    const next = this.#deconflictedName ?? this.#userName;
+    if (next !== old) {
+      trigger(this, TriggerOpTypes.SET, "name", next, old);
+    }
+  }
+
+  /**
+   * The name assigned by a name-conflict resolver, or `undefined` when the
+   * symbol is not currently renamed by conflict resolution.
+   *
+   * Resolvers should assign to this slot (rather than `name`) to record that a
+   * rename exists only because of a conflict. On re-deconfliction (e.g. after
+   * a conflicting symbol is removed), resolvers clear this slot by assigning
+   * `undefined`; the effective {@link OutputSymbol.name | name} then falls back to the
+   * user-assigned name, which in turn falls back to the original name.
+   *
+   * Name policy is applied to values written here (unless `ignoreNamePolicy`
+   * is true), matching `name`'s behavior.
+   *
+   * @reactive
+   */
+  get deconflictedName() {
+    track(this, TrackOpTypes.GET, "deconflictedName");
+    return this.#deconflictedName;
+  }
+  set deconflictedName(value) {
+    const policyApplied = value !== undefined && this.#namePolicy && !this.#ignoreNamePolicy ? this.#namePolicy(value) : value;
+    if (this.#deconflictedName === policyApplied) {
       return;
     }
-    this.#name = this.#namePolicy && !this.#ignoreNamePolicy ? this.#namePolicy(name) : name;
-    trigger(this, TriggerOpTypes.SET, "name", name, old);
+    const oldName = this.#deconflictedName ?? this.#userName;
+    const oldDeconflicted = this.#deconflictedName;
+    this.#deconflictedName = policyApplied;
+    trigger(this, TriggerOpTypes.SET, "deconflictedName", policyApplied, oldDeconflicted);
+    const nextName = this.#deconflictedName ?? this.#userName;
+    if (nextName !== oldName) {
+      trigger(this, TriggerOpTypes.SET, "name", nextName, oldName);
+    }
+  }
+
+  /**
+   * The canonical requested name for this symbol: the result of applying the
+   * symbol's name policy to its {@link OutputSymbol.originalName | originalName}, or the original name
+   * itself when no policy applies. This is the name the symbol would carry if
+   * there were no conflicts, and is stable across the symbol's lifetime (it
+   * depends only on the immutable `originalName` and the name policy).
+   *
+   * Used by {@link SymbolTable} as the grouping key for name-conflict
+   * resolution, so that symbols whose original names normalize to the same
+   * policy-applied name (e.g. `foo_bar` and `fooBar` under camelCase) are
+   * recognized as conflicting.
+   */
+  get canonicalName() {
+    if (this.#ignoreNamePolicy || !this.#namePolicy) {
+      return this.originalName;
+    }
+    return this.#namePolicy(this.originalName);
   }
   #id;
   /**