vite-plugin-dts 1.0.4 → 1.1.1

package/dist/index.js

@@ -28,7 +28,7 @@ module.exports = dtsPlugin;
 dtsPlugin['default'] = dtsPlugin;
 
 // src/plugin.ts
-var import_path3 = require("path");
+var import_path4 = require("path");
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_os = __toESM(require("os"));
 var import_chalk = __toESM(require("chalk"));
@@ -44,6 +44,7 @@ var import_vite = require("vite");
 
 // src/utils.ts
 var import_path = require("path");
+var import_fs = require("fs");
 function isNativeObj(value) {
   return Object.prototype.toString.call(value) === "[object Object]";
 }
@@ -146,6 +147,26 @@ function queryPublicPath(paths) {
   }
   return publicPath.slice(0, -1);
 }
+function removeDirIfEmpty(dir) {
+  if (!(0, import_fs.existsSync)(dir)) {
+    return;
+  }
+  let onlyHasDir = true;
+  for (const file of (0, import_fs.readdirSync)(dir)) {
+    const abs = (0, import_path.resolve)(dir, file);
+    if ((0, import_fs.lstatSync)(abs).isDirectory()) {
+      if (!removeDirIfEmpty(abs)) {
+        onlyHasDir = false;
+      }
+    } else {
+      onlyHasDir = false;
+    }
+  }
+  if (onlyHasDir) {
+    (0, import_fs.rmdirSync)(dir);
+  }
+  return onlyHasDir;
+}
 
 // src/transform.ts
 var globSuffixRE = /^((?:.*\.[^.]+)|(?:\*+))$/;
@@ -291,33 +312,117 @@ 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
+var import_path3 = require("path");
+var import_api_extractor = require("@microsoft/api-extractor");
+var import_Collector = require("@microsoft/api-extractor/lib/collector/Collector");
+var import_MessageRouter = require("@microsoft/api-extractor/lib/collector/MessageRouter");
+var import_DtsRollupGenerator = require("@microsoft/api-extractor/lib/generators/DtsRollupGenerator");
+var import_node_core_library = require("@rushstack/node-core-library");
+var dtsRE = /\.d\.tsx?$/;
+function rollupDeclarationFiles({
+  root,
+  tsConfigPath,
+  outputDir,
+  entryPath,
+  fileName
+}) {
+  const configObjectFullPath = (0, import_path3.resolve)(root, "api-extractor.json");
+  const packageJsonLookup = new import_node_core_library.PackageJsonLookup();
+  const packageJsonFullPath = packageJsonLookup.tryGetPackageJsonFilePathFor(configObjectFullPath);
+  if (!dtsRE.test(fileName)) {
+    fileName += ".d.ts";
+  }
+  const extractorConfig = import_api_extractor.ExtractorConfig.prepare({
+    configObject: {
+      projectFolder: root,
+      mainEntryPointFilePath: entryPath,
+      compiler: {
+        tsconfigFilePath: tsConfigPath
+      },
+      apiReport: {
+        enabled: false,
+        reportFileName: "<unscopedPackageName>.api.md"
+      },
+      docModel: {
+        enabled: false
+      },
+      dtsRollup: {
+        enabled: true,
+        publicTrimmedFilePath: (0, import_path3.resolve)(outputDir, fileName)
+      },
+      tsdocMetadata: {
+        enabled: false
+      },
+      messages: {
+        compilerMessageReporting: {
+          default: {
+            logLevel: "none"
+          }
+        },
+        extractorMessageReporting: {
+          default: {
+            logLevel: "none"
+          }
+        }
+      }
+    },
+    configObjectFullPath,
+    packageJsonFullPath
+  });
+  const compilerState = import_api_extractor.CompilerState.create(extractorConfig, {
+    localBuild: true,
+    showVerboseMessages: false
+  });
+  const messageRouter = new import_MessageRouter.MessageRouter({
+    workingPackageFolder: root,
+    messageCallback: void 0,
+    messagesConfig: extractorConfig.messages,
+    showVerboseMessages: false,
+    showDiagnostics: false,
+    tsdocConfiguration: extractorConfig.tsdocConfiguration
+  });
+  const collector = new import_Collector.Collector({
+    program: compilerState.program,
+    messageRouter,
+    extractorConfig
+  });
+  collector.analyze();
+  import_DtsRollupGenerator.DtsRollupGenerator.writeTypingsFile(collector, extractorConfig.publicTrimmedFilePath, import_DtsRollupGenerator.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 = import_chalk.default.cyan("[vite:dts]");
 var bundleDebug = (0, import_debug.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,
@@ -328,7 +433,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;
@@ -357,7 +464,7 @@ function dtsPlugin(options = {}) {
       }
     },
     configResolved(config) {
-      var _a2, _b;
+      var _a2, _b2, _c;
       if (isBundle)
         return;
       logger = config.logger;
@@ -365,8 +472,17 @@ function dtsPlugin(options = {}) {
         logger.warn(import_chalk.default.yellow(`
 ${import_chalk.default.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) {
@@ -390,10 +506,10 @@ ${import_chalk.default.cyan("[vite:dts]")} Can not resolve declaration directory
         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);
       }
     },
@@ -423,17 +539,17 @@ ${import_chalk.default.cyan("[vite:dts]")} Can not resolve declaration directory
       }
     },
     async closeBundle() {
-      var _a2, _b, _c, _d, _e, _f;
+      var _a2, _b2, _c, _d, _e, _f;
       if (!outputDir || !project || isBundle)
         return;
       logger.info(import_chalk.default.green(`
-${import_chalk.default.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 = (0, import_typescript.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();
@@ -444,7 +560,7 @@ ${import_chalk.default.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;
             }
@@ -475,21 +591,23 @@ ${import_chalk.default.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(import_os.default.cpus().length, outputFiles, async (outputFile) => {
-        var _a3, _b2;
+        var _a3, _b3;
         let filePath = outputFile.path;
         let content = outputFile.content;
         const isMapFile = filePath.endsWith(".map");
@@ -499,31 +617,34 @@ ${import_chalk.default.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 = (0, import_path3.resolve)(outputDir, (0, import_path3.relative)(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath));
+        filePath = (0, import_path4.resolve)(outputDir, (0, import_path4.relative)(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 import_fs_extra.default.mkdir((0, import_path3.dirname)(filePath), { recursive: true });
+        await import_fs_extra.default.mkdir((0, import_path4.dirname)(filePath), { recursive: true });
         await import_fs_extra.default.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf8");
+        wroteFiles.add((0, import_vite2.normalizePath)(filePath));
       });
       bundleDebug("output");
-      if (insertTypesEntry) {
-        const pkgPath = (0, import_path3.resolve)(root, "package.json");
+      if (insertTypesEntry || rollupTypes) {
+        const pkgPath = (0, import_path4.resolve)(root, "package.json");
         const pkg = import_fs_extra.default.existsSync(pkgPath) ? JSON.parse(await import_fs_extra.default.readFile(pkgPath, "utf-8")) : {};
-        let typesPath = pkg.types ? (0, import_path3.resolve)(root, pkg.types) : (0, import_path3.resolve)(outputDir, "index.d.ts");
+        let typesPath = pkg.types ? (0, import_path4.resolve)(root, pkg.types) : (0, import_path4.resolve)(outputDir, indexName);
         if (!import_fs_extra.default.existsSync(typesPath)) {
-          let content = entries.map((entry) => {
-            let filePath = (0, import_vite2.normalizePath)((0, import_path3.relative)((0, import_path3.dirname)(typesPath), (0, import_path3.resolve)(outputDir, (0, import_path3.relative)(entryRoot, entry))));
-            filePath = filePath.replace(tsRE, "");
-            filePath = /^\.\.?\//.test(filePath) ? filePath : `./${filePath}`;
-            return `export * from '${filePath}'`;
-          }).join("\n") + "\n";
+          const entry = entries[0];
+          let filePath = (0, import_vite2.normalizePath)((0, import_path4.relative)((0, import_path4.dirname)(typesPath), (0, import_path4.resolve)(outputDir, (0, import_path4.relative)(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)) {
@@ -534,13 +655,32 @@ ${import_chalk.default.cyan("[vite:dts]")} Start generate declaration files...`)
           await import_fs_extra.default.writeFile(typesPath, content, "utf-8");
         }
         bundleDebug("insert index");
+        if (rollupTypes) {
+          logger.info(import_chalk.default.green(`${logPrefix} Start rollup declaration files...`));
+          rollupDeclarationFiles({
+            root,
+            tsConfigPath,
+            outputDir,
+            entryPath: typesPath,
+            fileName: (0, import_path4.basename)(typesPath)
+          });
+          wroteFiles.delete((0, import_vite2.normalizePath)(typesPath));
+          await runParallel(import_os.default.cpus().length, Array.from(wroteFiles), (f) => import_fs_extra.default.unlink(f));
+          removeDirIfEmpty(outputDir);
+          if (copyDtsFiles) {
+            await runParallel(import_os.default.cpus().length, dtsOutputFiles, async ({ path, content }) => {
+              await import_fs_extra.default.writeFile((0, import_path4.resolve)(outputDir, (0, import_path4.basename)(path)), content, "utf8");
+            });
+          }
+          bundleDebug("rollup");
+        }
       }
       if (typeof afterBuild === "function") {
         const result = afterBuild();
         isPromise(result) && await result;
       }
       bundleDebug("finish");
-      logger.info(import_chalk.default.green(`${import_chalk.default.cyan("[vite:dts]")} Declaration files built in ${Date.now() - startTime}ms.
+      logger.info(import_chalk.default.green(`${logPrefix} Declaration files built in ${Date.now() - startTime}ms.
 `));
     }
   };