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

package/README.md

@@ -232,7 +232,8 @@ export interface PluginOptions {
   /**
    * Whether copy .d.ts source files into outputDir
    *
-   * @default true
+   * @default false
+   * @remarks Before 2.0 it defaults to true
    */
   copyDtsFiles?: boolean
 
@@ -251,6 +252,7 @@ export interface PluginOptions {
    * But for the source files with type errors will not be emitted
    *
    * @default false
+   * @remarks Before 1.7 it defaults to true
    */
   skipDiagnostics?: boolean
 

package/README.zh-CN.md

@@ -231,7 +231,8 @@ export interface PluginOptions {
   /**
    * 是否将源码里的 .d.ts 文件复制到 outputDir
    *
-   * @default true
+   * @default false
+   * @remarks 在 2.0 之前它默认为 true
    */
   copyDtsFiles?: boolean
 
@@ -250,6 +251,7 @@ export interface PluginOptions {
    * 但对于出现错误的源文件，将无法生成相应的类型文件
    *
    * @default false
+   * @remarks 在 1.7 之前它默认为 true
    */
   skipDiagnostics?: boolean
 

package/dist/index.cjs

@@ -370,7 +370,7 @@ function preprocessVueCode(code, setupScript) {
           let properties;
           if (decl.init.type === "ObjectExpression") {
             properties = decl.init.properties;
-          } else if (decl.init.type === "CallExpression" && decl.init.arguments[0].type === "ObjectExpression") {
+          } else if (decl.init.type === "CallExpression" && decl.init.arguments[0]?.type === "ObjectExpression") {
             properties = decl.init.arguments[0].properties;
           }
           if (!properties)
@@ -387,7 +387,7 @@ function preprocessVueCode(code, setupScript) {
     if (node.type === "ExportDefaultDeclaration") {
       if (node.declaration.type === "ObjectExpression") {
         options = node.declaration.properties;
-      } else if (node.declaration.type === "CallExpression" && node.declaration.arguments[0].type === "ObjectExpression") {
+      } 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)) {
@@ -421,7 +421,7 @@ function preprocessVueCode(code, setupScript) {
           }
         }
         if (option.type === "ObjectProperty" && option.key.type === "Identifier" && option.key.name === "components") {
-          source.remove(option.start, option.end);
+          source.overwrite(option.value.start, option.value.end, "undefined");
         }
         if (option.type === "ObjectMethod" && option.key.type === "Identifier" && option.key.name === "setup") {
           let exposed;
@@ -613,7 +613,7 @@ function dtsPlugin(options = {}) {
     rollupTypes = false,
     noEmitOnError = false,
     skipDiagnostics = false,
-    copyDtsFiles = true,
+    copyDtsFiles = false,
     logLevel = void 0,
     afterDiagnostic = noop,
     beforeWriteFile = noop,
@@ -636,16 +636,17 @@ function dtsPlugin(options = {}) {
   let filter;
   let libFolderPath = options.libFolderPath;
   const sourceDtsFiles = /* @__PURE__ */ new Set();
+  const includedFiles = /* @__PURE__ */ new Set();
   const emittedFiles = /* @__PURE__ */ new Map();
   let hasJsVue = false;
   let allowJs = false;
   let transformError = false;
-  function internalTransform(code, id) {
+  async function internalTransform(id) {
     if (!project || !filter(id)) {
       return;
     }
     if (vueRE.test(id)) {
-      const { error, content, ext } = compileVueCode(code);
+      const { error, content, ext } = compileVueCode(await fs.readFile(id, "utf-8"));
       if (!transformError && error) {
         logger.error(
           kolorist.red(
@@ -664,7 +665,7 @@ ${kolorist.cyan(
         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 });
+      project.createSourceFile(id, await fs.readFile(id, "utf-8"), { overwrite: true });
     }
   }
   return {
@@ -770,7 +771,7 @@ ${kolorist.cyan(
       filter = pluginutils.createFilter(include, exclude, { resolve: root });
       compilerOptions = tsConfig.compilerOptions;
     },
-    buildStart(inputOptions) {
+    async buildStart(inputOptions) {
       if (Array.isArray(inputOptions.input)) {
         entries = inputOptions.input.reduce((prev, current) => {
           prev[node_path.basename(current)] = current;
@@ -779,49 +780,27 @@ ${kolorist.cyan(
       } else {
         entries = { ...inputOptions.input };
       }
-    },
-    transform(code, id) {
-      internalTransform(code, id);
-      return null;
-    },
-    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);
-        }
-      }
-    },
-    async closeBundle() {
-      if (!outputDirs || !project || isBundle)
-        return;
-      logger.info(kolorist.green(`
-${logPrefix} Start generate declaration files...`));
-      bundleDebug("start");
-      isBundle = true;
+      bundleDebug("parse entries");
       sourceDtsFiles.clear();
-      emittedFiles.clear();
-      const startTime = Date.now();
-      const includedFileSet = /* @__PURE__ */ new Set();
-      if (include && include.length) {
+      includedFiles.clear();
+      if (project && include && include.length) {
         const files = await glob(include, {
           cwd: root,
           absolute: true,
           ignore: exclude
         });
-        files.forEach((file) => {
+        for (const file of files) {
+          this.addWatchFile(file);
           if (dtsRE.test(file)) {
             sourceDtsFiles.add(project.addSourceFileAtPath(file));
             if (!copyDtsFiles) {
-              return;
+              continue;
             }
-            includedFileSet.add(file);
-            return;
+            includedFiles.add(file);
+            continue;
           }
-          includedFileSet.add(`${file.replace(tjsRE, "")}.d.${extPrefix(file)}ts`);
-        });
+          includedFiles.add(`${file.replace(tjsRE, "")}.d.${extPrefix(file)}ts`);
+        }
         if (hasJsVue) {
           if (!allowJs) {
             logger.warn(
@@ -836,6 +815,30 @@ ${logPrefix} Start generate declaration files...`));
         }
         bundleDebug("collect files");
       }
+    },
+    async transform(_, id) {
+      await internalTransform(id);
+      return null;
+    },
+    async watchChange(id) {
+      if (watchExtensionRE.test(id)) {
+        isBundle = false;
+        if (project) {
+          const sourceFile = project.getSourceFile(vite.normalizePath(id));
+          sourceFile && project.removeSourceFile(sourceFile);
+          await internalTransform(id);
+        }
+      }
+    },
+    async closeBundle() {
+      if (!outputDirs || !project || isBundle)
+        return;
+      logger.info(kolorist.green(`
+${logPrefix} Start generate declaration files...`));
+      bundleDebug("start");
+      isBundle = true;
+      emittedFiles.clear();
+      const startTime = Date.now();
       project.resolveSourceFileDependencies();
       bundleDebug("resolve");
       if (!skipDiagnostics) {
@@ -868,7 +871,7 @@ ${logPrefix} Start generate declaration files...`));
         let filePath = outputFile.path;
         let content = outputFile.content;
         const isMapFile = filePath.endsWith(".map");
-        if (!includedFileSet.has(isMapFile ? filePath.slice(0, -4) : filePath) || clearPureImport && content === noneExport) {
+        if (!includedFiles.has(isMapFile ? filePath.slice(0, -4) : filePath) || clearPureImport && content === noneExport) {
           return;
         }
         if (!isMapFile && content && content !== noneExport) {
@@ -896,14 +899,6 @@ ${logPrefix} Start generate declaration files...`));
         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 = resolve(root, "package.json");
         const pkg = fs.existsSync(pkgPath) ? JSON.parse(await fs.readFile(pkgPath, "utf-8")) : {};

package/dist/index.d.ts

@@ -106,7 +106,8 @@ interface PluginOptions {
     /**
      * Whether copy .d.ts source files into outputDir
      *
-     * @default true
+     * @default false
+     * @remarks Before 2.0 it defaults to true
      */
     copyDtsFiles?: boolean;
     /**
@@ -123,6 +124,7 @@ interface PluginOptions {
      * But for the source files with type errors will not be emitted
      *
      * @default false
+     * @remarks Before 1.7 it defaults to true
      */
     skipDiagnostics?: boolean;
     /**

package/dist/index.mjs

@@ -375,7 +375,7 @@ function preprocessVueCode(code, setupScript) {
           let properties;
           if (decl.init.type === "ObjectExpression") {
             properties = decl.init.properties;
-          } else if (decl.init.type === "CallExpression" && decl.init.arguments[0].type === "ObjectExpression") {
+          } else if (decl.init.type === "CallExpression" && decl.init.arguments[0]?.type === "ObjectExpression") {
             properties = decl.init.arguments[0].properties;
           }
           if (!properties)
@@ -392,7 +392,7 @@ function preprocessVueCode(code, setupScript) {
     if (node.type === "ExportDefaultDeclaration") {
       if (node.declaration.type === "ObjectExpression") {
         options = node.declaration.properties;
-      } else if (node.declaration.type === "CallExpression" && node.declaration.arguments[0].type === "ObjectExpression") {
+      } 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)) {
@@ -426,7 +426,7 @@ function preprocessVueCode(code, setupScript) {
           }
         }
         if (option.type === "ObjectProperty" && option.key.type === "Identifier" && option.key.name === "components") {
-          source.remove(option.start, option.end);
+          source.overwrite(option.value.start, option.value.end, "undefined");
         }
         if (option.type === "ObjectMethod" && option.key.type === "Identifier" && option.key.name === "setup") {
           let exposed;
@@ -618,7 +618,7 @@ function dtsPlugin(options = {}) {
     rollupTypes = false,
     noEmitOnError = false,
     skipDiagnostics = false,
-    copyDtsFiles = true,
+    copyDtsFiles = false,
     logLevel = void 0,
     afterDiagnostic = noop,
     beforeWriteFile = noop,
@@ -641,16 +641,17 @@ function dtsPlugin(options = {}) {
   let filter;
   let libFolderPath = options.libFolderPath;
   const sourceDtsFiles = /* @__PURE__ */ new Set();
+  const includedFiles = /* @__PURE__ */ new Set();
   const emittedFiles = /* @__PURE__ */ new Map();
   let hasJsVue = false;
   let allowJs = false;
   let transformError = false;
-  function internalTransform(code, id) {
+  async function internalTransform(id) {
     if (!project || !filter(id)) {
       return;
     }
     if (vueRE.test(id)) {
-      const { error, content, ext } = compileVueCode(code);
+      const { error, content, ext } = compileVueCode(await fs.readFile(id, "utf-8"));
       if (!transformError && error) {
         logger.error(
           red(
@@ -669,7 +670,7 @@ ${cyan(
         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 });
+      project.createSourceFile(id, await fs.readFile(id, "utf-8"), { overwrite: true });
     }
   }
   return {
@@ -775,7 +776,7 @@ ${cyan(
       filter = createFilter(include, exclude, { resolve: root });
       compilerOptions = tsConfig.compilerOptions;
     },
-    buildStart(inputOptions) {
+    async buildStart(inputOptions) {
       if (Array.isArray(inputOptions.input)) {
         entries = inputOptions.input.reduce((prev, current) => {
           prev[basename(current)] = current;
@@ -784,49 +785,27 @@ ${cyan(
       } else {
         entries = { ...inputOptions.input };
       }
-    },
-    transform(code, id) {
-      internalTransform(code, id);
-      return null;
-    },
-    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);
-        }
-      }
-    },
-    async closeBundle() {
-      if (!outputDirs || !project || isBundle)
-        return;
-      logger.info(green(`
-${logPrefix} Start generate declaration files...`));
-      bundleDebug("start");
-      isBundle = true;
+      bundleDebug("parse entries");
       sourceDtsFiles.clear();
-      emittedFiles.clear();
-      const startTime = Date.now();
-      const includedFileSet = /* @__PURE__ */ new Set();
-      if (include && include.length) {
+      includedFiles.clear();
+      if (project && include && include.length) {
         const files = await glob(include, {
           cwd: root,
           absolute: true,
           ignore: exclude
         });
-        files.forEach((file) => {
+        for (const file of files) {
+          this.addWatchFile(file);
           if (dtsRE.test(file)) {
             sourceDtsFiles.add(project.addSourceFileAtPath(file));
             if (!copyDtsFiles) {
-              return;
+              continue;
             }
-            includedFileSet.add(file);
-            return;
+            includedFiles.add(file);
+            continue;
           }
-          includedFileSet.add(`${file.replace(tjsRE, "")}.d.${extPrefix(file)}ts`);
-        });
+          includedFiles.add(`${file.replace(tjsRE, "")}.d.${extPrefix(file)}ts`);
+        }
         if (hasJsVue) {
           if (!allowJs) {
             logger.warn(
@@ -841,6 +820,30 @@ ${logPrefix} Start generate declaration files...`));
         }
         bundleDebug("collect files");
       }
+    },
+    async transform(_, id) {
+      await internalTransform(id);
+      return null;
+    },
+    async watchChange(id) {
+      if (watchExtensionRE.test(id)) {
+        isBundle = false;
+        if (project) {
+          const sourceFile = project.getSourceFile(normalizePath(id));
+          sourceFile && project.removeSourceFile(sourceFile);
+          await internalTransform(id);
+        }
+      }
+    },
+    async closeBundle() {
+      if (!outputDirs || !project || isBundle)
+        return;
+      logger.info(green(`
+${logPrefix} Start generate declaration files...`));
+      bundleDebug("start");
+      isBundle = true;
+      emittedFiles.clear();
+      const startTime = Date.now();
       project.resolveSourceFileDependencies();
       bundleDebug("resolve");
       if (!skipDiagnostics) {
@@ -873,7 +876,7 @@ ${logPrefix} Start generate declaration files...`));
         let filePath = outputFile.path;
         let content = outputFile.content;
         const isMapFile = filePath.endsWith(".map");
-        if (!includedFileSet.has(isMapFile ? filePath.slice(0, -4) : filePath) || clearPureImport && content === noneExport) {
+        if (!includedFiles.has(isMapFile ? filePath.slice(0, -4) : filePath) || clearPureImport && content === noneExport) {
           return;
         }
         if (!isMapFile && content && content !== noneExport) {
@@ -901,14 +904,6 @@ ${logPrefix} Start generate declaration files...`));
         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")) : {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.1",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",