vite-plugin-dts 1.0.5 → 1.1.0

package/README.md

@@ -1,185 +1,192 @@
-# vite-plugin-dts
-
-**English** | [中文](./README.zh-CN.md)
-
-A vite plugin that generates declaration files (`*.d.ts`) from `.ts` or `.vue` source files when using vite in [library mode](https://vitejs.dev/guide/build.html#library-mode).
-
-## Install
-
-```sh
-pnpm add vite-plugin-dts -D
-```
-
-## Usage
-
-In `vite.config.ts`:
-
-```ts
-import { resolve } from 'path'
-import { defineConfig } from 'vite'
-import dts from 'vite-plugin-dts'
-
-export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
-      name: 'MyLib',
-      formats: ['es'],
-      fileName: 'my-lib'
-    }
-  },
-  plugins: [dts()]
-})
-```
-
-In your component:
-
-```vue
-<template>
-  <div></div>
-</template>
-
-<script lang="ts">
-// using defineComponent for inferring types
-import { defineComponent } from 'vue'
-
-export default defineComponent({
-  name: 'Component'
-})
-</script>
-```
-
-```vue
-<script setup lang="ts">
-// Need to access the defineProps returned value to
-// infer types although you never use the props directly
-const props = defineProps<{
-  color: 'blue' | 'red'
-}>()
-</script>
-
-<template>
-  <div>{{ color }}</div>
-</template>
-```
-
-## Options
-
-```ts
-import type { ts, Diagnostic } from 'ts-morph'
-
-interface TransformWriteFile {
-  filePath?: string
-  content?: string
-}
-
-export interface PluginOptions {
-  // Depends on the root directory
-  // Defaults base on your vite config root options
-  root?: string
-
-  // Declaration files output directory
-  // Defaults base on your vite config output options
-  outputDir?: string
-
-  // Manually set the root path of the entry files
-  // The output path of each file will be caculated base on it
-  // Defaults is the smallest public path for all files
-  entryRoot?: string
-
-  // Project init compilerOptions using by ts-morph
-  // Default: null
-  compilerOptions?: ts.CompilerOptions | null
-
-  // Project init tsconfig.json file path by ts-morph
-  // Plugin also resolve incldue and exclude files from tsconfig.json
-  // Default: 'tsconfig.json'
-  tsConfigFilePath?: string
-
-  // Whether transform file name '.vue.d.ts' to '.d.ts'
-  // Default: false
-  cleanVueFileName?: boolean
-
-  // Whether transform dynamic import to static
-  // eg. 'import('vue').DefineComponent' to 'import { DefineComponent } from "vue"'
-  // Default: false
-  staticImport?: boolean
-
-  // Manual set include glob
-  // Defaults base on your tsconfig.json include option
-  include?: string | string[]
-
-  // Manual set exclude glob
-  // Defaults base on your tsconfig.json exclude option, be 'node_module/**' when empty
-  exclude?: string | string[]
-
-  // Whether generate types entry file
-  // When true will from package.json types field if exists or `${outputDir}/index.d.ts`
-  // Default: false
-  insertTypesEntry?: boolean
-
-  // Whether copy .d.ts source files into outputDir
-  // Default: true
-  copyDtsFiles?: boolean
-
-  // Whether emit nothing when has any diagnostic
-  // Default: false
-  noEmitOnError?: boolean
-
-  // Whether skip typescript diagnostics
-  // Skip type diagnostics means that type errors will not interrupt the build process
-  // But for the source files with type errors will not be emitted
-  // Default: true
-  skipDiagnostics?: boolean
-
-  // Whether log diagnostic informations
-  // Not effective when `skipDiagnostics` is true
-  // Default: false
-  logDiagnostics?: boolean
-
-  // After emit diagnostic hook
-  // According to the length to judge whether there is any type error
-  // Default: () => {}
-  afterDiagnostic?: (diagnostics: Diagnostic[]) => void | Promise<void>
-
-  // Before declaration file be writed hook
-  // You can transform declaration file-path and content through it
-  // Default: () => {}
-  beforeWriteFile?: (filePath: string, content: string) => void | TransformWriteFile
-
-  // After build hook
-  // It wil be called after all declaration files are written
-  // Default: () => {}
-  afterBuild?: () => void | Promise<void>
-}
-```
-
-## Example
-
-Clone and run the following script:
-
-```sh
-pnpm run test:e2e
-```
-
-Then check `example/types`.
-
-## FAQ
-
-Here are some FAQ's and solutions.
-
-### Missing some declaration files after build
-
-By default `skipDiagnostics` option is `true`, which means that type diagnostic will be skipped during the build process (some projects may have diagnostic tools such as `vue-tsc`). If there are some files with type errors which interrupt the build process, these files will not be emitted (declaration files won't be generated).
-
-If your project doesn't use type diagnostic tools, you can set `skipDiagnostics: false` and `logDiagnostics: true` to turn on the diagnostic and log features of this plugin. It will help you check the type errors during build and log error information to the terminal.
-
-### Take type error when using both `script` and `setup-script` in vue component
-
-This is usually caused by using `defineComponent` function in both `script` and `setup-script`. When `vue/compiler-sfc` compiles these files, the default export result from `script` gets merged with the parameter object of `defineComponent` from `setup-script`. This is incompatible with parameters and types returned from `defineComponent`, which results in a type error.
-
-Here is a simple [example](https://github.com/qmhc/vite-plugin-dts/blob/main/example/components/BothScripts.vue), you should remove the `defineComponent` which in `script` and export a native object directly.
-
-## License
-
-MIT License.
+# vite-plugin-dts
+
+**English** | [中文](./README.zh-CN.md)
+
+A vite plugin that generates declaration files (`*.d.ts`) from `.ts` or `.vue` source files when using vite in [library mode](https://vitejs.dev/guide/build.html#library-mode).
+
+## Install
+
+```sh
+pnpm add vite-plugin-dts -D
+```
+
+## Usage
+
+In `vite.config.ts`:
+
+```ts
+import { resolve } from 'path'
+import { defineConfig } from 'vite'
+import dts from 'vite-plugin-dts'
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/index.ts'),
+      name: 'MyLib',
+      formats: ['es'],
+      fileName: 'my-lib'
+    }
+  },
+  plugins: [dts()]
+})
+```
+
+In your component:
+
+```vue
+<template>
+  <div></div>
+</template>
+
+<script lang="ts">
+// using defineComponent for inferring types
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'Component'
+})
+</script>
+```
+
+```vue
+<script setup lang="ts">
+// Need to access the defineProps returned value to
+// infer types although you never use the props directly
+const props = defineProps<{
+  color: 'blue' | 'red'
+}>()
+</script>
+
+<template>
+  <div>{{ color }}</div>
+</template>
+```
+
+## Options
+
+```ts
+import type { ts, Diagnostic } from 'ts-morph'
+
+interface TransformWriteFile {
+  filePath?: string
+  content?: string
+}
+
+export interface PluginOptions {
+  // Depends on the root directory
+  // Defaults base on your vite config root options
+  root?: string
+
+  // Declaration files output directory
+  // Defaults base on your vite config output options
+  outputDir?: string
+
+  // Manually set the root path of the entry files
+  // The output path of each file will be caculated base on it
+  // Defaults is the smallest public path for all files
+  entryRoot?: string
+
+  // Project init compilerOptions using by ts-morph
+  // Default: null
+  compilerOptions?: ts.CompilerOptions | null
+
+  // Project init tsconfig.json file path by ts-morph
+  // Plugin also resolve incldue and exclude files from tsconfig.json
+  // Default: 'tsconfig.json'
+  tsConfigFilePath?: string
+
+  // Whether transform file name '.vue.d.ts' to '.d.ts'
+  // Default: false
+  cleanVueFileName?: boolean
+
+  // Whether transform dynamic import to static
+  // Force true when `rollupTypes` is effective
+  // eg. 'import('vue').DefineComponent' to 'import { DefineComponent } from "vue"'
+  // Default: false
+  staticImport?: boolean
+
+  // Manual set include glob
+  // Defaults base on your tsconfig.json include option
+  include?: string | string[]
+
+  // Manual set exclude glob
+  // Defaults base on your tsconfig.json exclude option, be 'node_module/**' when empty
+  exclude?: string | string[]
+
+  // Whether generate types entry file
+  // When true will from package.json types field if exists or `${outputDir}/index.d.ts`
+  // Force true when `rollupTypes` is effective
+  // Default: false
+  insertTypesEntry?: boolean
+
+  // Set to rollup declaration files after emit
+  // Power by `@microsoft/api-extractor`, it will start a new program which takes some time
+  // Default: false
+  rollupTypes?: boolean
+
+  // Whether copy .d.ts source files into outputDir
+  // Default: true
+  copyDtsFiles?: boolean
+
+  // Whether emit nothing when has any diagnostic
+  // Default: false
+  noEmitOnError?: boolean
+
+  // Whether skip typescript diagnostics
+  // Skip type diagnostics means that type errors will not interrupt the build process
+  // But for the source files with type errors will not be emitted
+  // Default: true
+  skipDiagnostics?: boolean
+
+  // Whether log diagnostic informations
+  // Not effective when `skipDiagnostics` is true
+  // Default: false
+  logDiagnostics?: boolean
+
+  // After emit diagnostic hook
+  // According to the length to judge whether there is any type error
+  // Default: () => {}
+  afterDiagnostic?: (diagnostics: Diagnostic[]) => void | Promise<void>
+
+  // Before declaration file be writed hook
+  // You can transform declaration file-path and content through it
+  // Default: () => {}
+  beforeWriteFile?: (filePath: string, content: string) => void | TransformWriteFile
+
+  // After build hook
+  // It wil be called after all declaration files are written
+  // Default: () => {}
+  afterBuild?: () => void | Promise<void>
+}
+```
+
+## Example
+
+Clone and run the following script:
+
+```sh
+pnpm run test:e2e
+```
+
+Then check `example/types`.
+
+## FAQ
+
+Here are some FAQ's and solutions.
+
+### Missing some declaration files after build
+
+By default `skipDiagnostics` option is `true`, which means that type diagnostic will be skipped during the build process (some projects may have diagnostic tools such as `vue-tsc`). If there are some files with type errors which interrupt the build process, these files will not be emitted (declaration files won't be generated).
+
+If your project doesn't use type diagnostic tools, you can set `skipDiagnostics: false` and `logDiagnostics: true` to turn on the diagnostic and log features of this plugin. It will help you check the type errors during build and log error information to the terminal.
+
+### Take type error when using both `script` and `setup-script` in vue component
+
+This is usually caused by using `defineComponent` function in both `script` and `setup-script`. When `vue/compiler-sfc` compiles these files, the default export result from `script` gets merged with the parameter object of `defineComponent` from `setup-script`. This is incompatible with parameters and types returned from `defineComponent`, which results in a type error.
+
+Here is a simple [example](https://github.com/qmhc/vite-plugin-dts/blob/main/example/components/BothScripts.vue), you should remove the `defineComponent` which in `script` and export a native object directly.
+
+## License
+
+MIT License.

package/README.zh-CN.md

@@ -100,6 +100,7 @@ export interface PluginOptions {
   cleanVueFileName?: boolean
 
   //是否将动态引入转换为静态
+  // 当开启打包类型文件时强制为 true
   // eg. 'import('vue').DefineComponent' 转换为 'import { DefineComponent } from "vue"'
   // 默认值: false
   staticImport?: boolean
@@ -114,9 +115,15 @@ export interface PluginOptions {
 
   // 是否生成类型声明入口
   // 当为 true 时会基于 package.json 的 tpyes 字段生成，或者 `${outputDir}/index.d.ts`
+  // 当开启打包类型文件时强制为 true
   // 默认值: false
   insertTypesEntry?: boolean
 
+  // 设置是否在发出类型文件后将其打包
+  // 基于 `@microsoft/api-extractor`，由于这开启了一个新的进程，将会消耗一些时间
+  // 默认值: false
+  rollupTypes?: boolean
+
   // 是否将源码里的 .d.ts 文件复制到 outputDir
   // 默认值: true
   copyDtsFiles?: boolean

package/dist/index.d.ts

@@ -17,6 +17,7 @@ interface PluginOptions {
     staticImport?: boolean;
     clearPureImport?: boolean;
     insertTypesEntry?: boolean;
+    rollupTypes?: boolean;
     copyDtsFiles?: boolean;
     noEmitOnError?: boolean;
     skipDiagnostics?: boolean;

package/dist/index.js

@@ -28,7 +28,7 @@ module.exports = dtsPlugin;
 dtsPlugin['default'] = dtsPlugin;
 
 // src/plugin.ts
-var import_path3 = require("path");
+var import_path4 = require("path");
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_os = __toESM(require("os"));
 var import_chalk = __toESM(require("chalk"));
@@ -44,6 +44,7 @@ var import_vite = require("vite");
 
 // src/utils.ts
 var import_path = require("path");
+var import_fs = require("fs");
 function isNativeObj(value) {
   return Object.prototype.toString.call(value) === "[object Object]";
 }
@@ -146,6 +147,26 @@ function queryPublicPath(paths) {
   }
   return publicPath.slice(0, -1);
 }
+function removeDirIfEmpty(dir) {
+  if (!(0, import_fs.existsSync)(dir)) {
+    return;
+  }
+  let onlyHasDir = true;
+  for (const file of (0, import_fs.readdirSync)(dir)) {
+    const abs = (0, import_path.resolve)(dir, file);
+    if ((0, import_fs.lstatSync)(abs).isDirectory()) {
+      if (!removeDirIfEmpty(abs)) {
+        onlyHasDir = false;
+      }
+    } else {
+      onlyHasDir = false;
+    }
+  }
+  if (onlyHasDir) {
+    (0, import_fs.rmdirSync)(dir);
+  }
+  return onlyHasDir;
+}
 
 // src/transform.ts
 var globSuffixRE = /^((?:.*\.[^.]+)|(?:\*+))$/;
@@ -291,24 +312,107 @@ const _sfc_main = ${classMatch[1]}`;
       content += "\nexport default _sfc_main\n";
       ext = scriptSetup.lang || "js";
     } else if (script && script.content) {
-      content = script.content;
+      content = rewriteDefault(script.content, "_sfc_main");
+      content += "\nexport default _sfc_main\n";
       ext = script.lang || "js";
     }
   }
   return { content, ext };
 }
 
+// src/rollup.ts
+var import_path3 = require("path");
+var import_api_extractor = require("@microsoft/api-extractor");
+var import_Collector = require("@microsoft/api-extractor/lib/collector/Collector");
+var import_MessageRouter = require("@microsoft/api-extractor/lib/collector/MessageRouter");
+var import_DtsRollupGenerator = require("@microsoft/api-extractor/lib/generators/DtsRollupGenerator");
+var import_node_core_library = require("@rushstack/node-core-library");
+var dtsRE = /\.d\.tsx?$/;
+function rollupDeclarationFiles({
+  root,
+  tsConfigPath,
+  outputDir,
+  entryPath,
+  fileName
+}) {
+  const configObjectFullPath = (0, import_path3.resolve)(root, "api-extractor.json");
+  const packageJsonLookup = new import_node_core_library.PackageJsonLookup();
+  const packageJsonFullPath = packageJsonLookup.tryGetPackageJsonFilePathFor(configObjectFullPath);
+  if (!dtsRE.test(fileName)) {
+    fileName += ".d.ts";
+  }
+  const extractorConfig = import_api_extractor.ExtractorConfig.prepare({
+    configObject: {
+      projectFolder: root,
+      mainEntryPointFilePath: entryPath,
+      compiler: {
+        tsconfigFilePath: tsConfigPath
+      },
+      apiReport: {
+        enabled: false,
+        reportFileName: "<unscopedPackageName>.api.md"
+      },
+      docModel: {
+        enabled: false
+      },
+      dtsRollup: {
+        enabled: true,
+        publicTrimmedFilePath: (0, import_path3.resolve)(outputDir, fileName)
+      },
+      tsdocMetadata: {
+        enabled: false
+      },
+      messages: {
+        compilerMessageReporting: {
+          default: {
+            logLevel: "none"
+          }
+        },
+        extractorMessageReporting: {
+          default: {
+            logLevel: "none"
+          }
+        }
+      }
+    },
+    configObjectFullPath,
+    packageJsonFullPath
+  });
+  const compilerState = import_api_extractor.CompilerState.create(extractorConfig, {
+    localBuild: true,
+    showVerboseMessages: false
+  });
+  const messageRouter = new import_MessageRouter.MessageRouter({
+    workingPackageFolder: root,
+    messageCallback: void 0,
+    messagesConfig: extractorConfig.messages,
+    showVerboseMessages: false,
+    showDiagnostics: false,
+    tsdocConfiguration: extractorConfig.tsdocConfiguration
+  });
+  const collector = new import_Collector.Collector({
+    program: compilerState.program,
+    messageRouter,
+    extractorConfig
+  });
+  collector.analyze();
+  import_DtsRollupGenerator.DtsRollupGenerator.writeTypingsFile(collector, extractorConfig.publicTrimmedFilePath, import_DtsRollupGenerator.DtsRollupKind.PublicRelease, extractorConfig.newlineKind);
+}
+
 // src/plugin.ts
 var noneExport = "export {};\n";
 var virtualPrefix = "\0";
 var vueRE = /\.vue$/;
 var tsRE = /\.tsx?$/;
 var jsRE = /\.jsx?$/;
-var dtsRE = /\.d\.tsx?$/;
+var dtsRE2 = /\.d\.tsx?$/;
 var tjsRE = /\.(t|j)sx?$/;
 var watchExtensionRE = /\.(vue|(t|j)sx?)$/;
+var fullRelativeRE = /^\.\.?\//;
+var defaultIndex = "index.d.ts";
 var noop = () => {
 };
+var logPrefix = import_chalk.default.cyan("[vite:dts]");
 var bundleDebug = (0, import_debug.debug)("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
   var _a, _b;
@@ -318,6 +422,7 @@ function dtsPlugin(options = {}) {
     staticImport = false,
     clearPureImport = true,
     insertTypesEntry = false,
+    rollupTypes = false,
     noEmitOnError = false,
     skipDiagnostics = true,
     logDiagnostics = false,
@@ -329,6 +434,8 @@ function dtsPlugin(options = {}) {
   const compilerOptions = (_a = options.compilerOptions) != null ? _a : {};
   let root;
   let entryRoot = (_b = options.entryRoot) != null ? _b : "";
+  let libName;
+  let indexName;
   let aliases;
   let entries;
   let logger;
@@ -357,7 +464,7 @@ function dtsPlugin(options = {}) {
       }
     },
     configResolved(config) {
-      var _a2, _b2;
+      var _a2, _b2, _c;
       if (isBundle)
         return;
       logger = config.logger;
@@ -365,8 +472,17 @@ function dtsPlugin(options = {}) {
         logger.warn(import_chalk.default.yellow(`
 ${import_chalk.default.cyan("[vite:dts]")} You building not a library that may not need to generate declaration files.
 `));
+        libName = "_default";
+        indexName = defaultIndex;
+      } else {
+        const filename = (_a2 = config.build.lib.fileName) != null ? _a2 : defaultIndex;
+        libName = config.build.lib.name || "_default";
+        indexName = typeof filename === "string" ? filename : filename("es");
+        if (!dtsRE2.test(indexName)) {
+          indexName = `${tjsRE.test(indexName) ? indexName.replace(tjsRE, "") : indexName}.d.ts`;
+        }
       }
-      root = ensureAbsolute((_a2 = options.root) != null ? _a2 : "", config.root);
+      root = ensureAbsolute((_b2 = options.root) != null ? _b2 : "", config.root);
       tsConfigPath = ensureAbsolute(tsConfigFilePath, root);
       outputDir = options.outputDir ? ensureAbsolute(options.outputDir, root) : ensureAbsolute(config.build.outDir, root);
       if (!outputDir) {
@@ -390,10 +506,10 @@ ${import_chalk.default.cyan("[vite:dts]")} Can not resolve declaration directory
         tsConfigFilePath: tsConfigPath,
         skipAddingFilesFromTsConfig: true
       });
-      allowJs = (_b2 = project.getCompilerOptions().allowJs) != null ? _b2 : false;
+      allowJs = (_c = project.getCompilerOptions().allowJs) != null ? _c : false;
     },
     buildStart(inputOptions) {
-      if (insertTypesEntry) {
+      if (!isBundle && (insertTypesEntry || rollupTypes)) {
         entries = Array.isArray(inputOptions.input) ? inputOptions.input : Object.values(inputOptions.input);
       }
     },
@@ -427,7 +543,7 @@ ${import_chalk.default.cyan("[vite:dts]")} Can not resolve declaration directory
       if (!outputDir || !project || isBundle)
         return;
       logger.info(import_chalk.default.green(`
-${import_chalk.default.cyan("[vite:dts]")} Start generate declaration files...`));
+${logPrefix} Start generate declaration files...`));
       bundleDebug("start");
       isBundle = true;
       sourceDtsFiles.clear();
@@ -444,7 +560,7 @@ ${import_chalk.default.cyan("[vite:dts]")} Start generate declaration files...`)
           ignore: ensureArray(exclude != null ? exclude : ["node_modules/**"]).map(normalizeGlob)
         });
         files.forEach((file) => {
-          if (dtsRE.test(file)) {
+          if (dtsRE2.test(file)) {
             if (!copyDtsFiles) {
               return;
             }
@@ -475,19 +591,21 @@ ${import_chalk.default.cyan("[vite:dts]")} Start generate declaration files...`)
         }
         bundleDebug("diagnostics");
       }
+      const dtsOutputFiles = Array.from(sourceDtsFiles).map((sourceFile) => ({
+        path: sourceFile.getFilePath(),
+        content: sourceFile.getFullText()
+      }));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map((sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
         path: outputFile.getFilePath(),
         content: outputFile.getText()
-      }))).flat().concat(Array.from(sourceDtsFiles).map((sourceFile) => ({
-        path: sourceFile.getFilePath(),
-        content: sourceFile.getFullText()
-      })));
+      }))).flat().concat(dtsOutputFiles);
+      bundleDebug("emit");
       if (!entryRoot) {
         entryRoot = queryPublicPath(outputFiles.map((file) => file.path));
       }
       entryRoot = ensureAbsolute(entryRoot, root);
-      bundleDebug("emit");
+      const wroteFiles = /* @__PURE__ */ new Set();
       await runParallel(import_os.default.cpus().length, outputFiles, async (outputFile) => {
         var _a3, _b3;
         let filePath = outputFile.path;
@@ -499,9 +617,9 @@ ${import_chalk.default.cyan("[vite:dts]")} Start generate declaration files...`)
         if (!isMapFile && content && content !== noneExport) {
           content = clearPureImport ? removePureImport(content) : content;
           content = transformAliasImport(filePath, content, aliases);
-          content = staticImport ? transformDynamicImport(content) : content;
+          content = staticImport || rollupTypes ? transformDynamicImport(content) : content;
         }
-        filePath = (0, import_path3.resolve)(outputDir, (0, import_path3.relative)(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath));
+        filePath = (0, import_path4.resolve)(outputDir, (0, import_path4.relative)(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath));
         if (typeof beforeWriteFile === "function") {
           const result = beforeWriteFile(filePath, content);
           if (result && isNativeObj(result)) {
@@ -509,21 +627,24 @@ ${import_chalk.default.cyan("[vite:dts]")} Start generate declaration files...`)
             content = (_b3 = result.content) != null ? _b3 : content;
           }
         }
-        await import_fs_extra.default.mkdir((0, import_path3.dirname)(filePath), { recursive: true });
+        await import_fs_extra.default.mkdir((0, import_path4.dirname)(filePath), { recursive: true });
         await import_fs_extra.default.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf8");
+        wroteFiles.add((0, import_vite2.normalizePath)(filePath));
       });
       bundleDebug("output");
-      if (insertTypesEntry) {
-        const pkgPath = (0, import_path3.resolve)(root, "package.json");
+      if (insertTypesEntry || rollupTypes) {
+        const pkgPath = (0, import_path4.resolve)(root, "package.json");
         const pkg = import_fs_extra.default.existsSync(pkgPath) ? JSON.parse(await import_fs_extra.default.readFile(pkgPath, "utf-8")) : {};
-        let typesPath = pkg.types ? (0, import_path3.resolve)(root, pkg.types) : (0, import_path3.resolve)(outputDir, "index.d.ts");
+        let typesPath = pkg.types ? (0, import_path4.resolve)(root, pkg.types) : (0, import_path4.resolve)(outputDir, indexName);
         if (!import_fs_extra.default.existsSync(typesPath)) {
-          let content = entries.map((entry) => {
-            let filePath = (0, import_vite2.normalizePath)((0, import_path3.relative)((0, import_path3.dirname)(typesPath), (0, import_path3.resolve)(outputDir, (0, import_path3.relative)(entryRoot, entry))));
-            filePath = filePath.replace(tsRE, "");
-            filePath = /^\.\.?\//.test(filePath) ? filePath : `./${filePath}`;
-            return `export * from '${filePath}'`;
-          }).join("\n") + "\n";
+          const entry = entries[0];
+          let filePath = (0, import_vite2.normalizePath)((0, import_path4.relative)((0, import_path4.dirname)(typesPath), (0, import_path4.resolve)(outputDir, (0, import_path4.relative)(entryRoot, entry))));
+          filePath = filePath.replace(tsRE, "");
+          filePath = fullRelativeRE.test(filePath) ? filePath : `./${filePath}`;
+          let content = `import ${libName} from '${filePath}'
+export default ${libName}
+export * from '${filePath}'
+`;
           if (typeof beforeWriteFile === "function") {
             const result = beforeWriteFile(typesPath, content);
             if (result && isNativeObj(result)) {
@@ -534,13 +655,32 @@ ${import_chalk.default.cyan("[vite:dts]")} Start generate declaration files...`)
           await import_fs_extra.default.writeFile(typesPath, content, "utf-8");
         }
         bundleDebug("insert index");
+        if (rollupTypes) {
+          logger.info(import_chalk.default.green(`${logPrefix} Start rollup declaration files...`));
+          rollupDeclarationFiles({
+            root,
+            tsConfigPath,
+            outputDir,
+            entryPath: (0, import_path4.resolve)(outputDir, "src/index.d.ts"),
+            fileName: (0, import_path4.basename)(typesPath)
+          });
+          wroteFiles.delete((0, import_vite2.normalizePath)(typesPath));
+          await runParallel(import_os.default.cpus().length, Array.from(wroteFiles), (f) => import_fs_extra.default.unlink(f));
+          removeDirIfEmpty(outputDir);
+          if (copyDtsFiles) {
+            await runParallel(import_os.default.cpus().length, dtsOutputFiles, async ({ path, content }) => {
+              await import_fs_extra.default.writeFile((0, import_path4.resolve)(outputDir, (0, import_path4.basename)(path)), content, "utf8");
+            });
+          }
+          bundleDebug("rollup");
+        }
       }
       if (typeof afterBuild === "function") {
         const result = afterBuild();
         isPromise(result) && await result;
       }
       bundleDebug("finish");
-      logger.info(import_chalk.default.green(`${import_chalk.default.cyan("[vite:dts]")} Declaration files built in ${Date.now() - startTime}ms.
+      logger.info(import_chalk.default.green(`${logPrefix} Declaration files built in ${Date.now() - startTime}ms.
 `));
     }
   };

package/dist/index.mjs

@@ -7,7 +7,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/plugin.ts
-import { resolve as resolve2, dirname as dirname3, relative as relative2 } from "path";
+import { resolve as resolve3, dirname as dirname3, relative as relative2, basename } from "path";
 import fs from "fs-extra";
 import os from "os";
 import chalk from "chalk";
@@ -23,6 +23,7 @@ import { normalizePath } from "vite";
 
 // src/utils.ts
 import { resolve, isAbsolute, dirname, normalize, sep } from "path";
+import { existsSync, readdirSync, lstatSync, rmdirSync } from "fs";
 function isNativeObj(value) {
   return Object.prototype.toString.call(value) === "[object Object]";
 }
@@ -125,6 +126,26 @@ function queryPublicPath(paths) {
   }
   return publicPath.slice(0, -1);
 }
+function removeDirIfEmpty(dir) {
+  if (!existsSync(dir)) {
+    return;
+  }
+  let onlyHasDir = true;
+  for (const file of readdirSync(dir)) {
+    const abs = resolve(dir, file);
+    if (lstatSync(abs).isDirectory()) {
+      if (!removeDirIfEmpty(abs)) {
+        onlyHasDir = false;
+      }
+    } else {
+      onlyHasDir = false;
+    }
+  }
+  if (onlyHasDir) {
+    rmdirSync(dir);
+  }
+  return onlyHasDir;
+}
 
 // src/transform.ts
 var globSuffixRE = /^((?:.*\.[^.]+)|(?:\*+))$/;
@@ -270,24 +291,110 @@ const _sfc_main = ${classMatch[1]}`;
       content += "\nexport default _sfc_main\n";
       ext = scriptSetup.lang || "js";
     } else if (script && script.content) {
-      content = script.content;
+      content = rewriteDefault(script.content, "_sfc_main");
+      content += "\nexport default _sfc_main\n";
       ext = script.lang || "js";
     }
   }
   return { content, ext };
 }
 
+// src/rollup.ts
+import { resolve as resolve2 } from "path";
+import { ExtractorConfig, CompilerState } from "@microsoft/api-extractor";
+import { Collector } from "@microsoft/api-extractor/lib/collector/Collector";
+import { MessageRouter } from "@microsoft/api-extractor/lib/collector/MessageRouter";
+import {
+  DtsRollupGenerator,
+  DtsRollupKind
+} from "@microsoft/api-extractor/lib/generators/DtsRollupGenerator";
+import { PackageJsonLookup } from "@rushstack/node-core-library";
+var dtsRE = /\.d\.tsx?$/;
+function rollupDeclarationFiles({
+  root,
+  tsConfigPath,
+  outputDir,
+  entryPath,
+  fileName
+}) {
+  const configObjectFullPath = resolve2(root, "api-extractor.json");
+  const packageJsonLookup = new PackageJsonLookup();
+  const packageJsonFullPath = packageJsonLookup.tryGetPackageJsonFilePathFor(configObjectFullPath);
+  if (!dtsRE.test(fileName)) {
+    fileName += ".d.ts";
+  }
+  const extractorConfig = ExtractorConfig.prepare({
+    configObject: {
+      projectFolder: root,
+      mainEntryPointFilePath: entryPath,
+      compiler: {
+        tsconfigFilePath: tsConfigPath
+      },
+      apiReport: {
+        enabled: false,
+        reportFileName: "<unscopedPackageName>.api.md"
+      },
+      docModel: {
+        enabled: false
+      },
+      dtsRollup: {
+        enabled: true,
+        publicTrimmedFilePath: resolve2(outputDir, fileName)
+      },
+      tsdocMetadata: {
+        enabled: false
+      },
+      messages: {
+        compilerMessageReporting: {
+          default: {
+            logLevel: "none"
+          }
+        },
+        extractorMessageReporting: {
+          default: {
+            logLevel: "none"
+          }
+        }
+      }
+    },
+    configObjectFullPath,
+    packageJsonFullPath
+  });
+  const compilerState = CompilerState.create(extractorConfig, {
+    localBuild: true,
+    showVerboseMessages: false
+  });
+  const messageRouter = new MessageRouter({
+    workingPackageFolder: root,
+    messageCallback: void 0,
+    messagesConfig: extractorConfig.messages,
+    showVerboseMessages: false,
+    showDiagnostics: false,
+    tsdocConfiguration: extractorConfig.tsdocConfiguration
+  });
+  const collector = new Collector({
+    program: compilerState.program,
+    messageRouter,
+    extractorConfig
+  });
+  collector.analyze();
+  DtsRollupGenerator.writeTypingsFile(collector, extractorConfig.publicTrimmedFilePath, DtsRollupKind.PublicRelease, extractorConfig.newlineKind);
+}
+
 // src/plugin.ts
 var noneExport = "export {};\n";
 var virtualPrefix = "\0";
 var vueRE = /\.vue$/;
 var tsRE = /\.tsx?$/;
 var jsRE = /\.jsx?$/;
-var dtsRE = /\.d\.tsx?$/;
+var dtsRE2 = /\.d\.tsx?$/;
 var tjsRE = /\.(t|j)sx?$/;
 var watchExtensionRE = /\.(vue|(t|j)sx?)$/;
+var fullRelativeRE = /^\.\.?\//;
+var defaultIndex = "index.d.ts";
 var noop = () => {
 };
+var logPrefix = chalk.cyan("[vite:dts]");
 var bundleDebug = debug("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
   var _a, _b;
@@ -297,6 +404,7 @@ function dtsPlugin(options = {}) {
     staticImport = false,
     clearPureImport = true,
     insertTypesEntry = false,
+    rollupTypes = false,
     noEmitOnError = false,
     skipDiagnostics = true,
     logDiagnostics = false,
@@ -308,6 +416,8 @@ function dtsPlugin(options = {}) {
   const compilerOptions = (_a = options.compilerOptions) != null ? _a : {};
   let root;
   let entryRoot = (_b = options.entryRoot) != null ? _b : "";
+  let libName;
+  let indexName;
   let aliases;
   let entries;
   let logger;
@@ -336,7 +446,7 @@ function dtsPlugin(options = {}) {
       }
     },
     configResolved(config) {
-      var _a2, _b2;
+      var _a2, _b2, _c;
       if (isBundle)
         return;
       logger = config.logger;
@@ -344,8 +454,17 @@ function dtsPlugin(options = {}) {
         logger.warn(chalk.yellow(`
 ${chalk.cyan("[vite:dts]")} You building not a library that may not need to generate declaration files.
 `));
+        libName = "_default";
+        indexName = defaultIndex;
+      } else {
+        const filename = (_a2 = config.build.lib.fileName) != null ? _a2 : defaultIndex;
+        libName = config.build.lib.name || "_default";
+        indexName = typeof filename === "string" ? filename : filename("es");
+        if (!dtsRE2.test(indexName)) {
+          indexName = `${tjsRE.test(indexName) ? indexName.replace(tjsRE, "") : indexName}.d.ts`;
+        }
       }
-      root = ensureAbsolute((_a2 = options.root) != null ? _a2 : "", config.root);
+      root = ensureAbsolute((_b2 = options.root) != null ? _b2 : "", config.root);
       tsConfigPath = ensureAbsolute(tsConfigFilePath, root);
       outputDir = options.outputDir ? ensureAbsolute(options.outputDir, root) : ensureAbsolute(config.build.outDir, root);
       if (!outputDir) {
@@ -369,10 +488,10 @@ ${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check
         tsConfigFilePath: tsConfigPath,
         skipAddingFilesFromTsConfig: true
       });
-      allowJs = (_b2 = project.getCompilerOptions().allowJs) != null ? _b2 : false;
+      allowJs = (_c = project.getCompilerOptions().allowJs) != null ? _c : false;
     },
     buildStart(inputOptions) {
-      if (insertTypesEntry) {
+      if (!isBundle && (insertTypesEntry || rollupTypes)) {
         entries = Array.isArray(inputOptions.input) ? inputOptions.input : Object.values(inputOptions.input);
       }
     },
@@ -406,7 +525,7 @@ ${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check
       if (!outputDir || !project || isBundle)
         return;
       logger.info(chalk.green(`
-${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
+${logPrefix} Start generate declaration files...`));
       bundleDebug("start");
       isBundle = true;
       sourceDtsFiles.clear();
@@ -423,7 +542,7 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
           ignore: ensureArray(exclude != null ? exclude : ["node_modules/**"]).map(normalizeGlob)
         });
         files.forEach((file) => {
-          if (dtsRE.test(file)) {
+          if (dtsRE2.test(file)) {
             if (!copyDtsFiles) {
               return;
             }
@@ -454,19 +573,21 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
         }
         bundleDebug("diagnostics");
       }
+      const dtsOutputFiles = Array.from(sourceDtsFiles).map((sourceFile) => ({
+        path: sourceFile.getFilePath(),
+        content: sourceFile.getFullText()
+      }));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map((sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
         path: outputFile.getFilePath(),
         content: outputFile.getText()
-      }))).flat().concat(Array.from(sourceDtsFiles).map((sourceFile) => ({
-        path: sourceFile.getFilePath(),
-        content: sourceFile.getFullText()
-      })));
+      }))).flat().concat(dtsOutputFiles);
+      bundleDebug("emit");
       if (!entryRoot) {
         entryRoot = queryPublicPath(outputFiles.map((file) => file.path));
       }
       entryRoot = ensureAbsolute(entryRoot, root);
-      bundleDebug("emit");
+      const wroteFiles = /* @__PURE__ */ new Set();
       await runParallel(os.cpus().length, outputFiles, async (outputFile) => {
         var _a3, _b3;
         let filePath = outputFile.path;
@@ -478,9 +599,9 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
         if (!isMapFile && content && content !== noneExport) {
           content = clearPureImport ? removePureImport(content) : content;
           content = transformAliasImport(filePath, content, aliases);
-          content = staticImport ? transformDynamicImport(content) : content;
+          content = staticImport || rollupTypes ? transformDynamicImport(content) : content;
         }
-        filePath = resolve2(outputDir, relative2(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath));
+        filePath = resolve3(outputDir, relative2(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath));
         if (typeof beforeWriteFile === "function") {
           const result = beforeWriteFile(filePath, content);
           if (result && isNativeObj(result)) {
@@ -490,19 +611,22 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
         }
         await fs.mkdir(dirname3(filePath), { recursive: true });
         await fs.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf8");
+        wroteFiles.add(normalizePath2(filePath));
       });
       bundleDebug("output");
-      if (insertTypesEntry) {
-        const pkgPath = resolve2(root, "package.json");
+      if (insertTypesEntry || rollupTypes) {
+        const pkgPath = resolve3(root, "package.json");
         const pkg = fs.existsSync(pkgPath) ? JSON.parse(await fs.readFile(pkgPath, "utf-8")) : {};
-        let typesPath = pkg.types ? resolve2(root, pkg.types) : resolve2(outputDir, "index.d.ts");
+        let typesPath = pkg.types ? resolve3(root, pkg.types) : resolve3(outputDir, indexName);
         if (!fs.existsSync(typesPath)) {
-          let content = entries.map((entry) => {
-            let filePath = normalizePath2(relative2(dirname3(typesPath), resolve2(outputDir, relative2(entryRoot, entry))));
-            filePath = filePath.replace(tsRE, "");
-            filePath = /^\.\.?\//.test(filePath) ? filePath : `./${filePath}`;
-            return `export * from '${filePath}'`;
-          }).join("\n") + "\n";
+          const entry = entries[0];
+          let filePath = normalizePath2(relative2(dirname3(typesPath), resolve3(outputDir, relative2(entryRoot, entry))));
+          filePath = filePath.replace(tsRE, "");
+          filePath = fullRelativeRE.test(filePath) ? filePath : `./${filePath}`;
+          let content = `import ${libName} from '${filePath}'
+export default ${libName}
+export * from '${filePath}'
+`;
           if (typeof beforeWriteFile === "function") {
             const result = beforeWriteFile(typesPath, content);
             if (result && isNativeObj(result)) {
@@ -513,13 +637,32 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
           await fs.writeFile(typesPath, content, "utf-8");
         }
         bundleDebug("insert index");
+        if (rollupTypes) {
+          logger.info(chalk.green(`${logPrefix} Start rollup declaration files...`));
+          rollupDeclarationFiles({
+            root,
+            tsConfigPath,
+            outputDir,
+            entryPath: resolve3(outputDir, "src/index.d.ts"),
+            fileName: basename(typesPath)
+          });
+          wroteFiles.delete(normalizePath2(typesPath));
+          await runParallel(os.cpus().length, Array.from(wroteFiles), (f) => fs.unlink(f));
+          removeDirIfEmpty(outputDir);
+          if (copyDtsFiles) {
+            await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
+              await fs.writeFile(resolve3(outputDir, basename(path)), content, "utf8");
+            });
+          }
+          bundleDebug("rollup");
+        }
       }
       if (typeof afterBuild === "function") {
         const result = afterBuild();
         isPromise(result) && await result;
       }
       bundleDebug("finish");
-      logger.info(chalk.green(`${chalk.cyan("[vite:dts]")} Declaration files built in ${Date.now() - startTime}ms.
+      logger.info(chalk.green(`${logPrefix} Declaration files built in ${Date.now() - startTime}ms.
 `));
     }
   };

package/package.json

@@ -6,6 +6,8 @@
     "url": "https://github.com/qmhc/vite-plugin-dts/issues"
   },
   "dependencies": {
+    "@microsoft/api-extractor": "^7.20.0",
+    "@rushstack/node-core-library": "^3.45.1",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "fast-glob": "^3.2.11",
@@ -91,5 +93,5 @@
     "test:e2e": "cd example && cross-env DEBUG=\"vite-plugin-dts:bundle\" vite build"
   },
   "types": "dist/index.d.ts",
-  "version": "1.0.5"
+  "version": "1.1.0"
 }