feat: support resolving specific id for bundle dts

Author: sxzz

src/features/dts.ts

@@ -30,8 +30,9 @@ export async function bundleDts(
   format: NormalizedFormat,
   pkg?: PackageJson,
 ): Promise<void> {
-  typeAsserts<IsolatedDeclOptions>(options.dts)
-  typeAsserts<BundleDtsOptions>(options.bundleDts)
+  const { dts, bundleDts } = options
+  typeAsserts<IsolatedDeclOptions>(dts)
+  typeAsserts<BundleDtsOptions>(bundleDts)
 
   const ext = jsExtension.replace('j', 't')
   const dtsOutDir = path.resolve(options.outDir, getTempDtsDir(format))
@@ -41,6 +42,7 @@ export async function bundleDts(
       path.resolve(dtsOutDir, `${key}.d.${ext}`),
     ]),
   )
+
   const build = await rollup({
     input: dtsEntry,
     external: options.external,
@@ -51,10 +53,13 @@ export async function bundleDts(
     },
     plugins: [
       ExternalPlugin(options, pkg) as any,
-      options.bundleDts.resolve && ResolveDtsPlugin(),
+      bundleDts.resolve &&
+        ResolveDtsPlugin(
+          bundleDts.resolve !== true ? bundleDts.resolve : undefined,
+        ),
       DtsPlugin({
         compilerOptions: {
-          ...options.bundleDts.compilerOptions,
+          ...bundleDts.compilerOptions,
           declaration: true,
           noEmit: false,
           emitDeclarationOnly: true,
@@ -70,7 +75,7 @@ export async function bundleDts(
   })
 
   let outDir = options.outDir
-  const extraOutdir = options.dts.extraOutdir
+  const extraOutdir = dts.extraOutdir
   if (extraOutdir) {
     outDir = path.resolve(outDir, extraOutdir)
   }
@@ -84,7 +89,7 @@ export async function bundleDts(
 }
 
 let resolver: ResolverFactory | undefined
-export function ResolveDtsPlugin(): Plugin {
+export function ResolveDtsPlugin(resolveOnly?: Array<string | RegExp>): Plugin {
   return {
     name: 'resolve-dts',
     buildStart() {
@@ -99,6 +104,17 @@ export function ResolveDtsPlugin(): Plugin {
       if (id[0] === '.' || path.isAbsolute(id)) return
       if (/\0/.test(id)) return
 
+      if (resolveOnly) {
+        const shouldResolve = resolveOnly.some((value) => {
+          if (typeof value === 'string') return value === id
+          return value.test(id)
+        })
+        if (!shouldResolve) {
+          debug('skipped by matching resolveOnly: %s', id)
+          return
+        }
+      }
+
       const directory = importer ? path.dirname(importer) : process.cwd()
       debug('Resolving:', id, 'from:', directory)
       const { path: resolved } = await resolver!.async(directory, id)

src/options.ts

@@ -29,7 +29,8 @@ import type { ConfigEnv, UserConfigExport as ViteUserConfigExport } from 'vite'
 export type Sourcemap = boolean | 'inline' | 'hidden'
 
 export interface BundleDtsOptions {
-  resolve?: boolean
+  /** Resolve external types used in dts files from node_modules */
+  resolve?: boolean | (string | RegExp)[]
   compilerOptions?: CompilerOptions
 }
 

tests/__snapshots__/resolve-dependency-for-dts.snap.md

@@ -1,6 +1,8 @@
 ## index.d.mts
 
 ```mts
+export * from 'consola';
+
 interface GlobOptions {
     absolute?: boolean;
     cwd?: string;

tests/index.test.ts

@@ -176,7 +176,12 @@ test('fromVite', async (context) => {
 
 test('resolve dependency for dts', async (context) => {
   const files = {
-    'index.ts': `export type { GlobOptions } from 'tinyglobby'`,
+    'index.ts': `export type { GlobOptions } from 'tinyglobby'
+    export type * from 'consola'`,
   }
-  await testBuild(context, files, { dts: true, bundleDts: { resolve: true } })
+  const { snapshot } = await testBuild(context, files, {
+    dts: true,
+    bundleDts: { resolve: ['tinyglobby'] },
+  })
+  expect(snapshot).contain(`export * from 'consola'`)
 })