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

package/dist/index.cjs

@@ -9,21 +9,74 @@ const node_os = require('node:os');
 const languageCore = require('@vue/language-core');
 const typescript = require('@volar/typescript');
 const ts = require('typescript');
-const pluginutils = require('@rollup/pluginutils');
 const vueTsc = require('vue-tsc');
+const pluginutils = require('@rollup/pluginutils');
 const debug = require('debug');
 const kolorist = require('kolorist');
 const apiExtractor = require('@microsoft/api-extractor');
+const node_module = require('node:module');
 const localPkg = require('local-pkg');
 const compareVersions = require('compare-versions');
 const MagicString = require('magic-string');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 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 MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 
+const _createProgram = typescript.proxyCreateProgram(ts__default, ts__default.createProgram, (ts2, options) => {
+  const { configFilePath } = options.options;
+  const vueOptions = typeof configFilePath === "string" ? languageCore.createParsedCommandLine(ts2, ts2.sys, configFilePath.replace(/\\/g, "/")).vueOptions : languageCore.resolveVueCompilerOptions({});
+  if (options.host) {
+    const writeFile = options.host.writeFile.bind(options.host);
+    options.host.writeFile = (fileName, contents, ...args) => {
+      return writeFile(fileName, vueTsc.removeEmitGlobalTypes(contents), ...args);
+    };
+  }
+  const vueLanguagePlugin = languageCore.createVueLanguagePlugin2(
+    ts2,
+    (id) => id,
+    languageCore.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 = vueTsc.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, "/");
@@ -147,6 +200,23 @@ function getTsConfig(tsConfigPath, readFileSync) {
   Object.assign(tsConfig.compilerOptions, baseConfig.compilerOptions);
   return tsConfig;
 }
+function getTsLibFolder({ root, entryRoot }) {
+  let libFolder;
+  try {
+    libFolder = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))).resolve("typescript").replace(/node_modules\/typescript.*/, "node_modules/typescript");
+  } catch {
+    libFolder = resolve(root, "node_modules/typescript");
+    if (!node_fs.existsSync(libFolder)) {
+      if (root !== entryRoot) {
+        libFolder = resolve(entryRoot, "node_modules/typescript");
+        if (!node_fs.existsSync(libFolder))
+          libFolder = void 0;
+      }
+      libFolder = void 0;
+    }
+  }
+  return libFolder;
+}
 const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
 function base64Encode(number) {
   if (number >= 0 && number < BASE64_ALPHABET.length) {
@@ -285,6 +355,9 @@ function rollupDeclarationFiles({
   if (!dtsRE$1.test(fileName)) {
     fileName += ".d.ts";
   }
+  if (/preserve/i.test(compilerOptions.module)) {
+    compilerOptions = { ...compilerOptions, module: "ESNext" };
+  }
   const extractorConfig = apiExtractor.ExtractorConfig.prepare({
     configObject: {
       ...rollupConfig,
@@ -410,7 +483,7 @@ function VueResolver() {
       program.emit(
         sourceFile,
         (path, content) => {
-          outputs.push({ path, content });
+          outputs.push({ path, content: vueTsc.removeEmitGlobalTypes(content) });
         },
         void 0,
         true
@@ -501,10 +574,12 @@ function transformCode(options) {
     return options.cleanVueFileName ? name.replace(/\.vue$/, "") : name;
   };
   let indexCount = 0;
+  let importCount = 0;
   walkSourceFile(ast, (node, parent) => {
     if (ts__default.isImportDeclaration(node)) {
       if (!node.importClause) {
         options.clearPureImport && s.remove(node.pos, node.end);
+        ++importCount;
       } else if (ts__default.isStringLiteral(node.moduleSpecifier) && (node.importClause.name || node.importClause.namedBindings && ts__default.isNamedImports(node.importClause.namedBindings))) {
         const libName = toLibName(node.moduleSpecifier.text);
         const importSet = importMap.get(libName) ?? importMap.set(libName, /* @__PURE__ */ new Set()).get(libName);
@@ -523,6 +598,7 @@ function transformCode(options) {
           });
         }
         s.remove(node.pos, node.end);
+        ++importCount;
       }
       return false;
     }
@@ -565,7 +641,7 @@ function transformCode(options) {
       return false;
     }
     if (ts__default.isModuleDeclaration(node)) {
-      if (node.body && ts__default.isModuleBlock(node.body) && !node.body.statements.some(
+      if (node.modifiers?.[0] && node.modifiers[0].kind === ts__default.SyntaxKind.DeclareKeyword && node.body && ts__default.isModuleBlock(node.body) && !node.body.statements.some(
         (s2) => ts__default.isExportAssignment(s2) || ts__default.isExportDeclaration(s2) || ts__default.isImportDeclaration(s2)
       )) {
         declareModules.push(s.slice(node.pos, node.end + 1));
@@ -578,12 +654,36 @@ function transformCode(options) {
     prependImports += `import { ${Array.from(importSet).join(", ")} } from '${libName}';
 `;
   });
-  s.prepend(prependImports);
+  s.trimStart("\n").prepend(prependImports);
   return {
     content: s.toString(),
-    declareModules
+    declareModules,
+    diffLineCount: importMap.size && importCount < importMap.size ? importMap.size - importCount : null
   };
 }
+function hasNamedExport(content) {
+  const ast = ts__default.createSourceFile("a.ts", content, ts__default.ScriptTarget.Latest);
+  let has = false;
+  walkSourceFile(ast, (node) => {
+    if (ts__default.isExportDeclaration(node) && node.exportClause && ts__default.isNamedExports(node.exportClause)) {
+      for (const element of node.exportClause.elements) {
+        if (element.name.escapedText !== "default") {
+          has = true;
+          break;
+        }
+      }
+    } else if ("modifiers" in node && Array.isArray(node.modifiers) && node.modifiers.length > 1) {
+      for (let i = 0, len = node.modifiers.length; i < len; ++i) {
+        if (node.modifiers[i].kind === ts__default.SyntaxKind.ExportKeyword && node.modifiers[i + 1]?.kind !== ts__default.SyntaxKind.DefaultKeyword) {
+          has = true;
+          break;
+        }
+      }
+    }
+    return false;
+  });
+  return has;
+}
 function hasExportDefault(content) {
   const ast = ts__default.createSourceFile("a.ts", content, ts__default.ScriptTarget.Latest);
   let has = false;
@@ -610,26 +710,6 @@ function hasExportDefault(content) {
   return has;
 }
 
-const createProgram = typescript.proxyCreateProgram(ts__default, ts__default.createProgram, (ts2, options) => {
-  const { configFilePath } = options.options;
-  const vueOptions = typeof configFilePath === "string" ? languageCore.createParsedCommandLine(ts2, ts2.sys, configFilePath.replace(/\\/g, "/")).vueOptions : languageCore.resolveVueCompilerOptions({});
-  if (options.host) {
-    const writeFile2 = options.host.writeFile.bind(options.host);
-    options.host.writeFile = (fileName, contents, ...args) => {
-      return writeFile2(fileName, vueTsc.removeEmitGlobalTypes(contents), ...args);
-    };
-  }
-  const vueLanguagePlugin = languageCore.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?$/;
@@ -997,13 +1077,28 @@ ${logPrefix} Start generate declaration files...`));
       }
       bundleDebug("emit output patch");
       const currentDir = host.getCurrentDirectory();
+      const declarationFiles = /* @__PURE__ */ new Map();
+      const mapFiles = /* @__PURE__ */ new Map();
+      const prependMappings = /* @__PURE__ */ new Map();
+      for (const [filePath, content] of outputFiles.entries()) {
+        if (filePath.endsWith(".map")) {
+          mapFiles.set(filePath, content);
+        } else {
+          declarationFiles.set(filePath, content);
+        }
+      }
       await runParallel(
         node_os.cpus().length,
-        Array.from(outputFiles.entries()),
+        Array.from(declarationFiles.entries()),
         async ([filePath, content]) => {
-          const isMapFile = filePath.endsWith(".map");
-          const baseDir = node_path.dirname(filePath);
-          if (!isMapFile && content) {
+          const newFilePath = resolve(
+            outDir,
+            node_path.relative(
+              entryRoot,
+              cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath
+            )
+          );
+          if (content) {
             const result = transformCode({
               filePath,
               content,
@@ -1015,7 +1110,18 @@ ${logPrefix} Start generate declaration files...`));
             });
             content = result.content;
             declareModules.push(...result.declareModules);
+            if (result.diffLineCount) {
+              prependMappings.set(`${newFilePath}.map`, ";".repeat(result.diffLineCount));
+            }
           }
+          await writeOutput(newFilePath, content, outDir);
+        }
+      );
+      await runParallel(
+        node_os.cpus().length,
+        Array.from(mapFiles.entries()),
+        async ([filePath, content]) => {
+          const baseDir = node_path.dirname(filePath);
           filePath = resolve(
             outDir,
             node_path.relative(
@@ -1023,21 +1129,22 @@ ${logPrefix} Start generate declaration files...`));
               cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath
             )
           );
-          if (isMapFile) {
-            try {
-              const sourceMap = JSON.parse(content);
-              sourceMap.sources = sourceMap.sources.map((source) => {
-                return normalizePath(
-                  node_path.relative(
-                    node_path.dirname(filePath),
-                    resolve(currentDir, node_path.relative(publicRoot, baseDir), source)
-                  )
-                );
-              });
-              content = JSON.stringify(sourceMap);
-            } catch (e) {
-              logger.warn(`${logPrefix} ${kolorist.yellow("Processing source map fail:")} ${filePath}`);
+          try {
+            const sourceMap = JSON.parse(content);
+            sourceMap.sources = sourceMap.sources.map((source) => {
+              return normalizePath(
+                node_path.relative(
+                  node_path.dirname(filePath),
+                  resolve(currentDir, node_path.relative(publicRoot, baseDir), source)
+                )
+              );
+            });
+            if (prependMappings.has(filePath)) {
+              sourceMap.mappings = `${prependMappings.get(filePath)}${sourceMap.mappings}`;
             }
+            content = JSON.stringify(sourceMap);
+          } catch (e) {
+            logger.warn(`${logPrefix} ${kolorist.yellow("Processing source map fail:")} ${filePath}`);
           }
           await writeOutput(filePath, content, outDir);
         }
@@ -1074,27 +1181,23 @@ ${logPrefix} ${kolorist.yellow(
           let fromPath = normalizePath(node_path.relative(node_path.dirname(entryDtsPath), sourceEntry));
           fromPath = fromPath.replace(dtsRE, "");
           fromPath = fullRelativeRE.test(fromPath) ? fromPath : `./${fromPath}`;
-          let content = `export * from '${fromPath}'
+          let content = "";
+          if (emittedFiles.has(sourceEntry)) {
+            if (hasNamedExport(emittedFiles.get(sourceEntry))) {
+              content += `export * from '${fromPath}'
 `;
-          if (emittedFiles.has(sourceEntry) && hasExportDefault(emittedFiles.get(sourceEntry))) {
-            content += `import ${libName} from '${fromPath}'
+            }
+            if (hasExportDefault(emittedFiles.get(sourceEntry))) {
+              content += `import ${libName} from '${fromPath}'
 export default ${libName}
 `;
+            }
           }
           await writeOutput(cleanPath(entryDtsPath), content, outDir);
         }
         bundleDebug("insert index");
         if (rollupTypes) {
           logger.info(kolorist.green(`${logPrefix} Start rollup declaration files...`));
-          let libFolder = resolve(root, "node_modules/typescript");
-          if (!node_fs.existsSync(libFolder)) {
-            if (root !== entryRoot) {
-              libFolder = resolve(entryRoot, "node_modules/typescript");
-              if (!node_fs.existsSync(libFolder))
-                libFolder = void 0;
-            }
-            libFolder = void 0;
-          }
           const rollupFiles = /* @__PURE__ */ new Set();
           const compilerOptions2 = configPath ? getTsConfig(configPath, host.readFile).compilerOptions : rawCompilerOptions;
           const rollup = async (path) => {
@@ -1105,7 +1208,7 @@ export default ${libName}
               outDir,
               entryPath: path,
               fileName: node_path.basename(path),
-              libFolder,
+              libFolder: getTsLibFolder({ root, entryRoot }),
               rollupConfig,
               rollupOptions
             });
@@ -1130,8 +1233,7 @@ export default ${libName}
             await writeOutput(
               filePath,
               await promises.readFile(filePath, "utf-8") + (declared ? `
-${declared}
-` : ""),
+${declared}` : ""),
               node_path.dirname(filePath)
             );
           });

package/dist/index.mjs

@@ -9,18 +9,70 @@ 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, resolveVueCompilerOptions, createVueLanguagePlugin } from '@vue/language-core';
+import { createParsedCommandLine, resolveVueCompilerOptions, createVueLanguagePlugin2, createRootFileChecker } from '@vue/language-core';
 import { proxyCreateProgram } from '@volar/typescript';
 import ts from 'typescript';
-import { createFilter } from '@rollup/pluginutils';
 import { removeEmitGlobalTypes } from 'vue-tsc';
+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, "/");
@@ -144,6 +196,23 @@ function getTsConfig(tsConfigPath, readFileSync) {
   Object.assign(tsConfig.compilerOptions, baseConfig.compilerOptions);
   return tsConfig;
 }
+function getTsLibFolder({ root, entryRoot }) {
+  let libFolder;
+  try {
+    libFolder = 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;
+}
 const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
 function base64Encode(number) {
   if (number >= 0 && number < BASE64_ALPHABET.length) {
@@ -282,6 +351,9 @@ function rollupDeclarationFiles({
   if (!dtsRE$1.test(fileName)) {
     fileName += ".d.ts";
   }
+  if (/preserve/i.test(compilerOptions.module)) {
+    compilerOptions = { ...compilerOptions, module: "ESNext" };
+  }
   const extractorConfig = ExtractorConfig.prepare({
     configObject: {
       ...rollupConfig,
@@ -407,7 +479,7 @@ function VueResolver() {
       program.emit(
         sourceFile,
         (path, content) => {
-          outputs.push({ path, content });
+          outputs.push({ path, content: removeEmitGlobalTypes(content) });
         },
         void 0,
         true
@@ -498,10 +570,12 @@ function transformCode(options) {
     return options.cleanVueFileName ? name.replace(/\.vue$/, "") : name;
   };
   let indexCount = 0;
+  let importCount = 0;
   walkSourceFile(ast, (node, parent) => {
     if (ts.isImportDeclaration(node)) {
       if (!node.importClause) {
         options.clearPureImport && s.remove(node.pos, node.end);
+        ++importCount;
       } else if (ts.isStringLiteral(node.moduleSpecifier) && (node.importClause.name || node.importClause.namedBindings && ts.isNamedImports(node.importClause.namedBindings))) {
         const libName = toLibName(node.moduleSpecifier.text);
         const importSet = importMap.get(libName) ?? importMap.set(libName, /* @__PURE__ */ new Set()).get(libName);
@@ -520,6 +594,7 @@ function transformCode(options) {
           });
         }
         s.remove(node.pos, node.end);
+        ++importCount;
       }
       return false;
     }
@@ -562,7 +637,7 @@ function transformCode(options) {
       return false;
     }
     if (ts.isModuleDeclaration(node)) {
-      if (node.body && ts.isModuleBlock(node.body) && !node.body.statements.some(
+      if (node.modifiers?.[0] && node.modifiers[0].kind === ts.SyntaxKind.DeclareKeyword && node.body && ts.isModuleBlock(node.body) && !node.body.statements.some(
         (s2) => ts.isExportAssignment(s2) || ts.isExportDeclaration(s2) || ts.isImportDeclaration(s2)
       )) {
         declareModules.push(s.slice(node.pos, node.end + 1));
@@ -575,12 +650,36 @@ function transformCode(options) {
     prependImports += `import { ${Array.from(importSet).join(", ")} } from '${libName}';
 `;
   });
-  s.prepend(prependImports);
+  s.trimStart("\n").prepend(prependImports);
   return {
     content: s.toString(),
-    declareModules
+    declareModules,
+    diffLineCount: importMap.size && importCount < importMap.size ? importMap.size - importCount : null
   };
 }
+function hasNamedExport(content) {
+  const ast = ts.createSourceFile("a.ts", content, ts.ScriptTarget.Latest);
+  let has = false;
+  walkSourceFile(ast, (node) => {
+    if (ts.isExportDeclaration(node) && node.exportClause && ts.isNamedExports(node.exportClause)) {
+      for (const element of node.exportClause.elements) {
+        if (element.name.escapedText !== "default") {
+          has = true;
+          break;
+        }
+      }
+    } else if ("modifiers" in node && Array.isArray(node.modifiers) && node.modifiers.length > 1) {
+      for (let i = 0, len = node.modifiers.length; i < len; ++i) {
+        if (node.modifiers[i].kind === ts.SyntaxKind.ExportKeyword && node.modifiers[i + 1]?.kind !== ts.SyntaxKind.DefaultKeyword) {
+          has = true;
+          break;
+        }
+      }
+    }
+    return false;
+  });
+  return has;
+}
 function hasExportDefault(content) {
   const ast = ts.createSourceFile("a.ts", content, ts.ScriptTarget.Latest);
   let has = false;
@@ -607,26 +706,6 @@ 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?$/;
@@ -994,13 +1073,28 @@ ${logPrefix} Start generate declaration files...`));
       }
       bundleDebug("emit output patch");
       const currentDir = host.getCurrentDirectory();
+      const declarationFiles = /* @__PURE__ */ new Map();
+      const mapFiles = /* @__PURE__ */ new Map();
+      const prependMappings = /* @__PURE__ */ new Map();
+      for (const [filePath, content] of outputFiles.entries()) {
+        if (filePath.endsWith(".map")) {
+          mapFiles.set(filePath, content);
+        } else {
+          declarationFiles.set(filePath, content);
+        }
+      }
       await runParallel(
         cpus().length,
-        Array.from(outputFiles.entries()),
+        Array.from(declarationFiles.entries()),
         async ([filePath, content]) => {
-          const isMapFile = filePath.endsWith(".map");
-          const baseDir = dirname(filePath);
-          if (!isMapFile && content) {
+          const newFilePath = resolve(
+            outDir,
+            relative(
+              entryRoot,
+              cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath
+            )
+          );
+          if (content) {
             const result = transformCode({
               filePath,
               content,
@@ -1012,7 +1106,18 @@ ${logPrefix} Start generate declaration files...`));
             });
             content = result.content;
             declareModules.push(...result.declareModules);
+            if (result.diffLineCount) {
+              prependMappings.set(`${newFilePath}.map`, ";".repeat(result.diffLineCount));
+            }
           }
+          await writeOutput(newFilePath, content, outDir);
+        }
+      );
+      await runParallel(
+        cpus().length,
+        Array.from(mapFiles.entries()),
+        async ([filePath, content]) => {
+          const baseDir = dirname(filePath);
           filePath = resolve(
             outDir,
             relative(
@@ -1020,21 +1125,22 @@ ${logPrefix} Start generate declaration files...`));
               cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath
             )
           );
-          if (isMapFile) {
-            try {
-              const sourceMap = JSON.parse(content);
-              sourceMap.sources = sourceMap.sources.map((source) => {
-                return normalizePath(
-                  relative(
-                    dirname(filePath),
-                    resolve(currentDir, relative(publicRoot, baseDir), source)
-                  )
-                );
-              });
-              content = JSON.stringify(sourceMap);
-            } catch (e) {
-              logger.warn(`${logPrefix} ${yellow("Processing source map fail:")} ${filePath}`);
+          try {
+            const sourceMap = JSON.parse(content);
+            sourceMap.sources = sourceMap.sources.map((source) => {
+              return normalizePath(
+                relative(
+                  dirname(filePath),
+                  resolve(currentDir, relative(publicRoot, baseDir), source)
+                )
+              );
+            });
+            if (prependMappings.has(filePath)) {
+              sourceMap.mappings = `${prependMappings.get(filePath)}${sourceMap.mappings}`;
             }
+            content = JSON.stringify(sourceMap);
+          } catch (e) {
+            logger.warn(`${logPrefix} ${yellow("Processing source map fail:")} ${filePath}`);
           }
           await writeOutput(filePath, content, outDir);
         }
@@ -1071,27 +1177,23 @@ ${logPrefix} ${yellow(
           let fromPath = normalizePath(relative(dirname(entryDtsPath), sourceEntry));
           fromPath = fromPath.replace(dtsRE, "");
           fromPath = fullRelativeRE.test(fromPath) ? fromPath : `./${fromPath}`;
-          let content = `export * from '${fromPath}'
+          let content = "";
+          if (emittedFiles.has(sourceEntry)) {
+            if (hasNamedExport(emittedFiles.get(sourceEntry))) {
+              content += `export * from '${fromPath}'
 `;
-          if (emittedFiles.has(sourceEntry) && hasExportDefault(emittedFiles.get(sourceEntry))) {
-            content += `import ${libName} from '${fromPath}'
+            }
+            if (hasExportDefault(emittedFiles.get(sourceEntry))) {
+              content += `import ${libName} from '${fromPath}'
 export default ${libName}
 `;
+            }
           }
           await writeOutput(cleanPath(entryDtsPath), content, outDir);
         }
         bundleDebug("insert index");
         if (rollupTypes) {
           logger.info(green(`${logPrefix} Start rollup declaration files...`));
-          let 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;
-          }
           const rollupFiles = /* @__PURE__ */ new Set();
           const compilerOptions2 = configPath ? getTsConfig(configPath, host.readFile).compilerOptions : rawCompilerOptions;
           const rollup = async (path) => {
@@ -1102,7 +1204,7 @@ export default ${libName}
               outDir,
               entryPath: path,
               fileName: basename(path),
-              libFolder,
+              libFolder: getTsLibFolder({ root, entryRoot }),
               rollupConfig,
               rollupOptions
             });
@@ -1127,8 +1229,7 @@ export default ${libName}
             await writeOutput(
               filePath,
               await readFile(filePath, "utf-8") + (declared ? `
-${declared}
-` : ""),
+${declared}` : ""),
               dirname(filePath)
             );
           });

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "vite-plugin-dts",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0",
   "type": "module",
+  "packageManager": "pnpm@8.3.0",
   "license": "MIT",
   "author": "qmhc",
-  "packageManager": "pnpm@8.3.0",
   "scripts": {
     "build": "tsx scripts/build.ts",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path .",
     "dev": "unbuild --stub",
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx \"{src,tests}/**\"",
     "_postinstall": "is-ci || husky install",
-    "postpublish": "pinst --enable",
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx \"{src,tests}/**\"",
     "precommit": "lint-staged -c ./.husky/.lintstagedrc -q",
     "prepublishOnly": "pinst --disable",
     "prettier": "pretty-quick --staged && pnpm run lint",
+    "postpublish": "pinst --enable",
     "release": "tsx scripts/release.ts",
     "test": "vitest run",
     "test:dev": "vitest",
@@ -39,13 +39,6 @@
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/qmhc/vite-plugin-dts.git"
-  },
-  "bugs": {
-    "url": "https://github.com/qmhc/vite-plugin-dts/issues"
-  },
   "keywords": [
     "vite",
     "vite-plugin",
@@ -57,17 +50,24 @@
     "vue-tsc",
     "volar"
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/qmhc/vite-plugin-dts.git"
+  },
+  "bugs": {
+    "url": "https://github.com/qmhc/vite-plugin-dts/issues"
+  },
   "dependencies": {
-    "@microsoft/api-extractor": "7.47.2",
+    "@microsoft/api-extractor": "7.47.4",
     "@rollup/pluginutils": "^5.1.0",
     "@volar/typescript": "^2.3.4",
-    "@vue/language-core": "2.0.19",
+    "@vue/language-core": "2.0.29",
     "compare-versions": "^6.1.1",
-    "debug": "^4.3.5",
+    "debug": "^4.3.6",
     "kolorist": "^1.8.0",
     "local-pkg": "^0.5.0",
-    "magic-string": "^0.30.10",
-    "vue-tsc": "2.0.19"
+    "magic-string": "^0.30.11",
+    "vue-tsc": "2.0.29"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",
@@ -78,7 +78,7 @@
     "@types/semver": "^7.5.8",
     "@vexip-ui/commitlint-config": "^0.5.0",
     "@vexip-ui/eslint-config": "^0.12.1",
-    "@vexip-ui/prettier-config": "^0.2.0",
+    "@vexip-ui/prettier-config": "^1.0.0",
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^13.0.0",
     "conventional-changelog-cli": "^5.0.0",
@@ -95,10 +95,10 @@
     "rimraf": "^6.0.1",
     "semver": "^7.6.3",
     "tsx": "^4.16.2",
-    "typescript": "5.5.3",
+    "typescript": "5.5.4",
     "unbuild": "^2.0.0",
-    "vite": "^5.3.4",
-    "vitest": "^2.0.3"
+    "vite": "^5.3.5",
+    "vitest": "^2.0.4"
   },
   "peerDependencies": {
     "typescript": "*",
@@ -111,7 +111,7 @@
   },
   "pnpm": {
     "patchedDependencies": {
-      "@microsoft/api-extractor@7.47.2": "patches/@microsoft__api-extractor@7.47.2.patch"
+      "@microsoft/api-extractor@7.47.4": "patches/@microsoft__api-extractor@7.47.4.patch"
     }
   }
 }