fix: specify root dir for tsgo

sxzz · sxzz · commit 88bf0e786661 · 2025-06-11T16:17:06.000+08:00
diff --git a/src/generate.ts b/src/generate.ts
@@ -102,27 +102,7 @@ export function createGeneratePlugin({
 
     async buildStart(options) {
       if (tsgo) {
-        const tsgoPkg = import.meta.resolve(
-          '@typescript/native-preview/package.json',
-        )
-        const { default: getExePath } = await import(
-          new URL('./lib/getExePath.js', tsgoPkg).href
-        )
-        const tsgo = getExePath()
-        tsgoDist = await mkdtemp(path.join(tmpdir(), 'rolldown-plugin-dts-'))
-        await spawnAsync(
-          tsgo,
-          [
-            '--noEmit',
-            'false',
-            '--declaration',
-            '--emitDeclarationOnly',
-            ...(tsconfig ? ['-p', tsconfig] : []),
-            '--outDir',
-            tsgoDist,
-          ],
-          { stdio: 'inherit' },
-        )
+        tsgoDist = await runTsgo(cwd, tsconfig)
       } else if (!parallel && (!isolatedDeclarations || vue)) {
         tscModule = await import('./tsc/index.ts')
         tscContext = eager ? undefined : tscModule.createContext()
@@ -219,14 +199,12 @@ export function createGeneratePlugin({
             throw new Error('tsgo does not support Vue files.')
           const dtsPath = path.resolve(
             tsgoDist!,
-            path.relative(
-              path.resolve(typeof tsgo === 'string' ? tsgo : 'src'),
-              filename_ts_to_dts(id),
-            ),
+            path.relative(path.resolve(cwd), filename_ts_to_dts(id)),
           )
           if (existsSync(dtsPath)) {
             dtsCode = await readFile(dtsPath, 'utf8')
           } else {
+            debug('[tsgo]', dtsPath, 'is missing')
             throw new Error(
               `tsgo did not generate dts file for ${id}, please check your tsconfig.`,
             )
@@ -298,10 +276,38 @@ export function createGeneratePlugin({
 
     async buildEnd() {
       childProcess?.kill()
-      if (tsgoDist) {
+      if (!debug.enabled && tsgoDist) {
         await rm(tsgoDist, { recursive: true, force: true }).catch(() => {})
       }
       tscContext = tsgoDist = undefined
     },
   }
 }
+
+async function runTsgo(root: string, tsconfig?: string) {
+  const tsgoPkg = import.meta.resolve('@typescript/native-preview/package.json')
+  const { default: getExePath } = await import(
+    new URL('./lib/getExePath.js', tsgoPkg).href
+  )
+  const tsgo = getExePath()
+  const tsgoDist = await mkdtemp(path.join(tmpdir(), 'rolldown-plugin-dts-'))
+  debug('[tsgo] tsgoDist', tsgoDist)
+
+  await spawnAsync(
+    tsgo,
+    [
+      '--noEmit',
+      'false',
+      '--declaration',
+      '--emitDeclarationOnly',
+      ...(tsconfig ? ['-p', tsconfig] : []),
+      '--outDir',
+      tsgoDist,
+      '--rootDir',
+      root,
+    ],
+    { stdio: 'inherit' },
+  )
+
+  return tsgoDist
+}
diff --git a/src/options.ts b/src/options.ts
@@ -128,7 +128,7 @@ export interface Options {
    *
    * **Note:** This option is not yet recommended for production environments.
    */
-  tsgo?: boolean | string
+  tsgo?: boolean
 }
 
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ export interface Options {`
`128`	`128`	`*`
`129`	`129`	`* Note: This option is not yet recommended for production environments.`
`130`	`130`	`*/`
`131`		`- tsgo?: boolean \| string`
	`131`	`+ tsgo?: boolean`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U`