vite-plugin-dts 3.2.0 → 3.3.0

package/README.md

@@ -280,20 +280,21 @@ export interface PluginOptions {
    *
    * This allows you to transform the path or content
    *
-   * The file will be skipped when the return value `false`
+   * The file will be skipped when the return value `false` or `Promise<false>`
    *
    * @default () => {}
    */
   beforeWriteFile?: (
     filePath: string,
     content: string
-  ) =>
-  | void
-  | false
-  | {
-    filePath?: string,
-    content?: string
-  },
+  ) => MaybePromise<
+    | void
+    | false
+    | {
+      filePath?: string,
+      content?: string
+    }
+  >,
 
   /**
    * Hook called after all declaration files are written

package/README.zh-CN.md

@@ -280,20 +280,21 @@ export interface PluginOptions {
    *
    * 可以在钩子里转换文件路径和文件内容
    *
-   * 当返回 `false` 时会跳过该文件
+   * 当返回 `false` 或 `Promise<false>` 时会跳过该文件
    *
    * @default () => {}
    */
   beforeWriteFile?: (
     filePath: string,
     content: string
-  ) =>
-  | void
-  | false
-  | {
-    filePath?: string,
-    content?: string
-  },
+  ) => MaybePromise<
+    | void
+    | false
+    | {
+      filePath?: string,
+      content?: string
+    }
+  >,
 
   /**
    * 在所有类型文件被写入后调用的钩子

package/dist/index.cjs

@@ -11,17 +11,163 @@ const vueTsc = require('vue-tsc');
 const debug = require('debug');
 const kolorist = require('kolorist');
 const apiExtractor = require('@microsoft/api-extractor');
-const Collector_js = require('@microsoft/api-extractor/lib/collector/Collector.js');
-const MessageRouter_js = require('@microsoft/api-extractor/lib/collector/MessageRouter.js');
-const SourceMapper_js = require('@microsoft/api-extractor/lib/collector/SourceMapper.js');
-const DtsRollupGenerator_js = require('@microsoft/api-extractor/lib/generators/DtsRollupGenerator.js');
-const nodeCoreLibrary = require('@rushstack/node-core-library');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const ts__default = /*#__PURE__*/_interopDefaultCompat(ts);
 const debug__default = /*#__PURE__*/_interopDefaultCompat(debug);
 
+const windowsSlashRE = /\\+/g;
+function slash(p) {
+  return p.replace(windowsSlashRE, "/");
+}
+function normalizePath(id) {
+  return node_path.posix.normalize(slash(id));
+}
+function resolve(...paths) {
+  return normalizePath(node_path.resolve(...paths));
+}
+function isNativeObj(value) {
+  return Object.prototype.toString.call(value) === "[object Object]";
+}
+function isRegExp(value) {
+  return Object.prototype.toString.call(value) === "[object RegExp]";
+}
+function isPromise(value) {
+  return !!value && (typeof value === "function" || typeof value === "object") && typeof value.then === "function";
+}
+async function wrapPromise(maybePromise) {
+  return isPromise(maybePromise) ? await maybePromise : maybePromise;
+}
+function ensureAbsolute(path, root) {
+  return normalizePath(path ? node_path.isAbsolute(path) ? path : resolve(root, path) : root);
+}
+function ensureArray(value) {
+  return Array.isArray(value) ? value : value ? [value] : [];
+}
+async function runParallel(maxConcurrency, source, iteratorFn) {
+  const ret = [];
+  const executing = [];
+  for (const item of source) {
+    const p = Promise.resolve().then(() => iteratorFn(item, source));
+    ret.push(p);
+    if (maxConcurrency <= source.length) {
+      const e = p.then(() => executing.splice(executing.indexOf(e), 1));
+      executing.push(e);
+      if (executing.length >= maxConcurrency) {
+        await Promise.race(executing);
+      }
+    }
+  }
+  return Promise.all(ret);
+}
+const speRE = /[\\/]/;
+function queryPublicPath(paths) {
+  if (paths.length === 0) {
+    return "";
+  } else if (paths.length === 1) {
+    return node_path.dirname(paths[0]);
+  }
+  let publicPath = node_path.normalize(node_path.dirname(paths[0])) + node_path.sep;
+  let publicUnits = publicPath.split(speRE);
+  let index = publicUnits.length - 1;
+  for (const path of paths.slice(1)) {
+    if (!index) {
+      return publicPath;
+    }
+    const dirPath = node_path.normalize(node_path.dirname(path)) + node_path.sep;
+    if (dirPath.startsWith(publicPath)) {
+      continue;
+    }
+    const units = dirPath.split(speRE);
+    if (units.length < index) {
+      publicPath = dirPath;
+      publicUnits = units;
+      continue;
+    }
+    for (let i = 0; i <= index; ++i) {
+      if (publicUnits[i] !== units[i]) {
+        if (!i) {
+          return "";
+        }
+        index = i - 1;
+        publicUnits = publicUnits.slice(0, index + 1);
+        publicPath = publicUnits.join(node_path.sep) + node_path.sep;
+        break;
+      }
+    }
+  }
+  return publicPath.slice(0, -1);
+}
+function removeDirIfEmpty(dir) {
+  if (!node_fs.existsSync(dir)) {
+    return;
+  }
+  let onlyHasDir = true;
+  for (const file of node_fs.readdirSync(dir)) {
+    const abs = resolve(dir, file);
+    if (node_fs.lstatSync(abs).isDirectory()) {
+      if (!removeDirIfEmpty(abs)) {
+        onlyHasDir = false;
+      }
+    } else {
+      onlyHasDir = false;
+    }
+  }
+  if (onlyHasDir) {
+    node_fs.rmdirSync(dir);
+  }
+  return onlyHasDir;
+}
+const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
+function base64Encode(number) {
+  if (number >= 0 && number < BASE64_ALPHABET.length) {
+    return BASE64_ALPHABET[number];
+  }
+  throw new TypeError("Base64 integer must be between 0 and 63: " + number);
+}
+const VLQ_BASE_SHIFT = 5;
+const VLQ_BASE = 1 << VLQ_BASE_SHIFT;
+const VLQ_BASE_MASK = VLQ_BASE - 1;
+const VLQ_CONTINUATION_BIT = VLQ_BASE;
+function toVLQSigned(number) {
+  return number < 0 ? (-number << 1) + 1 : (number << 1) + 0;
+}
+function base64VLQEncode(numbers) {
+  let encoded = "";
+  for (const number of numbers) {
+    let vlq = toVLQSigned(number);
+    let digit;
+    do {
+      digit = vlq & VLQ_BASE_MASK;
+      vlq >>>= VLQ_BASE_SHIFT;
+      if (vlq > 0) {
+        digit |= VLQ_CONTINUATION_BIT;
+      }
+      encoded += base64Encode(digit);
+    } while (vlq > 0);
+  }
+  return encoded;
+}
+const pkgPathCache = /* @__PURE__ */ new Map();
+function tryGetPkgPath(beginPath) {
+  beginPath = normalizePath(beginPath);
+  if (pkgPathCache.has(beginPath)) {
+    return pkgPathCache.get(beginPath);
+  }
+  const pkgPath = resolve(beginPath, "package.json");
+  if (node_fs.existsSync(pkgPath)) {
+    pkgPathCache.set(beginPath, pkgPath);
+    return pkgPath;
+  }
+  const parentDir = normalizePath(node_path.dirname(beginPath));
+  if (!parentDir || parentDir === beginPath) {
+    pkgPathCache.set(beginPath, void 0);
+    return;
+  }
+  return tryGetPkgPath(parentDir);
+}
+
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
   root,
@@ -34,8 +180,6 @@ function rollupDeclarationFiles({
   bundledPackages
 }) {
   const configObjectFullPath = node_path.resolve(root, "api-extractor.json");
-  const packageJsonLookup = new nodeCoreLibrary.PackageJsonLookup();
-  const packageJsonFullPath = packageJsonLookup.tryGetPackageJsonFilePathFor(configObjectFullPath);
   if (!dtsRE$1.test(fileName)) {
     fileName += ".d.ts";
   }
@@ -48,15 +192,11 @@ function rollupDeclarationFiles({
         tsconfigFilePath: configPath,
         overrideTsconfig: {
           $schema: "http://json.schemastore.org/tsconfig",
-          compilerOptions: {
-            ...compilerOptions,
-            target: "ESNext"
-          }
+          compilerOptions
         }
       },
       apiReport: {
-        enabled: false,
-        reportFileName: "<unscopedPackageName>.api.md"
+        enabled: false
       },
       docModel: {
         enabled: false
@@ -82,36 +222,15 @@ function rollupDeclarationFiles({
       }
     },
     configObjectFullPath,
-    packageJsonFullPath
+    packageJsonFullPath: tryGetPkgPath(configObjectFullPath)
   });
-  const compilerState = apiExtractor.CompilerState.create(extractorConfig, {
+  const result = apiExtractor.Extractor.invoke(extractorConfig, {
     localBuild: false,
     showVerboseMessages: false,
-    typescriptCompilerFolder: libFolder ? node_path.resolve(libFolder) : void 0
-  });
-  const sourceMapper = new SourceMapper_js.SourceMapper();
-  const messageRouter = new MessageRouter_js.MessageRouter({
-    workingPackageFolder: root,
-    messageCallback: void 0,
-    messagesConfig: extractorConfig.messages,
-    showVerboseMessages: false,
     showDiagnostics: false,
-    tsdocConfiguration: extractorConfig.tsdocConfiguration,
-    sourceMapper
-  });
-  const collector = new Collector_js.Collector({
-    program: compilerState.program,
-    messageRouter,
-    extractorConfig,
-    sourceMapper
+    typescriptCompilerFolder: libFolder ? node_path.resolve(libFolder) : void 0
   });
-  collector.analyze();
-  DtsRollupGenerator_js.DtsRollupGenerator.writeTypingsFile(
-    collector,
-    extractorConfig.publicTrimmedFilePath,
-    DtsRollupGenerator_js.DtsRollupKind.PublicRelease,
-    extractorConfig.newlineKind
-  );
+  return result.succeeded;
 }
 
 const jsonRE = /\.json$/;
@@ -163,16 +282,36 @@ function VueResolver() {
     supports(id) {
       return vueRE.test(id);
     },
-    transform({ id, program, service }) {
+    transform({ id, code, program, service }) {
       const sourceFile = program.getSourceFile(id) || program.getSourceFile(id + ".ts") || program.getSourceFile(id + ".js") || program.getSourceFile(id + ".tsx") || program.getSourceFile(id + ".jsx");
       if (!sourceFile)
         return [];
-      return service.getEmitOutput(sourceFile.fileName, true).outputFiles.map((file) => {
+      const outputs = service.getEmitOutput(sourceFile.fileName, true).outputFiles.map((file) => {
         return {
           path: file.name,
           content: file.text
         };
       });
+      if (!program.getCompilerOptions().declarationMap)
+        return outputs;
+      const [beforeScript] = code.split(/\s*<script.*>/);
+      const beforeLines = beforeScript.split("\n").length;
+      for (const output of outputs) {
+        if (output.path.endsWith(".map")) {
+          try {
+            const sourceMap = JSON.parse(output.content);
+            sourceMap.sources = sourceMap.sources.map(
+              (source) => source.replace(/\.vue\.ts$/, ".vue")
+            );
+            if (beforeScript && beforeScript !== code && beforeLines) {
+              sourceMap.mappings = `${base64VLQEncode([0, 0, beforeLines, 0])};${sourceMap.mappings}`;
+            }
+            output.content = JSON.stringify(sourceMap);
+          } catch (e) {
+          }
+        }
+      }
+      return outputs;
     }
   };
 }
@@ -185,106 +324,6 @@ function parseResolvers(resolvers) {
   return Array.from(nameMap.values());
 }
 
-const windowsSlashRE = /\\+/g;
-function slash(p) {
-  return p.replace(windowsSlashRE, "/");
-}
-function normalizePath(id) {
-  return node_path.posix.normalize(slash(id));
-}
-function resolve(...paths) {
-  return normalizePath(node_path.resolve(...paths));
-}
-function isNativeObj(value) {
-  return Object.prototype.toString.call(value) === "[object Object]";
-}
-function isRegExp(value) {
-  return Object.prototype.toString.call(value) === "[object RegExp]";
-}
-function isPromise(value) {
-  return !!value && (typeof value === "function" || typeof value === "object") && typeof value.then === "function";
-}
-function ensureAbsolute(path, root) {
-  return normalizePath(path ? node_path.isAbsolute(path) ? path : resolve(root, path) : root);
-}
-function ensureArray(value) {
-  return Array.isArray(value) ? value : value ? [value] : [];
-}
-async function runParallel(maxConcurrency, source, iteratorFn) {
-  const ret = [];
-  const executing = [];
-  for (const item of source) {
-    const p = Promise.resolve().then(() => iteratorFn(item, source));
-    ret.push(p);
-    if (maxConcurrency <= source.length) {
-      const e = p.then(() => executing.splice(executing.indexOf(e), 1));
-      executing.push(e);
-      if (executing.length >= maxConcurrency) {
-        await Promise.race(executing);
-      }
-    }
-  }
-  return Promise.all(ret);
-}
-const speRE = /[\\/]/;
-function queryPublicPath(paths) {
-  if (paths.length === 0) {
-    return "";
-  } else if (paths.length === 1) {
-    return node_path.dirname(paths[0]);
-  }
-  let publicPath = node_path.normalize(node_path.dirname(paths[0])) + node_path.sep;
-  let publicUnits = publicPath.split(speRE);
-  let index = publicUnits.length - 1;
-  for (const path of paths.slice(1)) {
-    if (!index) {
-      return publicPath;
-    }
-    const dirPath = node_path.normalize(node_path.dirname(path)) + node_path.sep;
-    if (dirPath.startsWith(publicPath)) {
-      continue;
-    }
-    const units = dirPath.split(speRE);
-    if (units.length < index) {
-      publicPath = dirPath;
-      publicUnits = units;
-      continue;
-    }
-    for (let i = 0; i <= index; ++i) {
-      if (publicUnits[i] !== units[i]) {
-        if (!i) {
-          return "";
-        }
-        index = i - 1;
-        publicUnits = publicUnits.slice(0, index + 1);
-        publicPath = publicUnits.join(node_path.sep) + node_path.sep;
-        break;
-      }
-    }
-  }
-  return publicPath.slice(0, -1);
-}
-function removeDirIfEmpty(dir) {
-  if (!node_fs.existsSync(dir)) {
-    return;
-  }
-  let onlyHasDir = true;
-  for (const file of node_fs.readdirSync(dir)) {
-    const abs = resolve(dir, file);
-    if (node_fs.lstatSync(abs).isDirectory()) {
-      if (!removeDirIfEmpty(abs)) {
-        onlyHasDir = false;
-      }
-    } else {
-      onlyHasDir = false;
-    }
-  }
-  if (onlyHasDir) {
-    node_fs.rmdirSync(dir);
-  }
-  return onlyHasDir;
-}
-
 const globSuffixRE = /^((?:.*\.[^.]+)|(?:\*+))$/;
 function normalizeGlob(path) {
   if (/[\\/]$/.test(path)) {
@@ -587,8 +626,7 @@ ${kolorist.cyan(
         logger.error(ts__default.formatDiagnostics(diagnostics, host));
       }
       if (typeof afterDiagnostic === "function") {
-        const result = afterDiagnostic(diagnostics);
-        isPromise(result) && await result;
+        await wrapPromise(afterDiagnostic(diagnostics));
       }
       rootNames.forEach((file) => {
         this.addWatchFile(file);
@@ -599,13 +637,14 @@ ${kolorist.cyan(
     },
     async transform(code, id) {
       let resolver;
-      id = normalizePath(id).split("?")[0];
+      id = normalizePath(id);
       if (!host || !program || !filter(id) || !(resolver = resolvers.find((r) => r.supports(id))) && !tjsRE.test(id)) {
         return;
       }
       const startTime = Date.now();
       const outDir = outDirs[0];
       const service = program.__vue.languageService;
+      id = id.split("?")[0];
       rootFiles.delete(id);
       if (resolver) {
         const result = await resolver.transform({
@@ -640,11 +679,12 @@ ${kolorist.cyan(
       timeRecord += Date.now() - startTime;
     },
     watchChange(id) {
-      id = normalizePath(id).split("?")[0];
+      id = normalizePath(id);
       if (!host || !program || !filter(id) || !resolvers.find((r) => r.supports(id)) && !tjsRE.test(id)) {
         return;
       }
-      const sourceFile = host.getSourceFile(normalizePath(id), ts__default.ScriptTarget.ESNext);
+      id = id.split("?")[0];
+      const sourceFile = host.getSourceFile(id, ts__default.ScriptTarget.ESNext);
       if (sourceFile) {
         rootFiles.add(sourceFile.fileName);
         program.__vue.projectVersion++;
@@ -662,7 +702,16 @@ ${logPrefix} Start generate declaration files...`));
       const startTime = Date.now();
       const outDir = outDirs[0];
       const emittedFiles = /* @__PURE__ */ new Map();
-      const writeOutput = async (path, content, outDir2) => {
+      const writeOutput = async (path, content, outDir2, record = true) => {
+        if (typeof beforeWriteFile === "function") {
+          const result = await wrapPromise(beforeWriteFile(path, content));
+          if (result === false)
+            return;
+          if (result) {
+            path = result.filePath || path;
+            content = result.content ?? content;
+          }
+        }
         path = normalizePath(path);
         const dir = normalizePath(node_path.dirname(path));
         if (strictOutput && !dir.startsWith(normalizePath(outDir2))) {
@@ -673,7 +722,7 @@ ${logPrefix} Start generate declaration files...`));
           await promises.mkdir(dir, { recursive: true });
         }
         await promises.writeFile(path, content, "utf-8");
-        emittedFiles.set(path, content);
+        record && emittedFiles.set(path, content);
       };
       const service = program.__vue.languageService;
       const sourceFiles = program.getSourceFiles();
@@ -699,6 +748,7 @@ ${logPrefix} Start generate declaration files...`));
         Array.from(outputFiles.entries()),
         async ([path, content]) => {
           const isMapFile = path.endsWith(".map");
+          const baseDir = node_path.dirname(path);
           if (!isMapFile && content) {
             content = clearPureImport ? removePureImport(content) : content;
             content = transformAliasImport(path, content, aliases, aliasesExclude);
@@ -709,13 +759,15 @@ ${logPrefix} Start generate declaration files...`));
             node_path.relative(entryRoot, cleanVueFileName ? path.replace(".vue.d.ts", ".d.ts") : path)
           );
           content = cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content;
-          if (typeof beforeWriteFile === "function") {
-            const result = beforeWriteFile(path, content);
-            if (result === false)
-              return;
-            if (result && isNativeObj(result)) {
-              path = result.filePath || path;
-              content = result.content ?? content;
+          if (isMapFile) {
+            try {
+              const sourceMap = JSON.parse(content);
+              sourceMap.sources = sourceMap.sources.map((source) => {
+                return normalizePath(node_path.relative(node_path.dirname(path), resolve(baseDir, source)));
+              });
+              content = JSON.stringify(sourceMap);
+            } catch (e) {
+              logger.warn(`${logPrefix} ${kolorist.yellow("Processing source map fail:")} ${path}`);
             }
           }
           await writeOutput(path, content, outDir);
@@ -723,14 +775,18 @@ ${logPrefix} Start generate declaration files...`));
       );
       bundleDebug("write output");
       if (insertTypesEntry || rollupTypes) {
-        const pkgPath = resolve(root, "package.json");
-        const pkg = node_fs.existsSync(pkgPath) ? JSON.parse(await promises.readFile(pkgPath, "utf-8")) : {};
+        const pkgPath = tryGetPkgPath(root);
+        let pkg;
+        try {
+          pkg = pkgPath && node_fs.existsSync(pkgPath) ? JSON.parse(await promises.readFile(pkgPath, "utf-8")) : {};
+        } catch (e) {
+        }
         const entryNames = Object.keys(entries);
         const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings || (pkg.exports?.["."] || pkg.exports?.["./"])?.types;
         const multiple = entryNames.length > 1;
         const typesPath = types ? resolve(root, types) : resolve(outDir, indexName);
         for (const name of entryNames) {
-          let path = multiple ? resolve(outDir, `${name.replace(tsRE, "")}.d.ts`) : typesPath;
+          const path = multiple ? resolve(outDir, `${name.replace(tsRE, "")}.d.ts`) : typesPath;
           if (node_fs.existsSync(path))
             continue;
           const index = resolve(
@@ -750,15 +806,6 @@ export default ${libName}
 `;
             }
           }
-          if (typeof beforeWriteFile === "function") {
-            const result = beforeWriteFile(path, content);
-            if (result === false)
-              return;
-            if (result && isNativeObj(result)) {
-              path = result.filePath ?? path;
-              content = result.content ?? content;
-            }
-          }
           await writeOutput(path, content, outDir);
         }
         bundleDebug("insert index");
@@ -818,15 +865,29 @@ export default ${libName}
         await runParallel(node_os.cpus().length, Array.from(emittedFiles), async ([wroteFile, content]) => {
           const relativePath = node_path.relative(outDir, wroteFile);
           await Promise.all(
-            extraOutDirs.map(async (outDir2) => {
-              await writeOutput(resolve(outDir2, relativePath), content, outDir2);
+            extraOutDirs.map(async (targetOutDir) => {
+              const path = resolve(targetOutDir, relativePath);
+              if (wroteFile.endsWith(".map")) {
+                const relativeOutDir = node_path.relative(outDir, targetOutDir);
+                if (relativeOutDir) {
+                  try {
+                    const sourceMap = JSON.parse(content);
+                    sourceMap.sources = sourceMap.sources.map((source) => {
+                      return normalizePath(node_path.relative(relativeOutDir, source));
+                    });
+                    content = JSON.stringify(sourceMap);
+                  } catch (e) {
+                    logger.warn(`${logPrefix} ${kolorist.yellow("Processing source map fail:")} ${path}`);
+                  }
+                }
+              }
+              await writeOutput(path, content, targetOutDir, false);
             })
           );
         });
       }
       if (typeof afterBuild === "function") {
-        const result = afterBuild();
-        isPromise(result) && await result;
+        await wrapPromise(afterBuild());
       }
       bundleDebug("finish");
       logger.info(

package/dist/index.d.ts

@@ -181,14 +181,14 @@ interface PluginOptions {
      *
      * This allows you to transform the path or content
      *
-     * The file will be skipped when the return value `false`
+     * The file will be skipped when the return value `false` or `Promise<false>`
      *
      * @default () => {}
      */
-    beforeWriteFile?: (filePath: string, content: string) => void | false | {
+    beforeWriteFile?: (filePath: string, content: string) => MaybePromise<void | false | {
         filePath?: string;
         content?: string;
-    };
+    }>;
     /**
      * Hook called after all declaration files are written
      *

package/dist/index.mjs

@@ -5,7 +5,7 @@ import __cjs_mod__ from 'module';
 const __filename = __cjs_url__.fileURLToPath(import.meta.url);
 const __dirname = __cjs_path__.dirname(__filename);
 const require = __cjs_mod__.createRequire(import.meta.url);
-import { resolve as resolve$1, relative, posix, isAbsolute, dirname, normalize, sep, basename } from 'node:path';
+import { posix, resolve as resolve$1, isAbsolute, dirname, normalize, sep, relative, basename } from 'node:path';
 import { existsSync, readdirSync, lstatSync, rmdirSync } from 'node:fs';
 import { readFile, mkdir, writeFile, unlink } from 'node:fs/promises';
 import { cpus } from 'node:os';
@@ -15,12 +15,158 @@ import { createFilter } from '@rollup/pluginutils';
 import { createProgram } from 'vue-tsc';
 import debug from 'debug';
 import { cyan, yellow, green } from 'kolorist';
-import { ExtractorConfig, CompilerState } from '@microsoft/api-extractor';
-import { Collector } from '@microsoft/api-extractor/lib/collector/Collector.js';
-import { MessageRouter } from '@microsoft/api-extractor/lib/collector/MessageRouter.js';
-import { SourceMapper } from '@microsoft/api-extractor/lib/collector/SourceMapper.js';
-import { DtsRollupGenerator, DtsRollupKind } from '@microsoft/api-extractor/lib/generators/DtsRollupGenerator.js';
-import { PackageJsonLookup } from '@rushstack/node-core-library';
+import { ExtractorConfig, Extractor } from '@microsoft/api-extractor';
+
+const windowsSlashRE = /\\+/g;
+function slash(p) {
+  return p.replace(windowsSlashRE, "/");
+}
+function normalizePath(id) {
+  return posix.normalize(slash(id));
+}
+function resolve(...paths) {
+  return normalizePath(resolve$1(...paths));
+}
+function isNativeObj(value) {
+  return Object.prototype.toString.call(value) === "[object Object]";
+}
+function isRegExp(value) {
+  return Object.prototype.toString.call(value) === "[object RegExp]";
+}
+function isPromise(value) {
+  return !!value && (typeof value === "function" || typeof value === "object") && typeof value.then === "function";
+}
+async function wrapPromise(maybePromise) {
+  return isPromise(maybePromise) ? await maybePromise : maybePromise;
+}
+function ensureAbsolute(path, root) {
+  return normalizePath(path ? isAbsolute(path) ? path : resolve(root, path) : root);
+}
+function ensureArray(value) {
+  return Array.isArray(value) ? value : value ? [value] : [];
+}
+async function runParallel(maxConcurrency, source, iteratorFn) {
+  const ret = [];
+  const executing = [];
+  for (const item of source) {
+    const p = Promise.resolve().then(() => iteratorFn(item, source));
+    ret.push(p);
+    if (maxConcurrency <= source.length) {
+      const e = p.then(() => executing.splice(executing.indexOf(e), 1));
+      executing.push(e);
+      if (executing.length >= maxConcurrency) {
+        await Promise.race(executing);
+      }
+    }
+  }
+  return Promise.all(ret);
+}
+const speRE = /[\\/]/;
+function queryPublicPath(paths) {
+  if (paths.length === 0) {
+    return "";
+  } else if (paths.length === 1) {
+    return dirname(paths[0]);
+  }
+  let publicPath = normalize(dirname(paths[0])) + sep;
+  let publicUnits = publicPath.split(speRE);
+  let index = publicUnits.length - 1;
+  for (const path of paths.slice(1)) {
+    if (!index) {
+      return publicPath;
+    }
+    const dirPath = normalize(dirname(path)) + sep;
+    if (dirPath.startsWith(publicPath)) {
+      continue;
+    }
+    const units = dirPath.split(speRE);
+    if (units.length < index) {
+      publicPath = dirPath;
+      publicUnits = units;
+      continue;
+    }
+    for (let i = 0; i <= index; ++i) {
+      if (publicUnits[i] !== units[i]) {
+        if (!i) {
+          return "";
+        }
+        index = i - 1;
+        publicUnits = publicUnits.slice(0, index + 1);
+        publicPath = publicUnits.join(sep) + sep;
+        break;
+      }
+    }
+  }
+  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;
+}
+const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
+function base64Encode(number) {
+  if (number >= 0 && number < BASE64_ALPHABET.length) {
+    return BASE64_ALPHABET[number];
+  }
+  throw new TypeError("Base64 integer must be between 0 and 63: " + number);
+}
+const VLQ_BASE_SHIFT = 5;
+const VLQ_BASE = 1 << VLQ_BASE_SHIFT;
+const VLQ_BASE_MASK = VLQ_BASE - 1;
+const VLQ_CONTINUATION_BIT = VLQ_BASE;
+function toVLQSigned(number) {
+  return number < 0 ? (-number << 1) + 1 : (number << 1) + 0;
+}
+function base64VLQEncode(numbers) {
+  let encoded = "";
+  for (const number of numbers) {
+    let vlq = toVLQSigned(number);
+    let digit;
+    do {
+      digit = vlq & VLQ_BASE_MASK;
+      vlq >>>= VLQ_BASE_SHIFT;
+      if (vlq > 0) {
+        digit |= VLQ_CONTINUATION_BIT;
+      }
+      encoded += base64Encode(digit);
+    } while (vlq > 0);
+  }
+  return encoded;
+}
+const pkgPathCache = /* @__PURE__ */ new Map();
+function tryGetPkgPath(beginPath) {
+  beginPath = normalizePath(beginPath);
+  if (pkgPathCache.has(beginPath)) {
+    return pkgPathCache.get(beginPath);
+  }
+  const pkgPath = resolve(beginPath, "package.json");
+  if (existsSync(pkgPath)) {
+    pkgPathCache.set(beginPath, pkgPath);
+    return pkgPath;
+  }
+  const parentDir = normalizePath(dirname(beginPath));
+  if (!parentDir || parentDir === beginPath) {
+    pkgPathCache.set(beginPath, void 0);
+    return;
+  }
+  return tryGetPkgPath(parentDir);
+}
 
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
@@ -34,8 +180,6 @@ function rollupDeclarationFiles({
   bundledPackages
 }) {
   const configObjectFullPath = resolve$1(root, "api-extractor.json");
-  const packageJsonLookup = new PackageJsonLookup();
-  const packageJsonFullPath = packageJsonLookup.tryGetPackageJsonFilePathFor(configObjectFullPath);
   if (!dtsRE$1.test(fileName)) {
     fileName += ".d.ts";
   }
@@ -48,15 +192,11 @@ function rollupDeclarationFiles({
         tsconfigFilePath: configPath,
         overrideTsconfig: {
           $schema: "http://json.schemastore.org/tsconfig",
-          compilerOptions: {
-            ...compilerOptions,
-            target: "ESNext"
-          }
+          compilerOptions
         }
       },
       apiReport: {
-        enabled: false,
-        reportFileName: "<unscopedPackageName>.api.md"
+        enabled: false
       },
       docModel: {
         enabled: false
@@ -82,36 +222,15 @@ function rollupDeclarationFiles({
       }
     },
     configObjectFullPath,
-    packageJsonFullPath
+    packageJsonFullPath: tryGetPkgPath(configObjectFullPath)
   });
-  const compilerState = CompilerState.create(extractorConfig, {
+  const result = Extractor.invoke(extractorConfig, {
     localBuild: false,
     showVerboseMessages: false,
-    typescriptCompilerFolder: libFolder ? resolve$1(libFolder) : void 0
-  });
-  const sourceMapper = new SourceMapper();
-  const messageRouter = new MessageRouter({
-    workingPackageFolder: root,
-    messageCallback: void 0,
-    messagesConfig: extractorConfig.messages,
-    showVerboseMessages: false,
     showDiagnostics: false,
-    tsdocConfiguration: extractorConfig.tsdocConfiguration,
-    sourceMapper
-  });
-  const collector = new Collector({
-    program: compilerState.program,
-    messageRouter,
-    extractorConfig,
-    sourceMapper
+    typescriptCompilerFolder: libFolder ? resolve$1(libFolder) : void 0
   });
-  collector.analyze();
-  DtsRollupGenerator.writeTypingsFile(
-    collector,
-    extractorConfig.publicTrimmedFilePath,
-    DtsRollupKind.PublicRelease,
-    extractorConfig.newlineKind
-  );
+  return result.succeeded;
 }
 
 const jsonRE = /\.json$/;
@@ -163,16 +282,36 @@ function VueResolver() {
     supports(id) {
       return vueRE.test(id);
     },
-    transform({ id, program, service }) {
+    transform({ id, code, program, service }) {
       const sourceFile = program.getSourceFile(id) || program.getSourceFile(id + ".ts") || program.getSourceFile(id + ".js") || program.getSourceFile(id + ".tsx") || program.getSourceFile(id + ".jsx");
       if (!sourceFile)
         return [];
-      return service.getEmitOutput(sourceFile.fileName, true).outputFiles.map((file) => {
+      const outputs = service.getEmitOutput(sourceFile.fileName, true).outputFiles.map((file) => {
         return {
           path: file.name,
           content: file.text
         };
       });
+      if (!program.getCompilerOptions().declarationMap)
+        return outputs;
+      const [beforeScript] = code.split(/\s*<script.*>/);
+      const beforeLines = beforeScript.split("\n").length;
+      for (const output of outputs) {
+        if (output.path.endsWith(".map")) {
+          try {
+            const sourceMap = JSON.parse(output.content);
+            sourceMap.sources = sourceMap.sources.map(
+              (source) => source.replace(/\.vue\.ts$/, ".vue")
+            );
+            if (beforeScript && beforeScript !== code && beforeLines) {
+              sourceMap.mappings = `${base64VLQEncode([0, 0, beforeLines, 0])};${sourceMap.mappings}`;
+            }
+            output.content = JSON.stringify(sourceMap);
+          } catch (e) {
+          }
+        }
+      }
+      return outputs;
     }
   };
 }
@@ -185,106 +324,6 @@ function parseResolvers(resolvers) {
   return Array.from(nameMap.values());
 }
 
-const windowsSlashRE = /\\+/g;
-function slash(p) {
-  return p.replace(windowsSlashRE, "/");
-}
-function normalizePath(id) {
-  return posix.normalize(slash(id));
-}
-function resolve(...paths) {
-  return normalizePath(resolve$1(...paths));
-}
-function isNativeObj(value) {
-  return Object.prototype.toString.call(value) === "[object Object]";
-}
-function isRegExp(value) {
-  return Object.prototype.toString.call(value) === "[object RegExp]";
-}
-function isPromise(value) {
-  return !!value && (typeof value === "function" || typeof value === "object") && typeof value.then === "function";
-}
-function ensureAbsolute(path, root) {
-  return normalizePath(path ? isAbsolute(path) ? path : resolve(root, path) : root);
-}
-function ensureArray(value) {
-  return Array.isArray(value) ? value : value ? [value] : [];
-}
-async function runParallel(maxConcurrency, source, iteratorFn) {
-  const ret = [];
-  const executing = [];
-  for (const item of source) {
-    const p = Promise.resolve().then(() => iteratorFn(item, source));
-    ret.push(p);
-    if (maxConcurrency <= source.length) {
-      const e = p.then(() => executing.splice(executing.indexOf(e), 1));
-      executing.push(e);
-      if (executing.length >= maxConcurrency) {
-        await Promise.race(executing);
-      }
-    }
-  }
-  return Promise.all(ret);
-}
-const speRE = /[\\/]/;
-function queryPublicPath(paths) {
-  if (paths.length === 0) {
-    return "";
-  } else if (paths.length === 1) {
-    return dirname(paths[0]);
-  }
-  let publicPath = normalize(dirname(paths[0])) + sep;
-  let publicUnits = publicPath.split(speRE);
-  let index = publicUnits.length - 1;
-  for (const path of paths.slice(1)) {
-    if (!index) {
-      return publicPath;
-    }
-    const dirPath = normalize(dirname(path)) + sep;
-    if (dirPath.startsWith(publicPath)) {
-      continue;
-    }
-    const units = dirPath.split(speRE);
-    if (units.length < index) {
-      publicPath = dirPath;
-      publicUnits = units;
-      continue;
-    }
-    for (let i = 0; i <= index; ++i) {
-      if (publicUnits[i] !== units[i]) {
-        if (!i) {
-          return "";
-        }
-        index = i - 1;
-        publicUnits = publicUnits.slice(0, index + 1);
-        publicPath = publicUnits.join(sep) + sep;
-        break;
-      }
-    }
-  }
-  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;
-}
-
 const globSuffixRE = /^((?:.*\.[^.]+)|(?:\*+))$/;
 function normalizeGlob(path) {
   if (/[\\/]$/.test(path)) {
@@ -587,8 +626,7 @@ ${cyan(
         logger.error(ts.formatDiagnostics(diagnostics, host));
       }
       if (typeof afterDiagnostic === "function") {
-        const result = afterDiagnostic(diagnostics);
-        isPromise(result) && await result;
+        await wrapPromise(afterDiagnostic(diagnostics));
       }
       rootNames.forEach((file) => {
         this.addWatchFile(file);
@@ -599,13 +637,14 @@ ${cyan(
     },
     async transform(code, id) {
       let resolver;
-      id = normalizePath(id).split("?")[0];
+      id = normalizePath(id);
       if (!host || !program || !filter(id) || !(resolver = resolvers.find((r) => r.supports(id))) && !tjsRE.test(id)) {
         return;
       }
       const startTime = Date.now();
       const outDir = outDirs[0];
       const service = program.__vue.languageService;
+      id = id.split("?")[0];
       rootFiles.delete(id);
       if (resolver) {
         const result = await resolver.transform({
@@ -640,11 +679,12 @@ ${cyan(
       timeRecord += Date.now() - startTime;
     },
     watchChange(id) {
-      id = normalizePath(id).split("?")[0];
+      id = normalizePath(id);
       if (!host || !program || !filter(id) || !resolvers.find((r) => r.supports(id)) && !tjsRE.test(id)) {
         return;
       }
-      const sourceFile = host.getSourceFile(normalizePath(id), ts.ScriptTarget.ESNext);
+      id = id.split("?")[0];
+      const sourceFile = host.getSourceFile(id, ts.ScriptTarget.ESNext);
       if (sourceFile) {
         rootFiles.add(sourceFile.fileName);
         program.__vue.projectVersion++;
@@ -662,7 +702,16 @@ ${logPrefix} Start generate declaration files...`));
       const startTime = Date.now();
       const outDir = outDirs[0];
       const emittedFiles = /* @__PURE__ */ new Map();
-      const writeOutput = async (path, content, outDir2) => {
+      const writeOutput = async (path, content, outDir2, record = true) => {
+        if (typeof beforeWriteFile === "function") {
+          const result = await wrapPromise(beforeWriteFile(path, content));
+          if (result === false)
+            return;
+          if (result) {
+            path = result.filePath || path;
+            content = result.content ?? content;
+          }
+        }
         path = normalizePath(path);
         const dir = normalizePath(dirname(path));
         if (strictOutput && !dir.startsWith(normalizePath(outDir2))) {
@@ -673,7 +722,7 @@ ${logPrefix} Start generate declaration files...`));
           await mkdir(dir, { recursive: true });
         }
         await writeFile(path, content, "utf-8");
-        emittedFiles.set(path, content);
+        record && emittedFiles.set(path, content);
       };
       const service = program.__vue.languageService;
       const sourceFiles = program.getSourceFiles();
@@ -699,6 +748,7 @@ ${logPrefix} Start generate declaration files...`));
         Array.from(outputFiles.entries()),
         async ([path, content]) => {
           const isMapFile = path.endsWith(".map");
+          const baseDir = dirname(path);
           if (!isMapFile && content) {
             content = clearPureImport ? removePureImport(content) : content;
             content = transformAliasImport(path, content, aliases, aliasesExclude);
@@ -709,13 +759,15 @@ ${logPrefix} Start generate declaration files...`));
             relative(entryRoot, cleanVueFileName ? path.replace(".vue.d.ts", ".d.ts") : path)
           );
           content = cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content;
-          if (typeof beforeWriteFile === "function") {
-            const result = beforeWriteFile(path, content);
-            if (result === false)
-              return;
-            if (result && isNativeObj(result)) {
-              path = result.filePath || path;
-              content = result.content ?? content;
+          if (isMapFile) {
+            try {
+              const sourceMap = JSON.parse(content);
+              sourceMap.sources = sourceMap.sources.map((source) => {
+                return normalizePath(relative(dirname(path), resolve(baseDir, source)));
+              });
+              content = JSON.stringify(sourceMap);
+            } catch (e) {
+              logger.warn(`${logPrefix} ${yellow("Processing source map fail:")} ${path}`);
             }
           }
           await writeOutput(path, content, outDir);
@@ -723,14 +775,18 @@ ${logPrefix} Start generate declaration files...`));
       );
       bundleDebug("write output");
       if (insertTypesEntry || rollupTypes) {
-        const pkgPath = resolve(root, "package.json");
-        const pkg = existsSync(pkgPath) ? JSON.parse(await readFile(pkgPath, "utf-8")) : {};
+        const pkgPath = tryGetPkgPath(root);
+        let pkg;
+        try {
+          pkg = pkgPath && existsSync(pkgPath) ? JSON.parse(await readFile(pkgPath, "utf-8")) : {};
+        } catch (e) {
+        }
         const entryNames = Object.keys(entries);
         const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings || (pkg.exports?.["."] || pkg.exports?.["./"])?.types;
         const multiple = entryNames.length > 1;
         const typesPath = types ? resolve(root, types) : resolve(outDir, indexName);
         for (const name of entryNames) {
-          let path = multiple ? resolve(outDir, `${name.replace(tsRE, "")}.d.ts`) : typesPath;
+          const path = multiple ? resolve(outDir, `${name.replace(tsRE, "")}.d.ts`) : typesPath;
           if (existsSync(path))
             continue;
           const index = resolve(
@@ -750,15 +806,6 @@ export default ${libName}
 `;
             }
           }
-          if (typeof beforeWriteFile === "function") {
-            const result = beforeWriteFile(path, content);
-            if (result === false)
-              return;
-            if (result && isNativeObj(result)) {
-              path = result.filePath ?? path;
-              content = result.content ?? content;
-            }
-          }
           await writeOutput(path, content, outDir);
         }
         bundleDebug("insert index");
@@ -818,15 +865,29 @@ export default ${libName}
         await runParallel(cpus().length, Array.from(emittedFiles), async ([wroteFile, content]) => {
           const relativePath = relative(outDir, wroteFile);
           await Promise.all(
-            extraOutDirs.map(async (outDir2) => {
-              await writeOutput(resolve(outDir2, relativePath), content, outDir2);
+            extraOutDirs.map(async (targetOutDir) => {
+              const path = resolve(targetOutDir, relativePath);
+              if (wroteFile.endsWith(".map")) {
+                const relativeOutDir = relative(outDir, targetOutDir);
+                if (relativeOutDir) {
+                  try {
+                    const sourceMap = JSON.parse(content);
+                    sourceMap.sources = sourceMap.sources.map((source) => {
+                      return normalizePath(relative(relativeOutDir, source));
+                    });
+                    content = JSON.stringify(sourceMap);
+                  } catch (e) {
+                    logger.warn(`${logPrefix} ${yellow("Processing source map fail:")} ${path}`);
+                  }
+                }
+              }
+              await writeOutput(path, content, targetOutDir, false);
             })
           );
         });
       }
       if (typeof afterBuild === "function") {
-        const result = afterBuild();
-        isPromise(result) && await result;
+        await wrapPromise(afterBuild());
       }
       bundleDebug("finish");
       logger.info(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",
@@ -55,7 +55,6 @@
   "dependencies": {
     "@microsoft/api-extractor": "^7.36.0",
     "@rollup/pluginutils": "^5.0.2",
-    "@rushstack/node-core-library": "^3.59.4",
     "@vue/language-core": "^1.8.1",
     "debug": "^4.3.4",
     "kolorist": "^1.8.0",
@@ -96,10 +95,12 @@
     "vitest": "^0.32.2"
   },
   "peerDependencies": {
-    "typescript": "*"
-  },
-  "optionalDependencies": {
-    "rollup": "*",
+    "typescript": "*",
     "vite": "*"
+  },
+  "peerDependenciesMeta": {
+    "vite": {
+      "optional": true
+    }
   }
 }