vite-plugin-dts 1.0.4 → 1.1.1

package/dist/index.mjs

@@ -7,7 +7,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/plugin.ts
-import { resolve as resolve2, dirname as dirname3, relative as relative2 } from "path";
+import { resolve as resolve3, dirname as dirname3, relative as relative2, basename } from "path";
 import fs from "fs-extra";
 import os from "os";
 import chalk from "chalk";
@@ -23,6 +23,7 @@ import { normalizePath } from "vite";
 
 // src/utils.ts
 import { resolve, isAbsolute, dirname, normalize, sep } from "path";
+import { existsSync, readdirSync, lstatSync, rmdirSync } from "fs";
 function isNativeObj(value) {
   return Object.prototype.toString.call(value) === "[object Object]";
 }
@@ -125,6 +126,26 @@ function queryPublicPath(paths) {
   }
   return publicPath.slice(0, -1);
 }
+function removeDirIfEmpty(dir) {
+  if (!existsSync(dir)) {
+    return;
+  }
+  let onlyHasDir = true;
+  for (const file of readdirSync(dir)) {
+    const abs = resolve(dir, file);
+    if (lstatSync(abs).isDirectory()) {
+      if (!removeDirIfEmpty(abs)) {
+        onlyHasDir = false;
+      }
+    } else {
+      onlyHasDir = false;
+    }
+  }
+  if (onlyHasDir) {
+    rmdirSync(dir);
+  }
+  return onlyHasDir;
+}
 
 // src/transform.ts
 var globSuffixRE = /^((?:.*\.[^.]+)|(?:\*+))$/;
@@ -270,33 +291,120 @@ const _sfc_main = ${classMatch[1]}`;
       content += "\nexport default _sfc_main\n";
       ext = scriptSetup.lang || "js";
     } else if (script && script.content) {
-      content = script.content;
+      content = rewriteDefault(script.content, "_sfc_main");
+      content += "\nexport default _sfc_main\n";
       ext = script.lang || "js";
     }
   }
   return { content, ext };
 }
 
+// src/rollup.ts
+import { resolve as resolve2 } from "path";
+import { ExtractorConfig, CompilerState } from "@microsoft/api-extractor";
+import { Collector } from "@microsoft/api-extractor/lib/collector/Collector";
+import { MessageRouter } from "@microsoft/api-extractor/lib/collector/MessageRouter";
+import {
+  DtsRollupGenerator,
+  DtsRollupKind
+} from "@microsoft/api-extractor/lib/generators/DtsRollupGenerator";
+import { PackageJsonLookup } from "@rushstack/node-core-library";
+var dtsRE = /\.d\.tsx?$/;
+function rollupDeclarationFiles({
+  root,
+  tsConfigPath,
+  outputDir,
+  entryPath,
+  fileName
+}) {
+  const configObjectFullPath = resolve2(root, "api-extractor.json");
+  const packageJsonLookup = new PackageJsonLookup();
+  const packageJsonFullPath = packageJsonLookup.tryGetPackageJsonFilePathFor(configObjectFullPath);
+  if (!dtsRE.test(fileName)) {
+    fileName += ".d.ts";
+  }
+  const extractorConfig = ExtractorConfig.prepare({
+    configObject: {
+      projectFolder: root,
+      mainEntryPointFilePath: entryPath,
+      compiler: {
+        tsconfigFilePath: tsConfigPath
+      },
+      apiReport: {
+        enabled: false,
+        reportFileName: "<unscopedPackageName>.api.md"
+      },
+      docModel: {
+        enabled: false
+      },
+      dtsRollup: {
+        enabled: true,
+        publicTrimmedFilePath: resolve2(outputDir, fileName)
+      },
+      tsdocMetadata: {
+        enabled: false
+      },
+      messages: {
+        compilerMessageReporting: {
+          default: {
+            logLevel: "none"
+          }
+        },
+        extractorMessageReporting: {
+          default: {
+            logLevel: "none"
+          }
+        }
+      }
+    },
+    configObjectFullPath,
+    packageJsonFullPath
+  });
+  const compilerState = CompilerState.create(extractorConfig, {
+    localBuild: true,
+    showVerboseMessages: false
+  });
+  const messageRouter = new MessageRouter({
+    workingPackageFolder: root,
+    messageCallback: void 0,
+    messagesConfig: extractorConfig.messages,
+    showVerboseMessages: false,
+    showDiagnostics: false,
+    tsdocConfiguration: extractorConfig.tsdocConfiguration
+  });
+  const collector = new Collector({
+    program: compilerState.program,
+    messageRouter,
+    extractorConfig
+  });
+  collector.analyze();
+  DtsRollupGenerator.writeTypingsFile(collector, extractorConfig.publicTrimmedFilePath, DtsRollupKind.PublicRelease, extractorConfig.newlineKind);
+}
+
 // src/plugin.ts
 var noneExport = "export {};\n";
 var virtualPrefix = "\0";
 var vueRE = /\.vue$/;
 var tsRE = /\.tsx?$/;
 var jsRE = /\.jsx?$/;
-var dtsRE = /\.d\.tsx?$/;
+var dtsRE2 = /\.d\.tsx?$/;
 var tjsRE = /\.(t|j)sx?$/;
 var watchExtensionRE = /\.(vue|(t|j)sx?)$/;
+var fullRelativeRE = /^\.\.?\//;
+var defaultIndex = "index.d.ts";
 var noop = () => {
 };
+var logPrefix = chalk.cyan("[vite:dts]");
 var bundleDebug = debug("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
-  var _a;
+  var _a, _b;
   const {
     tsConfigFilePath = "tsconfig.json",
     cleanVueFileName = false,
     staticImport = false,
     clearPureImport = true,
     insertTypesEntry = false,
+    rollupTypes = false,
     noEmitOnError = false,
     skipDiagnostics = true,
     logDiagnostics = false,
@@ -307,7 +415,9 @@ function dtsPlugin(options = {}) {
   } = options;
   const compilerOptions = (_a = options.compilerOptions) != null ? _a : {};
   let root;
-  let entryRoot;
+  let entryRoot = (_b = options.entryRoot) != null ? _b : "";
+  let libName;
+  let indexName;
   let aliases;
   let entries;
   let logger;
@@ -336,7 +446,7 @@ function dtsPlugin(options = {}) {
       }
     },
     configResolved(config) {
-      var _a2, _b;
+      var _a2, _b2, _c;
       if (isBundle)
         return;
       logger = config.logger;
@@ -344,8 +454,17 @@ function dtsPlugin(options = {}) {
         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;
+        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((_a2 = options.root) != null ? _a2 : "", config.root);
+      root = ensureAbsolute((_b2 = options.root) != null ? _b2 : "", config.root);
       tsConfigPath = ensureAbsolute(tsConfigFilePath, root);
       outputDir = options.outputDir ? ensureAbsolute(options.outputDir, root) : ensureAbsolute(config.build.outDir, root);
       if (!outputDir) {
@@ -369,10 +488,10 @@ ${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check
         tsConfigFilePath: tsConfigPath,
         skipAddingFilesFromTsConfig: true
       });
-      allowJs = (_b = project.getCompilerOptions().allowJs) != null ? _b : false;
+      allowJs = (_c = project.getCompilerOptions().allowJs) != null ? _c : false;
     },
     buildStart(inputOptions) {
-      if (insertTypesEntry) {
+      if (!isBundle && (insertTypesEntry || rollupTypes)) {
         entries = Array.isArray(inputOptions.input) ? inputOptions.input : Object.values(inputOptions.input);
       }
     },
@@ -402,17 +521,17 @@ ${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check
       }
     },
     async closeBundle() {
-      var _a2, _b, _c, _d, _e, _f;
+      var _a2, _b2, _c, _d, _e, _f;
       if (!outputDir || !project || isBundle)
         return;
       logger.info(chalk.green(`
-${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
+${logPrefix} Start generate declaration files...`));
       bundleDebug("start");
       isBundle = true;
       sourceDtsFiles.clear();
       const startTime = Date.now();
       const tsConfig = (_a2 = readConfigFile(tsConfigPath, project.getFileSystem().readFileSync).config) != null ? _a2 : {};
-      const include = (_c = (_b = options.include) != null ? _b : tsConfig.include) != null ? _c : "**/*";
+      const include = (_c = (_b2 = options.include) != null ? _b2 : tsConfig.include) != null ? _c : "**/*";
       const exclude = (_d = options.exclude) != null ? _d : tsConfig.exclude;
       bundleDebug("read config");
       const includedFileSet = /* @__PURE__ */ new Set();
@@ -423,7 +542,7 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
           ignore: ensureArray(exclude != null ? exclude : ["node_modules/**"]).map(normalizeGlob)
         });
         files.forEach((file) => {
-          if (dtsRE.test(file)) {
+          if (dtsRE2.test(file)) {
             if (!copyDtsFiles) {
               return;
             }
@@ -454,21 +573,23 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
         }
         bundleDebug("diagnostics");
       }
+      const dtsOutputFiles = Array.from(sourceDtsFiles).map((sourceFile) => ({
+        path: sourceFile.getFilePath(),
+        content: sourceFile.getFullText()
+      }));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map((sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
         path: outputFile.getFilePath(),
         content: outputFile.getText()
-      }))).flat().concat(Array.from(sourceDtsFiles).map((sourceFile) => ({
-        path: sourceFile.getFilePath(),
-        content: sourceFile.getFullText()
-      })));
+      }))).flat().concat(dtsOutputFiles);
+      bundleDebug("emit");
       if (!entryRoot) {
         entryRoot = queryPublicPath(outputFiles.map((file) => file.path));
       }
       entryRoot = ensureAbsolute(entryRoot, root);
-      bundleDebug("emit");
+      const wroteFiles = /* @__PURE__ */ new Set();
       await runParallel(os.cpus().length, outputFiles, async (outputFile) => {
-        var _a3, _b2;
+        var _a3, _b3;
         let filePath = outputFile.path;
         let content = outputFile.content;
         const isMapFile = filePath.endsWith(".map");
@@ -478,31 +599,34 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
         if (!isMapFile && content && content !== noneExport) {
           content = clearPureImport ? removePureImport(content) : content;
           content = transformAliasImport(filePath, content, aliases);
-          content = staticImport ? transformDynamicImport(content) : content;
+          content = staticImport || rollupTypes ? transformDynamicImport(content) : content;
         }
-        filePath = resolve2(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 && isNativeObj(result)) {
             filePath = (_a3 = result.filePath) != null ? _a3 : filePath;
-            content = (_b2 = result.content) != null ? _b2 : content;
+            content = (_b3 = result.content) != null ? _b3 : content;
           }
         }
         await fs.mkdir(dirname3(filePath), { recursive: true });
         await fs.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf8");
+        wroteFiles.add(normalizePath2(filePath));
       });
       bundleDebug("output");
-      if (insertTypesEntry) {
-        const pkgPath = resolve2(root, "package.json");
+      if (insertTypesEntry || rollupTypes) {
+        const pkgPath = resolve3(root, "package.json");
         const pkg = fs.existsSync(pkgPath) ? JSON.parse(await fs.readFile(pkgPath, "utf-8")) : {};
-        let typesPath = pkg.types ? resolve2(root, pkg.types) : resolve2(outputDir, "index.d.ts");
+        let typesPath = pkg.types ? resolve3(root, pkg.types) : resolve3(outputDir, indexName);
         if (!fs.existsSync(typesPath)) {
-          let content = entries.map((entry) => {
-            let filePath = normalizePath2(relative2(dirname3(typesPath), resolve2(outputDir, relative2(entryRoot, entry))));
-            filePath = filePath.replace(tsRE, "");
-            filePath = /^\.\.?\//.test(filePath) ? filePath : `./${filePath}`;
-            return `export * from '${filePath}'`;
-          }).join("\n") + "\n";
+          const entry = entries[0];
+          let filePath = normalizePath2(relative2(dirname3(typesPath), resolve3(outputDir, relative2(entryRoot, entry))));
+          filePath = filePath.replace(tsRE, "");
+          filePath = fullRelativeRE.test(filePath) ? filePath : `./${filePath}`;
+          let content = `import ${libName} from '${filePath}'
+export default ${libName}
+export * from '${filePath}'
+`;
           if (typeof beforeWriteFile === "function") {
             const result = beforeWriteFile(typesPath, content);
             if (result && isNativeObj(result)) {
@@ -513,13 +637,32 @@ ${chalk.cyan("[vite:dts]")} Start generate declaration files...`));
           await fs.writeFile(typesPath, content, "utf-8");
         }
         bundleDebug("insert index");
+        if (rollupTypes) {
+          logger.info(chalk.green(`${logPrefix} Start rollup declaration files...`));
+          rollupDeclarationFiles({
+            root,
+            tsConfigPath,
+            outputDir,
+            entryPath: typesPath,
+            fileName: basename(typesPath)
+          });
+          wroteFiles.delete(normalizePath2(typesPath));
+          await runParallel(os.cpus().length, Array.from(wroteFiles), (f) => fs.unlink(f));
+          removeDirIfEmpty(outputDir);
+          if (copyDtsFiles) {
+            await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
+              await fs.writeFile(resolve3(outputDir, basename(path)), content, "utf8");
+            });
+          }
+          bundleDebug("rollup");
+        }
       }
       if (typeof afterBuild === "function") {
         const result = afterBuild();
         isPromise(result) && await result;
       }
       bundleDebug("finish");
-      logger.info(chalk.green(`${chalk.cyan("[vite:dts]")} 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,6 +6,8 @@
     "url": "https://github.com/qmhc/vite-plugin-dts/issues"
   },
   "dependencies": {
+    "@microsoft/api-extractor": "^7.20.0",
+    "@rushstack/node-core-library": "^3.45.1",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "fast-glob": "^3.2.11",
@@ -91,5 +93,5 @@
     "test:e2e": "cd example && cross-env DEBUG=\"vite-plugin-dts:bundle\" vite build"
   },
   "types": "dist/index.d.ts",
-  "version": "1.0.4"
+  "version": "1.1.1"
 }