vite-plugin-dts 3.3.0 → 3.4.0

package/dist/index.cjs

@@ -167,6 +167,14 @@ function tryGetPkgPath(beginPath) {
   }
   return tryGetPkgPath(parentDir);
 }
+function toCapitalCase(value) {
+  value = value.trim().replace(/\s+/g, "-");
+  value = value.replace(/-+(\w)/g, (_, char) => char ? char.toUpperCase() : "");
+  return (value.charAt(0).toLocaleUpperCase() + value.slice(1)).replace(
+    /[^\w]/g,
+    ""
+  );
+}
 
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
@@ -177,7 +185,7 @@ function rollupDeclarationFiles({
   entryPath,
   fileName,
   libFolder,
-  bundledPackages
+  rollupConfig = {}
 }) {
   const configObjectFullPath = node_path.resolve(root, "api-extractor.json");
   if (!dtsRE$1.test(fileName)) {
@@ -185,9 +193,9 @@ function rollupDeclarationFiles({
   }
   const extractorConfig = apiExtractor.ExtractorConfig.prepare({
     configObject: {
+      ...rollupConfig,
       projectFolder: root,
       mainEntryPointFilePath: entryPath,
-      bundledPackages,
       compiler: {
         tsconfigFilePath: configPath,
         overrideTsconfig: {
@@ -196,17 +204,21 @@ function rollupDeclarationFiles({
         }
       },
       apiReport: {
-        enabled: false
+        enabled: false,
+        reportFileName: "<unscopedPackageName>.api.md",
+        ...rollupConfig.apiReport
       },
       docModel: {
-        enabled: false
+        enabled: false,
+        ...rollupConfig.docModel
       },
       dtsRollup: {
         enabled: true,
         publicTrimmedFilePath: node_path.resolve(outDir, fileName)
       },
       tsdocMetadata: {
-        enabled: false
+        enabled: false,
+        ...rollupConfig.tsdocMetadata
       },
       messages: {
         compilerMessageReporting: {
@@ -218,7 +230,8 @@ function rollupDeclarationFiles({
           default: {
             logLevel: "none"
           }
-        }
+        },
+        ...rollupConfig.messages
       }
     },
     configObjectFullPath,
@@ -455,7 +468,6 @@ function dtsPlugin(options = {}) {
     cleanVueFileName = false,
     insertTypesEntry = false,
     rollupTypes = false,
-    bundledPackages = [],
     pathsToAliases = true,
     aliasesExclude = [],
     copyDtsFiles = false,
@@ -491,6 +503,8 @@ function dtsPlugin(options = {}) {
   ]);
   const rootFiles = /* @__PURE__ */ new Set();
   const outputFiles = /* @__PURE__ */ new Map();
+  const rollupConfig = { ...options.rollupConfig || {} };
+  rollupConfig.bundledPackages = rollupConfig.bundledPackages || options.bundledPackages || [];
   return {
     name: "vite:dts",
     apply: "build",
@@ -610,7 +624,7 @@ ${kolorist.cyan(
       const rootNames = Object.values(entries).map((entry) => ensureAbsolute(entry, root)).concat(content?.fileNames.filter(filter) || []).map(normalizePath);
       host = ts__default.createCompilerHost(compilerOptions, true);
       program = vueTsc.createProgram({ host, rootNames, options: compilerOptions });
-      libName = libName || "_default";
+      libName = toCapitalCase(libName || "_default");
       indexName = indexName || defaultIndex;
       const maybeEmitted = (sourceFile) => {
         return !(compilerOptions.noEmitForJsFiles && jsRE.test(sourceFile.fileName)) && !sourceFile.isDeclarationFile && !program.isSourceFileFromExternalLibrary(sourceFile);
@@ -665,7 +679,7 @@ ${kolorist.cyan(
       } else {
         const sourceFile = program.getSourceFile(id);
         if (sourceFile) {
-          for (const outputFile of service.getEmitOutput(sourceFile.fileName, true).outputFiles) {
+          for (const outputFile of service.getEmitOutput(sourceFile.fileName, true, true).outputFiles) {
             outputFiles.set(
               resolve(publicRoot, node_path.relative(outDir, ensureAbsolute(outputFile.name, outDir))),
               outputFile.text
@@ -693,7 +707,7 @@ ${kolorist.cyan(
       }
     },
     async writeBundle() {
-      if (!program || bundled)
+      if (!host || !program || bundled)
         return;
       bundled = true;
       bundleDebug("begin writeBundle");
@@ -743,6 +757,7 @@ ${logPrefix} Start generate declaration files...`));
         }
       }
       bundleDebug("emit output patch");
+      const currentDir = host.getCurrentDirectory();
       await runParallel(
         node_os.cpus().length,
         Array.from(outputFiles.entries()),
@@ -763,7 +778,12 @@ ${logPrefix} Start generate declaration files...`));
             try {
               const sourceMap = JSON.parse(content);
               sourceMap.sources = sourceMap.sources.map((source) => {
-                return normalizePath(node_path.relative(node_path.dirname(path), resolve(baseDir, source)));
+                return normalizePath(
+                  node_path.relative(
+                    node_path.dirname(path),
+                    resolve(currentDir, node_path.relative(publicRoot, baseDir), source)
+                  )
+                );
               });
               content = JSON.stringify(sourceMap);
             } catch (e) {
@@ -832,7 +852,7 @@ export default ${libName}
                 entryPath: path,
                 fileName: node_path.basename(path),
                 libFolder,
-                bundledPackages
+                rollupConfig
               });
               emittedFiles.delete(path);
               rollupFiles.add(path);
@@ -846,7 +866,7 @@ export default ${libName}
               entryPath: typesPath,
               fileName: node_path.basename(typesPath),
               libFolder,
-              bundledPackages
+              rollupConfig
             });
             emittedFiles.delete(typesPath);
             rollupFiles.add(typesPath);

package/dist/index.d.ts

@@ -1,8 +1,10 @@
 import * as vite from 'vite';
 import { LogLevel } from 'vite';
 import ts from 'typescript';
+import { IExtractorConfigPrepareOptions } from '@microsoft/api-extractor';
 
 type MaybePromise<T> = T | Promise<T>;
+type RollupConfig = Omit<IExtractorConfigPrepareOptions['configObject'], 'projectFolder' | 'mainEntryPointFilePath' | 'compiler' | 'dtsRollup'>;
 interface Resolver {
     /**
      * The name of the resolver
@@ -155,6 +157,13 @@ interface PluginOptions {
      * @see https://api-extractor.com/pages/configs/api-extractor_json/#bundledpackages
      */
     bundledPackages?: string[];
+    /**
+     * Override the config of `@microsoft/api-extractor`
+     *
+     * @default null
+     * @see https://api-extractor.com/pages/setup/configure_api_report/
+     */
+    rollupConfig?: RollupConfig;
     /**
      * Whether to copy .d.ts source files to `outDir`
      *

package/dist/index.mjs

@@ -167,6 +167,14 @@ function tryGetPkgPath(beginPath) {
   }
   return tryGetPkgPath(parentDir);
 }
+function toCapitalCase(value) {
+  value = value.trim().replace(/\s+/g, "-");
+  value = value.replace(/-+(\w)/g, (_, char) => char ? char.toUpperCase() : "");
+  return (value.charAt(0).toLocaleUpperCase() + value.slice(1)).replace(
+    /[^\w]/g,
+    ""
+  );
+}
 
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
@@ -177,7 +185,7 @@ function rollupDeclarationFiles({
   entryPath,
   fileName,
   libFolder,
-  bundledPackages
+  rollupConfig = {}
 }) {
   const configObjectFullPath = resolve$1(root, "api-extractor.json");
   if (!dtsRE$1.test(fileName)) {
@@ -185,9 +193,9 @@ function rollupDeclarationFiles({
   }
   const extractorConfig = ExtractorConfig.prepare({
     configObject: {
+      ...rollupConfig,
       projectFolder: root,
       mainEntryPointFilePath: entryPath,
-      bundledPackages,
       compiler: {
         tsconfigFilePath: configPath,
         overrideTsconfig: {
@@ -196,17 +204,21 @@ function rollupDeclarationFiles({
         }
       },
       apiReport: {
-        enabled: false
+        enabled: false,
+        reportFileName: "<unscopedPackageName>.api.md",
+        ...rollupConfig.apiReport
       },
       docModel: {
-        enabled: false
+        enabled: false,
+        ...rollupConfig.docModel
       },
       dtsRollup: {
         enabled: true,
         publicTrimmedFilePath: resolve$1(outDir, fileName)
       },
       tsdocMetadata: {
-        enabled: false
+        enabled: false,
+        ...rollupConfig.tsdocMetadata
       },
       messages: {
         compilerMessageReporting: {
@@ -218,7 +230,8 @@ function rollupDeclarationFiles({
           default: {
             logLevel: "none"
           }
-        }
+        },
+        ...rollupConfig.messages
       }
     },
     configObjectFullPath,
@@ -455,7 +468,6 @@ function dtsPlugin(options = {}) {
     cleanVueFileName = false,
     insertTypesEntry = false,
     rollupTypes = false,
-    bundledPackages = [],
     pathsToAliases = true,
     aliasesExclude = [],
     copyDtsFiles = false,
@@ -491,6 +503,8 @@ function dtsPlugin(options = {}) {
   ]);
   const rootFiles = /* @__PURE__ */ new Set();
   const outputFiles = /* @__PURE__ */ new Map();
+  const rollupConfig = { ...options.rollupConfig || {} };
+  rollupConfig.bundledPackages = rollupConfig.bundledPackages || options.bundledPackages || [];
   return {
     name: "vite:dts",
     apply: "build",
@@ -610,7 +624,7 @@ ${cyan(
       const rootNames = Object.values(entries).map((entry) => ensureAbsolute(entry, root)).concat(content?.fileNames.filter(filter) || []).map(normalizePath);
       host = ts.createCompilerHost(compilerOptions, true);
       program = createProgram({ host, rootNames, options: compilerOptions });
-      libName = libName || "_default";
+      libName = toCapitalCase(libName || "_default");
       indexName = indexName || defaultIndex;
       const maybeEmitted = (sourceFile) => {
         return !(compilerOptions.noEmitForJsFiles && jsRE.test(sourceFile.fileName)) && !sourceFile.isDeclarationFile && !program.isSourceFileFromExternalLibrary(sourceFile);
@@ -665,7 +679,7 @@ ${cyan(
       } else {
         const sourceFile = program.getSourceFile(id);
         if (sourceFile) {
-          for (const outputFile of service.getEmitOutput(sourceFile.fileName, true).outputFiles) {
+          for (const outputFile of service.getEmitOutput(sourceFile.fileName, true, true).outputFiles) {
             outputFiles.set(
               resolve(publicRoot, relative(outDir, ensureAbsolute(outputFile.name, outDir))),
               outputFile.text
@@ -693,7 +707,7 @@ ${cyan(
       }
     },
     async writeBundle() {
-      if (!program || bundled)
+      if (!host || !program || bundled)
         return;
       bundled = true;
       bundleDebug("begin writeBundle");
@@ -743,6 +757,7 @@ ${logPrefix} Start generate declaration files...`));
         }
       }
       bundleDebug("emit output patch");
+      const currentDir = host.getCurrentDirectory();
       await runParallel(
         cpus().length,
         Array.from(outputFiles.entries()),
@@ -763,7 +778,12 @@ ${logPrefix} Start generate declaration files...`));
             try {
               const sourceMap = JSON.parse(content);
               sourceMap.sources = sourceMap.sources.map((source) => {
-                return normalizePath(relative(dirname(path), resolve(baseDir, source)));
+                return normalizePath(
+                  relative(
+                    dirname(path),
+                    resolve(currentDir, relative(publicRoot, baseDir), source)
+                  )
+                );
               });
               content = JSON.stringify(sourceMap);
             } catch (e) {
@@ -832,7 +852,7 @@ export default ${libName}
                 entryPath: path,
                 fileName: basename(path),
                 libFolder,
-                bundledPackages
+                rollupConfig
               });
               emittedFiles.delete(path);
               rollupFiles.add(path);
@@ -846,7 +866,7 @@ export default ${libName}
               entryPath: typesPath,
               fileName: basename(typesPath),
               libFolder,
-              bundledPackages
+              rollupConfig
             });
             emittedFiles.delete(typesPath);
             rollupFiles.add(typesPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",
@@ -53,46 +53,43 @@
     "typescript"
   ],
   "dependencies": {
-    "@microsoft/api-extractor": "^7.36.0",
+    "@microsoft/api-extractor": "^7.36.3",
     "@rollup/pluginutils": "^5.0.2",
-    "@vue/language-core": "^1.8.1",
+    "@vue/language-core": "^1.8.8",
     "debug": "^4.3.4",
     "kolorist": "^1.8.0",
-    "vue-tsc": "^1.8.1"
+    "vue-tsc": "^1.8.8"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.6",
-    "@commitlint/config-conventional": "^17.6.6",
+    "@commitlint/cli": "^17.6.7",
     "@types/debug": "^4.1.8",
     "@types/minimist": "^1.2.2",
-    "@types/node": "^20.3.1",
+    "@types/node": "^20.4.5",
     "@types/prompts": "^2.4.4",
     "@types/semver": "^7.5.0",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
-    "@vexip-ui/commitlint-config": "^0.1.0",
-    "@vexip-ui/eslint-config": "^0.6.3",
+    "@vexip-ui/commitlint-config": "^0.2.0",
+    "@vexip-ui/eslint-config": "^0.8.1",
     "@vexip-ui/prettier-config": "^0.2.0",
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^11.0.3",
     "conventional-changelog-cli": "^3.0.0",
-    "eslint": "^8.43.0",
-    "execa": "^7.1.1",
+    "eslint": "^8.46.0",
+    "execa": "^7.2.0",
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
-    "lint-staged": "^13.2.2",
+    "lint-staged": "^13.2.3",
     "minimist": "^1.2.8",
     "pinst": "^3.0.0",
     "prettier": "^2.8.8",
     "pretty-quick": "^3.1.3",
     "prompts": "^2.4.2",
     "rimraf": "^5.0.1",
-    "semver": "^7.5.3",
+    "semver": "^7.5.4",
     "tsx": "^3.12.7",
     "typescript": "5.0.4",
     "unbuild": "^1.2.1",
-    "vite": "^4.3.9",
-    "vitest": "^0.32.2"
+    "vite": "^4.4.7",
+    "vitest": "^0.33.0"
   },
   "peerDependencies": {
     "typescript": "*",