vite-plugin-dts 2.0.0-beta.1 → 2.0.0-beta.3

package/README.md

@@ -112,6 +112,7 @@ This is a exist issue when TypeScript inferring types from packages which under
 
 ```ts
 import type { ts, Diagnostic } from 'ts-morph'
+import type { LogLevel } from 'vite'
 
 interface TransformWriteFile {
   filePath?: string
@@ -122,7 +123,7 @@ export interface PluginOptions {
   /**
    * Depends on the root directory
    *
-   * Defaults base on your vite config root options
+   * By Default it base on 'root' option of your vite config
    */
   root?: string
 
@@ -131,16 +132,16 @@ export interface PluginOptions {
    *
    * Can be specified a array to output to multiple directories
    *
-   * Defaults base on your vite config output options
+   * By Default it base on 'build.outDir' option of your vite config
    */
   outputDir?: string | string[]
 
   /**
    * Manually set the root path of the entry files
    *
-   * The output path of each file will be caculated base on it
+   * The output path of each file will be calculated base on it
    *
-   * Defaults is the smallest public path for all files
+   * By Default it is the smallest public path for all files
    */
   entryRoot?: string
 
@@ -154,7 +155,7 @@ export interface PluginOptions {
   /**
    * Project init tsconfig.json file path by ts-morph
    *
-   * Plugin also resolve incldue and exclude files from tsconfig.json
+   * Plugin also resolve include and exclude files from tsconfig.json
    *
    * @default 'tsconfig.json'
    */
@@ -190,14 +191,14 @@ export interface PluginOptions {
   /**
    * Manual set include glob
    *
-   * Defaults base on your tsconfig.json include option
+   * By Default it base on 'include' option of the tsconfig.json
    */
   include?: string | string[]
 
   /**
    * Manual set exclude glob
    *
-   * Defaults base on your tsconfig.json exclude option, be 'node_modules/**' when empty
+   * By Default it base on 'exclude' option of the tsconfig.json, be 'node_module/**' when empty
    */
   exclude?: string | string[]
 
@@ -253,16 +254,6 @@ export interface PluginOptions {
    */
   skipDiagnostics?: boolean
 
-  /**
-   * Whether log diagnostic informations
-   *
-   * Not effective when `skipDiagnostics` is true
-   *
-   * @deprecated
-   * @default false
-   */
-  logDiagnostics?: boolean
-
   /**
    * Customize typescript lib folder path
    *
@@ -272,6 +263,13 @@ export interface PluginOptions {
    */
   libFolderPath?: string
 
+  /**
+   * Specify the log level of plugin
+   *
+   * By Default it base on 'logLevel' option of your vite config
+   */
+  logLevel?: LogLevel
+
   /**
    * After emit diagnostic hook
    *

package/README.zh-CN.md

@@ -111,6 +111,7 @@ const props = defineProps<{
 
 ```ts
 import type { ts, Diagnostic } from 'ts-morph'
+import type { LogLevel } from 'vite'
 
 interface TransformWriteFile {
   filePath?: string
@@ -121,7 +122,7 @@ export interface PluginOptions {
   /**
    * 执行的根目录
    *
-   * 默认基于 vite 配置的 root 选项
+   * 默认基于 vite 配置的 'root' 选项
    */
   root?: string
 
@@ -130,7 +131,7 @@ export interface PluginOptions {
    *
    * 可以指定一个数组来输出到多个目录中
    *
-   * 默认基于 vite 配置的输出目录
+   * 默认基于 vite 配置的 'build.outDir' 选项
    */
   outputDir?: string | string[]
 
@@ -189,14 +190,14 @@ export interface PluginOptions {
   /**
    * 手动设置包含路径的 glob
    *
-   * 默认基于 tsconfig.json 的 include 选项
+   * 默认基于 tsconfig.json 的 'include' 选项
    */
   include?: string | string[]
 
   /**
    * 手动设置排除路径的 glob
    *
-   * 默认基于 tsconfig.json 的 exclude 选线，未设置时为 'node_module/**'
+   * 默认基于 tsconfig.json 的 'exclude' 选线，未设置时为 'node_module/**'
    */
   exclude?: string | string[]
 
@@ -252,16 +253,6 @@ export interface PluginOptions {
    */
   skipDiagnostics?: boolean
 
-  /**
-   * 是否打印类型诊断信息
-   *
-   * 当跳过类型诊断时该属性将不会生效
-   *
-   * @deprecated
-   * @default false
-   */
-  logDiagnostics?: boolean
-
   /**
    * 定制 typescript 的 lib 文件夹路径
    *
@@ -271,6 +262,13 @@ export interface PluginOptions {
    */
   libFolderPath?: string
 
+  /**
+   * 指定插件的输出等级
+   *
+   * 默认基于 vite 配置的 'logLevel' 选项
+   */
+  logLevel?: LogLevel
+
   /**
    * 获取诊断信息后的钩子
    *

package/dist/index.cjs

@@ -360,62 +360,90 @@ function preprocessVueCode(code, setupScript) {
       }
     }
   }
+  const declRecord = /* @__PURE__ */ new Map();
+  let defaultExport;
+  let options;
   for (const node of scriptAst) {
+    if (node.type === "VariableDeclaration") {
+      for (const decl of node.declarations) {
+        if (decl.id.type === "Identifier" && decl.init) {
+          let properties;
+          if (decl.init.type === "ObjectExpression") {
+            properties = decl.init.properties;
+          } else if (decl.init.type === "CallExpression" && decl.init.arguments[0].type === "ObjectExpression") {
+            properties = decl.init.arguments[0].properties;
+          }
+          if (!properties)
+            continue;
+          if (defaultExport && decl.id.name === defaultExport) {
+            options = properties;
+            break;
+          } else {
+            declRecord.set(decl.id.name, properties);
+          }
+        }
+      }
+    }
     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;
+      } else if (node.declaration.type === "Identifier") {
+        if (declRecord.has(node.declaration.name)) {
+          options = declRecord.get(node.declaration.name);
+        } else {
+          defaultExport = node.declaration.name;
+        }
       }
-      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 unknown as __PropType<${propsTypeName}['${prop.key.name}']>`
-                      );
-                    }
+    }
+    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 unknown as __PropType<${propsTypeName}['${prop.key.name}']>`
+                    );
                   }
-                } else {
-                  source.prependLeft(
-                    prop.end,
-                    ` as unknown as __PropType<${propsTypeName}['${prop.key.name}']>`
-                  );
                 }
+              } else {
+                source.prependLeft(
+                  prop.end,
+                  ` as unknown as __PropType<${propsTypeName}['${prop.key.name}']>`
+                );
               }
             }
           }
-          if (option.type === "ObjectProperty" && option.key.type === "Identifier" && option.key.name === "components") {
-            source.remove(option.start, option.end);
-          }
-          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;
-              }
+        }
+        if (option.type === "ObjectProperty" && option.key.type === "Identifier" && option.key.name === "components") {
+          source.remove(option.start, option.end);
+        }
+        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, `
+          }
+          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}
 `);
-              }
             }
           }
         }
@@ -475,10 +503,11 @@ function compileVueCode(code) {
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
   root,
+  compilerOptions,
   outputDir,
   entryPath,
   fileName,
-  compilerOptions
+  libFolder
 }) {
   const configObjectFullPath = node_path.resolve(root, "api-extractor.json");
   const packageJsonLookup = new nodeCoreLibrary.PackageJsonLookup();
@@ -527,8 +556,9 @@ function rollupDeclarationFiles({
     packageJsonFullPath
   });
   const compilerState = apiExtractor.CompilerState.create(extractorConfig, {
-    localBuild: true,
-    showVerboseMessages: false
+    localBuild: false,
+    showVerboseMessages: false,
+    typescriptCompilerFolder: libFolder ? node_path.resolve(libFolder, "..") : void 0
   });
   const sourceMapper = new SourceMapper_js.SourceMapper();
   const messageRouter = new MessageRouter_js.MessageRouter({
@@ -569,6 +599,7 @@ const defaultIndex = "index.d.ts";
 const noop = () => {
 };
 const extPrefix = (file) => mtjsRE.test(file) ? "m" : ctjsRE.test(file) ? "c" : "";
+const resolve = (...paths) => vite.normalizePath(node_path.resolve(...paths));
 const logPrefix = kolorist.cyan("[vite:dts]");
 const bundleDebug = debug("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
@@ -582,9 +613,8 @@ function dtsPlugin(options = {}) {
     rollupTypes = false,
     noEmitOnError = false,
     skipDiagnostics = false,
-    logDiagnostics = void 0,
     copyDtsFiles = true,
-    libFolderPath = void 0,
+    logLevel = void 0,
     afterDiagnostic = noop,
     beforeWriteFile = noop,
     afterBuild = noop
@@ -604,10 +634,39 @@ function dtsPlugin(options = {}) {
   let include;
   let exclude;
   let filter;
+  let libFolderPath = options.libFolderPath;
   const sourceDtsFiles = /* @__PURE__ */ new Set();
+  const emittedFiles = /* @__PURE__ */ new Map();
   let hasJsVue = false;
   let allowJs = false;
   let transformError = false;
+  function internalTransform(code, id) {
+    if (!project || !filter(id)) {
+      return;
+    }
+    if (vueRE.test(id)) {
+      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;
+        project.createSourceFile(`${id}.${ext || "js"}`, content, { overwrite: true });
+      }
+    } else if (!id.includes(".vue?vue") && (tsRE.test(id) || allowJs && jsRE.test(id))) {
+      project.createSourceFile(id, code, { overwrite: true });
+    }
+  }
   return {
     name: "vite:dts",
     apply: "build",
@@ -634,18 +693,7 @@ function dtsPlugin(options = {}) {
     configResolved(config) {
       if (isBundle)
         return;
-      logger = config.logger;
-      if (logDiagnostics != null) {
-        logger.warn(
-          kolorist.yellow(
-            `
-${kolorist.cyan(
-              "[vite:dts]"
-            )} 'logDiagnostics' has been deprecated, the original feature now following 'skipDiagnostics'.
-`
-          )
-        );
-      }
+      logger = logLevel ? vite.createLogger(logLevel, { allowClearScreen: config.clearScreen }) : config.logger;
       if (!config.build.lib) {
         logger.warn(
           kolorist.yellow(
@@ -669,6 +717,7 @@ ${kolorist.cyan(
       }
       root = ensureAbsolute(options.root ?? "", config.root);
       tsConfigPath = ensureAbsolute(tsConfigFilePath, root);
+      libFolderPath = libFolderPath && ensureAbsolute(libFolderPath, root);
       outputDirs = options.outputDir ? ensureArray(options.outputDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(config.build.outDir, root)];
       if (!outputDirs[0]) {
         logger.error(
@@ -687,7 +736,7 @@ ${kolorist.cyan(
         compilerOptions: mergeObjects(compilerOptions, {
           rootDir: compilerOptions.rootDir || root,
           noEmitOnError,
-          outDir: ".",
+          outDir: outputDirs[0],
           declarationDir: void 0,
           noUnusedParameters: false,
           declaration: true,
@@ -697,7 +746,7 @@ ${kolorist.cyan(
         }),
         tsConfigFilePath: tsConfigPath,
         skipAddingFilesFromTsConfig: true,
-        libFolderPath: libFolderPath ? ensureAbsolute(libFolderPath, root) : void 0
+        libFolderPath
       });
       allowJs = project.getCompilerOptions().allowJs ?? false;
       const tsConfig = { compilerOptions: {} };
@@ -732,39 +781,16 @@ ${kolorist.cyan(
       }
     },
     transform(code, id) {
-      if (!filter(id)) {
-        return null;
-      }
-      if (vueRE.test(id)) {
-        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;
-          project.createSourceFile(`${id}.${ext || "js"}`, content, { overwrite: true });
-        }
-      } else if (!id.includes(".vue?vue") && (tsRE.test(id) || allowJs && jsRE.test(id))) {
-        project.createSourceFile(id, code, { overwrite: true });
-      }
+      internalTransform(code, id);
       return null;
     },
-    watchChange(id) {
+    async watchChange(id) {
       if (watchExtensionRE.test(id)) {
         isBundle = false;
         if (project) {
           const sourceFile = project.getSourceFile(vite.normalizePath(id));
           sourceFile && project.removeSourceFile(sourceFile);
+          internalTransform(await fs.readFile(id, "utf-8"), id);
         }
       }
     },
@@ -776,6 +802,7 @@ ${logPrefix} Start generate declaration files...`));
       bundleDebug("start");
       isBundle = true;
       sourceDtsFiles.clear();
+      emittedFiles.clear();
       const startTime = Date.now();
       const includedFileSet = /* @__PURE__ */ new Set();
       if (include && include.length) {
@@ -822,6 +849,7 @@ ${logPrefix} Start generate declaration files...`));
         }
         bundleDebug("diagnostics");
       }
+      const outputDir = outputDirs[0];
       const dtsOutputFiles = Array.from(sourceDtsFiles).map((sourceFile) => ({
         path: sourceFile.getFilePath(),
         content: sourceFile.getFullText()
@@ -829,17 +857,13 @@ ${logPrefix} Start generate declaration files...`));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map(
         (sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
-          path: vite.normalizePath(node_path.resolve(root, outputFile.compilerObject.name)),
+          path: resolve(root, node_path.relative(outputDir, outputFile.compilerObject.name)),
           content: outputFile.getText()
         }))
       ).flat().concat(dtsOutputFiles);
       bundleDebug("emit");
-      if (!entryRoot) {
-        entryRoot = queryPublicPath(outputFiles.map((file) => file.path));
-      }
+      entryRoot = entryRoot || queryPublicPath(outputFiles.map((file) => file.path));
       entryRoot = ensureAbsolute(entryRoot, root);
-      const wroteFiles = /* @__PURE__ */ new Set();
-      const outputDir = outputDirs[0];
       await runParallel(os.cpus().length, outputFiles, async (outputFile) => {
         let filePath = outputFile.path;
         let content = outputFile.content;
@@ -852,40 +876,46 @@ ${logPrefix} Start generate declaration files...`));
           content = transformAliasImport(filePath, content, aliases, aliasesExclude);
           content = staticImport || rollupTypes ? transformDynamicImport(content) : content;
         }
-        filePath = node_path.resolve(
+        filePath = resolve(
           outputDir,
           node_path.relative(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath)
         );
+        content = cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content;
         if (typeof beforeWriteFile === "function") {
           const result = beforeWriteFile(filePath, content);
           if (result === false)
             return;
           if (result && isNativeObj(result)) {
-            filePath = result.filePath ?? filePath;
+            filePath = result.filePath || filePath;
             content = result.content ?? content;
           }
         }
+        filePath = vite.normalizePath(filePath);
         await fs.mkdir(node_path.dirname(filePath), { recursive: true });
-        await fs.writeFile(
-          filePath,
-          cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content,
-          "utf-8"
-        );
-        wroteFiles.add(vite.normalizePath(filePath));
+        await fs.writeFile(filePath, content, "utf-8");
+        emittedFiles.set(filePath, content);
       });
       bundleDebug("output");
+      if (copyDtsFiles) {
+        await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
+          const filePath = resolve(outputDir, node_path.basename(path));
+          await fs.writeFile(filePath, content, "utf-8");
+          emittedFiles.set(filePath, content);
+        });
+      }
+      bundleDebug("copy dts");
       if (insertTypesEntry || rollupTypes) {
-        const pkgPath = node_path.resolve(root, "package.json");
+        const pkgPath = resolve(root, "package.json");
         const pkg = fs.existsSync(pkgPath) ? JSON.parse(await fs.readFile(pkgPath, "utf-8")) : {};
         const entryNames = Object.keys(entries);
-        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings;
+        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings || (pkg.exports?.["."] || pkg.exports?.["./"])?.types;
         const multiple = entryNames.length > 1;
-        const typesPath = types ? node_path.resolve(root, types) : node_path.resolve(outputDir, indexName);
+        const typesPath = types ? resolve(root, types) : resolve(outputDir, indexName);
         for (const name of entryNames) {
-          let filePath = multiple ? node_path.resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`) : typesPath;
+          let filePath = multiple ? resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`) : typesPath;
           if (fs.existsSync(filePath))
             continue;
-          const index = node_path.resolve(
+          const index = resolve(
             outputDir,
             node_path.relative(entryRoot, `${entries[name].replace(tsRE, "")}.d.ts`)
           );
@@ -910,9 +940,10 @@ export default ${libName}
               content = result.content ?? content;
             }
           }
+          filePath = vite.normalizePath(filePath);
           if (result !== false) {
             await fs.writeFile(filePath, content, "utf-8");
-            wroteFiles.add(vite.normalizePath(filePath));
+            emittedFiles.set(filePath, content);
           }
         }
         bundleDebug("insert index");
@@ -921,17 +952,17 @@ export default ${libName}
           const rollupFiles = /* @__PURE__ */ new Set();
           if (multiple) {
             for (const name of entryNames) {
-              const path = node_path.resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`);
+              const path = resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`);
               rollupDeclarationFiles({
                 root,
                 compilerOptions,
                 outputDir,
                 entryPath: path,
-                fileName: node_path.basename(path)
+                fileName: node_path.basename(path),
+                libFolder: libFolderPath
               });
-              const wroteFile = vite.normalizePath(path);
-              wroteFiles.delete(wroteFile);
-              rollupFiles.add(wroteFile);
+              emittedFiles.delete(path);
+              rollupFiles.add(path);
             }
           } else {
             rollupDeclarationFiles({
@@ -939,41 +970,37 @@ export default ${libName}
               compilerOptions,
               outputDir,
               entryPath: typesPath,
-              fileName: node_path.basename(typesPath)
+              fileName: node_path.basename(typesPath),
+              libFolder: libFolderPath
             });
-            const wroteFile = vite.normalizePath(typesPath);
-            wroteFiles.delete(wroteFile);
-            rollupFiles.add(wroteFile);
+            emittedFiles.delete(typesPath);
+            rollupFiles.add(typesPath);
           }
-          await runParallel(os.cpus().length, Array.from(wroteFiles), (f) => fs.unlink(f));
+          await runParallel(os.cpus().length, Array.from(emittedFiles.keys()), (f) => fs.unlink(f));
           removeDirIfEmpty(outputDir);
-          wroteFiles.clear();
+          emittedFiles.clear();
           for (const file of rollupFiles) {
-            wroteFiles.add(file);
-          }
-          if (copyDtsFiles) {
-            await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
-              const filePath = node_path.resolve(outputDir, node_path.basename(path));
-              await fs.writeFile(filePath, content, "utf-8");
-              wroteFiles.add(vite.normalizePath(filePath));
-            });
+            emittedFiles.set(file, await fs.readFile(file, "utf-8"));
           }
           bundleDebug("rollup");
         }
       }
       if (outputDirs.length > 1) {
         const dirs = outputDirs.slice(1);
-        await runParallel(os.cpus().length, Array.from(wroteFiles), async (wroteFile) => {
-          const relativePath = node_path.relative(outputDir, wroteFile);
-          const content = await fs.readFile(wroteFile, "utf-8");
-          await Promise.all(
-            dirs.map(async (dir) => {
-              const filePath = node_path.resolve(dir, relativePath);
-              await fs.mkdir(node_path.dirname(filePath), { recursive: true });
-              await fs.writeFile(filePath, content, "utf-8");
-            })
-          );
-        });
+        await runParallel(
+          os.cpus().length,
+          Array.from(emittedFiles),
+          async ([wroteFile, content]) => {
+            const relativePath = node_path.relative(outputDir, wroteFile);
+            await Promise.all(
+              dirs.map(async (dir) => {
+                const filePath = resolve(dir, relativePath);
+                await fs.mkdir(node_path.dirname(filePath), { recursive: true });
+                await fs.writeFile(filePath, content, "utf-8");
+              })
+            );
+          }
+        );
       }
       if (typeof afterBuild === "function") {
         const result = afterBuild();

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import * as vite from 'vite';
+import { LogLevel } from 'vite';
 import { ts, Diagnostic } from 'ts-morph';
 
 interface TransformWriteFile {
@@ -9,7 +10,7 @@ interface PluginOptions {
     /**
      * Depends on the root directory
      *
-     * Defaults base on your vite config root options
+     * By Default it base on 'root' option of your vite config
      */
     root?: string;
     /**
@@ -17,7 +18,7 @@ interface PluginOptions {
      *
      * Can be specified a array to output to multiple directories
      *
-     * Defaults base on your vite config output options
+     * By Default it base on 'build.outDir' option of your vite config
      */
     outputDir?: string | string[];
     /**
@@ -25,7 +26,7 @@ interface PluginOptions {
      *
      * The output path of each file will be calculated base on it
      *
-     * Defaults is the smallest public path for all files
+     * By Default it is the smallest public path for all files
      */
     entryRoot?: string;
     /**
@@ -69,13 +70,13 @@ interface PluginOptions {
     /**
      * Manual set include glob
      *
-     * Defaults base on your tsconfig.json include option
+     * By Default it base on 'include' option of the tsconfig.json
      */
     include?: string | string[];
     /**
      * Manual set exclude glob
      *
-     * Defaults base on your tsconfig.json exclude option, be 'node_module/**' when empty
+     * By Default it base on 'exclude' option of the tsconfig.json, be 'node_module/**' when empty
      */
     exclude?: string | string[];
     /**
@@ -124,15 +125,6 @@ interface PluginOptions {
      * @default false
      */
     skipDiagnostics?: boolean;
-    /**
-     * Whether log diagnostic informations
-     *
-     * Not effective when `skipDiagnostics` is true
-     *
-     * @deprecated
-     * @default false
-     */
-    logDiagnostics?: boolean;
     /**
      * Customize typescript lib folder path
      *
@@ -141,6 +133,12 @@ interface PluginOptions {
      * @default undefined
      */
     libFolderPath?: string;
+    /**
+     * Specify the log level of plugin
+     *
+     * By Default it base on 'logLevel' option of your vite config
+     */
+    logLevel?: LogLevel;
     /**
      * After emit diagnostic hook
      *

package/dist/index.mjs

@@ -5,14 +5,14 @@ import __cjs_mod__ from 'module';
 const __filename = __cjs_url__.fileURLToPath(import.meta.url);
 const __dirname = __cjs_path__.dirname(__filename);
 const require = __cjs_mod__.createRequire(import.meta.url);
-import { isAbsolute, resolve, dirname, normalize, sep, relative, basename } from 'node:path';
+import { isAbsolute, resolve as resolve$1, dirname, normalize, sep, relative, basename } from 'node:path';
 import fs from 'fs-extra';
 import os from 'os';
 import { cyan, yellow, red, green } from 'kolorist';
 import glob from 'fast-glob';
 import debug from 'debug';
 import { Project } from 'ts-morph';
-import { normalizePath } from 'vite';
+import { normalizePath, createLogger } from 'vite';
 import typescript from 'typescript';
 import { createFilter } from '@rollup/pluginutils';
 import { existsSync, readdirSync, lstatSync, rmdirSync } from 'node:fs';
@@ -69,7 +69,7 @@ function mergeObjects(sourceObj, targetObj) {
   return sourceObj;
 }
 function ensureAbsolute(path, root) {
-  return path ? isAbsolute(path) ? path : resolve(root, path) : root;
+  return path ? isAbsolute(path) ? path : resolve$1(root, path) : root;
 }
 function ensureArray(value) {
   return Array.isArray(value) ? value : value ? [value] : [];
@@ -134,7 +134,7 @@ function removeDirIfEmpty(dir) {
   }
   let onlyHasDir = true;
   for (const file of readdirSync(dir)) {
-    const abs = resolve(dir, file);
+    const abs = resolve$1(dir, file);
     if (lstatSync(abs).isDirectory()) {
       if (!removeDirIfEmpty(abs)) {
         onlyHasDir = false;
@@ -365,62 +365,90 @@ function preprocessVueCode(code, setupScript) {
       }
     }
   }
+  const declRecord = /* @__PURE__ */ new Map();
+  let defaultExport;
+  let options;
   for (const node of scriptAst) {
+    if (node.type === "VariableDeclaration") {
+      for (const decl of node.declarations) {
+        if (decl.id.type === "Identifier" && decl.init) {
+          let properties;
+          if (decl.init.type === "ObjectExpression") {
+            properties = decl.init.properties;
+          } else if (decl.init.type === "CallExpression" && decl.init.arguments[0].type === "ObjectExpression") {
+            properties = decl.init.arguments[0].properties;
+          }
+          if (!properties)
+            continue;
+          if (defaultExport && decl.id.name === defaultExport) {
+            options = properties;
+            break;
+          } else {
+            declRecord.set(decl.id.name, properties);
+          }
+        }
+      }
+    }
     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;
+      } else if (node.declaration.type === "Identifier") {
+        if (declRecord.has(node.declaration.name)) {
+          options = declRecord.get(node.declaration.name);
+        } else {
+          defaultExport = node.declaration.name;
+        }
       }
-      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 unknown as __PropType<${propsTypeName}['${prop.key.name}']>`
-                      );
-                    }
+    }
+    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 unknown as __PropType<${propsTypeName}['${prop.key.name}']>`
+                    );
                   }
-                } else {
-                  source.prependLeft(
-                    prop.end,
-                    ` as unknown as __PropType<${propsTypeName}['${prop.key.name}']>`
-                  );
                 }
+              } else {
+                source.prependLeft(
+                  prop.end,
+                  ` as unknown as __PropType<${propsTypeName}['${prop.key.name}']>`
+                );
               }
             }
           }
-          if (option.type === "ObjectProperty" && option.key.type === "Identifier" && option.key.name === "components") {
-            source.remove(option.start, option.end);
-          }
-          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;
-              }
+        }
+        if (option.type === "ObjectProperty" && option.key.type === "Identifier" && option.key.name === "components") {
+          source.remove(option.start, option.end);
+        }
+        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, `
+          }
+          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}
 `);
-              }
             }
           }
         }
@@ -480,12 +508,13 @@ function compileVueCode(code) {
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
   root,
+  compilerOptions,
   outputDir,
   entryPath,
   fileName,
-  compilerOptions
+  libFolder
 }) {
-  const configObjectFullPath = resolve(root, "api-extractor.json");
+  const configObjectFullPath = resolve$1(root, "api-extractor.json");
   const packageJsonLookup = new PackageJsonLookup();
   const packageJsonFullPath = packageJsonLookup.tryGetPackageJsonFilePathFor(configObjectFullPath);
   if (!dtsRE$1.test(fileName)) {
@@ -510,7 +539,7 @@ function rollupDeclarationFiles({
       },
       dtsRollup: {
         enabled: true,
-        publicTrimmedFilePath: resolve(outputDir, fileName)
+        publicTrimmedFilePath: resolve$1(outputDir, fileName)
       },
       tsdocMetadata: {
         enabled: false
@@ -532,8 +561,9 @@ function rollupDeclarationFiles({
     packageJsonFullPath
   });
   const compilerState = CompilerState.create(extractorConfig, {
-    localBuild: true,
-    showVerboseMessages: false
+    localBuild: false,
+    showVerboseMessages: false,
+    typescriptCompilerFolder: libFolder ? resolve$1(libFolder, "..") : void 0
   });
   const sourceMapper = new SourceMapper();
   const messageRouter = new MessageRouter({
@@ -574,6 +604,7 @@ const defaultIndex = "index.d.ts";
 const noop = () => {
 };
 const extPrefix = (file) => mtjsRE.test(file) ? "m" : ctjsRE.test(file) ? "c" : "";
+const resolve = (...paths) => normalizePath(resolve$1(...paths));
 const logPrefix = cyan("[vite:dts]");
 const bundleDebug = debug("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
@@ -587,9 +618,8 @@ function dtsPlugin(options = {}) {
     rollupTypes = false,
     noEmitOnError = false,
     skipDiagnostics = false,
-    logDiagnostics = void 0,
     copyDtsFiles = true,
-    libFolderPath = void 0,
+    logLevel = void 0,
     afterDiagnostic = noop,
     beforeWriteFile = noop,
     afterBuild = noop
@@ -609,10 +639,39 @@ function dtsPlugin(options = {}) {
   let include;
   let exclude;
   let filter;
+  let libFolderPath = options.libFolderPath;
   const sourceDtsFiles = /* @__PURE__ */ new Set();
+  const emittedFiles = /* @__PURE__ */ new Map();
   let hasJsVue = false;
   let allowJs = false;
   let transformError = false;
+  function internalTransform(code, id) {
+    if (!project || !filter(id)) {
+      return;
+    }
+    if (vueRE.test(id)) {
+      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;
+        project.createSourceFile(`${id}.${ext || "js"}`, content, { overwrite: true });
+      }
+    } else if (!id.includes(".vue?vue") && (tsRE.test(id) || allowJs && jsRE.test(id))) {
+      project.createSourceFile(id, code, { overwrite: true });
+    }
+  }
   return {
     name: "vite:dts",
     apply: "build",
@@ -639,18 +698,7 @@ function dtsPlugin(options = {}) {
     configResolved(config) {
       if (isBundle)
         return;
-      logger = config.logger;
-      if (logDiagnostics != null) {
-        logger.warn(
-          yellow(
-            `
-${cyan(
-              "[vite:dts]"
-            )} 'logDiagnostics' has been deprecated, the original feature now following 'skipDiagnostics'.
-`
-          )
-        );
-      }
+      logger = logLevel ? createLogger(logLevel, { allowClearScreen: config.clearScreen }) : config.logger;
       if (!config.build.lib) {
         logger.warn(
           yellow(
@@ -674,6 +722,7 @@ ${cyan(
       }
       root = ensureAbsolute(options.root ?? "", config.root);
       tsConfigPath = ensureAbsolute(tsConfigFilePath, root);
+      libFolderPath = libFolderPath && ensureAbsolute(libFolderPath, root);
       outputDirs = options.outputDir ? ensureArray(options.outputDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(config.build.outDir, root)];
       if (!outputDirs[0]) {
         logger.error(
@@ -692,7 +741,7 @@ ${cyan(
         compilerOptions: mergeObjects(compilerOptions, {
           rootDir: compilerOptions.rootDir || root,
           noEmitOnError,
-          outDir: ".",
+          outDir: outputDirs[0],
           declarationDir: void 0,
           noUnusedParameters: false,
           declaration: true,
@@ -702,7 +751,7 @@ ${cyan(
         }),
         tsConfigFilePath: tsConfigPath,
         skipAddingFilesFromTsConfig: true,
-        libFolderPath: libFolderPath ? ensureAbsolute(libFolderPath, root) : void 0
+        libFolderPath
       });
       allowJs = project.getCompilerOptions().allowJs ?? false;
       const tsConfig = { compilerOptions: {} };
@@ -737,39 +786,16 @@ ${cyan(
       }
     },
     transform(code, id) {
-      if (!filter(id)) {
-        return null;
-      }
-      if (vueRE.test(id)) {
-        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;
-          project.createSourceFile(`${id}.${ext || "js"}`, content, { overwrite: true });
-        }
-      } else if (!id.includes(".vue?vue") && (tsRE.test(id) || allowJs && jsRE.test(id))) {
-        project.createSourceFile(id, code, { overwrite: true });
-      }
+      internalTransform(code, id);
       return null;
     },
-    watchChange(id) {
+    async watchChange(id) {
       if (watchExtensionRE.test(id)) {
         isBundle = false;
         if (project) {
           const sourceFile = project.getSourceFile(normalizePath(id));
           sourceFile && project.removeSourceFile(sourceFile);
+          internalTransform(await fs.readFile(id, "utf-8"), id);
         }
       }
     },
@@ -781,6 +807,7 @@ ${logPrefix} Start generate declaration files...`));
       bundleDebug("start");
       isBundle = true;
       sourceDtsFiles.clear();
+      emittedFiles.clear();
       const startTime = Date.now();
       const includedFileSet = /* @__PURE__ */ new Set();
       if (include && include.length) {
@@ -827,6 +854,7 @@ ${logPrefix} Start generate declaration files...`));
         }
         bundleDebug("diagnostics");
       }
+      const outputDir = outputDirs[0];
       const dtsOutputFiles = Array.from(sourceDtsFiles).map((sourceFile) => ({
         path: sourceFile.getFilePath(),
         content: sourceFile.getFullText()
@@ -834,17 +862,13 @@ ${logPrefix} Start generate declaration files...`));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map(
         (sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
-          path: normalizePath(resolve(root, outputFile.compilerObject.name)),
+          path: resolve(root, relative(outputDir, outputFile.compilerObject.name)),
           content: outputFile.getText()
         }))
       ).flat().concat(dtsOutputFiles);
       bundleDebug("emit");
-      if (!entryRoot) {
-        entryRoot = queryPublicPath(outputFiles.map((file) => file.path));
-      }
+      entryRoot = entryRoot || queryPublicPath(outputFiles.map((file) => file.path));
       entryRoot = ensureAbsolute(entryRoot, root);
-      const wroteFiles = /* @__PURE__ */ new Set();
-      const outputDir = outputDirs[0];
       await runParallel(os.cpus().length, outputFiles, async (outputFile) => {
         let filePath = outputFile.path;
         let content = outputFile.content;
@@ -861,29 +885,35 @@ ${logPrefix} Start generate declaration files...`));
           outputDir,
           relative(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath)
         );
+        content = cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content;
         if (typeof beforeWriteFile === "function") {
           const result = beforeWriteFile(filePath, content);
           if (result === false)
             return;
           if (result && isNativeObj(result)) {
-            filePath = result.filePath ?? filePath;
+            filePath = result.filePath || filePath;
             content = result.content ?? content;
           }
         }
+        filePath = normalizePath(filePath);
         await fs.mkdir(dirname(filePath), { recursive: true });
-        await fs.writeFile(
-          filePath,
-          cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content,
-          "utf-8"
-        );
-        wroteFiles.add(normalizePath(filePath));
+        await fs.writeFile(filePath, content, "utf-8");
+        emittedFiles.set(filePath, content);
       });
       bundleDebug("output");
+      if (copyDtsFiles) {
+        await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
+          const filePath = resolve(outputDir, basename(path));
+          await fs.writeFile(filePath, content, "utf-8");
+          emittedFiles.set(filePath, content);
+        });
+      }
+      bundleDebug("copy dts");
       if (insertTypesEntry || rollupTypes) {
         const pkgPath = resolve(root, "package.json");
         const pkg = fs.existsSync(pkgPath) ? JSON.parse(await fs.readFile(pkgPath, "utf-8")) : {};
         const entryNames = Object.keys(entries);
-        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings;
+        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings || (pkg.exports?.["."] || pkg.exports?.["./"])?.types;
         const multiple = entryNames.length > 1;
         const typesPath = types ? resolve(root, types) : resolve(outputDir, indexName);
         for (const name of entryNames) {
@@ -915,9 +945,10 @@ export default ${libName}
               content = result.content ?? content;
             }
           }
+          filePath = normalizePath(filePath);
           if (result !== false) {
             await fs.writeFile(filePath, content, "utf-8");
-            wroteFiles.add(normalizePath(filePath));
+            emittedFiles.set(filePath, content);
           }
         }
         bundleDebug("insert index");
@@ -932,11 +963,11 @@ export default ${libName}
                 compilerOptions,
                 outputDir,
                 entryPath: path,
-                fileName: basename(path)
+                fileName: basename(path),
+                libFolder: libFolderPath
               });
-              const wroteFile = normalizePath(path);
-              wroteFiles.delete(wroteFile);
-              rollupFiles.add(wroteFile);
+              emittedFiles.delete(path);
+              rollupFiles.add(path);
             }
           } else {
             rollupDeclarationFiles({
@@ -944,41 +975,37 @@ export default ${libName}
               compilerOptions,
               outputDir,
               entryPath: typesPath,
-              fileName: basename(typesPath)
+              fileName: basename(typesPath),
+              libFolder: libFolderPath
             });
-            const wroteFile = normalizePath(typesPath);
-            wroteFiles.delete(wroteFile);
-            rollupFiles.add(wroteFile);
+            emittedFiles.delete(typesPath);
+            rollupFiles.add(typesPath);
           }
-          await runParallel(os.cpus().length, Array.from(wroteFiles), (f) => fs.unlink(f));
+          await runParallel(os.cpus().length, Array.from(emittedFiles.keys()), (f) => fs.unlink(f));
           removeDirIfEmpty(outputDir);
-          wroteFiles.clear();
+          emittedFiles.clear();
           for (const file of rollupFiles) {
-            wroteFiles.add(file);
-          }
-          if (copyDtsFiles) {
-            await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
-              const filePath = resolve(outputDir, basename(path));
-              await fs.writeFile(filePath, content, "utf-8");
-              wroteFiles.add(normalizePath(filePath));
-            });
+            emittedFiles.set(file, await fs.readFile(file, "utf-8"));
           }
           bundleDebug("rollup");
         }
       }
       if (outputDirs.length > 1) {
         const dirs = outputDirs.slice(1);
-        await runParallel(os.cpus().length, Array.from(wroteFiles), async (wroteFile) => {
-          const relativePath = relative(outputDir, wroteFile);
-          const content = await fs.readFile(wroteFile, "utf-8");
-          await Promise.all(
-            dirs.map(async (dir) => {
-              const filePath = resolve(dir, relativePath);
-              await fs.mkdir(dirname(filePath), { recursive: true });
-              await fs.writeFile(filePath, content, "utf-8");
-            })
-          );
-        });
+        await runParallel(
+          os.cpus().length,
+          Array.from(emittedFiles),
+          async ([wroteFile, content]) => {
+            const relativePath = relative(outputDir, wroteFile);
+            await Promise.all(
+              dirs.map(async (dir) => {
+                const filePath = resolve(dir, relativePath);
+                await fs.mkdir(dirname(filePath), { recursive: true });
+                await fs.writeFile(filePath, content, "utf-8");
+              })
+            );
+          }
+        );
       }
       if (typeof afterBuild === "function") {
         const result = afterBuild();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",
@@ -29,6 +29,7 @@
     "prettier": "pretty-quick --staged",
     "release": "tsx scripts/release.ts",
     "test": "vitest run",
+    "test:react": "pnpm -C examples/react build",
     "test:ts": "pnpm -C examples/ts build",
     "test:vue": "pnpm -C examples/vue build"
   },