chore: update

Author: Timeless0911

packages/plugin-dts/src/tsc.ts

@@ -165,13 +165,44 @@ export async function emitDts(
     }
   };
 
-  const system = { ...ts.sys };
+  const renameDtsFile = (fileName: string): string => {
+    if (bundle) {
+      return fileName;
+    }
+    return fileName.replace(/\.d\.ts$/, dtsExtension);
+  };
+
+  const system: ts.System = {
+    ...ts.sys,
+    writeFile: (fileName, contents, writeByteOrderMark) => {
+      ts.sys.writeFile(renameDtsFile(fileName), contents, writeByteOrderMark);
+    },
+  };
 
   // build mode
   if (!isWatch) {
     // normal build - npx tsc
     if (!build && !compilerOptions.composite) {
-      const host: ts.CompilerHost = ts.createCompilerHost(compilerOptions);
+      const originHost: ts.CompilerHost =
+        ts.createCompilerHost(compilerOptions);
+      const host: ts.CompilerHost = {
+        ...originHost,
+        writeFile: (
+          fileName,
+          contents,
+          writeByteOrderMark,
+          onError,
+          sourceFiles,
+        ) => {
+          originHost.writeFile(
+            renameDtsFile(fileName),
+            contents,
+            writeByteOrderMark,
+            onError,
+            sourceFiles,
+          );
+        },
+      };
 
       const program: ts.Program = ts.createProgram({
         rootNames: fileNames,
@@ -202,8 +233,26 @@ export async function emitDts(
       );
     } else if (!build && compilerOptions.composite) {
       // incremental build with composite true - npx tsc
-      const host: ts.CompilerHost =
+      const originHost: ts.CompilerHost =
         ts.createIncrementalCompilerHost(compilerOptions);
+      const host: ts.CompilerHost = {
+        ...originHost,
+        writeFile: (
+          fileName,
+          contents,
+          writeByteOrderMark,
+          onError,
+          sourceFiles,
+        ) => {
+          originHost.writeFile(
+            renameDtsFile(fileName),
+            contents,
+            writeByteOrderMark,
+            onError,
+            sourceFiles,
+          );
+        },
+      };
 
       const program = ts.createIncrementalProgram({
         rootNames: fileNames,

packages/plugin-dts/src/utils.ts

@@ -378,7 +378,7 @@ export async function processDtsFiles(
     );
   }
 
-  const dtsFiles = await glob(convertPath(join(dir, '/**/*.d.ts')), {
+  const dtsFiles = await glob(convertPath(join(dir, '/**/*.d.{ts,cts,mts}')), {
     absolute: true,
   });
 
@@ -399,9 +399,6 @@ export async function processDtsFiles(
             rootDir,
           );
         }
-
-        const newFile = file.replace('.d.ts', dtsExtension);
-        await fsP.rename(file, newFile);
       } catch (error) {
         logger.error(`Failed to rename declaration file ${file}: ${error}`);
       }

tests/integration/dts/bundle-false/auto-extension/rslib.config.ts

@@ -5,11 +5,17 @@ export default defineConfig({
   lib: [
     generateBundleEsmConfig({
       bundle: false,
+      dts: {
+        autoExtension: true,
+        distPath: './dist/types',
+        bundle: false,
+      },
     }),
     generateBundleCjsConfig({
       bundle: false,
       dts: {
         autoExtension: true,
+        distPath: './dist/types',
         bundle: false,
       },
     }),

tests/integration/dts/index.test.ts

@@ -90,10 +90,14 @@ describe('dts when bundle: false', () => {
 
     expect(files.cjs).toMatchInlineSnapshot(`
       [
-        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/cjs/index.d.cts",
-        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/cjs/sum.d.cts",
-        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/cjs/utils/numbers.d.cts",
-        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/cjs/utils/strings.d.cts",
+        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/types/index.d.cts",
+        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/types/index.d.ts",
+        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/types/sum.d.cts",
+        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/types/sum.d.ts",
+        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/types/utils/numbers.d.cts",
+        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/types/utils/numbers.d.ts",
+        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/types/utils/strings.d.cts",
+        "<ROOT>/tests/integration/dts/bundle-false/auto-extension/dist/types/utils/strings.d.ts",
       ]
     `);
   });