vite-plugin-dts 1.5.0 → 1.6.0

package/dist/index.mjs

@@ -1,11 +1,3 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-});
-
 // src/plugin.ts
 import { resolve as resolve3, dirname as dirname3, relative as relative2, basename } from "path";
 import fs from "fs-extra";
@@ -163,20 +155,25 @@ var importTypesRE = /import\s?(?:type)?\s?\{(.+)\}\s?from\s?['"].+['"]/;
 function transformDynamicImport(content) {
   const importMap = /* @__PURE__ */ new Map();
   content = content.replace(globalDynamicTypeRE, (str) => {
-    var _a;
     const matchResult = str.match(dynamicTypeRE);
     const libName = matchResult[1];
-    const importSet = (_a = importMap.get(libName)) != null ? _a : importMap.set(libName, /* @__PURE__ */ new Set()).get(libName);
+    const importSet = importMap.get(libName) ?? importMap.set(libName, /* @__PURE__ */ new Set()).get(libName);
     const usedType = matchResult[2];
     importSet.add(usedType);
     return usedType + matchResult[3];
   });
   importMap.forEach((importSet, libName) => {
-    const importReg = new RegExp(`import\\s?(?:type)?\\s?\\{[^;\\n]+\\}\\s?from\\s?['"]${libName}['"]`, "g");
+    const importReg = new RegExp(
+      `import\\s?(?:type)?\\s?\\{[^;\\n]+\\}\\s?from\\s?['"]${libName}['"]`,
+      "g"
+    );
     const matchResult = content.match(importReg);
     if (matchResult == null ? void 0 : matchResult[0]) {
       const importedTypes = matchResult[0].match(importTypesRE)[1].trim().split(",");
-      content = content.replace(matchResult[0], `import type { ${Array.from(importSet).concat(importedTypes).join(", ")} } from '${libName}'`);
+      content = content.replace(
+        matchResult[0],
+        `import type { ${Array.from(importSet).concat(importedTypes).join(", ")} } from '${libName}'`
+      );
     } else {
       content = `import type { ${Array.from(importSet).join(", ")} } from '${libName}';
 ` + content;
@@ -215,7 +212,13 @@ function transformAliasImport(filePath, content, aliases, exclude = []) {
           return str;
         }
         const truthPath = isAbsolute2(matchedAlias.replacement) ? normalizePath(relative(dirname2(filePath), matchedAlias.replacement)) : normalizePath(matchedAlias.replacement);
-        return str.replace(isDynamic ? simpleDynamicImportRE : simpleStaticImportRE, `$1'${matchResult[1].replace(matchedAlias.find, (truthPath.startsWith(".") ? truthPath : `./${truthPath}`) + (typeof matchedAlias.find === "string" && matchedAlias.find.endsWith("/") ? "/" : ""))}'${isDynamic ? ")" : ""}`);
+        return str.replace(
+          isDynamic ? simpleDynamicImportRE : simpleStaticImportRE,
+          `$1'${matchResult[1].replace(
+            matchedAlias.find,
+            (truthPath.startsWith(".") ? truthPath : `./${truthPath}`) + (typeof matchedAlias.find === "string" && matchedAlias.find.endsWith("/") ? "/" : "")
+          )}'${isDynamic ? ")" : ""}`
+        );
       }
     }
     return str;
@@ -236,6 +239,7 @@ function transferSetupPosition(content) {
 }
 
 // src/compile.ts
+import { createRequire } from "node:module";
 var exportDefaultRE = /export\s+default/;
 var exportDefaultClassRE = /(?:(?:^|\n|;)\s*)export\s+default\s+class\s+([\w$]+)/;
 var noScriptContent = "import { defineComponent } from 'vue'\nexport default defineComponent({})";
@@ -243,20 +247,21 @@ var index = 1;
 var compileRoot = null;
 var compiler;
 var vue;
+var _require = createRequire(import.meta.url);
 function requireCompiler() {
   if (!compiler) {
     if (compileRoot) {
       try {
-        compiler = __require(__require.resolve("vue/compiler-sfc", { paths: [compileRoot] }));
+        compiler = _require(_require.resolve("vue/compiler-sfc", { paths: [compileRoot] }));
       } catch (e) {
       }
     }
     if (!compiler) {
       try {
-        compiler = __require("vue/compiler-sfc");
+        compiler = _require("vue/compiler-sfc");
       } catch (e) {
         try {
-          compiler = __require("@vue/compiler-sfc");
+          compiler = _require("@vue/compiler-sfc");
         } catch (e2) {
           throw new Error("@vue/compiler-sfc is not present in the dependency tree.\n");
         }
@@ -269,13 +274,13 @@ function isVue3() {
   if (!vue) {
     if (compileRoot) {
       try {
-        vue = __require(__require.resolve("vue", { paths: [compileRoot] }));
+        vue = _require(_require.resolve("vue", { paths: [compileRoot] }));
       } catch (e) {
       }
     }
     if (!vue) {
       try {
-        vue = __require("vue");
+        vue = _require("vue");
       } catch (e) {
         throw new Error("vue is not present in the dependency tree.\n");
       }
@@ -311,7 +316,7 @@ function compileVueCode(code) {
         id: `${index++}`
       });
       const classMatch = compiled.content.match(exportDefaultClassRE);
-      const plugins = scriptSetup.lang === "ts" ? ["typescript"] : void 0;
+      const plugins = scriptSetup.lang === "ts" ? ["typescript", "decorators-legacy"] : void 0;
       if (classMatch) {
         content = compiled.content.replace(exportDefaultClassRE, "\nclass $1") + `
 const _sfc_main = ${classMatch[1]}`;
@@ -322,10 +327,18 @@ const _sfc_main = ${classMatch[1]}`;
         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"] : void 0);
+      content = rewriteDefault(
+        script.content,
+        "_sfc_main",
+        script.lang === "ts" ? ["typescript"] : void 0
+      );
       content += "\nexport default _sfc_main\n";
       ext = script.lang || "js";
     }
@@ -417,7 +430,12 @@ function rollupDeclarationFiles({
     extractorConfig
   });
   collector.analyze();
-  DtsRollupGenerator.writeTypingsFile(collector, extractorConfig.publicTrimmedFilePath, DtsRollupKind.PublicRelease, extractorConfig.newlineKind);
+  DtsRollupGenerator.writeTypingsFile(
+    collector,
+    extractorConfig.publicTrimmedFilePath,
+    DtsRollupKind.PublicRelease,
+    extractorConfig.newlineKind
+  );
 }
 
 // src/plugin.ts
@@ -436,7 +454,6 @@ var noop = () => {
 var logPrefix = chalk.cyan("[vite:dts]");
 var bundleDebug = debug("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
-  var _a, _b;
   const {
     tsConfigFilePath = "tsconfig.json",
     aliasesExclude = [],
@@ -453,9 +470,9 @@ function dtsPlugin(options = {}) {
     beforeWriteFile = noop,
     afterBuild = noop
   } = options;
-  const compilerOptions = (_a = options.compilerOptions) != null ? _a : {};
+  const compilerOptions = options.compilerOptions ?? {};
   let root;
-  let entryRoot = (_b = options.entryRoot) != null ? _b : "";
+  let entryRoot = options.entryRoot ?? "";
   let libName;
   let indexName;
   let aliases;
@@ -473,10 +490,10 @@ function dtsPlugin(options = {}) {
     apply: "build",
     enforce: "pre",
     config(config) {
-      var _a2, _b2;
+      var _a;
       if (isBundle)
         return;
-      const aliasOptions = (_b2 = (_a2 = config == null ? void 0 : config.resolve) == null ? void 0 : _a2.alias) != null ? _b2 : [];
+      const aliasOptions = ((_a = config == null ? void 0 : config.resolve) == null ? void 0 : _a.alias) ?? [];
       if (isNativeObj(aliasOptions)) {
         aliases = Object.entries(aliasOptions).map(([key, value]) => {
           return { find: key, replacement: value };
@@ -485,38 +502,53 @@ function dtsPlugin(options = {}) {
         aliases = ensureArray(aliasOptions);
       }
       if (aliasesExclude.length > 0) {
-        aliases = aliases.filter(({ find }) => !aliasesExclude.some((alias) => {
-          var _a3;
-          return alias && (isRegExp(find) ? find.toString() === alias.toString() : isRegExp(alias) ? (_a3 = find.match(alias)) == null ? void 0 : _a3[0] : find === alias);
-        }));
+        aliases = aliases.filter(
+          ({ find }) => !aliasesExclude.some(
+            (alias) => {
+              var _a2;
+              return alias && (isRegExp(find) ? find.toString() === alias.toString() : isRegExp(alias) ? (_a2 = find.match(alias)) == null ? void 0 : _a2[0] : find === alias);
+            }
+          )
+        );
       }
     },
     configResolved(config) {
-      var _a2, _b2, _c;
       if (isBundle)
         return;
       logger = config.logger;
       if (!config.build.lib) {
-        logger.warn(chalk.yellow(`
-${chalk.cyan("[vite:dts]")} You building not a library that may not need to generate declaration files.
-`));
+        logger.warn(
+          chalk.yellow(
+            `
+${chalk.cyan(
+              "[vite:dts]"
+            )} You building not a library that may not need to generate declaration files.
+`
+          )
+        );
         libName = "_default";
         indexName = defaultIndex;
       } else {
-        const filename = (_a2 = config.build.lib.fileName) != null ? _a2 : defaultIndex;
+        const filename = config.build.lib.fileName ?? defaultIndex;
         libName = config.build.lib.name || "_default";
         indexName = typeof filename === "string" ? filename : filename("es");
         if (!dtsRE2.test(indexName)) {
           indexName = `${tjsRE.test(indexName) ? indexName.replace(tjsRE, "") : indexName}.d.ts`;
         }
       }
-      root = ensureAbsolute((_b2 = options.root) != null ? _b2 : "", config.root);
+      root = ensureAbsolute(options.root ?? "", config.root);
       tsConfigPath = ensureAbsolute(tsConfigFilePath, root);
       outputDirs = options.outputDir ? ensureArray(options.outputDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(config.build.outDir, root)];
-      if (!outputDirs) {
-        logger.error(chalk.red(`
-${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check your vite config and plugin options.
-`));
+      if (!outputDirs[0]) {
+        logger.error(
+          chalk.red(
+            `
+${chalk.cyan(
+              "[vite:dts]"
+            )} Can not resolve declaration directory, please check your vite config and plugin options.
+`
+          )
+        );
         return;
       }
       setCompileRoot(root);
@@ -534,7 +566,7 @@ ${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check
         tsConfigFilePath: tsConfigPath,
         skipAddingFilesFromTsConfig: true
       });
-      allowJs = (_c = project.getCompilerOptions().allowJs) != null ? _c : false;
+      allowJs = project.getCompilerOptions().allowJs ?? false;
     },
     buildStart(inputOptions) {
       if (!isBundle && (insertTypesEntry || rollupTypes)) {
@@ -567,7 +599,6 @@ ${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check
       }
     },
     async closeBundle() {
-      var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
       if (!outputDirs || !project || isBundle)
         return;
       logger.info(chalk.green(`
@@ -576,11 +607,11 @@ ${logPrefix} Start generate declaration files...`));
       isBundle = true;
       sourceDtsFiles.clear();
       const startTime = Date.now();
-      const tsConfig = (_a2 = readConfigFile(tsConfigPath, project.getFileSystem().readFileSync).config) != null ? _a2 : {};
+      const tsConfig = readConfigFile(tsConfigPath, project.getFileSystem().readFileSync).config ?? {};
       const parentTsConfigPath = tsConfig.extends && ensureAbsolute(tsConfig.extends, root);
       const parentTsConfig = parentTsConfigPath ? readConfigFile(parentTsConfigPath, project.getFileSystem().readFileSync).config : {};
-      const include = (_d = (_c = (_b2 = options.include) != null ? _b2 : tsConfig.include) != null ? _c : parentTsConfig.include) != null ? _d : "**/*";
-      const exclude = (_g = (_f = (_e = options.exclude) != null ? _e : tsConfig.exclude) != null ? _f : parentTsConfig.exclude) != null ? _g : "node_modules/**";
+      const include = options.include ?? tsConfig.include ?? parentTsConfig.include ?? "**/*";
+      const exclude = options.exclude ?? tsConfig.exclude ?? parentTsConfig.exclude ?? "node_modules/**";
       bundleDebug("read config");
       const includedFileSet = /* @__PURE__ */ new Set();
       if (include && include.length) {
@@ -602,13 +633,18 @@ ${logPrefix} Start generate declaration files...`));
         });
         if (hasJsVue) {
           if (!allowJs) {
-            logger.warn(chalk.yellow(`${chalk.cyan("[vite:dts]")} Some js files are referenced, but you may not enable the 'allowJs' option.`));
+            logger.warn(
+              chalk.yellow(
+                `${chalk.cyan(
+                  "[vite:dts]"
+                )} Some js files are referenced, but you may not enable the 'allowJs' option.`
+              )
+            );
           }
           project.compilerOptions.set({ allowJs: true });
         }
         bundleDebug("collect files");
       }
-      project.resolveSourceFileDependencies();
       bundleDebug("resolve");
       if (!skipDiagnostics) {
         const diagnostics = project.getPreEmitDiagnostics();
@@ -626,10 +662,12 @@ ${logPrefix} Start generate declaration files...`));
         content: sourceFile.getFullText()
       }));
       const service = project.getLanguageService();
-      const outputFiles = project.getSourceFiles().map((sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
-        path: normalizePath2(resolve3(root, outputFile.compilerObject.name)),
-        content: outputFile.getText()
-      }))).flat().concat(dtsOutputFiles);
+      const outputFiles = project.getSourceFiles().map(
+        (sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
+          path: normalizePath2(resolve3(root, outputFile.compilerObject.name)),
+          content: outputFile.getText()
+        }))
+      ).flat().concat(dtsOutputFiles);
       bundleDebug("emit");
       if (!entryRoot) {
         entryRoot = queryPublicPath(outputFiles.map((file) => file.path));
@@ -638,7 +676,6 @@ ${logPrefix} Start generate declaration files...`));
       const wroteFiles = /* @__PURE__ */ new Set();
       const outputDir = outputDirs[0];
       await runParallel(os.cpus().length, outputFiles, async (outputFile) => {
-        var _a3, _b3;
         let filePath = outputFile.path;
         let content = outputFile.content;
         const isMapFile = filePath.endsWith(".map");
@@ -650,16 +687,25 @@ ${logPrefix} Start generate declaration files...`));
           content = transformAliasImport(filePath, content, aliases, aliasesExclude);
           content = staticImport || rollupTypes ? transformDynamicImport(content) : content;
         }
-        filePath = resolve3(outputDir, relative2(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath));
+        filePath = resolve3(
+          outputDir,
+          relative2(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath)
+        );
         if (typeof beforeWriteFile === "function") {
           const result = beforeWriteFile(filePath, content);
+          if (result === false)
+            return;
           if (result && isNativeObj(result)) {
-            filePath = (_a3 = result.filePath) != null ? _a3 : filePath;
-            content = (_b3 = result.content) != null ? _b3 : content;
+            filePath = result.filePath ?? filePath;
+            content = result.content ?? content;
           }
         }
         await fs.mkdir(dirname3(filePath), { recursive: true });
-        await fs.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf-8");
+        await fs.writeFile(
+          filePath,
+          cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content,
+          "utf-8"
+        );
         wroteFiles.add(normalizePath2(filePath));
       });
       bundleDebug("output");
@@ -684,15 +730,18 @@ export default ${libName}
 `;
             }
           }
+          let result;
           if (typeof beforeWriteFile === "function") {
-            const result = beforeWriteFile(typesPath, content);
+            result = beforeWriteFile(typesPath, content);
             if (result && isNativeObj(result)) {
-              typesPath = (_h = result.filePath) != null ? _h : typesPath;
-              content = (_i = result.content) != null ? _i : content;
+              typesPath = result.filePath ?? typesPath;
+              content = result.content ?? content;
             }
           }
-          await fs.writeFile(typesPath, content, "utf-8");
-          wroteFiles.add(normalizePath2(typesPath));
+          if (result !== false) {
+            await fs.writeFile(typesPath, content, "utf-8");
+            wroteFiles.add(normalizePath2(typesPath));
+          }
         }
         bundleDebug("insert index");
         if (rollupTypes) {
@@ -726,11 +775,13 @@ export default ${libName}
         await runParallel(os.cpus().length, Array.from(wroteFiles), async (wroteFile) => {
           const relativePath = relative2(outputDir, wroteFile);
           const content = await fs.readFile(wroteFile, "utf-8");
-          await Promise.all(dirs.map(async (dir) => {
-            const filePath = resolve3(dir, relativePath);
-            await fs.mkdir(dirname3(filePath), { recursive: true });
-            await fs.writeFile(filePath, content, "utf-8");
-          }));
+          await Promise.all(
+            dirs.map(async (dir) => {
+              const filePath = resolve3(dir, relativePath);
+              await fs.mkdir(dirname3(filePath), { recursive: true });
+              await fs.writeFile(filePath, content, "utf-8");
+            })
+          );
         });
       }
       if (typeof afterBuild === "function") {
@@ -738,8 +789,10 @@ export default ${libName}
         isPromise(result) && await result;
       }
       bundleDebug("finish");
-      logger.info(chalk.green(`${logPrefix} Declaration files built in ${Date.now() - startTime}ms.
-`));
+      logger.info(
+        chalk.green(`${logPrefix} Declaration files built in ${Date.now() - startTime}ms.
+`)
+      );
     }
   };
 }

package/package.json

@@ -6,51 +6,52 @@
     "url": "https://github.com/qmhc/vite-plugin-dts/issues"
   },
   "dependencies": {
-    "@microsoft/api-extractor": "^7.20.0",
-    "@rushstack/node-core-library": "^3.45.1",
+    "@microsoft/api-extractor": "^7.31.2",
+    "@rushstack/node-core-library": "^3.52.0",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
-    "fast-glob": "^3.2.11",
-    "fs-extra": "^10.0.1",
-    "ts-morph": "^14.0.0"
+    "fast-glob": "^3.2.12",
+    "fs-extra": "^10.1.0",
+    "ts-morph": "^16.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.3",
-    "@commitlint/config-conventional": "^16.2.1",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^27.4.1",
-    "@typescript-eslint/eslint-plugin": "^5.16.0",
-    "@typescript-eslint/parser": "^5.16.0",
-    "@vitejs/plugin-vue": "^2.2.4",
-    "@vue/eslint-config-standard": "^6.1.0",
-    "@vue/eslint-config-typescript": "^10.0.0",
-    "commitizen": "^4.2.4",
+    "@types/jest": "^29.0.3",
+    "@types/node": "^18.7.23",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
+    "@vitejs/plugin-vue": "^3.1.0",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/eslint-config-typescript": "^11.0.2",
+    "commitizen": "^4.2.5",
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
-    "cz-customizable": "^6.3.0",
+    "cz-customizable": "^7.0.0",
     "enquirer": "^2.3.6",
-    "eslint": "^8.11.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint": "^8.24.0",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-vue": "^8.5.0",
+    "eslint-plugin-promise": "^6.0.1",
+    "eslint-plugin-vue": "^9.5.1",
     "execa": "^5.1.1",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
     "is-ci": "^3.0.1",
-    "jest": "^27.5.1",
-    "lint-staged": "^12.3.7",
-    "minimist": "^1.2.5",
+    "jest": "^29.0.3",
+    "lint-staged": "^13.0.3",
+    "minimist": "^1.2.6",
     "pinst": "^3.0.0",
-    "prettier": "^2.6.0",
+    "prettier": "^2.7.1",
     "pretty-quick": "^3.1.3",
     "rimraf": "^3.0.2",
-    "semver": "^7.3.5",
-    "ts-jest": "^27.1.3",
-    "tsup": "^5.12.1",
-    "typescript": "4.6.2",
-    "vite": "^2.8.6",
-    "vue": "3.2.26"
+    "semver": "^7.3.7",
+    "ts-jest": "^29.0.2",
+    "tsup": "^6.2.3",
+    "typescript": "4.7.4",
+    "vite": "^3.1.3",
+    "vue": "3.2.40"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -70,7 +71,7 @@
   "module": "dist/index.mjs",
   "name": "vite-plugin-dts",
   "peerDependencies": {
-    "vite": ">=2.4.4"
+    "vite": ">=3.0.0"
   },
   "repository": {
     "type": "git",
@@ -85,13 +86,13 @@
     "lint:example": "eslint --fix --ext .js,.jsx,.ts,.tsx,.vue example/{src,components}/**",
     "_postinstall": "is-ci || husky install",
     "postpublish": "pinst --enable",
-    "precommit": "lint-staged -c ./.husky/.lintstagedrc",
+    "precommit": "lint-staged -c ./.husky/.lintstagedrc -q",
     "prepublishOnly": "pinst --disable",
     "prettier": "pretty-quick --staged",
     "release": "node scripts/release.js",
     "test": "jest --runInBand",
-    "test:e2e": "cd example && cross-env DEBUG=\"vite-plugin-dts:bundle\" vite build"
+    "test:e2e": "pnpm -C example build"
   },
   "types": "dist/index.d.ts",
-  "version": "1.5.0"
+  "version": "1.6.0"
 }