fix: improve identifier naming

sxzz · sxzz · commit fb726cfd84f6 · 2025-07-15T23:20:37.000+08:00
closes #59
diff --git a/src/fake-js.ts b/src/fake-js.ts
@@ -42,7 +42,7 @@ export function createFakeJsPlugin({
   sourcemap,
 }: Pick<OptionsResolved, 'dtsInput' | 'sourcemap'>): Plugin {
   let symbolIdx = 0
-  let identifierIdx = 0
+  const identifierMap: Record<string, number> = Object.create(null)
   const symbolMap = new Map<number /* symbol id */, SymbolInfo>()
   const commentsMap = new Map<string /* filename */, t.Comment[]>()
 
@@ -158,7 +158,7 @@ export function createFakeJsPlugin({
       } else if ('id' in decl && decl.id) {
         let binding = decl.id
         binding = sideEffect
-          ? t.identifier(`_${identifierIdx++}`)
+          ? t.identifier(`_${getIdentifierIndex('')}`)
           : (binding as t.Identifier)
         bindings.push(binding)
       } else {
@@ -332,8 +332,11 @@ export function createFakeJsPlugin({
     return result
   }
 
-  function getIdentifierIndex() {
-    return identifierIdx++
+  function getIdentifierIndex(name: string) {
+    if (name in identifierMap) {
+      return identifierMap[name]++
+    }
+    return (identifierMap[name] = 0)
   }
 
   function registerSymbol(info: SymbolInfo) {
@@ -423,7 +426,7 @@ export function createFakeJsPlugin({
   ): Dep {
     const sourceText = source.value.replaceAll(/\W/g, '_')
     let local: t.Identifier | t.TSQualifiedName = t.identifier(
-      `${sourceText}${getIdentifierIndex()}`,
+      `${sourceText}${getIdentifierIndex(sourceText)}`,
     )
 
     if (namespaceStmts.has(source.value)) {
diff --git a/tests/__snapshots__/tsc.test.ts.snap b/tests/__snapshots__/tsc.test.ts.snap
@@ -132,7 +132,7 @@ export { Unused };"
 
 exports[`tsc > vue-sfc w/ ts-compiler 1`] = `
 "// main.d.ts
-import * as vue1 from "vue";
+import * as vue0 from "vue";
 
 //#region tests/fixtures/vue-sfc/App.vue.d.ts
 type __VLS_Props = {
@@ -143,7 +143,7 @@ declare global {
     foo: string;
   }
 }
-declare const _default: vue1.DefineComponent<__VLS_Props, {}, {}, {}, {}, vue1.ComponentOptionsMixin, vue1.ComponentOptionsMixin, {}, string, vue1.PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, vue1.ComponentProvideOptions, false, {}, any>;
+declare const _default: vue0.DefineComponent<__VLS_Props, {}, {}, {}, {}, vue0.ComponentOptionsMixin, vue0.ComponentOptionsMixin, {}, string, vue0.PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, vue0.ComponentProvideOptions, false, {}, any>;
 //#endregion
 export { _default as App };"
 `;
diff --git a/tests/rollup-plugin-dts/inline-import-typeof-members/known-diff.patch b/tests/rollup-plugin-dts/inline-import-typeof-members/known-diff.patch
@@ -8,10 +8,10 @@ Index: diff.patch
 -import * as typescript from 'typescript'
 -type TypeScript = typeof typescript
 +import * as typescript0 from 'typescript'
-+import * as rollup1 from 'rollup'
++import * as rollup0 from 'rollup'
 +type TypeScript = typeof typescript0
  interface Test {
 -  rollup: rollup.RollupOptions
-+  rollup: rollup1.RollupOptions
++  rollup: rollup0.RollupOptions
  }
  export { Test, TypeScript }
diff --git a/tests/rollup-plugin-dts/inline-import-typeof-members/snapshot.d.ts b/tests/rollup-plugin-dts/inline-import-typeof-members/snapshot.d.ts
@@ -1,11 +1,11 @@
 // index.d.ts
 import * as typescript0 from "typescript";
-import * as rollup1 from "rollup";
+import * as rollup0 from "rollup";
 
 //#region tests/rollup-plugin-dts/inline-import-typeof-members/index.d.ts
 type TypeScript = typeof typescript0;
 interface Test {
-  rollup: rollup1.RollupOptions;
+  rollup: rollup0.RollupOptions;
 }
 //#endregion
 export { Test, TypeScript };
