vite-plugin-dts 4.0.0-beta.2 → 4.0.1

package/dist/index.cjs

@@ -14,17 +14,19 @@ 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 _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) {
@@ -46,6 +48,34 @@ const createProgram = typescript.proxyCreateProgram(ts__default, ts__default.cre
   );
   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) {
@@ -170,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) {
@@ -308,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,
@@ -433,7 +483,7 @@ function VueResolver() {
       program.emit(
         sourceFile,
         (path, content) => {
-          outputs.push({ path, content });
+          outputs.push({ path, content: vueTsc.removeEmitGlobalTypes(content) });
         },
         void 0,
         true
@@ -524,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);
@@ -546,6 +598,7 @@ function transformCode(options) {
           });
         }
         s.remove(node.pos, node.end);
+        ++importCount;
       }
       return false;
     }
@@ -601,22 +654,27 @@ 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) {
+function hasNormalExport(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;
+    if (ts__default.isExportDeclaration(node)) {
+      if (node.exportClause && ts__default.isNamedExports(node.exportClause)) {
+        for (const element of node.exportClause.elements) {
+          if (element.name.escapedText !== "default") {
+            has = true;
+            break;
+          }
         }
+      } else {
+        has = true;
       }
     } else if ("modifiers" in node && Array.isArray(node.modifiers) && node.modifiers.length > 1) {
       for (let i = 0, len = node.modifiers.length; i < len; ++i) {
@@ -1023,13 +1081,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,
@@ -1041,7 +1114,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(
@@ -1049,21 +1133,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);
         }
@@ -1102,7 +1187,7 @@ ${logPrefix} ${kolorist.yellow(
           fromPath = fullRelativeRE.test(fromPath) ? fromPath : `./${fromPath}`;
           let content = "";
           if (emittedFiles.has(sourceEntry)) {
-            if (hasNamedExport(emittedFiles.get(sourceEntry))) {
+            if (hasNormalExport(emittedFiles.get(sourceEntry))) {
               content += `export * from '${fromPath}'
 `;
             }
@@ -1117,15 +1202,6 @@ export default ${libName}
         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) => {
@@ -1136,7 +1212,7 @@ export default ${libName}
               outDir,
               entryPath: path,
               fileName: node_path.basename(path),
-              libFolder,
+              libFolder: getTsLibFolder({ root, entryRoot }),
               rollupConfig,
               rollupOptions
             });

package/dist/index.mjs

@@ -17,11 +17,12 @@ 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 _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) {
@@ -43,6 +44,34 @@ const createProgram = proxyCreateProgram(ts, ts.createProgram, (ts2, options) =>
   );
   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) {
@@ -167,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) {
@@ -305,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,
@@ -430,7 +479,7 @@ function VueResolver() {
       program.emit(
         sourceFile,
         (path, content) => {
-          outputs.push({ path, content });
+          outputs.push({ path, content: removeEmitGlobalTypes(content) });
         },
         void 0,
         true
@@ -521,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);
@@ -543,6 +594,7 @@ function transformCode(options) {
           });
         }
         s.remove(node.pos, node.end);
+        ++importCount;
       }
       return false;
     }
@@ -598,22 +650,27 @@ 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) {
+function hasNormalExport(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;
+    if (ts.isExportDeclaration(node)) {
+      if (node.exportClause && ts.isNamedExports(node.exportClause)) {
+        for (const element of node.exportClause.elements) {
+          if (element.name.escapedText !== "default") {
+            has = true;
+            break;
+          }
         }
+      } else {
+        has = true;
       }
     } else if ("modifiers" in node && Array.isArray(node.modifiers) && node.modifiers.length > 1) {
       for (let i = 0, len = node.modifiers.length; i < len; ++i) {
@@ -1020,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(
         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,
@@ -1038,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(
+        cpus().length,
+        Array.from(mapFiles.entries()),
+        async ([filePath, content]) => {
+          const baseDir = dirname(filePath);
           filePath = resolve(
             outDir,
             relative(
@@ -1046,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(
-                  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);
         }
@@ -1099,7 +1183,7 @@ ${logPrefix} ${yellow(
           fromPath = fullRelativeRE.test(fromPath) ? fromPath : `./${fromPath}`;
           let content = "";
           if (emittedFiles.has(sourceEntry)) {
-            if (hasNamedExport(emittedFiles.get(sourceEntry))) {
+            if (hasNormalExport(emittedFiles.get(sourceEntry))) {
               content += `export * from '${fromPath}'
 `;
             }
@@ -1114,15 +1198,6 @@ export default ${libName}
         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) => {
@@ -1133,7 +1208,7 @@ export default ${libName}
               outDir,
               entryPath: path,
               fileName: basename(path),
-              libFolder,
+              libFolder: getTsLibFolder({ root, entryRoot }),
               rollupConfig,
               rollupOptions
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.1",
   "type": "module",
   "packageManager": "pnpm@8.3.0",
   "license": "MIT",