refactor!: drop autoAddExts option

It will always be `true`, and cannot be disabled.

Author: sxzz

README.md

@@ -123,8 +123,6 @@ export interface Options {
   ignoreErrors?: boolean
   /** An extra directory layer for output files. */
   extraOutdir?: string
-  /** Automatically add `.js` extension to resolve in `Node16` + ESM mode. */
-  autoAddExts?: boolean
 
   rewriteImports?: (
     id: string,
@@ -157,22 +155,6 @@ export default {
 }
 ```
 
-### `autoAddExts`
-
-Automatically add `.js` extension to resolve in Node 16+ ESM mode. (esbuild support is not available)
-
-```ts
-// index.d.ts
-import {} from './foo'
-```
-
-With `autoAddExts`, it will be transformed to:
-
-```ts
-// index.d.ts
-import {} from './foo.js'
-```
-
 ### `patchCjsDefaultExport`
 
 Patch `export default` in `.d.cts` to `export =`

src/core/ast.ts

@@ -1,5 +1,6 @@
 import path from 'node:path'
-import { debug, guessSuffix, stripExt } from './utils'
+import { debug, stripExt } from './utils'
+import type { OptionsResolved } from './options'
 import type * as OxcTypes from '@oxc-project/types'
 import type MagicString from 'magic-string'
 
@@ -9,7 +10,7 @@ export type OxcImport = (
   | OxcTypes.ExportNamedDeclaration
 ) & {
   source: OxcTypes.StringLiteral
-  suffix?: string
+  shouldAddIndex?: boolean
 }
 
 export function filterImports(program: OxcTypes.Program): OxcImport[] {
@@ -24,6 +25,7 @@ export function filterImports(program: OxcTypes.Program): OxcImport[] {
 
 export function rewriteImports(
   s: MagicString,
+  options: OptionsResolved,
   imports: OxcImport[],
   entryMap: Record<string, string> | undefined,
   inputBase: string,
@@ -50,25 +52,25 @@ export function rewriteImports(
 
   for (const i of imports) {
     const { source } = i
-    const srcIdRel = stripExt(source.value)
+    let srcIdRel = source.value
     if (srcIdRel[0] !== '.') continue
 
+    if (i.shouldAddIndex) srcIdRel += '/index'
+
     const srcId = path.resolve(srcDir, srcIdRel)
-    const importAlias = entryMap?.[srcId]
+    const importAlias = entryMap?.[stripExt(srcId)]
 
     let id: string
     if (importAlias) {
-      const resolved = stripExt(
-        entryFileNames.replaceAll('[name]', importAlias),
+      const resolved = entryFileNames.replaceAll(
+        '[name]',
+        stripExt(importAlias),
       )
       id = pathRelative(srcDirRel, resolved)
     } else {
-      id = stripExt(entryFileNames.replaceAll('[name]', srcIdRel))
+      id = entryFileNames.replaceAll('[name]', stripExt(srcIdRel))
     }
 
-    const suffix = i.suffix || guessSuffix(source.value, source.value)
-    if (suffix) id += suffix
-
     let final = path.normalize(path.join(offset, id))
     if (final !== path.normalize(source.value)) {
       debug('Patch import in', srcRel, ':', srcIdRel, '->', final)

src/core/options.ts

@@ -19,8 +19,6 @@ export type Options = {
   ignoreErrors?: boolean
   /** An extra directory layer for output files. */
   extraOutdir?: string
-  /** Automatically add `.js` extension to resolve in `Node16` + ESM mode. */
-  autoAddExts?: boolean
   /** Patch `export default` in `.d.cts` to `export = ` */
   patchCjsDefaultExport?: boolean
   /** Base directory for input files. */
@@ -64,7 +62,6 @@ export function resolveOptions(options: Options): OptionsResolved {
     transformer: options.transformer || 'typescript',
     ignoreErrors: options.ignoreErrors || false,
     extraOutdir: options.extraOutdir,
-    autoAddExts: options.autoAddExts || false,
     patchCjsDefaultExport: options.patchCjsDefaultExport || false,
     rewriteImports: options.rewriteImports,
     inputBase: options.inputBase,

src/core/utils.ts

@@ -60,15 +60,6 @@ function endsWithIndex(s: string) {
   return /(?:^|[/\\])index\..+$/.test(s)
 }
 
-export function guessSuffix(id: string, resolved: string): string {
-  let suffix = ''
-  if (!endsWithIndex(id) && endsWithIndex(resolved)) {
-    suffix += '/index'
-  }
-  const ext = path
-    .extname(resolved)
-    .slice(1)
-    .replace(/^([cm]?)ts/, (_, $1) => `${$1}js`)
-  if (ext) suffix += `.${ext}`
-  return suffix
+export function shouldAddIndex(id: string, resolved: string): boolean {
+  return !endsWithIndex(id) && endsWithIndex(resolved)
 }

src/index.ts

@@ -26,9 +26,9 @@ import {
 } from './core/transformer'
 import {
   debug,
-  guessSuffix,
   lowestCommonAncestor,
   resolveEntry,
+  shouldAddIndex,
   stripExt,
 } from './core/utils'
 import type {
@@ -147,29 +147,26 @@ export const IsolatedDecl: UnpluginInstance<Options | undefined, false> =
       const imports = filterImports(program)
 
       const s = new MagicString(dts)
-      if (options.autoAddExts || options.rewriteImports) {
-        for (const i of imports) {
-          const { source } = i
-          let { value } = source
-
-          if (options.rewriteImports) {
-            const result = options.rewriteImports(value, id)
-            if (typeof result === 'string') {
-              source.value = value = result
-              s.overwrite(source.start + 1, source.end - 1, result)
-            }
-          }
 
-          if (
-            options.autoAddExts &&
-            (path.isAbsolute(value) || value[0] === '.')
-          ) {
-            const resolved = await resolve(context, value, stripExt(id))
-            if (!resolved || resolved.external) continue
-            i.suffix = guessSuffix(value, resolved.id)
+      for (const i of imports) {
+        const { source } = i
+        let { value } = source
+
+        if (options.rewriteImports) {
+          const result = options.rewriteImports(value, id)
+          if (typeof result === 'string') {
+            source.value = value = result
+            s.overwrite(source.start + 1, source.end - 1, result)
           }
         }
+
+        if (path.isAbsolute(value) || value[0] === '.') {
+          const resolved = await resolve(context, value, stripExt(id))
+          if (!resolved || resolved.external) continue
+          i.shouldAddIndex = shouldAddIndex(value, resolved.id)
+        }
       }
+
       addOutput(id, { s, imports, map })
 
       const typeImports = program.body.filter((node): node is OxcImport => {
@@ -230,6 +227,7 @@ export const IsolatedDecl: UnpluginInstance<Options | undefined, false> =
       )) {
         const emitName = rewriteImports(
           s,
+          options,
           imports,
           entryMap,
           inputBase,
@@ -299,6 +297,7 @@ export const IsolatedDecl: UnpluginInstance<Options | undefined, false> =
       )) {
         const emitName = rewriteImports(
           s,
+          options,
           imports,
           entryMap,
           inputBase,

tests/__snapshots__/rollup.test.ts.snap

@@ -1,6 +1,18 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`rollup > auto add exts 1`] = `
+exports[`rollup > custom rewriter 1`] = `
+"// index.d.ts
+export type * from './test.js';
+
+// index.js
+
+
+// test.d.ts
+export type Str = string;
+"
+`;
+
+exports[`rollup > extraOutdir 1`] = `
 "// main.js
 function Component() {
   return /* @__PURE__ */ React.createElement("div", null, "I'm a div in a tsx component!");
@@ -14,45 +26,66 @@ let num = 1;
 
 export { c, hello, num };
 
-// temp/component.d.ts
+// types/component.d.ts
 export declare function Component(): React.JSX.Element;
 
-// temp/main.d.ts
-import { type Num } from '../temp/types.js';
+// types/main.d.ts
+import { type Num } from '../types/types.js';
 export type Str = string;
 export declare function hello(s: Str): Str;
 export declare let c: React.JSX.Element;
 export declare let num: Num;
 
-// temp/types.d.ts
-import type { Num2 } from '../temp/types2.js';
+// types/types.d.ts
+import type { Num2 } from '../types/types2.js';
 export type Num = Num2;
 
-// temp/types2.d.ts
+// types/types2.d.ts
 export type Num2 = number;
 "
 `;
 
-exports[`rollup > custom rewriter 1`] = `
-"// index.d.ts
-export type * from './test.js';
+exports[`rollup > generate basic 1`] = `
+"// component.d.ts
+export declare function Component(): React.JSX.Element;
 
-// index.js
+// main.d.ts
+import { type Num } from './types.js';
+export type Str = string;
+export declare function hello(s: Str): Str;
+export declare let c: React.JSX.Element;
+export declare let num: Num;
 
+// main.js
+function Component() {
+  return /* @__PURE__ */ React.createElement("div", null, "I'm a div in a tsx component!");
+}
 
-// test.d.ts
-export type Str = string;
+function hello(s) {
+  return "hello" + s;
+}
+let c = Component;
+let num = 1;
+
+export { c, hello, num };
+
+// types.d.ts
+import type { Num2 } from './types2.js';
+export type Num = Num2;
+
+// types2.d.ts
+export type Num2 = number;
 "
 `;
 
-exports[`rollup > don't add exts, but keep 1`] = `
+exports[`rollup > keep ext 1`] = `
 "// main.d.ts
 export type {} from './types.js';
 export type {} from './types.js';
 export type {} from './tsx.js';
-export type {} from './tsx.jsx';
 export type {} from './tsx.js';
-export type {} from './tsx.jsx';
+export type {} from './tsx.js';
+export type {} from './tsx.js';
 
 // main.js
 
@@ -64,36 +97,3 @@ export type A = string;
 export type Str = string;
 "
 `;
-
-exports[`rollup > generate basic 1`] = `
-"// main.js
-function Component() {
-  return /* @__PURE__ */ React.createElement("div", null, "I'm a div in a tsx component!");
-}
-
-function hello(s) {
-  return "hello" + s;
-}
-let c = Component;
-let num = 1;
-
-export { c, hello, num };
-
-// temp/component.d.ts
-export declare function Component(): React.JSX.Element;
-
-// temp/main.d.ts
-import { type Num } from '../temp/types';
-export type Str = string;
-export declare function hello(s: Str): Str;
-export declare let c: React.JSX.Element;
-export declare let num: Num;
-
-// temp/types.d.ts
-import type { Num2 } from '../temp/types2';
-export type Num = Num2;
-
-// temp/types2.d.ts
-export type Num2 = number;
-"
-`;

tests/__snapshots__/rollup/entry-points-22.md

@@ -44,7 +44,7 @@ export declare const a = "b";
 ## a/index.d.ts
 
 ```ts
-export { ComponentA } from "./ComponentA/ComponentA/index.jsx";
+export { ComponentA } from "./ComponentA/ComponentA/index.js";
 //# sourceMappingURL=index.d.ts.map
 ```
 ## a/index.d.ts.map
@@ -90,7 +90,7 @@ export { ComponentB };
 ## b/index.d.ts
 
 ```ts
-export { ComponentB } from "./ComponentB/ComponentB/index.jsx";
+export { ComponentB } from "./ComponentB/ComponentB/index.js";
 //# sourceMappingURL=index.d.ts.map
 ```
 ## b/index.d.ts.map