refactor

Author: sxzz

src/build.ts

@@ -296,7 +296,7 @@ async function buildSingle(
           format,
           configFiles,
           bundle,
-          true,
+          true, // cjsDts
           isDualFormat,
         ),
       )

src/features/rolldown.ts

@@ -11,6 +11,7 @@ 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'
@@ -349,16 +350,19 @@ export function CjsDtsReexportPlugin(): Plugin {
       for (const chunk of Object.values(bundle)) {
         if (chunk.type !== 'chunk') continue
 
-        const match = chunk.fileName.match(/^(.*)\.(cjs|js)$/)
-        if (!match) continue
+        if (!chunk.fileName.endsWith('.cjs') && !chunk.fileName.endsWith('.js'))
+          continue
 
-        const baseName = match[1]
-        const dCtsName =
-          match[2] === 'cjs' ? `${baseName}.d.cts` : `${baseName}.d.ts`
-        const dMtsBasename = path.basename(`${baseName}.d.mts`)
+        const dMtsBasename = path.basename(
+          chunk.fileName.replace(RE_JS, '.d.mts'),
+        )
         const content = `export * from './${dMtsBasename}'\n`
 
-        this.emitFile({ type: 'asset', fileName: dCtsName, source: content })
+        this.emitFile({
+          type: 'prebuilt-chunk',
+          fileName: filename_js_to_dts(chunk.fileName),
+          code: content,
+        })
       }
     },
   }

tests/__snapshots__/cjs-dts-reexport.snap.md

@@ -1,4 +1,4 @@
-## index.cjs
+## folder/index.cjs
 
 ```cjs
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
@@ -11,14 +11,14 @@ exports.hello = hello;
 
 ```
 
-## index.d.cts
+## folder/index.d.cts
 
 ```cts
 export * from './index.d.mts'
 
 ```
 
-## index.d.mts
+## folder/index.d.mts
 
 ```mts
 //#region index.d.ts
@@ -27,7 +27,7 @@ declare function hello(): void;
 export { hello };
 ```
 
-## index.mjs
+## folder/index.mjs
 
 ```mjs
 //#region index.ts

tests/e2e.test.ts

@@ -108,6 +108,9 @@ test('cjs dts reexport', async (context) => {
     context,
     files,
     options: {
+      entry: {
+        'folder/index': 'index.ts',
+      },
       format: ['esm', 'cjs'],
       dts: { cjsReexport: true },
     },