vite-plugin-dts 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/index.cjs

@@ -599,6 +599,7 @@ const defaultIndex = "index.d.ts";
 const noop = () => {
 };
 const extPrefix = (file) => mtjsRE.test(file) ? "m" : ctjsRE.test(file) ? "c" : "";
+const resolve = (...paths) => vite.normalizePath(node_path.resolve(...paths));
 const logPrefix = kolorist.cyan("[vite:dts]");
 const bundleDebug = debug("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
@@ -640,7 +641,7 @@ function dtsPlugin(options = {}) {
   let allowJs = false;
   let transformError = false;
   function internalTransform(code, id) {
-    if (!filter(id)) {
+    if (!project || !filter(id)) {
       return;
     }
     if (vueRE.test(id)) {
@@ -735,7 +736,7 @@ ${kolorist.cyan(
         compilerOptions: mergeObjects(compilerOptions, {
           rootDir: compilerOptions.rootDir || root,
           noEmitOnError,
-          outDir: ".",
+          outDir: outputDirs[0],
           declarationDir: void 0,
           noUnusedParameters: false,
           declaration: true,
@@ -848,6 +849,7 @@ ${logPrefix} Start generate declaration files...`));
         }
         bundleDebug("diagnostics");
       }
+      const outputDir = outputDirs[0];
       const dtsOutputFiles = Array.from(sourceDtsFiles).map((sourceFile) => ({
         path: sourceFile.getFilePath(),
         content: sourceFile.getFullText()
@@ -855,16 +857,13 @@ ${logPrefix} Start generate declaration files...`));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map(
         (sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
-          path: vite.normalizePath(node_path.resolve(root, outputFile.compilerObject.name)),
+          path: resolve(root, node_path.relative(outputDir, outputFile.compilerObject.name)),
           content: outputFile.getText()
         }))
       ).flat().concat(dtsOutputFiles);
       bundleDebug("emit");
-      if (!entryRoot) {
-        entryRoot = queryPublicPath(outputFiles.map((file) => file.path));
-      }
+      entryRoot = entryRoot || queryPublicPath(outputFiles.map((file) => file.path));
       entryRoot = ensureAbsolute(entryRoot, root);
-      const outputDir = outputDirs[0];
       await runParallel(os.cpus().length, outputFiles, async (outputFile) => {
         let filePath = outputFile.path;
         let content = outputFile.content;
@@ -877,43 +876,46 @@ ${logPrefix} Start generate declaration files...`));
           content = transformAliasImport(filePath, content, aliases, aliasesExclude);
           content = staticImport || rollupTypes ? transformDynamicImport(content) : content;
         }
-        filePath = node_path.resolve(
+        filePath = resolve(
           outputDir,
           node_path.relative(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath)
         );
+        content = cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content;
         if (typeof beforeWriteFile === "function") {
           const result = beforeWriteFile(filePath, content);
           if (result === false)
             return;
           if (result && isNativeObj(result)) {
-            filePath = result.filePath ?? filePath;
+            filePath = result.filePath || filePath;
             content = result.content ?? content;
           }
         }
+        filePath = vite.normalizePath(filePath);
         await fs.mkdir(node_path.dirname(filePath), { recursive: true });
-        await fs.writeFile(
-          filePath,
-          cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content,
-          "utf-8"
-        );
-        emittedFiles.set(
-          vite.normalizePath(filePath),
-          cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content
-        );
+        await fs.writeFile(filePath, content, "utf-8");
+        emittedFiles.set(filePath, content);
       });
       bundleDebug("output");
+      if (copyDtsFiles) {
+        await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
+          const filePath = resolve(outputDir, node_path.basename(path));
+          await fs.writeFile(filePath, content, "utf-8");
+          emittedFiles.set(filePath, content);
+        });
+      }
+      bundleDebug("copy dts");
       if (insertTypesEntry || rollupTypes) {
-        const pkgPath = node_path.resolve(root, "package.json");
+        const pkgPath = resolve(root, "package.json");
         const pkg = fs.existsSync(pkgPath) ? JSON.parse(await fs.readFile(pkgPath, "utf-8")) : {};
         const entryNames = Object.keys(entries);
-        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings;
+        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings || (pkg.exports?.["."] || pkg.exports?.["./"])?.types;
         const multiple = entryNames.length > 1;
-        const typesPath = types ? node_path.resolve(root, types) : node_path.resolve(outputDir, indexName);
+        const typesPath = types ? resolve(root, types) : resolve(outputDir, indexName);
         for (const name of entryNames) {
-          let filePath = multiple ? node_path.resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`) : typesPath;
+          let filePath = multiple ? resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`) : typesPath;
           if (fs.existsSync(filePath))
             continue;
-          const index = node_path.resolve(
+          const index = resolve(
             outputDir,
             node_path.relative(entryRoot, `${entries[name].replace(tsRE, "")}.d.ts`)
           );
@@ -938,21 +940,19 @@ export default ${libName}
               content = result.content ?? content;
             }
           }
+          filePath = vite.normalizePath(filePath);
           if (result !== false) {
             await fs.writeFile(filePath, content, "utf-8");
-            emittedFiles.set(vite.normalizePath(filePath), content);
+            emittedFiles.set(filePath, content);
           }
         }
         bundleDebug("insert index");
         if (rollupTypes) {
           logger.info(kolorist.green(`${logPrefix} Start rollup declaration files...`));
           const rollupFiles = /* @__PURE__ */ new Set();
-          for (const [filePath, content] of emittedFiles) {
-            project.createSourceFile(filePath, content, { overwrite: true });
-          }
           if (multiple) {
             for (const name of entryNames) {
-              const path = node_path.resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`);
+              const path = resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`);
               rollupDeclarationFiles({
                 root,
                 compilerOptions,
@@ -961,9 +961,8 @@ export default ${libName}
                 fileName: node_path.basename(path),
                 libFolder: libFolderPath
               });
-              const wroteFile = vite.normalizePath(path);
-              emittedFiles.delete(wroteFile);
-              rollupFiles.add(wroteFile);
+              emittedFiles.delete(path);
+              rollupFiles.add(path);
             }
           } else {
             rollupDeclarationFiles({
@@ -974,9 +973,8 @@ export default ${libName}
               fileName: node_path.basename(typesPath),
               libFolder: libFolderPath
             });
-            const wroteFile = vite.normalizePath(typesPath);
-            emittedFiles.delete(wroteFile);
-            rollupFiles.add(wroteFile);
+            emittedFiles.delete(typesPath);
+            rollupFiles.add(typesPath);
           }
           await runParallel(os.cpus().length, Array.from(emittedFiles.keys()), (f) => fs.unlink(f));
           removeDirIfEmpty(outputDir);
@@ -984,13 +982,6 @@ export default ${libName}
           for (const file of rollupFiles) {
             emittedFiles.set(file, await fs.readFile(file, "utf-8"));
           }
-          if (copyDtsFiles) {
-            await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
-              const filePath = node_path.resolve(outputDir, node_path.basename(path));
-              await fs.writeFile(filePath, content, "utf-8");
-              emittedFiles.set(vite.normalizePath(filePath), content);
-            });
-          }
           bundleDebug("rollup");
         }
       }
@@ -1003,7 +994,7 @@ export default ${libName}
             const relativePath = node_path.relative(outputDir, wroteFile);
             await Promise.all(
               dirs.map(async (dir) => {
-                const filePath = node_path.resolve(dir, relativePath);
+                const filePath = resolve(dir, relativePath);
                 await fs.mkdir(node_path.dirname(filePath), { recursive: true });
                 await fs.writeFile(filePath, content, "utf-8");
               })

package/dist/index.mjs

@@ -5,7 +5,7 @@ import __cjs_mod__ from 'module';
 const __filename = __cjs_url__.fileURLToPath(import.meta.url);
 const __dirname = __cjs_path__.dirname(__filename);
 const require = __cjs_mod__.createRequire(import.meta.url);
-import { isAbsolute, resolve, dirname, normalize, sep, relative, basename } from 'node:path';
+import { isAbsolute, resolve as resolve$1, dirname, normalize, sep, relative, basename } from 'node:path';
 import fs from 'fs-extra';
 import os from 'os';
 import { cyan, yellow, red, green } from 'kolorist';
@@ -69,7 +69,7 @@ function mergeObjects(sourceObj, targetObj) {
   return sourceObj;
 }
 function ensureAbsolute(path, root) {
-  return path ? isAbsolute(path) ? path : resolve(root, path) : root;
+  return path ? isAbsolute(path) ? path : resolve$1(root, path) : root;
 }
 function ensureArray(value) {
   return Array.isArray(value) ? value : value ? [value] : [];
@@ -134,7 +134,7 @@ function removeDirIfEmpty(dir) {
   }
   let onlyHasDir = true;
   for (const file of readdirSync(dir)) {
-    const abs = resolve(dir, file);
+    const abs = resolve$1(dir, file);
     if (lstatSync(abs).isDirectory()) {
       if (!removeDirIfEmpty(abs)) {
         onlyHasDir = false;
@@ -514,7 +514,7 @@ function rollupDeclarationFiles({
   fileName,
   libFolder
 }) {
-  const configObjectFullPath = resolve(root, "api-extractor.json");
+  const configObjectFullPath = resolve$1(root, "api-extractor.json");
   const packageJsonLookup = new PackageJsonLookup();
   const packageJsonFullPath = packageJsonLookup.tryGetPackageJsonFilePathFor(configObjectFullPath);
   if (!dtsRE$1.test(fileName)) {
@@ -539,7 +539,7 @@ function rollupDeclarationFiles({
       },
       dtsRollup: {
         enabled: true,
-        publicTrimmedFilePath: resolve(outputDir, fileName)
+        publicTrimmedFilePath: resolve$1(outputDir, fileName)
       },
       tsdocMetadata: {
         enabled: false
@@ -563,7 +563,7 @@ function rollupDeclarationFiles({
   const compilerState = CompilerState.create(extractorConfig, {
     localBuild: false,
     showVerboseMessages: false,
-    typescriptCompilerFolder: libFolder ? resolve(libFolder, "..") : void 0
+    typescriptCompilerFolder: libFolder ? resolve$1(libFolder, "..") : void 0
   });
   const sourceMapper = new SourceMapper();
   const messageRouter = new MessageRouter({
@@ -604,6 +604,7 @@ const defaultIndex = "index.d.ts";
 const noop = () => {
 };
 const extPrefix = (file) => mtjsRE.test(file) ? "m" : ctjsRE.test(file) ? "c" : "";
+const resolve = (...paths) => normalizePath(resolve$1(...paths));
 const logPrefix = cyan("[vite:dts]");
 const bundleDebug = debug("vite-plugin-dts:bundle");
 function dtsPlugin(options = {}) {
@@ -645,7 +646,7 @@ function dtsPlugin(options = {}) {
   let allowJs = false;
   let transformError = false;
   function internalTransform(code, id) {
-    if (!filter(id)) {
+    if (!project || !filter(id)) {
       return;
     }
     if (vueRE.test(id)) {
@@ -740,7 +741,7 @@ ${cyan(
         compilerOptions: mergeObjects(compilerOptions, {
           rootDir: compilerOptions.rootDir || root,
           noEmitOnError,
-          outDir: ".",
+          outDir: outputDirs[0],
           declarationDir: void 0,
           noUnusedParameters: false,
           declaration: true,
@@ -853,6 +854,7 @@ ${logPrefix} Start generate declaration files...`));
         }
         bundleDebug("diagnostics");
       }
+      const outputDir = outputDirs[0];
       const dtsOutputFiles = Array.from(sourceDtsFiles).map((sourceFile) => ({
         path: sourceFile.getFilePath(),
         content: sourceFile.getFullText()
@@ -860,16 +862,13 @@ ${logPrefix} Start generate declaration files...`));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map(
         (sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
-          path: normalizePath(resolve(root, outputFile.compilerObject.name)),
+          path: resolve(root, relative(outputDir, outputFile.compilerObject.name)),
           content: outputFile.getText()
         }))
       ).flat().concat(dtsOutputFiles);
       bundleDebug("emit");
-      if (!entryRoot) {
-        entryRoot = queryPublicPath(outputFiles.map((file) => file.path));
-      }
+      entryRoot = entryRoot || queryPublicPath(outputFiles.map((file) => file.path));
       entryRoot = ensureAbsolute(entryRoot, root);
-      const outputDir = outputDirs[0];
       await runParallel(os.cpus().length, outputFiles, async (outputFile) => {
         let filePath = outputFile.path;
         let content = outputFile.content;
@@ -886,32 +885,35 @@ ${logPrefix} Start generate declaration files...`));
           outputDir,
           relative(entryRoot, cleanVueFileName ? filePath.replace(".vue.d.ts", ".d.ts") : filePath)
         );
+        content = cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content;
         if (typeof beforeWriteFile === "function") {
           const result = beforeWriteFile(filePath, content);
           if (result === false)
             return;
           if (result && isNativeObj(result)) {
-            filePath = result.filePath ?? filePath;
+            filePath = result.filePath || filePath;
             content = result.content ?? content;
           }
         }
+        filePath = normalizePath(filePath);
         await fs.mkdir(dirname(filePath), { recursive: true });
-        await fs.writeFile(
-          filePath,
-          cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content,
-          "utf-8"
-        );
-        emittedFiles.set(
-          normalizePath(filePath),
-          cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content
-        );
+        await fs.writeFile(filePath, content, "utf-8");
+        emittedFiles.set(filePath, content);
       });
       bundleDebug("output");
+      if (copyDtsFiles) {
+        await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
+          const filePath = resolve(outputDir, basename(path));
+          await fs.writeFile(filePath, content, "utf-8");
+          emittedFiles.set(filePath, content);
+        });
+      }
+      bundleDebug("copy dts");
       if (insertTypesEntry || rollupTypes) {
         const pkgPath = resolve(root, "package.json");
         const pkg = fs.existsSync(pkgPath) ? JSON.parse(await fs.readFile(pkgPath, "utf-8")) : {};
         const entryNames = Object.keys(entries);
-        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings;
+        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings || (pkg.exports?.["."] || pkg.exports?.["./"])?.types;
         const multiple = entryNames.length > 1;
         const typesPath = types ? resolve(root, types) : resolve(outputDir, indexName);
         for (const name of entryNames) {
@@ -943,18 +945,16 @@ export default ${libName}
               content = result.content ?? content;
             }
           }
+          filePath = normalizePath(filePath);
           if (result !== false) {
             await fs.writeFile(filePath, content, "utf-8");
-            emittedFiles.set(normalizePath(filePath), content);
+            emittedFiles.set(filePath, content);
           }
         }
         bundleDebug("insert index");
         if (rollupTypes) {
           logger.info(green(`${logPrefix} Start rollup declaration files...`));
           const rollupFiles = /* @__PURE__ */ new Set();
-          for (const [filePath, content] of emittedFiles) {
-            project.createSourceFile(filePath, content, { overwrite: true });
-          }
           if (multiple) {
             for (const name of entryNames) {
               const path = resolve(outputDir, `${name.replace(tsRE, "")}.d.ts`);
@@ -966,9 +966,8 @@ export default ${libName}
                 fileName: basename(path),
                 libFolder: libFolderPath
               });
-              const wroteFile = normalizePath(path);
-              emittedFiles.delete(wroteFile);
-              rollupFiles.add(wroteFile);
+              emittedFiles.delete(path);
+              rollupFiles.add(path);
             }
           } else {
             rollupDeclarationFiles({
@@ -979,9 +978,8 @@ export default ${libName}
               fileName: basename(typesPath),
               libFolder: libFolderPath
             });
-            const wroteFile = normalizePath(typesPath);
-            emittedFiles.delete(wroteFile);
-            rollupFiles.add(wroteFile);
+            emittedFiles.delete(typesPath);
+            rollupFiles.add(typesPath);
           }
           await runParallel(os.cpus().length, Array.from(emittedFiles.keys()), (f) => fs.unlink(f));
           removeDirIfEmpty(outputDir);
@@ -989,13 +987,6 @@ export default ${libName}
           for (const file of rollupFiles) {
             emittedFiles.set(file, await fs.readFile(file, "utf-8"));
           }
-          if (copyDtsFiles) {
-            await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
-              const filePath = resolve(outputDir, basename(path));
-              await fs.writeFile(filePath, content, "utf-8");
-              emittedFiles.set(normalizePath(filePath), content);
-            });
-          }
           bundleDebug("rollup");
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",