vite-plugin-dts 1.6.6 → 1.7.1

package/dist/index.mjs

@@ -17,6 +17,7 @@ import require$$1$1 from 'fs';
 import require$$1 from 'path';
 import require$$5 from 'buffer';
 import require$$7 from 'inspector';
+import { createFilter } from '@rollup/pluginutils';
 import { existsSync, readdirSync, lstatSync, rmdirSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { ExtractorConfig, CompilerState } from '@microsoft/api-extractor';
@@ -176687,6 +176688,10 @@ function requireCompiler() {
       try {
         compiler = _require(_require.resolve("vue/compiler-sfc", { paths: [compileRoot] }));
       } catch (e) {
+        try {
+          compiler = _require(_require.resolve("@vue/compiler-sfc", { paths: [compileRoot] }));
+        } catch (e2) {
+        }
       }
     }
     if (!compiler) {
@@ -176770,7 +176775,7 @@ const _sfc_main = ${classMatch[1]}`;
       content = rewriteDefault(
         script.content,
         "_sfc_main",
-        script.lang === "ts" ? ["typescript"] : void 0
+        script.lang === "ts" ? ["typescript", "decorators-legacy"] : void 0
       );
       content += "\nexport default _sfc_main\n";
       ext = script.lang || "js";
@@ -176865,13 +176870,12 @@ function rollupDeclarationFiles({
 }
 
 const noneExport = "export {};\n";
-const virtualPrefix = "\0";
 const vueRE = /\.vue$/;
-const tsRE = /\.tsx?$/;
-const jsRE = /\.jsx?$/;
+const tsRE = /\.(m|c)?tsx?$/;
+const jsRE = /\.(m|c)?jsx?$/;
 const dtsRE = /\.d\.tsx?$/;
-const tjsRE = /\.(t|j)sx?$/;
-const watchExtensionRE = /\.(vue|(t|j)sx?)$/;
+const tjsRE = /\.(m|c)?(t|j)sx?$/;
+const watchExtensionRE = /\.(vue|(m|c)?(t|j)sx?)$/;
 const fullRelativeRE = /^\.\.?\//;
 const defaultIndex = "index.d.ts";
 const noop = () => {
@@ -176888,9 +176892,10 @@ function dtsPlugin(options = {}) {
     insertTypesEntry = false,
     rollupTypes = false,
     noEmitOnError = false,
-    skipDiagnostics = true,
-    logDiagnostics = false,
+    skipDiagnostics = false,
+    logDiagnostics = void 0,
     copyDtsFiles = true,
+    libFolderPath = void 0,
     afterDiagnostic = noop,
     beforeWriteFile = noop,
     afterBuild = noop
@@ -176907,6 +176912,9 @@ function dtsPlugin(options = {}) {
   let tsConfigPath;
   let outputDirs;
   let isBundle = false;
+  let include;
+  let exclude;
+  let filter;
   const sourceDtsFiles = /* @__PURE__ */ new Set();
   let hasJsVue = false;
   let allowJs = false;
@@ -176937,6 +176945,17 @@ function dtsPlugin(options = {}) {
       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'.
+`
+          )
+        );
+      }
       if (!config.build.lib) {
         logger.warn(
           yellow(
@@ -176951,8 +176970,9 @@ ${cyan(
         indexName = defaultIndex;
       } else {
         const filename = config.build.lib.fileName ?? defaultIndex;
+        const entry = typeof config.build.lib.entry === "string" ? config.build.lib.entry : Object.values(config.build.lib.entry)[0];
         libName = config.build.lib.name || "_default";
-        indexName = typeof filename === "string" ? filename : filename("es");
+        indexName = typeof filename === "string" ? filename : filename("es", entry);
         if (!dtsRE.test(indexName)) {
           indexName = `${tjsRE.test(indexName) ? indexName.replace(tjsRE, "") : indexName}.d.ts`;
         }
@@ -176985,17 +177005,33 @@ ${cyan(
           emitDeclarationOnly: true
         }),
         tsConfigFilePath: tsConfigPath,
-        skipAddingFilesFromTsConfig: true
+        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);
+      filter = createFilter(include, exclude, { resolve: root });
     },
     buildStart(inputOptions) {
-      if (!isBundle && (insertTypesEntry || rollupTypes)) {
-        entries = Array.isArray(inputOptions.input) ? inputOptions.input : Object.values(inputOptions.input);
+      if (Array.isArray(inputOptions.input)) {
+        entries = inputOptions.input.reduce((prev, current) => {
+          prev[basename(current)] = current;
+          return prev;
+        }, {});
+      } else {
+        entries = { ...inputOptions.input };
       }
     },
     transform(code, id) {
-      if (id.startsWith(virtualPrefix)) {
+      if (!filter(id)) {
         return null;
       }
       if (vueRE.test(id)) {
@@ -177006,7 +177042,7 @@ ${cyan(
           project.createSourceFile(`${id}.${ext || "js"}`, content, { overwrite: true });
         }
       } else if (!id.includes(".vue?vue") && (tsRE.test(id) || allowJs && jsRE.test(id))) {
-        project.addSourceFileAtPath(id);
+        project.createSourceFile(id, code, { overwrite: true });
       }
       return null;
     },
@@ -177028,18 +177064,12 @@ ${logPrefix} Start generate declaration files...`));
       isBundle = true;
       sourceDtsFiles.clear();
       const startTime = Date.now();
-      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 : {};
-      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) {
-        const files = await glob(ensureArray(include).map(normalizeGlob), {
+        const files = await glob(include, {
           cwd: root,
           absolute: true,
-          ignore: ensureArray(exclude).map(normalizeGlob)
+          ignore: exclude
         });
         files.forEach((file) => {
           if (dtsRE.test(file)) {
@@ -177070,7 +177100,7 @@ ${logPrefix} Start generate declaration files...`));
       bundleDebug("resolve");
       if (!skipDiagnostics) {
         const diagnostics = project.getPreEmitDiagnostics();
-        if (diagnostics?.length && logDiagnostics) {
+        if (diagnostics?.length) {
           logger.warn(project.formatDiagnosticsWithColorAndContext(diagnostics));
         }
         if (typeof afterDiagnostic === "function") {
@@ -177134,54 +177164,82 @@ ${logPrefix} Start generate declaration files...`));
       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;
-        let typesPath = types ? resolve(root, types) : resolve(outputDir, indexName);
-        if (!fs.existsSync(typesPath)) {
-          const entry = entries[0];
-          const outputIndex = resolve(outputDir, relative(entryRoot, entry.replace(tsRE, ".d.ts")));
-          let filePath = normalizePath(relative(dirname(typesPath), outputIndex));
-          filePath = filePath.replace(dtsRE, "");
-          filePath = fullRelativeRE.test(filePath) ? filePath : `./${filePath}`;
-          let content = `export * from '${filePath}'
+        const multiple = entryNames.length > 1;
+        const typesPath = types ? resolve(root, types) : resolve(outputDir, indexName);
+        for (const name of entryNames) {
+          let filePath = multiple ? resolve(outputDir, name.replace(tsRE, ".d.ts")) : typesPath;
+          if (fs.existsSync(filePath))
+            continue;
+          const index = resolve(
+            outputDir,
+            relative(entryRoot, entries[name].replace(tsRE, ".d.ts"))
+          );
+          let fromPath = normalizePath(relative(dirname(filePath), index));
+          fromPath = fromPath.replace(dtsRE, "");
+          fromPath = fullRelativeRE.test(fromPath) ? fromPath : `./${fromPath}`;
+          let content = `export * from '${fromPath}'
 `;
-          if (fs.existsSync(outputIndex)) {
-            const entryCodes = await fs.readFile(outputIndex, "utf-8");
+          if (fs.existsSync(index)) {
+            const entryCodes = await fs.readFile(index, "utf-8");
             if (entryCodes.includes("export default")) {
-              content += `import ${libName} from '${filePath}'
+              content += `import ${libName} from '${fromPath}'
 export default ${libName}
 `;
             }
           }
           let result;
           if (typeof beforeWriteFile === "function") {
-            result = beforeWriteFile(typesPath, content);
+            result = beforeWriteFile(filePath, content);
             if (result && isNativeObj(result)) {
-              typesPath = result.filePath ?? typesPath;
+              filePath = result.filePath ?? filePath;
               content = result.content ?? content;
             }
           }
           if (result !== false) {
-            await fs.writeFile(typesPath, content, "utf-8");
-            wroteFiles.add(normalizePath(typesPath));
+            await fs.writeFile(filePath, content, "utf-8");
+            wroteFiles.add(normalizePath(filePath));
           }
         }
         bundleDebug("insert index");
         if (rollupTypes) {
           logger.info(green(`${logPrefix} Start rollup declaration files...`));
-          rollupDeclarationFiles({
-            root,
-            tsConfigPath,
-            compilerOptions,
-            outputDir,
-            entryPath: typesPath,
-            fileName: basename(typesPath)
-          });
-          const wroteFile = normalizePath(typesPath);
-          wroteFiles.delete(wroteFile);
+          const rollupFiles = /* @__PURE__ */ new Set();
+          if (multiple) {
+            for (const name of entryNames) {
+              const path = resolve(outputDir, name.replace(tsRE, ".d.ts"));
+              rollupDeclarationFiles({
+                root,
+                tsConfigPath,
+                compilerOptions,
+                outputDir,
+                entryPath: path,
+                fileName: basename(path)
+              });
+              const wroteFile = normalizePath(path);
+              wroteFiles.delete(wroteFile);
+              rollupFiles.add(wroteFile);
+            }
+          } else {
+            rollupDeclarationFiles({
+              root,
+              tsConfigPath,
+              compilerOptions,
+              outputDir,
+              entryPath: typesPath,
+              fileName: basename(typesPath)
+            });
+            const wroteFile = normalizePath(typesPath);
+            wroteFiles.delete(wroteFile);
+            rollupFiles.add(wroteFile);
+          }
           await runParallel(os.cpus().length, Array.from(wroteFiles), (f) => fs.unlink(f));
           removeDirIfEmpty(outputDir);
           wroteFiles.clear();
-          wroteFiles.add(wroteFile);
+          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));

package/package.json

@@ -6,7 +6,8 @@
     "url": "https://github.com/qmhc/vite-plugin-dts/issues"
   },
   "dependencies": {
-    "@microsoft/api-extractor": "^7.33.1",
+    "@microsoft/api-extractor": "^7.33.5",
+    "@rollup/pluginutils": "^5.0.2",
     "@rushstack/node-core-library": "^3.53.2",
     "debug": "^4.3.4",
     "fast-glob": "^3.2.12",
@@ -20,20 +21,20 @@
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
     "@types/minimist": "^1.2.2",
-    "@types/node": "^18.8.5",
+    "@types/node": "^18.11.7",
     "@types/prompts": "^2.4.1",
-    "@types/semver": "^7.3.12",
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
-    "@typescript-eslint/parser": "^5.40.0",
-    "@vitejs/plugin-vue": "^3.1.2",
+    "@types/semver": "^7.3.13",
+    "@typescript-eslint/eslint-plugin": "^5.41.0",
+    "@typescript-eslint/parser": "^5.41.0",
+    "@vitejs/plugin-vue": "^3.2.0",
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^11.0.2",
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.25.0",
+    "eslint": "^8.26.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-vue": "^9.6.0",
     "execa": "^6.1.0",
     "husky": "^8.0.1",
@@ -46,18 +47,19 @@
     "prompts": "^2.4.2",
     "rimraf": "^3.0.2",
     "semver": "^7.3.8",
-    "tsx": "^3.10.1",
+    "tsx": "^3.11.0",
     "typescript": "4.8.4",
-    "unbuild": "^0.8.11",
-    "vite": "^3.1.8",
-    "vitest": "^0.24.1",
-    "vue": "3.2.40"
+    "unbuild": "^0.9.4",
+    "vite": "^3.2.1",
+    "vitest": "^0.24.3",
+    "vue": "3.2.41"
   },
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
   },
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "require": "./dist/index.cjs",
       "import": "./dist/index.mjs"
     }
@@ -101,5 +103,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "1.6.6"
+  "version": "1.7.1"
 }