fix: resolve id in input

Author: sxzz

src/generate.ts

@@ -46,10 +46,15 @@ export function createGeneratePlugin({
   const inputAliasMap = new Map<string, string>()
   const resolver = createResolver()
   let programs: TsProgram[] = []
+  let cwd: string
 
   return {
     name: 'rolldown-plugin-dts:generate',
 
+    options(options) {
+      cwd = options.cwd || process.cwd()
+    },
+
     buildStart(options) {
       if (!compilerOptions) {
         const { config } = getTsconfig(options.cwd) || {}
@@ -71,10 +76,9 @@ export function createGeneratePlugin({
       }
 
       if (!Array.isArray(options.input)) {
-        const cwd = options.cwd || process.cwd()
-        for (const [fileName, inputFilePath] of Object.entries(options.input)) {
-          const id = path.resolve(cwd, inputFilePath)
-          inputAliasMap.set(id, fileName)
+        for (const [name, id] of Object.entries(options.input)) {
+          // `id` should be resolved in `resolveId`
+          inputAliasMap.set(id, name)
         }
       }
     },
@@ -163,10 +167,28 @@ export function createGeneratePlugin({
       },
     },
 
-    async resolveId(id, importer) {
-      // must be entry
+    async resolveId(id, importer, extraOptions) {
       if (dtsMap.has(id)) {
+        // must be dts entry
         return { id, meta }
+      } else if (extraOptions.isEntry && inputAliasMap.has(id)) {
+        // resolve id for inputAliasMap
+        let resolution = await this.resolve(id, importer, {
+          ...extraOptions,
+          skipSelf: true,
+        })
+        if (!resolution) {
+          resolution = await this.resolve(path.resolve(cwd, id), importer, {
+            ...extraOptions,
+            skipSelf: true,
+          })
+          if (!resolution) return
+        }
+
+        const alias = inputAliasMap.get(id)!
+        inputAliasMap.delete(id)
+        inputAliasMap.set(resolution.id, alias)
+        return resolution
       }
 
       if (importer && this.getModuleInfo(importer)?.meta.dtsFile) {

tsdown.config.ts

@@ -2,7 +2,7 @@ import { defineConfig } from 'tsdown'
 import { dts } from './src/index'
 
 export default defineConfig({
-  entry: ['./src/index.ts'],
+  entry: ['./src/index.ts', './src/utils/filename.ts'],
   target: 'node20.18',
   clean: true,
   platform: 'node',