fix: rename infer to avoid conflict with TypeScript's infer keyword

sxzz · sxzz · commit 8fd342c8ace1 · 2026-02-13T22:04:34.000+08:00
closes rolldown/tsdown#764
diff --git a/package.json b/package.json
@@ -107,7 +107,8 @@
     "typescript": "6.0.0-beta",
     "vitest": "^4.0.18",
     "vue": "^3.5.27",
-    "vue-tsc": "^3.2.4"
+    "vue-tsc": "^3.2.4",
+    "zod": "^4.3.6"
   },
   "resolutions": {
     "rolldown": "^1.0.0-rc.3"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/fake-js.ts b/src/fake-js.ts
@@ -446,6 +446,8 @@ export function createFakeJsPlugin({
               start: transformedDep.start,
               end: transformedDep.end,
             }
+          } else if (isInfer(transformedDep)) {
+            transformedDep.name = '__Infer'
           }
 
           if (originalDep.replace) {
@@ -864,6 +866,9 @@ function isThisExpression(node: t.Node): boolean {
   )
 }
 
+function isInfer(node: t.Node): node is t.Identifier {
+  return isIdentifierOf(node, 'infer')
+}
 function TSEntityNameToRuntime(
   node: t.TSEntityName,
 ): t.MemberExpression | t.Identifier | t.ThisExpression {
@@ -905,7 +910,7 @@ function isHelperImport(node: t.Node) {
  * patch `.d.ts` suffix in import source to `.js`
  */
 function patchImportExport(
-  node: t.Node,
+  node: t.Statement,
   typeOnlyIds: string[],
   cjsDefault: boolean,
 ): t.Statement | false | undefined {
@@ -919,6 +924,14 @@ function patchImportExport(
     return false
   }
 
+  if (node.type === 'ImportDeclaration' && node.specifiers.length) {
+    for (const specifier of node.specifiers) {
+      if (isInfer(specifier.local)) {
+        specifier.local.name = '__Infer'
+      }
+    }
+  }
+
   if (
     isTypeOf(node, [
       'ImportDeclaration',
diff --git a/tests/__snapshots__/tsc.test.ts.snap b/tests/__snapshots__/tsc.test.ts.snap
@@ -421,6 +421,20 @@ const a = 1;
 export { a };"
 `;
 
+exports[`tsc > rename infer 1`] = `
+"// infer-renaming.d.ts
+import { infer as __Infer, z } from "zod";
+
+//#region tests/fixtures/infer-renaming.d.ts
+declare const productSchema: z.ZodObject<{
+  id: z.ZodString;
+  price: z.ZodNumber;
+}, z.core.$strip>;
+declare const product: __Infer<typeof productSchema>;
+//#endregion
+export { product, productSchema };"
+`;
+
 exports[`tsc > resolve paths > resolver: oxc 1`] = `
 "// index.d.ts
 //#region tests/fixtures/paths/mod.d.ts
diff --git a/tests/fixtures/infer-renaming.ts b/tests/fixtures/infer-renaming.ts
@@ -0,0 +1,11 @@
+import type { infer as Infer } from 'zod'
+import { z } from 'zod'
+
+export const productSchema = z.object({
+  id: z.string(),
+  price: z.number(),
+})
+export const product: Infer<typeof productSchema> = {
+  id: 'abc123',
+  price: 19.99,
+}
diff --git a/tests/tsc.test.ts b/tests/tsc.test.ts
@@ -324,4 +324,20 @@ describe('tsc', () => {
       expect(snapshot).toMatchSnapshot()
     })
   })
+
+  test('rename infer', async () => {
+    const { snapshot } = await rolldownBuild(
+      path.resolve(dirname, 'fixtures/infer-renaming.ts'),
+      [
+        dts({
+          compilerOptions: {
+            isolatedDeclarations: false,
+          },
+          emitDtsOnly: true,
+        }),
+      ],
+      { external: ['zod'] },
+    )
+    expect(snapshot).toMatchSnapshot()
+  })
 })
