vite-plugin-dts 3.9.1 → 4.0.0-beta.1

package/dist/index.mjs

@@ -9,13 +9,16 @@ import { relative, posix, resolve as resolve$1, isAbsolute, dirname, normalize,
 import { existsSync, readdirSync, lstatSync, rmdirSync } from 'node:fs';
 import { readFile, mkdir, writeFile, unlink } from 'node:fs/promises';
 import { cpus } from 'node:os';
-import { createParsedCommandLine } from '@vue/language-core';
+import { createParsedCommandLine, resolveVueCompilerOptions, createVueLanguagePlugin } from '@vue/language-core';
+import { proxyCreateProgram } from '@volar/typescript';
 import ts from 'typescript';
 import { createFilter } from '@rollup/pluginutils';
-import { createProgram } from 'vue-tsc';
+import { removeEmitGlobalTypes } from 'vue-tsc';
 import debug from 'debug';
 import { cyan, yellow, green } from 'kolorist';
 import { ExtractorConfig, Extractor } from '@microsoft/api-extractor';
+import { getPackageInfoSync, resolveModule } from 'local-pkg';
+import { compare } from 'compare-versions';
 import MagicString from 'magic-string';
 
 const windowsSlashRE = /\\+/g;
@@ -121,9 +124,10 @@ function removeDirIfEmpty(dir) {
   return onlyHasDir;
 }
 function getTsConfig(tsConfigPath, readFileSync) {
+  const baseConfig = ts.readConfigFile(tsConfigPath, readFileSync).config ?? {};
   const tsConfig = {
-    compilerOptions: {},
-    ...ts.readConfigFile(tsConfigPath, readFileSync).config ?? {}
+    ...baseConfig,
+    compilerOptions: {}
   };
   if (tsConfig.extends) {
     ensureArray(tsConfig.extends).forEach((configPath) => {
@@ -137,6 +141,7 @@ function getTsConfig(tsConfigPath, readFileSync) {
       }
     });
   }
+  Object.assign(tsConfig.compilerOptions, baseConfig.compilerOptions);
   return tsConfig;
 }
 const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
@@ -200,7 +205,7 @@ function findTypesPath(...pkgs) {
   for (const pkg of pkgs) {
     if (typeof pkg !== "object")
       continue;
-    path = pkg.types || pkg.typings || pkg.exports?.["."]?.types || pkg.exports?.["./"]?.types;
+    path = pkg.types || pkg.typings || pkg.exports?.types || pkg.exports?.["."]?.types || pkg.exports?.["./"]?.types;
     if (path)
       return path;
   }
@@ -241,8 +246,27 @@ function editSourceMapDir(content, fromDir, toDir) {
   }
   return true;
 }
+const regexpSymbolRE = /([$.\\+?()[\]!<=|{}^,])/g;
+const asteriskRE = /[*]+/g;
+function parseTsAliases(basePath, paths) {
+  const result = [];
+  for (const [pathWithAsterisk, replacements] of Object.entries(paths)) {
+    const find = new RegExp(
+      `^${pathWithAsterisk.replace(regexpSymbolRE, "\\$1").replace(asteriskRE, "([^\\/]+)")}$`
+    );
+    let index = 1;
+    result.push({
+      find,
+      replacement: ensureAbsolute(
+        replacements[0].replace(asteriskRE, () => `$${index++}`),
+        basePath
+      )
+    });
+  }
+  return result;
+}
 
-const dtsRE$1 = /\.d\.tsx?$/;
+const dtsRE$1 = /\.d\.(m|c)?tsx?$/;
 function rollupDeclarationFiles({
   root,
   configPath,
@@ -338,6 +362,17 @@ export default _default;
 }
 
 const svelteRE = /\.svelte$/;
+let lowerVersion;
+function querySvelteVersion() {
+  if (typeof lowerVersion === "boolean")
+    return;
+  try {
+    const version = getPackageInfoSync("svelte")?.version ?? getPackageInfoSync("svelte", { paths: [resolveModule("svelte") || process.cwd()] })?.version;
+    lowerVersion = version ? compare(version, "4.0.0", "<") : false;
+  } catch {
+    lowerVersion = false;
+  }
+}
 function SvelteResolver() {
   return {
     name: "svelte",
@@ -345,10 +380,12 @@ function SvelteResolver() {
       return svelteRE.test(id);
     },
     transform({ id, root }) {
+      querySvelteVersion();
       return [
         {
           path: relative(root, `${id}.d.ts`),
-          content: "export { SvelteComponentTyped as default } from 'svelte';\n"
+          content: `export { ${lowerVersion ? "SvelteComponentTyped" : "SvelteComponent"} as default } from 'svelte';
+`
         }
       ];
     }
@@ -362,16 +399,19 @@ function VueResolver() {
     supports(id) {
       return vueRE.test(id);
     },
-    transform({ id, code, program, service }) {
+    transform({ id, code, program }) {
       const sourceFile = program.getSourceFile(id) || program.getSourceFile(id + ".ts") || program.getSourceFile(id + ".js") || program.getSourceFile(id + ".tsx") || program.getSourceFile(id + ".jsx");
       if (!sourceFile)
         return [];
-      const outputs = service.getEmitOutput(sourceFile.fileName, true).outputFiles.map((file) => {
-        return {
-          path: file.name,
-          content: file.text
-        };
-      });
+      const outputs = [];
+      program.emit(
+        sourceFile,
+        (path, content) => {
+          outputs.push({ path, content });
+        },
+        void 0,
+        true
+      );
       if (!program.getCompilerOptions().declarationMap)
         return outputs;
       const [beforeScript] = code.split(/\s*<script.*>/);
@@ -567,6 +607,26 @@ function hasExportDefault(content) {
   return has;
 }
 
+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 writeFile2 = options.host.writeFile.bind(options.host);
+    options.host.writeFile = (fileName, contents, ...args) => {
+      return writeFile2(fileName, removeEmitGlobalTypes(contents), ...args);
+    };
+  }
+  const vueLanguagePlugin = createVueLanguagePlugin(
+    ts2,
+    (id) => id,
+    options.host?.useCaseSensitiveFileNames?.() ?? false,
+    () => "",
+    () => options.rootNames.map((rootName) => rootName.replace(/\\/g, "/")),
+    options.options,
+    vueOptions
+  );
+  return [vueLanguagePlugin];
+});
 const jsRE = /\.(m|c)?jsx?$/;
 const tsRE = /\.(m|c)?tsx?$/;
 const dtsRE = /\.d\.(m|c)?tsx?$/;
@@ -593,8 +653,6 @@ const noop = () => {
 };
 const extPrefix = (file) => mtjsRE.test(file) ? "m" : ctjsRE.test(file) ? "c" : "";
 const tsToDts = (path) => `${path.replace(tsRE, "")}.d.ts`;
-const regexpSymbolRE = /([$.\\+?()[\]!<=|{}^,])/g;
-const asteriskRE = /[*]+/g;
 function dtsPlugin(options = {}) {
   const {
     tsconfigPath,
@@ -632,6 +690,7 @@ function dtsPlugin(options = {}) {
   let host;
   let program;
   let filter;
+  let rebuildProgram;
   let bundled = false;
   let timeRecord = 0;
   const resolvers = parseResolvers([
@@ -642,6 +701,9 @@ function dtsPlugin(options = {}) {
   ]);
   const rootFiles = /* @__PURE__ */ new Set();
   const outputFiles = /* @__PURE__ */ new Map();
+  const setOutputFile = (path, content) => {
+    outputFiles.set(path, content);
+  };
   const rollupConfig = { ...options.rollupConfig || {} };
   rollupConfig.bundledPackages = rollupConfig.bundledPackages || options.bundledPackages || [];
   const cleanPath = (path) => {
@@ -755,20 +817,9 @@ ${logPrefix} ${yellow(
       }
       const { baseUrl, paths } = compilerOptions;
       if (pathsToAliases && baseUrl && paths) {
-        const basePath = ensureAbsolute(baseUrl, configPath ? dirname(configPath) : root);
-        for (const [pathWithAsterisk, replacements] of Object.entries(paths)) {
-          const find = new RegExp(
-            `^${pathWithAsterisk.replace(regexpSymbolRE, "\\$1").replace(asteriskRE, "(.+)")}$`
-          );
-          let index = 1;
-          aliases.push({
-            find,
-            replacement: ensureAbsolute(
-              replacements[0].replace(asteriskRE, () => `$${index++}`),
-              basePath
-            )
-          });
-        }
+        aliases.push(
+          ...parseTsAliases(ensureAbsolute(baseUrl, configPath ? dirname(configPath) : root), paths)
+        );
       }
       const computeGlobs = (rootGlobs, tsGlobs, defaultGlob) => {
         if (rootGlobs?.length) {
@@ -778,7 +829,11 @@ ${logPrefix} ${yellow(
           (glob) => normalizeGlob(ensureAbsolute(glob, configPath ? dirname(configPath) : root))
         );
       };
-      include = computeGlobs(options.include, content?.raw.include, "**/*");
+      include = computeGlobs(
+        options.include,
+        [...ensureArray(content?.raw.include ?? []), ...ensureArray(content?.raw.files ?? [])],
+        "**/*"
+      );
       exclude = computeGlobs(options.exclude, content?.raw.exclude, "node_modules/**");
       filter = createFilter(include, exclude);
       const rootNames = [
@@ -787,11 +842,12 @@ ${logPrefix} ${yellow(
         )
       ];
       host = ts.createCompilerHost(compilerOptions);
-      program = createProgram({
+      program = (rebuildProgram = () => createProgram({
         host,
         rootNames,
-        options: compilerOptions
-      });
+        options: compilerOptions,
+        projectReferences: content?.projectReferences
+      }))();
       libName = toCapitalCase(libName || "_default");
       indexName = indexName || defaultIndex;
       const maybeEmitted = (sourceFile) => {
@@ -829,7 +885,6 @@ ${logPrefix} ${yellow(
       }
       const startTime = Date.now();
       const outDir = outDirs[0];
-      const service = program.__vue.languageService;
       id = id.split("?")[0];
       rootFiles.delete(id);
       if (resolver) {
@@ -839,11 +894,10 @@ ${logPrefix} ${yellow(
           root: publicRoot,
           outDir,
           host,
-          program,
-          service
+          program
         });
         for (const { path, content } of result) {
-          outputFiles.set(
+          setOutputFile(
             resolve(publicRoot, relative(outDir, ensureAbsolute(path, outDir))),
             content
           );
@@ -851,17 +905,22 @@ ${logPrefix} ${yellow(
       } else {
         const sourceFile = program.getSourceFile(id);
         if (sourceFile) {
-          for (const outputFile of service.getEmitOutput(sourceFile.fileName, true).outputFiles) {
-            outputFiles.set(
-              resolve(publicRoot, relative(outDir, ensureAbsolute(outputFile.name, outDir))),
-              outputFile.text
-            );
-          }
+          program.emit(
+            sourceFile,
+            (name, text) => {
+              setOutputFile(
+                resolve(publicRoot, relative(outDir, ensureAbsolute(name, outDir))),
+                text
+              );
+            },
+            void 0,
+            true
+          );
         }
       }
       const dtsId = id.replace(tjsRE, "") + ".d.ts";
       const dtsSourceFile = program.getSourceFile(dtsId);
-      dtsSourceFile && filter(dtsSourceFile.fileName) && outputFiles.set(normalizePath(dtsSourceFile.fileName), dtsSourceFile.getFullText());
+      dtsSourceFile && filter(dtsSourceFile.fileName) && setOutputFile(normalizePath(dtsSourceFile.fileName), dtsSourceFile.getFullText());
       timeRecord += Date.now() - startTime;
     },
     watchChange(id) {
@@ -873,9 +932,9 @@ ${logPrefix} ${yellow(
       const sourceFile = host.getSourceFile(id, ts.ScriptTarget.ESNext);
       if (sourceFile) {
         rootFiles.add(sourceFile.fileName);
-        program.__vue.projectVersion++;
         bundled = false;
         timeRecord = 0;
+        program = rebuildProgram();
       }
     },
     async writeBundle() {
@@ -911,21 +970,25 @@ ${logPrefix} Start generate declaration files...`));
         await writeFile(path, content, "utf-8");
         record && emittedFiles.set(path, content);
       };
-      const service = program.__vue.languageService;
       const sourceFiles = program.getSourceFiles();
       for (const sourceFile of sourceFiles) {
         if (!filter(sourceFile.fileName))
           continue;
         if (copyDtsFiles && dtsRE.test(sourceFile.fileName)) {
-          outputFiles.set(normalizePath(sourceFile.fileName), sourceFile.getFullText());
+          setOutputFile(normalizePath(sourceFile.fileName), sourceFile.getFullText());
         }
         if (rootFiles.has(sourceFile.fileName)) {
-          for (const outputFile of service.getEmitOutput(sourceFile.fileName, true).outputFiles) {
-            outputFiles.set(
-              resolve(publicRoot, relative(outDir, ensureAbsolute(outputFile.name, outDir))),
-              outputFile.text
-            );
-          }
+          program.emit(
+            sourceFile,
+            (name, text) => {
+              setOutputFile(
+                resolve(publicRoot, relative(outDir, ensureAbsolute(name, outDir))),
+                text
+              );
+            },
+            void 0,
+            true
+          );
           rootFiles.delete(sourceFile.fileName);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "3.9.1",
+  "version": "4.0.0-beta.1",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",
@@ -58,44 +58,47 @@
     "volar"
   ],
   "dependencies": {
-    "@microsoft/api-extractor": "7.43.0",
+    "@microsoft/api-extractor": "7.47.2",
     "@rollup/pluginutils": "^5.1.0",
-    "@vue/language-core": "^1.8.27",
-    "debug": "^4.3.4",
+    "@volar/typescript": "^2.3.4",
+    "@vue/language-core": "2.0.19",
+    "compare-versions": "^6.1.1",
+    "debug": "^4.3.5",
     "kolorist": "^1.8.0",
-    "magic-string": "^0.30.8",
-    "vue-tsc": "^1.8.27"
+    "local-pkg": "^0.5.0",
+    "magic-string": "^0.30.10",
+    "vue-tsc": "2.0.19"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.2.1",
+    "@commitlint/cli": "^19.3.0",
     "@types/debug": "^4.1.12",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.14.11",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
-    "@vexip-ui/commitlint-config": "^0.4.0",
-    "@vexip-ui/eslint-config": "^0.12.0",
+    "@vexip-ui/commitlint-config": "^0.5.0",
+    "@vexip-ui/eslint-config": "^0.12.1",
     "@vexip-ui/prettier-config": "^0.2.0",
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^13.0.0",
-    "conventional-changelog-cli": "^4.1.0",
+    "conventional-changelog-cli": "^5.0.0",
     "eslint": "^8.57.0",
     "execa": "^8.0.1",
-    "husky": "^9.0.11",
+    "husky": "^8.0.3",
     "is-ci": "^3.0.1",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.7",
     "minimist": "^1.2.8",
     "pinst": "^3.0.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.3",
     "pretty-quick": "^4.0.0",
     "prompts": "^2.4.2",
-    "rimraf": "^5.0.5",
-    "semver": "^7.6.0",
-    "tsx": "^4.7.1",
-    "typescript": "5.4.3",
+    "rimraf": "^6.0.1",
+    "semver": "^7.6.3",
+    "tsx": "^4.16.2",
+    "typescript": "5.5.3",
     "unbuild": "^2.0.0",
-    "vite": "^5.2.6",
-    "vitest": "^1.4.0"
+    "vite": "^5.3.4",
+    "vitest": "^2.0.3"
   },
   "peerDependencies": {
     "typescript": "*",
@@ -108,7 +111,7 @@
   },
   "pnpm": {
     "patchedDependencies": {
-      "@microsoft/api-extractor@7.43.0": "patches/@microsoft__api-extractor@7.43.0.patch"
+      "@microsoft/api-extractor@7.47.2": "patches/@microsoft__api-extractor@7.47.2.patch"
     }
   }
 }