fix(dts): skip cjs dts reexport for non-entry chunks

Author: sxzz

src/features/cjs.ts

@@ -1,6 +1,9 @@
+import path from 'node:path'
+import { filename_js_to_dts, RE_JS } from 'rolldown-plugin-dts/internal'
 import coerce from 'semver/functions/coerce.js'
 import satisfies from 'semver/functions/satisfies.js'
 import type { ResolvedConfig } from '../config/index.ts'
+import type { Plugin } from 'rolldown'
 
 export function warnLegacyCJS(config: ResolvedConfig): void {
   if (
@@ -26,3 +29,28 @@ export function warnLegacyCJS(config: ResolvedConfig): void {
     )
   }
 }
+
+export function CjsDtsReexportPlugin(): Plugin {
+  return {
+    name: 'tsdown:cjs-dts-reexport',
+    generateBundle(_options, bundle) {
+      for (const chunk of Object.values(bundle)) {
+        if (chunk.type !== 'chunk' || !chunk.isEntry) continue
+
+        if (!chunk.fileName.endsWith('.cjs') && !chunk.fileName.endsWith('.js'))
+          continue
+
+        const dMtsBasename = path.basename(
+          chunk.fileName.replace(RE_JS, '.d.mts'),
+        )
+        const content = `export type * from './${dMtsBasename}'\n`
+
+        this.emitFile({
+          type: 'prebuilt-chunk',
+          fileName: filename_js_to_dts(chunk.fileName),
+          code: content,
+        })
+      }
+    },
+  }
+}

src/features/rolldown.ts

@@ -11,12 +11,12 @@ import {
   type Plugin,
   type RolldownPluginOption,
 } from 'rolldown'
-import { filename_js_to_dts, RE_JS } from 'rolldown-plugin-dts/internal'
 import { importGlobPlugin } from 'rolldown/experimental'
 import pkg from '../../package.json' with { type: 'json' }
 import { mergeUserOptions } from '../config/options.ts'
 import { importWithError, pkgExists } from '../utils/general.ts'
 import { LogLevels } from '../utils/logger.ts'
+import { CjsDtsReexportPlugin } from './cjs.ts'
 import { DepsPlugin } from './deps.ts'
 import { NodeProtocolPlugin } from './node-protocol.ts'
 import { resolveChunkAddon, resolveChunkFilename } from './output.ts'
@@ -343,31 +343,6 @@ function handlePluginInspect(plugins: RolldownPluginOption) {
   }
 }
 
-export function CjsDtsReexportPlugin(): Plugin {
-  return {
-    name: 'tsdown:cjs-dts-reexport',
-    generateBundle(_options, bundle) {
-      for (const chunk of Object.values(bundle)) {
-        if (chunk.type !== 'chunk') continue
-
-        if (!chunk.fileName.endsWith('.cjs') && !chunk.fileName.endsWith('.js'))
-          continue
-
-        const dMtsBasename = path.basename(
-          chunk.fileName.replace(RE_JS, '.d.mts'),
-        )
-        const content = `export type * from './${dMtsBasename}'\n`
-
-        this.emitFile({
-          type: 'prebuilt-chunk',
-          fileName: filename_js_to_dts(chunk.fileName),
-          code: content,
-        })
-      }
-    },
-  }
-}
-
 export function CssGuardPlugin(): Plugin {
   return {
     name: 'tsdown:css-guard',

tests/__snapshots__/issues/903.snap.md

@@ -0,0 +1,132 @@
+## a.cjs
+
+```cjs
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_shared = require("./shared-Ccciw35G.cjs");
+//#region a.ts
+const loadDynamic = () => Promise.resolve().then(() => require("./dynamic-wQmydOCv.cjs"));
+//#endregion
+exports.loadDynamic = loadDynamic;
+exports.shared = require_shared.shared;
+
+```
+
+## a.d.cts
+
+```cts
+export type * from './a.d.mts'
+
+```
+
+## a.d.mts
+
+```mts
+import { t as shared } from "./shared-BoxP0Nhj.mjs";
+
+//#region \0rolldown/runtime.js
+declare namespace dynamic_d_exports {
+  export { dynamic };
+}
+declare const dynamic = 2;
+//#endregion
+//#region a.d.ts
+declare const loadDynamic: () => Promise<typeof dynamic_d_exports>;
+//#endregion
+export { loadDynamic, shared };
+```
+
+## a.mjs
+
+```mjs
+import { t as shared } from "./shared-BVEkDxo-.mjs";
+//#region a.ts
+const loadDynamic = () => import("./dynamic-BUNvldLi.mjs");
+//#endregion
+export { loadDynamic, shared };
+
+```
+
+## b.cjs
+
+```cjs
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_shared = require("./shared-Ccciw35G.cjs");
+exports.shared = require_shared.shared;
+
+```
+
+## b.d.cts
+
+```cts
+export type * from './b.d.mts'
+
+```
+
+## b.d.mts
+
+```mts
+import { t as shared } from "./shared-BoxP0Nhj.mjs";
+export { shared };
+```
+
+## b.mjs
+
+```mjs
+import { t as shared } from "./shared-BVEkDxo-.mjs";
+export { shared };
+
+```
+
+## dynamic-BUNvldLi.mjs
+
+```mjs
+//#region dynamic.ts
+const dynamic = 2;
+//#endregion
+export { dynamic };
+
+```
+
+## dynamic-wQmydOCv.cjs
+
+```cjs
+//#region dynamic.ts
+const dynamic = 2;
+//#endregion
+exports.dynamic = dynamic;
+
+```
+
+## shared-BVEkDxo-.mjs
+
+```mjs
+//#region shared.ts
+const shared = 1;
+//#endregion
+export { shared as t };
+
+```
+
+## shared-BoxP0Nhj.d.mts
+
+```mts
+//#region shared.d.ts
+declare const shared = 1;
+//#endregion
+export { shared as t };
+```
+
+## shared-Ccciw35G.cjs
+
+```cjs
+//#region shared.ts
+const shared = 1;
+//#endregion
+Object.defineProperty(exports, "shared", {
+	enumerable: true,
+	get: function() {
+		return shared;
+	}
+});
+
+```

tests/issues.test.ts

@@ -252,6 +252,28 @@ button {
     expect(css).toMatch(/\[data-v-[\da-f]+\]/)
   })
 
+  test('#903', async (context) => {
+    const { outputFiles } = await testBuild({
+      context,
+      files: {
+        'a.ts': `export { shared } from './shared'
+export const loadDynamic = () => import('./dynamic')`,
+        'b.ts': `export { shared } from './shared'`,
+        'shared.ts': `export const shared = 1`,
+        'dynamic.ts': `export const dynamic = 2`,
+      },
+      options: {
+        entry: ['a.ts', 'b.ts'],
+        format: ['cjs', 'esm'],
+        dts: { cjsReexport: true },
+        platform: 'node',
+      },
+    })
+    expect(outputFiles.some((f) => /^chunk-.*\.d\.cts$/.test(f))).toBe(false)
+    expect(outputFiles).toContain('a.d.cts')
+    expect(outputFiles).toContain('b.d.cts')
+  })
+
   test('#772', async (context) => {
     const { fileMap, outputFiles } = await testBuild({
       context,