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

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,64 +304,179 @@ 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?$/;
 function rollupDeclarationFiles({
   root,
-  tsConfigPath,
   outputDir,
   entryPath,
   fileName,
@@ -378,8 +493,10 @@ function rollupDeclarationFiles({
       projectFolder: root,
       mainEntryPointFilePath: entryPath,
       compiler: {
-        tsconfigFilePath: tsConfigPath,
-        overrideTsconfig: compilerOptions
+        overrideTsconfig: {
+          $schema: "http://json.schemastore.org/tsconfig",
+          compilerOptions
+        }
       },
       apiReport: {
         enabled: false,
@@ -444,13 +561,16 @@ const noneExport = "export {};\n";
 const vueRE = /\.vue$/;
 const tsRE = /\.(m|c)?tsx?$/;
 const jsRE = /\.(m|c)?jsx?$/;
-const dtsRE = /\.d\.tsx?$/;
+const dtsRE = /\.d\.(m|c)?tsx?$/;
 const tjsRE = /\.(m|c)?(t|j)sx?$/;
+const mtjsRE = /\.m(t|j)sx?$/;
+const ctjsRE = /\.c(t|j)sx?$/;
 const watchExtensionRE = /\.(vue|(m|c)?(t|j)sx?)$/;
 const fullRelativeRE = /^\.\.?\//;
 const defaultIndex = "index.d.ts";
 const noop = () => {
 };
+const extPrefix = (file) => mtjsRE.test(file) ? "m" : ctjsRE.test(file) ? "c" : "";
 const logPrefix = cyan("[vite:dts]");
 const bundleDebug = debug("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
@@ -471,7 +591,7 @@ function dtsPlugin(options = {}) {
     beforeWriteFile = noop,
     afterBuild = noop
   } = options;
-  const compilerOptions = options.compilerOptions ?? {};
+  let compilerOptions = options.compilerOptions ?? {};
   let root;
   let entryRoot = options.entryRoot ?? "";
   let libName;
@@ -489,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",
@@ -545,7 +666,7 @@ ${cyan(
         libName = config.build.lib.name || "_default";
         indexName = typeof filename === "string" ? filename : filename("es", entry);
         if (!dtsRE.test(indexName)) {
-          indexName = `${tjsRE.test(indexName) ? indexName.replace(tjsRE, "") : indexName}.d.ts`;
+          indexName = `${indexName.replace(tjsRE, "")}.d.${extPrefix(indexName)}ts`;
         }
       }
       root = ensureAbsolute(options.root ?? "", config.root);
@@ -564,32 +685,43 @@ ${cyan(
         return;
       }
       setCompileRoot(root);
-      compilerOptions.rootDir || (compilerOptions.rootDir = root);
       project = new Project({
         compilerOptions: mergeObjects(compilerOptions, {
+          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,
         libFolderPath: libFolderPath ? ensureAbsolute(libFolderPath, root) : void 0
       });
       allowJs = project.getCompilerOptions().allowJs ?? false;
-      const tsConfig = typescript.readConfigFile(tsConfigPath, project.getFileSystem().readFileSync).config ?? {};
-      const parentTsConfigPath = tsConfig.extends && ensureAbsolute(tsConfig.extends, root);
-      const parentTsConfig = parentTsConfigPath ? typescript.readConfigFile(parentTsConfigPath, project.getFileSystem().readFileSync).config : {};
-      include = ensureArray(
-        options.include ?? tsConfig.include ?? parentTsConfig.include ?? "**/*"
-      ).map(normalizeGlob);
-      exclude = ensureArray(
-        options.exclude ?? tsConfig.exclude ?? parentTsConfig.exclude ?? "node_modules/**"
-      ).map(normalizeGlob);
+      const tsConfig = { compilerOptions: {} };
+      const readFile = project.getFileSystem().readFileSync;
+      let currentConfigPath = tsConfigPath;
+      while (currentConfigPath) {
+        const currentConfig = typescript.readConfigFile(currentConfigPath, readFile).config ?? {};
+        Object.assign(tsConfig.compilerOptions, currentConfig.compilerOptions || {});
+        if (!tsConfig.include) {
+          tsConfig.include = currentConfig.include;
+        }
+        if (!tsConfig.exclude) {
+          tsConfig.exclude = currentConfig.exclude;
+        }
+        currentConfigPath = currentConfig.extends;
+      }
+      include = ensureArray(options.include ?? tsConfig.include ?? "**/*").map(normalizeGlob);
+      exclude = ensureArray(options.exclude ?? tsConfig.exclude ?? "node_modules/**").map(
+        normalizeGlob
+      );
       filter = createFilter(include, exclude, { resolve: root });
+      compilerOptions = tsConfig.compilerOptions;
     },
     buildStart(inputOptions) {
       if (Array.isArray(inputOptions.input)) {
@@ -606,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;
@@ -651,7 +795,7 @@ ${logPrefix} Start generate declaration files...`));
             includedFileSet.add(file);
             return;
           }
-          includedFileSet.add(`${tjsRE.test(file) ? file.replace(tjsRE, "") : file}.d.ts`);
+          includedFileSet.add(`${file.replace(tjsRE, "")}.d.${extPrefix(file)}ts`);
         });
         if (hasJsVue) {
           if (!allowJs) {
@@ -782,7 +926,6 @@ export default ${libName}
               const path = resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`);
               rollupDeclarationFiles({
                 root,
-                tsConfigPath,
                 compilerOptions,
                 outputDir,
                 entryPath: path,
@@ -795,7 +938,6 @@ export default ${libName}
           } else {
             rollupDeclarationFiles({
               root,
-              tsConfigPath,
               compilerOptions,
               outputDir,
               entryPath: typesPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "1.7.2",
+  "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",