vite-plugin-dts 4.0.3 → 4.1.1

package/dist/index.d.ts

@@ -35,176 +35,178 @@ interface Resolver {
 }
 interface PluginOptions {
     /**
-     * Specify root directory
+     * Specify root directory.
      *
-     * Defaults to the 'root' of the Vite config, or `process.cwd()` if using Rollup
+     * Defaults to the 'root' of the Vite config, or `process.cwd()` if using Rollup.
      */
     root?: string;
     /**
-     * Output directory for declaration files
+     * Output directory for declaration files.
      *
-     * Can be an array to output to multiple directories
+     * Can be an array to output to multiple directories.
      *
-     * Defaults to 'build.outDir' of the Vite config, or `outDir` of tsconfig.json if using Rollup
+     * Defaults to 'build.outDir' of the Vite config, or `outDir` of tsconfig.json if using Rollup.
      */
     outDir?: string | string[];
     /**
-     * Override root path of entry files (useful in monorepos)
+     * Override root path of entry files (useful in monorepos).
      *
-     * The output path of each file will be calculated based on the value provided
+     * The output path of each file will be calculated based on the value provided.
      *
-     * The default is the smallest public path for all source files
+     * The default is the smallest public path for all source files.
      */
     entryRoot?: string;
     /**
-     * Restrict declaration files output to `outDir`
+     * Restrict declaration files output to `outDir`.
      *
-     * If true, generated declaration files outside `outDir` will be ignored
+     * If true, generated declaration files outside `outDir` will be ignored.
      *
      * @default true
      */
     strictOutput?: boolean;
     /**
-     * Override compilerOptions
+     * Override compilerOptions.
      *
      * @default null
      */
     compilerOptions?: ts.CompilerOptions | null;
     /**
-     * Specify tsconfig.json path
+     * Specify tsconfig.json path.
      *
-     * Plugin resolves `include` and `exclude` globs from tsconfig.json
+     * Plugin resolves `include` and `exclude` globs from tsconfig.json.
      *
-     * If not specified, plugin will find config file from root
+     * If not specified, plugin will find config file from root.
      */
     tsconfigPath?: string;
     /**
-     * Specify custom resolvers
+     * Specify custom resolvers.
      *
      * @default []
      */
     resolvers?: Resolver[];
     /**
-     * Parsing `paths` of tsconfig.json to aliases
+     * Parsing `paths` of tsconfig.json to aliases.
      *
-     * Note that these aliases only use for declaration files
+     * Note that these aliases only use for declaration files.
      *
      * @default true
-     * @remarks Only use first replacement of each path
+     * @remarks Only use first replacement of each path.
      */
     pathsToAliases?: boolean;
     /**
-     * Set which paths should be excluded when transforming aliases
+     * Set which paths should be excluded when transforming aliases.
      *
      * @default []
      */
     aliasesExclude?: (string | RegExp)[];
     /**
-     * Whether to transform file names ending in '.vue.d.ts' to '.d.ts'
+     * Whether to transform file names ending in '.vue.d.ts' to '.d.ts'.
+     *
+     * If there is a duplicate name after transform, it will fall back to the original name.
      *
      * @default false
      */
     cleanVueFileName?: boolean;
     /**
-     * Whether to transform dynamic imports to static (eg `import('vue').DefineComponent` to `import { DefineComponent } from 'vue'`)
+     * Whether to transform dynamic imports to static (eg `import('vue').DefineComponent` to `import { DefineComponent } from 'vue'`).
      *
-     * Value is forced to `true` when `rollupTypes` is `true`
+     * Value is forced to `true` when `rollupTypes` is `true`.
      *
      * @default false
      */
     staticImport?: boolean;
     /**
-     * Override `include` glob (relative to root)
+     * Override `include` glob (relative to root).
      *
-     * Defaults to `include` property of tsconfig.json (relative to tsconfig.json located)
+     * Defaults to `include` property of tsconfig.json (relative to tsconfig.json located).
      */
     include?: string | string[];
     /**
-     * Override `exclude` glob
+     * Override `exclude` glob.
      *
      * Defaults to `exclude` property of tsconfig.json or `'node_modules/**'` if not supplied.
      */
     exclude?: string | string[];
     /**
-     * Whether to remove `import 'xxx'`
+     * Whether to remove `import 'xxx'`.
      *
      * @default true
      */
     clearPureImport?: boolean;
     /**
-     * Whether to generate types entry file(s)
+     * Whether to generate types entry file(s).
      *
-     * When `true`, uses package.json `types` property if it exists or `${outDir}/index.d.ts`
+     * When `true`, uses package.json `types` property if it exists or `${outDir}/index.d.ts`.
      *
-     * Value is forced to `true` when `rollupTypes` is `true`
+     * Value is forced to `true` when `rollupTypes` is `true`.
      *
      * @default false
      */
     insertTypesEntry?: boolean;
     /**
-     * Rollup type declaration files after emitting them
+     * Rollup type declaration files after emitting them.
      *
-     * Powered by `@microsoft/api-extractor` - time-intensive operation
+     * Powered by `@microsoft/api-extractor` - time-intensive operation.
      *
      * @default false
      */
     rollupTypes?: boolean;
     /**
-     * Bundled packages for `@microsoft/api-extractor`
+     * Bundled packages for `@microsoft/api-extractor`.
      *
      * @default []
      * @see https://api-extractor.com/pages/configs/api-extractor_json/#bundledpackages
      */
     bundledPackages?: string[];
     /**
-     * Override the config of `@microsoft/api-extractor`
+     * Override the config of `@microsoft/api-extractor`.
      *
      * @default null
      * @see https://api-extractor.com/pages/setup/configure_api_report/
      */
     rollupConfig?: RollupConfig;
     /**
-     * Override the invoke options of `@microsoft/api-extractor`
+     * Override the invoke options of `@microsoft/api-extractor`.
      *
      * @default null
      * @see https://api-extractor.com/pages/setup/invoking/#invoking-from-a-build-script
      */
     rollupOptions?: IExtractorInvokeOptions;
     /**
-     * Whether to copy .d.ts source files to `outDir`
+     * Whether to copy .d.ts source files to `outDir`.
      *
      * @default false
-     * @remarks Before 2.0, the default was `true`
+     * @remarks Before 2.0, the default was `true`.
      */
     copyDtsFiles?: boolean;
     /**
-     * Whether to emit declaration files only
+     * Whether to emit declaration files only.
      *
-     * When `true`, all the original outputs of vite (rollup) will be force removed
+     * When `true`, all the original outputs of vite (rollup) will be force removed.
      *
      * @default false
      */
     declarationOnly?: boolean;
     /**
-     * Logging level for this plugin
+     * Logging level for this plugin.
      *
-     * Defaults to the 'logLevel' property of your Vite config
+     * Defaults to the 'logLevel' property of your Vite config.
      */
     logLevel?: LogLevel;
     /**
-     * Hook called after diagnostic is emitted
+     * Hook called after diagnostic is emitted.
      *
-     * According to the `diagnostics.length`, you can judge whether there is any type error
+     * According to the `diagnostics.length`, you can judge whether there is any type error.
      *
      * @default () => {}
      */
     afterDiagnostic?: (diagnostics: readonly ts.Diagnostic[]) => MaybePromise<void>;
     /**
-     * Hook called prior to writing each declaration file
+     * Hook called prior to writing each declaration file.
      *
-     * This allows you to transform the path or content
+     * This allows you to transform the path or content.
      *
-     * The file will be skipped when the return value `false` or `Promise<false>`
+     * The file will be skipped when the return value `false` or `Promise<false>`.
      *
      * @default () => {}
      */
@@ -213,15 +215,15 @@ interface PluginOptions {
         content?: string;
     }>;
     /**
-     * Hook called after rolling up declaration files
+     * Hook called after rolling up declaration files.
      *
      * @default () => {}
      */
     afterRollup?: (result: ExtractorResult) => MaybePromise<void>;
     /**
-     * Hook called after all declaration files are written
+     * Hook called after all declaration files are written.
      *
-     * It will be received a map (path -> content) that records those emitted files
+     * It will be received a map (path -> content) that records those emitted files.
      *
      * @default () => {}
      */

package/dist/index.mjs

@@ -13,66 +13,14 @@ import { createParsedCommandLine, resolveVueCompilerOptions, createVueLanguagePl
 import { proxyCreateProgram } from '@volar/typescript';
 import ts from 'typescript';
 import { removeEmitGlobalTypes } from 'vue-tsc';
+import { getPackageInfoSync, resolveModule } from 'local-pkg';
 import { createFilter } from '@rollup/pluginutils';
 import debug from 'debug';
 import { cyan, yellow, green } from 'kolorist';
 import { ExtractorConfig, Extractor } from '@microsoft/api-extractor';
-import { createRequire } from 'node:module';
-import { getPackageInfoSync, resolveModule } from 'local-pkg';
 import { compare } from 'compare-versions';
 import MagicString from 'magic-string';
 
-const _createProgram = proxyCreateProgram(ts, ts.createProgram, (ts2, options) => {
-  const { configFilePath } = options.options;
-  const vueOptions = typeof configFilePath === "string" ? createParsedCommandLine(ts2, ts2.sys, configFilePath.replace(/\\/g, "/")).vueOptions : resolveVueCompilerOptions({});
-  if (options.host) {
-    const writeFile = options.host.writeFile.bind(options.host);
-    options.host.writeFile = (fileName, contents, ...args) => {
-      return writeFile(fileName, removeEmitGlobalTypes(contents), ...args);
-    };
-  }
-  const vueLanguagePlugin = createVueLanguagePlugin2(
-    ts2,
-    (id) => id,
-    createRootFileChecker(
-      void 0,
-      () => options.rootNames.map((rootName) => rootName.replace(/\\/g, "/")),
-      options.host?.useCaseSensitiveFileNames?.() ?? false
-    ),
-    options.options,
-    vueOptions
-  );
-  return [vueLanguagePlugin];
-});
-const createProgram = (options) => {
-  const program = _createProgram(options);
-  const emit = program.emit;
-  program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
-    if (writeFile) {
-      return emit(
-        targetSourceFile,
-        (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
-          if (fileName.endsWith(".d.ts")) {
-            data = removeEmitGlobalTypes(data);
-          }
-          return writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
-        },
-        cancellationToken,
-        emitOnlyDtsFiles,
-        customTransformers
-      );
-    }
-    return emit(
-      targetSourceFile,
-      writeFile,
-      cancellationToken,
-      emitOnlyDtsFiles,
-      customTransformers
-    );
-  };
-  return program;
-};
-
 const windowsSlashRE = /\\+/g;
 function slash(p) {
   return p.replace(windowsSlashRE, "/");
@@ -196,25 +144,9 @@ function getTsConfig(tsConfigPath, readFileSync) {
   Object.assign(tsConfig.compilerOptions, baseConfig.compilerOptions);
   return tsConfig;
 }
-function getTsLibFolder({ root, entryRoot }) {
-  let libFolder;
-  try {
-    libFolder = normalizePath(createRequire(import.meta.url).resolve("typescript")).replace(
-      /node_modules\/typescript.*/,
-      "node_modules/typescript"
-    );
-  } catch {
-    libFolder = resolve(root, "node_modules/typescript");
-    if (!existsSync(libFolder)) {
-      if (root !== entryRoot) {
-        libFolder = resolve(entryRoot, "node_modules/typescript");
-        if (!existsSync(libFolder))
-          libFolder = void 0;
-      }
-      libFolder = void 0;
-    }
-  }
-  return libFolder;
+function getTsLibFolder() {
+  const libFolder = tryGetPackageInfo("typescript")?.rootPath;
+  return libFolder && normalizePath(libFolder);
 }
 const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
 function base64Encode(number) {
@@ -324,7 +256,7 @@ function parseTsAliases(basePath, paths) {
   const result = [];
   for (const [pathWithAsterisk, replacements] of Object.entries(paths)) {
     const find = new RegExp(
-      `^${pathWithAsterisk.replace(regexpSymbolRE, "\\$1").replace(asteriskRE, "([^\\/]+)")}$`
+      `^${pathWithAsterisk.replace(regexpSymbolRE, "\\$1").replace(asteriskRE, "(.+)")}$`
     );
     let index = 1;
     result.push({
@@ -337,6 +269,64 @@ function parseTsAliases(basePath, paths) {
   }
   return result;
 }
+function tryGetPackageInfo(name) {
+  try {
+    return getPackageInfoSync(name) ?? getPackageInfoSync(name, { paths: [resolveModule(name) || process.cwd()] });
+  } catch (e) {
+  }
+}
+
+const hasVue = !!tryGetPackageInfo("vue");
+const _createProgram = !hasVue ? ts.createProgram : proxyCreateProgram(ts, ts.createProgram, (ts2, options) => {
+  const { configFilePath } = options.options;
+  const vueOptions = typeof configFilePath === "string" ? createParsedCommandLine(ts2, ts2.sys, configFilePath.replace(/\\/g, "/")).vueOptions : resolveVueCompilerOptions({});
+  if (options.host) {
+    const writeFile = options.host.writeFile.bind(options.host);
+    options.host.writeFile = (fileName, contents, ...args) => {
+      return writeFile(fileName, removeEmitGlobalTypes(contents), ...args);
+    };
+  }
+  const vueLanguagePlugin = createVueLanguagePlugin2(
+    ts2,
+    (id) => id,
+    createRootFileChecker(
+      void 0,
+      () => options.rootNames.map((rootName) => rootName.replace(/\\/g, "/")),
+      options.host?.useCaseSensitiveFileNames?.() ?? false
+    ),
+    options.options,
+    vueOptions
+  );
+  return [vueLanguagePlugin];
+});
+const createProgram = !hasVue ? ts.createProgram : (options) => {
+  const program = _createProgram(options);
+  const emit = program.emit;
+  program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
+    if (writeFile) {
+      return emit(
+        targetSourceFile,
+        (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
+          if (fileName.endsWith(".d.ts")) {
+            data = removeEmitGlobalTypes(data);
+          }
+          return writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
+        },
+        cancellationToken,
+        emitOnlyDtsFiles,
+        customTransformers
+      );
+    }
+    return emit(
+      targetSourceFile,
+      writeFile,
+      cancellationToken,
+      emitOnlyDtsFiles,
+      customTransformers
+    );
+  };
+  return program;
+};
 
 const dtsRE$1 = /\.d\.(m|c)?tsx?$/;
 function rollupDeclarationFiles({
@@ -350,7 +340,7 @@ function rollupDeclarationFiles({
   rollupConfig = {},
   rollupOptions = {}
 }) {
-  const configObjectFullPath = resolve$1(root, "api-extractor.json");
+  const configObjectFullPath = resolve(root, "api-extractor.json");
   if (!dtsRE$1.test(fileName)) {
     fileName += ".d.ts";
   }
@@ -380,7 +370,7 @@ function rollupDeclarationFiles({
       },
       dtsRollup: {
         enabled: true,
-        publicTrimmedFilePath: resolve$1(outDir, fileName)
+        publicTrimmedFilePath: resolve(outDir, fileName)
       },
       tsdocMetadata: {
         enabled: false,
@@ -407,7 +397,7 @@ function rollupDeclarationFiles({
     localBuild: false,
     showVerboseMessages: false,
     showDiagnostics: false,
-    typescriptCompilerFolder: libFolder ? resolve$1(libFolder) : void 0,
+    typescriptCompilerFolder: libFolder,
     ...rollupOptions
   });
 }
@@ -442,9 +432,9 @@ function querySvelteVersion() {
   if (typeof lowerVersion === "boolean")
     return;
   try {
-    const version = getPackageInfoSync("svelte")?.version ?? getPackageInfoSync("svelte", { paths: [resolveModule("svelte") || process.cwd()] })?.version;
+    const version = tryGetPackageInfo("svelte")?.version;
     lowerVersion = version ? compare(version, "4.0.0", "<") : false;
-  } catch {
+  } catch (e) {
     lowerVersion = false;
   }
 }
@@ -792,8 +782,9 @@ function dtsPlugin(options = {}) {
   };
   const rollupConfig = { ...options.rollupConfig || {} };
   rollupConfig.bundledPackages = rollupConfig.bundledPackages || options.bundledPackages || [];
-  const cleanPath = (path) => {
-    return cleanVueFileName ? path.replace(".vue.d.ts", ".d.ts") : path;
+  const cleanPath = (path, emittedFiles) => {
+    const newPath = path.replace(".vue.d.ts", ".d.ts");
+    return !emittedFiles.has(newPath) && cleanVueFileName ? newPath : path;
   };
   return {
     name: pluginName,
@@ -1163,7 +1154,10 @@ ${logPrefix} Start generate declaration files...`));
         const entryNames = Object.keys(entries);
         const types = findTypesPath(pkg.publishConfig, pkg);
         const multiple = entryNames.length > 1;
-        let typesPath = cleanPath(types ? resolve(root, types) : resolve(outDir, indexName));
+        let typesPath = cleanPath(
+          types ? resolve(root, types) : resolve(outDir, indexName),
+          emittedFiles
+        );
         if (!multiple && !dtsRE.test(typesPath)) {
           logger.warn(
             `
@@ -1175,11 +1169,11 @@ ${logPrefix} ${yellow(
           typesPath = `${typesPath.replace(tjsRE, "")}.d.${extPrefix(typesPath)}ts`;
         }
         for (const name of entryNames) {
-          const entryDtsPath = multiple ? cleanPath(resolve(outDir, tsToDts(name))) : typesPath;
+          const entryDtsPath = multiple ? cleanPath(resolve(outDir, tsToDts(name)), emittedFiles) : typesPath;
           if (existsSync(entryDtsPath))
             continue;
           const sourceEntry = normalizePath(
-            cleanPath(resolve(outDir, relative(entryRoot, tsToDts(entries[name]))))
+            cleanPath(resolve(outDir, relative(entryRoot, tsToDts(entries[name]))), emittedFiles)
           );
           let fromPath = normalizePath(relative(dirname(entryDtsPath), sourceEntry));
           fromPath = fromPath.replace(dtsRE, "");
@@ -1196,7 +1190,7 @@ export default ${libName}
 ${content}`;
             }
           }
-          await writeOutput(cleanPath(entryDtsPath), content, outDir);
+          await writeOutput(cleanPath(entryDtsPath, emittedFiles), content, outDir);
         }
         bundleDebug("insert index");
         if (rollupTypes) {
@@ -1211,7 +1205,7 @@ ${content}`;
               outDir,
               entryPath: path,
               fileName: basename(path),
-              libFolder: getTsLibFolder({ root, entryRoot }),
+              libFolder: getTsLibFolder(),
               rollupConfig,
               rollupOptions
             });
@@ -1223,7 +1217,7 @@ ${content}`;
           };
           if (multiple) {
             await runParallel(cpus().length, entryNames, async (name) => {
-              await rollup(cleanPath(resolve(outDir, tsToDts(name))));
+              await rollup(cleanPath(resolve(outDir, tsToDts(name)), emittedFiles));
             });
           } else {
             await rollup(typesPath);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "vite-plugin-dts",
-  "version": "4.0.3",
+  "version": "4.1.1",
   "type": "module",
-  "packageManager": "pnpm@8.3.0",
+  "packageManager": "pnpm@9.9.0",
   "license": "MIT",
   "author": "qmhc",
   "scripts": {
@@ -11,7 +11,7 @@
     "dev": "unbuild --stub",
     "_postinstall": "is-ci || husky install",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx \"{src,tests}/**\"",
-    "precommit": "lint-staged -c ./.husky/.lintstagedrc -q",
+    "precommit": "lint-staged -c ./.husky/.lintstagedrc -q --allow-empty",
     "prepublishOnly": "pinst --disable",
     "prettier": "pretty-quick --staged && pnpm run lint",
     "postpublish": "pinst --enable",