vite-plugin-dts 4.2.3-dev.2 → 4.2.4

package/dist/index.cjs

@@ -260,7 +260,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, "(?!\\.{1,2}\\/)([^*]+)")}$`
     );
     let index = 1;
     result.push({
@@ -620,7 +620,7 @@ function transformCode(options) {
     }
     if (ts__default.isModuleDeclaration(node) && node.body && ts__default.isModuleBlock(node.body)) {
       if (ts__default.isIdentifier(node.name) && node.name.escapedText === "global" && node.body.statements.some(isVLSNode)) {
-        s.remove(node.pos, node.end + 1);
+        s.remove(node.pos, node.end);
       } else if (node.modifiers?.[0] && node.modifiers[0].kind === ts__default.SyntaxKind.DeclareKeyword && !node.body.statements.some(
         (s2) => ts__default.isExportAssignment(s2) || ts__default.isExportDeclaration(s2) || ts__default.isImportDeclaration(s2)
       )) {
@@ -757,6 +757,7 @@ function dtsPlugin(options = {}) {
   let host;
   let program;
   let filter;
+  let rootNames = [];
   let rebuildProgram;
   let bundled = false;
   let timeRecord = 0;
@@ -883,7 +884,13 @@ ${logPrefix} ${kolorist.yellow(
       if (!outDirs) {
         outDirs = options.outDir ? ensureArray(options.outDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(content?.raw.compilerOptions?.outDir || "dist", root)];
       }
-      const { baseUrl, paths } = compilerOptions;
+      const {
+        // Here we are using the default value to set the `baseUrl` to the current directory if no value exists. This is
+        // the same behavior as the TS Compiler. See TS source:
+        // https://github.com/microsoft/TypeScript/blob/3386e943215613c40f68ba0b108cda1ddb7faee1/src/compiler/utilities.ts#L6493-L6501
+        baseUrl = compilerOptions.paths ? process.cwd() : void 0,
+        paths
+      } = compilerOptions;
       if (pathsToAliases && baseUrl && paths) {
         aliases.push(
           ...parseTsAliases(ensureAbsolute(baseUrl, configPath ? node_path.dirname(configPath) : root), paths)
@@ -904,7 +911,7 @@ ${logPrefix} ${kolorist.yellow(
       );
       exclude = computeGlobs(options.exclude, content?.raw.exclude, "node_modules/**");
       filter = pluginutils.createFilter(include, exclude);
-      const rootNames = [
+      rootNames = [
         ...new Set(
           Object.values(entries).map((entry) => ensureAbsolute(entry, root)).concat(content?.fileNames.filter(filter) || []).map(normalizePath)
         )
@@ -938,10 +945,10 @@ ${logPrefix} ${kolorist.yellow(
       if (typeof afterDiagnostic === "function") {
         await unwrapPromise(afterDiagnostic(diagnostics));
       }
-      rootNames.forEach((file) => {
+      for (const file of rootNames) {
         this.addWatchFile(file);
         rootFiles.add(file);
-      });
+      }
       bundleDebug("create ts program");
       timeRecord += Date.now() - startTime;
     },
@@ -999,7 +1006,10 @@ ${logPrefix} ${kolorist.yellow(
       id = id.split("?")[0];
       const sourceFile = host.getSourceFile(id, ts__default.ScriptTarget.ESNext);
       if (sourceFile) {
-        rootFiles.add(sourceFile.fileName);
+        for (const file of rootNames) {
+          rootFiles.add(file);
+        }
+        rootFiles.add(normalizePath(sourceFile.fileName));
         bundled = false;
         timeRecord = 0;
         program = rebuildProgram();

package/dist/index.mjs

@@ -256,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, "(?!\\.{1,2}\\/)([^*]+)")}$`
     );
     let index = 1;
     result.push({
@@ -616,7 +616,7 @@ function transformCode(options) {
     }
     if (ts.isModuleDeclaration(node) && node.body && ts.isModuleBlock(node.body)) {
       if (ts.isIdentifier(node.name) && node.name.escapedText === "global" && node.body.statements.some(isVLSNode)) {
-        s.remove(node.pos, node.end + 1);
+        s.remove(node.pos, node.end);
       } else if (node.modifiers?.[0] && node.modifiers[0].kind === ts.SyntaxKind.DeclareKeyword && !node.body.statements.some(
         (s2) => ts.isExportAssignment(s2) || ts.isExportDeclaration(s2) || ts.isImportDeclaration(s2)
       )) {
@@ -753,6 +753,7 @@ function dtsPlugin(options = {}) {
   let host;
   let program;
   let filter;
+  let rootNames = [];
   let rebuildProgram;
   let bundled = false;
   let timeRecord = 0;
@@ -879,7 +880,13 @@ ${logPrefix} ${yellow(
       if (!outDirs) {
         outDirs = options.outDir ? ensureArray(options.outDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(content?.raw.compilerOptions?.outDir || "dist", root)];
       }
-      const { baseUrl, paths } = compilerOptions;
+      const {
+        // Here we are using the default value to set the `baseUrl` to the current directory if no value exists. This is
+        // the same behavior as the TS Compiler. See TS source:
+        // https://github.com/microsoft/TypeScript/blob/3386e943215613c40f68ba0b108cda1ddb7faee1/src/compiler/utilities.ts#L6493-L6501
+        baseUrl = compilerOptions.paths ? process.cwd() : void 0,
+        paths
+      } = compilerOptions;
       if (pathsToAliases && baseUrl && paths) {
         aliases.push(
           ...parseTsAliases(ensureAbsolute(baseUrl, configPath ? dirname(configPath) : root), paths)
@@ -900,7 +907,7 @@ ${logPrefix} ${yellow(
       );
       exclude = computeGlobs(options.exclude, content?.raw.exclude, "node_modules/**");
       filter = createFilter(include, exclude);
-      const rootNames = [
+      rootNames = [
         ...new Set(
           Object.values(entries).map((entry) => ensureAbsolute(entry, root)).concat(content?.fileNames.filter(filter) || []).map(normalizePath)
         )
@@ -934,10 +941,10 @@ ${logPrefix} ${yellow(
       if (typeof afterDiagnostic === "function") {
         await unwrapPromise(afterDiagnostic(diagnostics));
       }
-      rootNames.forEach((file) => {
+      for (const file of rootNames) {
         this.addWatchFile(file);
         rootFiles.add(file);
-      });
+      }
       bundleDebug("create ts program");
       timeRecord += Date.now() - startTime;
     },
@@ -995,7 +1002,10 @@ ${logPrefix} ${yellow(
       id = id.split("?")[0];
       const sourceFile = host.getSourceFile(id, ts.ScriptTarget.ESNext);
       if (sourceFile) {
-        rootFiles.add(sourceFile.fileName);
+        for (const file of rootNames) {
+          rootFiles.add(file);
+        }
+        rootFiles.add(normalizePath(sourceFile.fileName));
         bundled = false;
         timeRecord = 0;
         program = rebuildProgram();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "4.2.3-dev.2",
+  "version": "4.2.4",
   "type": "module",
   "packageManager": "pnpm@9.9.0",
   "license": "MIT",