fix: handle param name renaming

sxzz · sxzz · commit ae94e99d0861 · 2025-10-17T00:26:50.000+02:00
closes #115
diff --git a/src/fake-js.ts b/src/fake-js.ts
@@ -28,6 +28,7 @@ type Dep = t.Expression & { replace?: (newNode: t.Node) => void }
 interface SymbolInfo {
   decl: t.Declaration
   bindings: t.Identifier[]
+  params: t.TSTypeParameter[]
   deps: Dep[]
 }
 
@@ -177,15 +178,27 @@ export function createFakeJsPlugin({
         // @ts-expect-error
         decl.id = binding
       }
+
+      const params: t.TSTypeParameter[] =
+        'typeParameters' in decl &&
+        decl.typeParameters?.type === 'TSTypeParameterDeclaration'
+          ? decl.typeParameters.params
+          : []
+
       const deps = collectDependencies(decl, namespaceStmts)
 
       const elements: t.Expression[] = [
-        t.numericLiteral(0),
-        ...deps.map((dep) => t.arrowFunctionExpression([], dep)),
-        ...(sideEffect
-          ? [t.callExpression(t.identifier('sideEffect'), [bindings[0]])]
-          : []),
+        t.numericLiteral(0 /* placeholder */),
+        t.arrowFunctionExpression(
+          params.map((param) => t.identifier(param.name)),
+          t.arrayExpression(deps),
+        ),
       ]
+      if (sideEffect) {
+        elements.push(
+          t.callExpression(t.identifier('sideEffect'), [bindings[0]]),
+        )
+      }
       const runtime: t.ArrayExpression = t.arrayExpression(elements)
 
       if (decl !== stmt) {
@@ -196,10 +209,11 @@ export function createFakeJsPlugin({
         decl,
         deps,
         bindings,
+        params,
       })
       elements[0] = t.numericLiteral(symbolId)
 
-      // var ${binding} = [${symbolId}, () => ${dep}, ..., sideEffect()]
+      // var ${binding} = [${symbolId}, (param, ...) => [dep, ...], sideEffect()]
       const runtimeAssignment: t.VariableDeclaration = {
         type: 'VariableDeclaration',
         kind: 'var',
@@ -284,7 +298,8 @@ export function createFakeJsPlugin({
           return null
         }
 
-        const [symbolIdNode, ...depsFns] = decl.init.elements as t.Expression[]
+        const [symbolIdNode, depsFn /*, ignore sideEffect */] = decl.init
+          .elements as [t.Expression, t.ArrowFunctionExpression]
         if (symbolIdNode?.type !== 'NumericLiteral') {
           return null
         }
@@ -300,18 +315,21 @@ export function createFakeJsPlugin({
           overwriteNode(original.bindings[i], transformedBinding)
         }
 
-        const transformedDeps = depsFns
-          .filter((node) => node?.type === 'ArrowFunctionExpression')
-          .map((node) => node.body)
-
-        if (original.deps.length) {
-          for (let i = 0; i < original.deps.length; i++) {
-            const originalDep = original.deps[i]
-            if (originalDep.replace) {
-              originalDep.replace(transformedDeps[i])
-            } else {
-              Object.assign(originalDep, transformedDeps[i])
-            }
+        const transformedParams = depsFn.params as t.Identifier[]
+        for (let i = 0; i < original.params.length; i++) {
+          const originalParam = original.params[i]
+          const transformedParam = transformedParams[i]
+          originalParam.name = transformedParam.name
+        }
+
+        const transformedDeps = (depsFn.body as t.ArrayExpression)
+          .elements as t.Expression[]
+        for (let i = 0; i < original.deps.length; i++) {
+          const originalDep = original.deps[i]
+          if (originalDep.replace) {
+            originalDep.replace(transformedDeps[i])
+          } else {
+            Object.assign(originalDep, transformedDeps[i])
           }
         }
 
diff --git a/tests/rollup-plugin-dts/generic-shadowing/diff.patch b/tests/rollup-plugin-dts/generic-shadowing/diff.patch
@@ -0,0 +1,12 @@
+Index: diff.patch
+===================================================================
+--- diff.patch
++++ diff.patch
+@@ -1,5 +1,5 @@
+ // index.d.ts
+-type Config1<Client> = Client
++type Config1<Client$1> = Client$1
+ type Client = any
+-type Config2<Client> = Client
++type Config2<Client$1> = Client$1
+ export { Client, Config1, Config2 }
diff --git a/tests/rollup-plugin-dts/generic-shadowing/index.d.ts b/tests/rollup-plugin-dts/generic-shadowing/index.d.ts
@@ -0,0 +1,4 @@
+export * from './mod'
+
+export type Client = any
+export type Config2<Client> = Client
diff --git a/tests/rollup-plugin-dts/generic-shadowing/mod.d.ts b/tests/rollup-plugin-dts/generic-shadowing/mod.d.ts
@@ -0,0 +1,2 @@
+type Client = any
+export type Config1<Client> = Client
diff --git a/tests/rollup-plugin-dts/generic-shadowing/snapshot.d.ts b/tests/rollup-plugin-dts/generic-shadowing/snapshot.d.ts
@@ -0,0 +1,9 @@
+// index.d.ts
+//#region tests/rollup-plugin-dts/generic-shadowing/mod.d.ts
+type Config1<Client$1> = Client$1;
+//#endregion
+//#region tests/rollup-plugin-dts/generic-shadowing/index.d.ts
+type Client = any;
+type Config2<Client$1> = Client$1;
+//#endregion
+export { Client, Config1, Config2 };
diff --git a/tests/rollup-plugin-dts/generics/known-diff.patch b/tests/rollup-plugin-dts/generics/known-diff.patch
@@ -2,8 +2,33 @@ Index: diff.patch
 ===================================================================
 --- diff.patch
 +++ diff.patch
-@@ -30,6 +30,5 @@
- declare function fn<T = G>(g: T, h: Gen<H>): void
+@@ -13,23 +13,22 @@
+ interface M {}
+ interface N {}
+ interface O {}
+ interface P {}
+-declare type Gen<T> = T
+-interface I1<T = A> {
+-  a: T
++declare type Gen<T$1> = T$1
++interface I1<T$1 = A> {
++  a: T$1
+   b: Gen<B>
+ }
+-declare type Ty<T = C> = {
+-  c: T
++declare type Ty<T$1 = C> = {
++  c: T$1
+   d: Gen<D>
+ }
+-declare class Cl<T = E> {
+-  e: T
++declare class Cl<T$1 = E> {
++  e: T$1
+   f: Gen<F>
+ }
+-declare function fn<T = G>(g: T, h: Gen<H>): void
++declare function fn<T$1 = G>(g: T$1, h: Gen<H>): void
  declare type TyFn = <T = J>(j: T, k: Gen<K>) => L
  declare type TyCtor = new <T = M>(m: T, n: Gen<N>) => O
  interface I2 extends Gen<P> {}
diff --git a/tests/rollup-plugin-dts/generics/snapshot.d.ts b/tests/rollup-plugin-dts/generics/snapshot.d.ts
@@ -15,20 +15,20 @@ interface M {}
 interface N {}
 interface O {}
 interface P {}
-declare type Gen<T> = T;
-interface I1<T = A> {
-  a: T;
+declare type Gen<T$1> = T$1;
+interface I1<T$1 = A> {
+  a: T$1;
   b: Gen<B>;
 }
-declare type Ty<T = C> = {
-  c: T;
+declare type Ty<T$1 = C> = {
+  c: T$1;
   d: Gen<D>;
 };
-declare class Cl<T = E> {
-  e: T;
+declare class Cl<T$1 = E> {
+  e: T$1;
   f: Gen<F>;
 }
-declare function fn<T = G>(g: T, h: Gen<H>): void;
+declare function fn<T$1 = G>(g: T$1, h: Gen<H>): void;
 declare type TyFn = <T = J>(j: T, k: Gen<K>) => L;
 declare type TyCtor = new <T = M>(m: T, n: Gen<N>) => O;
 interface I2 extends Gen<P> {}
diff --git a/tests/rollup-plugin-dts/shadowing/known-diff.patch b/tests/rollup-plugin-dts/shadowing/known-diff.patch
@@ -2,27 +2,15 @@ Index: diff.patch
 ===================================================================
 --- diff.patch
 +++ diff.patch
-@@ -1,5 +1,19 @@
+@@ -1,5 +1,7 @@
  // index.d.ts
-+interface A {}
-+interface B {}
-+interface C {}
-+interface D {}
-+interface E {}
-+interface F {}
-+interface G {}
 +interface H {}
-+interface I {}
 +interface J {}
-+interface K {}
-+interface L {}
-+interface M {}
-+interface N {}
  declare class GenericKlass<A = any, B = A> {
    a: A
    b: B
  }
-@@ -8,14 +22,11 @@
+@@ -8,14 +10,11 @@
    d: D
  }
  declare function genericFunction<E = any, F = E>(e: E): F
diff --git a/tests/rollup-plugin-dts/shadowing/snapshot.d.ts b/tests/rollup-plugin-dts/shadowing/snapshot.d.ts
@@ -1,19 +1,8 @@
 // index.d.ts
 //#region tests/rollup-plugin-dts/shadowing/exports.d.ts
-interface A {}
-interface B {}
-interface C {}
-interface D {}
-interface E {}
-interface F {}
-interface G {}
+
 interface H {}
-interface I {}
 interface J {}
-interface K {}
-interface L {}
-interface M {}
-interface N {}
 declare class GenericKlass<A = any, B = A> {
   a: A;
   b: B;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+type Client = any`
	`2`	`+export type Config1<Client> = Client`