vite-plugin-dts 1.7.3 → 2.0.0-beta.0

package/README.md

@@ -1,318 +1,326 @@
-<h1 align="center">vite-plugin-dts</h1>
-
-<p align="center">
-  A vite plugin that generates declaration files (<code>*.d.ts</code>) from <code>.ts(x)</code> or <code>.vue</code> source files when using vite in <a href="https://vitejs.dev/guide/build.html#library-mode">library mode</a>.
-</p>
-
-<p align="center">
-  <a href="https://www.npmjs.com/package/vite-plugin-dts">
-    <img src="https://img.shields.io/npm/v/vite-plugin-dts?color=orange&label=" alt="version" />
-  </a>
-</p>
-
-<p align="center">
-  <strong>English</strong> | <a href="./README.zh-CN.md">中文</a>
-</p>
-
-<p align="center"><strong>Notice: </strong><code>skipDiagnostics</code> option default to <code>false</code> since 1.7.0.</p>
-
-<br />
-
-## 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>
-```
-
-## FAQ
-
-Here are some FAQ's and solutions.
-
-### Missing some declaration files after build (before `1.7.0`)
-
-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.
-
-### Take errors that unable to infer types from packages which under `node_modules`
-
-This is a exist issue when TypeScript inferring types from packages which under `node_modules` through soft links (pnpm), you can refer to this [issue](https://github.com/microsoft/TypeScript/issues/42873). Currently has a workaround that add `baseUrl` to your `tsconfig.json` and specify the `paths` for these packages:
-
-```json
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "third-lib": ["node_modules/third-lib"]
-    }
-  }
-}
-```
-
-## 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
-   *
-   * Can be specified a array to output to multiple directories
-   *
-   * Defaults base on your vite config output options
-   */
-  outputDir?: string | 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
-
-  /**
-   * Set which paths should exclude when transform aliases
-   *
-   * If it's regexp, it will test the original import path directly
-   *
-   * @default []
-   */
-  aliasesExclude?: (string | RegExp)[]
-
-  /**
-   * 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_modules/**' when empty
-   */
-  exclude?: string | string[]
-
-  /**
-   * Do not emit if content of file only includes 'export {}'
-   *
-   * @default true
-   */
-  clearPureImport?: boolean
-
-  /**
-   * 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 false
-   */
-  skipDiagnostics?: boolean
-
-  /**
-   * Whether log diagnostic informations
-   *
-   * Not effective when `skipDiagnostics` is true
-   *
-   * @deprecated
-   * @default false
-   */
-  logDiagnostics?: boolean
-
-  /**
-   * Customize typescript lib folder path
-   *
-   * Should pass a relative path to root or a absolute path
-   *
-   * @default undefined
-   */
-  libFolderPath?: string
-
-  /**
-   * 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
-   *
-   * The file will be skipped when return exact false
-   *
-   * @default () => {}
-   */
-  beforeWriteFile?: (filePath: string, content: string) => void | false | 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:ts
-```
-
-Then check `examples/ts/types`.
-
-## License
-
-MIT License.
+<h1 align="center">vite-plugin-dts</h1>
+
+<p align="center">
+  A vite plugin that generates declaration files (<code>*.d.ts</code>) from <code>.ts(x)</code> or <code>.vue</code> source files when using vite in <a href="https://vitejs.dev/guide/build.html#library-mode">library mode</a>.
+</p>
+
+<p align="center">
+  <a href="https://www.npmjs.com/package/vite-plugin-dts">
+    <img src="https://img.shields.io/npm/v/vite-plugin-dts?color=orange&label=" alt="version" />
+  </a>
+</p>
+
+<p align="center">
+  <strong>English</strong> | <a href="./README.zh-CN.md">中文</a>
+</p>
+
+<p align="center"><strong>Notice: </strong><code>skipDiagnostics</code> option default to <code>false</code> since 1.7.0.</p>
+
+<br />
+
+## 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>
+```
+
+## FAQ
+
+Here are some FAQ's and solutions.
+
+### Missing some declaration files after build (before `1.7.0`)
+
+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.
+
+### Take errors that unable to infer types from packages which under `node_modules`
+
+This is a exist issue when TypeScript inferring types from packages which under `node_modules` through soft links (pnpm), you can refer to this [issue](https://github.com/microsoft/TypeScript/issues/42873). Currently has a workaround that add `baseUrl` to your `tsconfig.json` and specify the `paths` for these packages:
+
+```json
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "third-lib": ["node_modules/third-lib"]
+    }
+  }
+}
+```
+
+## 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
+   *
+   * Can be specified a array to output to multiple directories
+   *
+   * Defaults base on your vite config output options
+   */
+  outputDir?: string | 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
+
+  /**
+   * Set which paths should exclude when transform aliases
+   *
+   * If it's regexp, it will test the original import path directly
+   *
+   * @default []
+   */
+  aliasesExclude?: (string | RegExp)[]
+
+  /**
+   * 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_modules/**' when empty
+   */
+  exclude?: string | string[]
+
+  /**
+   * Do not emit if content of file only includes 'export {}'
+   *
+   * @default true
+   */
+  clearPureImport?: boolean
+
+  /**
+   * 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 false
+   */
+  skipDiagnostics?: boolean
+
+  /**
+   * Whether log diagnostic informations
+   *
+   * Not effective when `skipDiagnostics` is true
+   *
+   * @deprecated
+   * @default false
+   */
+  logDiagnostics?: boolean
+
+  /**
+   * Customize typescript lib folder path
+   *
+   * Should pass a relative path to root or a absolute path
+   *
+   * @default undefined
+   */
+  libFolderPath?: string
+
+  /**
+   * 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
+   *
+   * The file will be skipped when return exact false
+   *
+   * @default () => {}
+   */
+  beforeWriteFile?: (filePath: string, content: string) => void | false | TransformWriteFile
+
+  /**
+   * After build hook
+   *
+   * It wil be called after all declaration files are written
+   *
+   * @default () => {}
+   */
+  afterBuild?: () => void | Promise<void>
+}
+```
+
+## Contributors
+
+Thanks for all their contributions!
+
+<a href="https://github.com/qmhc/vite-plugin-dts/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=qmhc/vite-plugin-dts" />
+</a>
+
+## Example
+
+Clone and run the following script:
+
+```sh
+pnpm run test:ts
+```
+
+Then check `examples/ts/types`.
+
+## License
+
+MIT License.

package/README.zh-CN.md

@@ -302,6 +302,14 @@ export interface PluginOptions {
 }
 ```
 
+## 贡献者
+
+感谢他们的所做的一切贡献！
+
+<a href="https://github.com/qmhc/vite-plugin-dts/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=qmhc/vite-plugin-dts" />
+</a>
+
 ## 示例
 
 克隆项目然后执行下列命令：

package/dist/index.cjs

@@ -12,6 +12,8 @@ const typescript = require('typescript');
 const pluginutils = require('@rollup/pluginutils');
 const node_fs = require('node:fs');
 const node_module = require('node:module');
+const parser = require('@babel/parser');
+const MagicString = require('magic-string');
 const apiExtractor = require('@microsoft/api-extractor');
 const Collector_js = require('@microsoft/api-extractor/lib/collector/Collector.js');
 const MessageRouter_js = require('@microsoft/api-extractor/lib/collector/MessageRouter.js');
@@ -240,8 +242,6 @@ function transferSetupPosition(content) {
   return content;
 }
 
-const exportDefaultRE = /export\s+default/;
-const exportDefaultClassRE = /(?:(?:^|\n|;)\s*)export\s+default\s+class\s+([\w$]+)/;
 const noScriptContent = "import { defineComponent } from 'vue'\nexport default defineComponent({})";
 const _require = node_module.createRequire((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href)));
 let index = 1;
@@ -299,58 +299,174 @@ function setCompileRoot(root) {
   }
 }
 function parseCode(code) {
-  const { parse } = requireCompiler();
+  const { parse: parseVueCode } = requireCompiler();
   let descriptor;
   if (isVue3()) {
-    descriptor = parse(code).descriptor;
+    descriptor = parseVueCode(code).descriptor;
   } else {
-    descriptor = parse({ source: code });
+    descriptor = parseVueCode({ source: code });
   }
   return descriptor;
 }
+function transformJsToTs(script) {
+  if (!script)
+    return script;
+  const lang = !script.lang || script.lang === "js" ? "ts" : script.lang === "jsx" ? "tsx" : script.lang;
+  return { ...script, lang };
+}
+function preprocessVueCode(code, setupScript) {
+  const plugins = ["typescript", "decorators-legacy", "jsx"];
+  const scriptAst = parser.parse(code, { sourceType: "module", plugins }).program.body;
+  const source = new MagicString(code);
+  let propsTypeName;
+  let propsTypeLiteral;
+  if (setupScript) {
+    let processDefineProps = function(node) {
+      if (node.type === "CallExpression" && node.callee.type === "Identifier") {
+        if (node.callee.name === "defineProps") {
+          defineProps = node;
+          return true;
+        } else if (node.callee.name === "withDefaults") {
+          const propsDef = node.arguments[0];
+          if (propsDef.type === "CallExpression" && propsDef.callee.type === "Identifier" && propsDef.callee.name === "defineProps") {
+            defineProps = propsDef;
+            return true;
+          }
+        }
+      }
+      return false;
+    };
+    const setupAst = parser.parse(setupScript.content, { sourceType: "module", plugins }).program.body;
+    let defineProps;
+    for (const node of setupAst) {
+      if (node.type === "ExpressionStatement") {
+        processDefineProps(node.expression);
+      } else if (node.type === "VariableDeclaration" && !node.declare) {
+        for (const decl of node.declarations) {
+          if (decl.init && processDefineProps(decl.init)) {
+            break;
+          }
+        }
+      }
+      if (defineProps) {
+        const type = defineProps.typeParameters?.params[0];
+        if (type && type.type === "TSTypeReference" && type.typeName.type === "Identifier") {
+          propsTypeName = type.typeName.name;
+        } else if (type?.type === "TSTypeLiteral") {
+          propsTypeName = "__DTS_Props__";
+          propsTypeLiteral = setupScript.content.substring(type.start, type.end);
+        }
+        break;
+      }
+    }
+  }
+  for (const node of scriptAst) {
+    if (node.type === "ExportDefaultDeclaration") {
+      let options;
+      if (node.declaration.type === "ObjectExpression") {
+        options = node.declaration.properties;
+      } else if (node.declaration.type === "CallExpression" && node.declaration.arguments[0].type === "ObjectExpression") {
+        options = node.declaration.arguments[0].properties;
+      }
+      if (options) {
+        for (const option of options) {
+          if (propsTypeName && option.type === "ObjectProperty" && option.key.type === "Identifier" && option.key.name === "props" && option.value.type === "ObjectExpression") {
+            for (const prop of option.value.properties) {
+              if (prop.type === "ObjectProperty" && prop.key.type === "Identifier") {
+                if (prop.value.type === "ObjectExpression") {
+                  for (const propDef of prop.value.properties) {
+                    if (propDef.type === "ObjectProperty" && propDef.key.type === "Identifier" && propDef.key.name === "type") {
+                      source.prependLeft(
+                        propDef.end,
+                        ` as __PropType<${propsTypeName}['${prop.key.name}']>`
+                      );
+                    }
+                  }
+                } else {
+                  source.prependLeft(
+                    prop.end,
+                    ` as __PropType<${propsTypeName}['${prop.key.name}']>`
+                  );
+                }
+              }
+            }
+          }
+          if (option.type === "ObjectMethod" && option.key.type === "Identifier" && option.key.name === "setup") {
+            let exposed;
+            let returned;
+            for (const node2 of option.body.body) {
+              if (!exposed && node2.type === "ExpressionStatement" && node2.expression.type === "CallExpression" && node2.expression.callee.type === "Identifier" && node2.expression.callee.name === "expose") {
+                exposed = node2.expression.arguments[0];
+                continue;
+              }
+              if (node2.type === "ReturnStatement") {
+                returned = node2;
+                break;
+              }
+            }
+            const newReturned = exposed && exposed.type === "ObjectExpression" ? `return ${code.substring(exposed.start, exposed.end)}` : setupScript ? "return {}" : "";
+            if (newReturned) {
+              if (returned) {
+                source.overwrite(returned.start, returned.end, newReturned);
+              } else if (option.body.body.length) {
+                source.appendRight(option.body.body.at(-1).end, `
+${newReturned}
+`);
+              }
+            }
+          }
+        }
+      }
+      break;
+    }
+  }
+  if (propsTypeName) {
+    if (propsTypeLiteral) {
+      source.prepend(`
+type ${propsTypeName} = ${propsTypeLiteral}
+
+`);
+    }
+    source.prepend("import type { PropType as __PropType } from 'vue'\n");
+  }
+  return source.toString();
+}
 function compileVueCode(code) {
   const { compileScript, rewriteDefault } = requireCompiler();
   const descriptor = parseCode(code);
   const { script, scriptSetup } = descriptor;
-  let content = null;
-  let ext = null;
+  let error;
+  let content;
+  let ext = "js";
   if (script || scriptSetup) {
+    const compiled = compileScript(
+      {
+        ...descriptor,
+        script: transformJsToTs(script),
+        scriptSetup: transformJsToTs(scriptSetup),
+        cssVars: []
+      },
+      { id: `${index++}` }
+    );
+    try {
+      content = preprocessVueCode(compiled.content, scriptSetup);
+    } catch (e) {
+      error = e;
+      content = compiled.content;
+    }
+    content = rewriteDefault(content, "_sfc_main", ["typescript", "decorators-legacy"]);
     if (scriptSetup) {
-      const compiled = compileScript(descriptor, {
-        id: `${index++}`
-      });
-      const classMatch = compiled.content.match(exportDefaultClassRE);
-      const plugins = scriptSetup.lang === "ts" ? ["typescript", "decorators-legacy"] : void 0;
-      if (classMatch) {
-        content = compiled.content.replace(exportDefaultClassRE, "\nclass $1") + `
-const _sfc_main = ${classMatch[1]}`;
-        if (exportDefaultRE.test(content)) {
-          content = rewriteDefault(compiled.content, "_sfc_main", plugins);
-        }
-      } else {
-        content = rewriteDefault(compiled.content, "_sfc_main", plugins);
-      }
       content = transferSetupPosition(content);
-      content = content.replace(/(const __returned__\s?=\s?\{[\s\S]+?)(props)(\s?\})/, "$1props: props as any$3").replace(
-        /(const __returned__\s?=\s?\{[\s\S]+?)(props,)([\s\S]+?)/,
-        "$1props: props as any,$3"
-      );
-      content += "\nexport default _sfc_main\n";
       ext = scriptSetup.lang || "js";
     } else if (script && script.content) {
-      content = rewriteDefault(
-        script.content,
-        "_sfc_main",
-        script.lang === "ts" ? ["typescript", "decorators-legacy"] : void 0
-      );
-      content += "\nexport default _sfc_main\n";
       ext = script.lang || "js";
     }
+    content += "\nexport default _sfc_main\n";
   } else {
     content = noScriptContent;
     ext = "ts";
   }
-  return { content, ext };
+  return { error, content, ext };
 }
 
 const dtsRE$1 = /\.d\.tsx?$/;
@@ -488,6 +604,7 @@ function dtsPlugin(options = {}) {
   const sourceDtsFiles = /* @__PURE__ */ new Set();
   let hasJsVue = false;
   let allowJs = false;
+  let transformError = false;
   return {
     name: "vite:dts",
     apply: "build",
@@ -568,11 +685,12 @@ ${kolorist.cyan(
           rootDir: compilerOptions.rootDir || root,
           noEmitOnError,
           outDir: ".",
-          declarationDir: null,
+          declarationDir: void 0,
           noUnusedParameters: false,
           declaration: true,
           noEmit: false,
-          emitDeclarationOnly: true
+          emitDeclarationOnly: true,
+          composite: false
         }),
         tsConfigFilePath: tsConfigPath,
         skipAddingFilesFromTsConfig: true,
@@ -615,7 +733,19 @@ ${kolorist.cyan(
         return null;
       }
       if (vueRE.test(id)) {
-        const { content, ext } = compileVueCode(code);
+        const { error, content, ext } = compileVueCode(code);
+        if (!transformError && error) {
+          logger.error(
+            kolorist.red(
+              `
+${kolorist.cyan(
+                "[vite:dts]"
+              )} A error occurred when transform code, maybe there are some inertnal bugs.
+`
+            )
+          );
+          transformError = true;
+        }
         if (content) {
           if (ext === "js" || ext === "jsx")
             hasJsVue = true;

package/dist/index.mjs

@@ -17,6 +17,8 @@ import typescript from 'typescript';
 import { createFilter } from '@rollup/pluginutils';
 import { existsSync, readdirSync, lstatSync, rmdirSync } from 'node:fs';
 import { createRequire } from 'node:module';
+import { parse } from '@babel/parser';
+import MagicString from 'magic-string';
 import { ExtractorConfig, CompilerState } from '@microsoft/api-extractor';
 import { Collector } from '@microsoft/api-extractor/lib/collector/Collector.js';
 import { MessageRouter } from '@microsoft/api-extractor/lib/collector/MessageRouter.js';
@@ -245,8 +247,6 @@ function transferSetupPosition(content) {
   return content;
 }
 
-const exportDefaultRE = /export\s+default/;
-const exportDefaultClassRE = /(?:(?:^|\n|;)\s*)export\s+default\s+class\s+([\w$]+)/;
 const noScriptContent = "import { defineComponent } from 'vue'\nexport default defineComponent({})";
 const _require = createRequire(import.meta.url);
 let index = 1;
@@ -304,58 +304,174 @@ function setCompileRoot(root) {
   }
 }
 function parseCode(code) {
-  const { parse } = requireCompiler();
+  const { parse: parseVueCode } = requireCompiler();
   let descriptor;
   if (isVue3()) {
-    descriptor = parse(code).descriptor;
+    descriptor = parseVueCode(code).descriptor;
   } else {
-    descriptor = parse({ source: code });
+    descriptor = parseVueCode({ source: code });
   }
   return descriptor;
 }
+function transformJsToTs(script) {
+  if (!script)
+    return script;
+  const lang = !script.lang || script.lang === "js" ? "ts" : script.lang === "jsx" ? "tsx" : script.lang;
+  return { ...script, lang };
+}
+function preprocessVueCode(code, setupScript) {
+  const plugins = ["typescript", "decorators-legacy", "jsx"];
+  const scriptAst = parse(code, { sourceType: "module", plugins }).program.body;
+  const source = new MagicString(code);
+  let propsTypeName;
+  let propsTypeLiteral;
+  if (setupScript) {
+    let processDefineProps = function(node) {
+      if (node.type === "CallExpression" && node.callee.type === "Identifier") {
+        if (node.callee.name === "defineProps") {
+          defineProps = node;
+          return true;
+        } else if (node.callee.name === "withDefaults") {
+          const propsDef = node.arguments[0];
+          if (propsDef.type === "CallExpression" && propsDef.callee.type === "Identifier" && propsDef.callee.name === "defineProps") {
+            defineProps = propsDef;
+            return true;
+          }
+        }
+      }
+      return false;
+    };
+    const setupAst = parse(setupScript.content, { sourceType: "module", plugins }).program.body;
+    let defineProps;
+    for (const node of setupAst) {
+      if (node.type === "ExpressionStatement") {
+        processDefineProps(node.expression);
+      } else if (node.type === "VariableDeclaration" && !node.declare) {
+        for (const decl of node.declarations) {
+          if (decl.init && processDefineProps(decl.init)) {
+            break;
+          }
+        }
+      }
+      if (defineProps) {
+        const type = defineProps.typeParameters?.params[0];
+        if (type && type.type === "TSTypeReference" && type.typeName.type === "Identifier") {
+          propsTypeName = type.typeName.name;
+        } else if (type?.type === "TSTypeLiteral") {
+          propsTypeName = "__DTS_Props__";
+          propsTypeLiteral = setupScript.content.substring(type.start, type.end);
+        }
+        break;
+      }
+    }
+  }
+  for (const node of scriptAst) {
+    if (node.type === "ExportDefaultDeclaration") {
+      let options;
+      if (node.declaration.type === "ObjectExpression") {
+        options = node.declaration.properties;
+      } else if (node.declaration.type === "CallExpression" && node.declaration.arguments[0].type === "ObjectExpression") {
+        options = node.declaration.arguments[0].properties;
+      }
+      if (options) {
+        for (const option of options) {
+          if (propsTypeName && option.type === "ObjectProperty" && option.key.type === "Identifier" && option.key.name === "props" && option.value.type === "ObjectExpression") {
+            for (const prop of option.value.properties) {
+              if (prop.type === "ObjectProperty" && prop.key.type === "Identifier") {
+                if (prop.value.type === "ObjectExpression") {
+                  for (const propDef of prop.value.properties) {
+                    if (propDef.type === "ObjectProperty" && propDef.key.type === "Identifier" && propDef.key.name === "type") {
+                      source.prependLeft(
+                        propDef.end,
+                        ` as __PropType<${propsTypeName}['${prop.key.name}']>`
+                      );
+                    }
+                  }
+                } else {
+                  source.prependLeft(
+                    prop.end,
+                    ` as __PropType<${propsTypeName}['${prop.key.name}']>`
+                  );
+                }
+              }
+            }
+          }
+          if (option.type === "ObjectMethod" && option.key.type === "Identifier" && option.key.name === "setup") {
+            let exposed;
+            let returned;
+            for (const node2 of option.body.body) {
+              if (!exposed && node2.type === "ExpressionStatement" && node2.expression.type === "CallExpression" && node2.expression.callee.type === "Identifier" && node2.expression.callee.name === "expose") {
+                exposed = node2.expression.arguments[0];
+                continue;
+              }
+              if (node2.type === "ReturnStatement") {
+                returned = node2;
+                break;
+              }
+            }
+            const newReturned = exposed && exposed.type === "ObjectExpression" ? `return ${code.substring(exposed.start, exposed.end)}` : setupScript ? "return {}" : "";
+            if (newReturned) {
+              if (returned) {
+                source.overwrite(returned.start, returned.end, newReturned);
+              } else if (option.body.body.length) {
+                source.appendRight(option.body.body.at(-1).end, `
+${newReturned}
+`);
+              }
+            }
+          }
+        }
+      }
+      break;
+    }
+  }
+  if (propsTypeName) {
+    if (propsTypeLiteral) {
+      source.prepend(`
+type ${propsTypeName} = ${propsTypeLiteral}
+
+`);
+    }
+    source.prepend("import type { PropType as __PropType } from 'vue'\n");
+  }
+  return source.toString();
+}
 function compileVueCode(code) {
   const { compileScript, rewriteDefault } = requireCompiler();
   const descriptor = parseCode(code);
   const { script, scriptSetup } = descriptor;
-  let content = null;
-  let ext = null;
+  let error;
+  let content;
+  let ext = "js";
   if (script || scriptSetup) {
+    const compiled = compileScript(
+      {
+        ...descriptor,
+        script: transformJsToTs(script),
+        scriptSetup: transformJsToTs(scriptSetup),
+        cssVars: []
+      },
+      { id: `${index++}` }
+    );
+    try {
+      content = preprocessVueCode(compiled.content, scriptSetup);
+    } catch (e) {
+      error = e;
+      content = compiled.content;
+    }
+    content = rewriteDefault(content, "_sfc_main", ["typescript", "decorators-legacy"]);
     if (scriptSetup) {
-      const compiled = compileScript(descriptor, {
-        id: `${index++}`
-      });
-      const classMatch = compiled.content.match(exportDefaultClassRE);
-      const plugins = scriptSetup.lang === "ts" ? ["typescript", "decorators-legacy"] : void 0;
-      if (classMatch) {
-        content = compiled.content.replace(exportDefaultClassRE, "\nclass $1") + `
-const _sfc_main = ${classMatch[1]}`;
-        if (exportDefaultRE.test(content)) {
-          content = rewriteDefault(compiled.content, "_sfc_main", plugins);
-        }
-      } else {
-        content = rewriteDefault(compiled.content, "_sfc_main", plugins);
-      }
       content = transferSetupPosition(content);
-      content = content.replace(/(const __returned__\s?=\s?\{[\s\S]+?)(props)(\s?\})/, "$1props: props as any$3").replace(
-        /(const __returned__\s?=\s?\{[\s\S]+?)(props,)([\s\S]+?)/,
-        "$1props: props as any,$3"
-      );
-      content += "\nexport default _sfc_main\n";
       ext = scriptSetup.lang || "js";
     } else if (script && script.content) {
-      content = rewriteDefault(
-        script.content,
-        "_sfc_main",
-        script.lang === "ts" ? ["typescript", "decorators-legacy"] : void 0
-      );
-      content += "\nexport default _sfc_main\n";
       ext = script.lang || "js";
     }
+    content += "\nexport default _sfc_main\n";
   } else {
     content = noScriptContent;
     ext = "ts";
   }
-  return { content, ext };
+  return { error, content, ext };
 }
 
 const dtsRE$1 = /\.d\.tsx?$/;
@@ -493,6 +609,7 @@ function dtsPlugin(options = {}) {
   const sourceDtsFiles = /* @__PURE__ */ new Set();
   let hasJsVue = false;
   let allowJs = false;
+  let transformError = false;
   return {
     name: "vite:dts",
     apply: "build",
@@ -573,11 +690,12 @@ ${cyan(
           rootDir: compilerOptions.rootDir || root,
           noEmitOnError,
           outDir: ".",
-          declarationDir: null,
+          declarationDir: void 0,
           noUnusedParameters: false,
           declaration: true,
           noEmit: false,
-          emitDeclarationOnly: true
+          emitDeclarationOnly: true,
+          composite: false
         }),
         tsConfigFilePath: tsConfigPath,
         skipAddingFilesFromTsConfig: true,
@@ -620,7 +738,19 @@ ${cyan(
         return null;
       }
       if (vueRE.test(id)) {
-        const { content, ext } = compileVueCode(code);
+        const { error, content, ext } = compileVueCode(code);
+        if (!transformError && error) {
+          logger.error(
+            red(
+              `
+${cyan(
+                "[vite:dts]"
+              )} A error occurred when transform code, maybe there are some inertnal bugs.
+`
+            )
+          );
+          transformError = true;
+        }
         if (content) {
           if (ext === "js" || ext === "jsx")
             hasJsVue = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "1.7.3",
+  "version": "2.0.0-beta.0",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",
@@ -53,6 +53,7 @@
     "typescript"
   ],
   "dependencies": {
+    "@babel/parser": "^7.20.15",
     "@microsoft/api-extractor": "^7.33.5",
     "@rollup/pluginutils": "^5.0.2",
     "@rushstack/node-core-library": "^3.53.2",
@@ -60,9 +61,11 @@
     "fast-glob": "^3.2.12",
     "fs-extra": "^10.1.0",
     "kolorist": "^1.6.0",
+    "magic-string": "^0.29.0",
     "ts-morph": "17.0.1"
   },
   "devDependencies": {
+    "@babel/types": "^7.20.7",
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
     "@types/debug": "^4.1.7",