vite-plugin-dts 3.8.2 → 3.9.0

package/dist/index.cjs

@@ -307,14 +307,13 @@ function rollupDeclarationFiles({
     configObjectFullPath,
     packageJsonFullPath: tryGetPkgPath(configObjectFullPath)
   });
-  const result = apiExtractor.Extractor.invoke(extractorConfig, {
+  return apiExtractor.Extractor.invoke(extractorConfig, {
     localBuild: false,
     showVerboseMessages: false,
     showDiagnostics: false,
     typescriptCompilerFolder: libFolder ? node_path.resolve(libFolder) : void 0,
     ...rollupOptions
   });
-  return result.succeeded;
 }
 
 const jsonRE = /\.json$/;
@@ -563,6 +562,14 @@ function hasExportDefault(content) {
       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;
         }
       }
     }
@@ -616,6 +623,7 @@ function dtsPlugin(options = {}) {
     strictOutput = true,
     afterDiagnostic = noop,
     beforeWriteFile = noop,
+    afterRollup = noop,
     afterBuild = noop
   } = options;
   let root = ensureAbsolute(options.root ?? "", process.cwd());
@@ -1035,37 +1043,30 @@ export default ${libName}
           }
           const rollupFiles = /* @__PURE__ */ new Set();
           const compilerOptions2 = configPath ? getTsConfig(configPath, host.readFile).compilerOptions : rawCompilerOptions;
-          if (multiple) {
-            for (const name of entryNames) {
-              const path = cleanPath(resolve(outDir, tsToDts(name)));
-              rollupDeclarationFiles({
-                root,
-                configPath,
-                compilerOptions: compilerOptions2,
-                outDir,
-                entryPath: path,
-                fileName: node_path.basename(path),
-                libFolder,
-                rollupConfig,
-                rollupOptions
-              });
-              emittedFiles.delete(path);
-              rollupFiles.add(path);
-            }
-          } else {
-            rollupDeclarationFiles({
+          const rollup = async (path) => {
+            const result = rollupDeclarationFiles({
               root,
               configPath,
               compilerOptions: compilerOptions2,
               outDir,
-              entryPath: typesPath,
-              fileName: node_path.basename(typesPath),
+              entryPath: path,
+              fileName: node_path.basename(path),
               libFolder,
               rollupConfig,
               rollupOptions
             });
-            emittedFiles.delete(typesPath);
-            rollupFiles.add(typesPath);
+            emittedFiles.delete(path);
+            rollupFiles.add(path);
+            if (typeof afterRollup === "function") {
+              await unwrapPromise(afterRollup(result));
+            }
+          };
+          if (multiple) {
+            await runParallel(node_os.cpus().length, entryNames, async (name) => {
+              await rollup(cleanPath(resolve(outDir, tsToDts(name))));
+            });
+          } else {
+            await rollup(typesPath);
           }
           await runParallel(node_os.cpus().length, Array.from(emittedFiles.keys()), (f) => promises.unlink(f));
           removeDirIfEmpty(outDir);

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import * as vite from 'vite';
 import { LogLevel } from 'vite';
 import ts from 'typescript';
-import { IExtractorInvokeOptions, IExtractorConfigPrepareOptions } from '@microsoft/api-extractor';
+import { IExtractorInvokeOptions, ExtractorResult, IExtractorConfigPrepareOptions } from '@microsoft/api-extractor';
 
 type MaybePromise<T> = T | Promise<T>;
 type RollupConfig = Omit<IExtractorConfigPrepareOptions['configObject'], 'projectFolder' | 'mainEntryPointFilePath' | 'compiler' | 'dtsRollup'>;
@@ -213,6 +213,12 @@ interface PluginOptions {
         filePath?: string;
         content?: string;
     }>;
+    /**
+     * Hook called after rolling up declaration files
+     *
+     * @default () => {}
+     */
+    afterRollup?: (result: ExtractorResult) => MaybePromise<void>;
     /**
      * Hook called after all declaration files are written
      *

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import * as vite from 'vite';
 import { LogLevel } from 'vite';
 import ts from 'typescript';
-import { IExtractorInvokeOptions, IExtractorConfigPrepareOptions } from '@microsoft/api-extractor';
+import { IExtractorInvokeOptions, ExtractorResult, IExtractorConfigPrepareOptions } from '@microsoft/api-extractor';
 
 type MaybePromise<T> = T | Promise<T>;
 type RollupConfig = Omit<IExtractorConfigPrepareOptions['configObject'], 'projectFolder' | 'mainEntryPointFilePath' | 'compiler' | 'dtsRollup'>;
@@ -213,6 +213,12 @@ interface PluginOptions {
         filePath?: string;
         content?: string;
     }>;
+    /**
+     * Hook called after rolling up declaration files
+     *
+     * @default () => {}
+     */
+    afterRollup?: (result: ExtractorResult) => MaybePromise<void>;
     /**
      * Hook called after all declaration files are written
      *

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as vite from 'vite';
 import { LogLevel } from 'vite';
 import ts from 'typescript';
-import { IExtractorInvokeOptions, IExtractorConfigPrepareOptions } from '@microsoft/api-extractor';
+import { IExtractorInvokeOptions, ExtractorResult, IExtractorConfigPrepareOptions } from '@microsoft/api-extractor';
 
 type MaybePromise<T> = T | Promise<T>;
 type RollupConfig = Omit<IExtractorConfigPrepareOptions['configObject'], 'projectFolder' | 'mainEntryPointFilePath' | 'compiler' | 'dtsRollup'>;
@@ -213,6 +213,12 @@ interface PluginOptions {
         filePath?: string;
         content?: string;
     }>;
+    /**
+     * Hook called after rolling up declaration files
+     *
+     * @default () => {}
+     */
+    afterRollup?: (result: ExtractorResult) => MaybePromise<void>;
     /**
      * Hook called after all declaration files are written
      *

package/dist/index.mjs

@@ -304,14 +304,13 @@ function rollupDeclarationFiles({
     configObjectFullPath,
     packageJsonFullPath: tryGetPkgPath(configObjectFullPath)
   });
-  const result = Extractor.invoke(extractorConfig, {
+  return Extractor.invoke(extractorConfig, {
     localBuild: false,
     showVerboseMessages: false,
     showDiagnostics: false,
     typescriptCompilerFolder: libFolder ? resolve$1(libFolder) : void 0,
     ...rollupOptions
   });
-  return result.succeeded;
 }
 
 const jsonRE = /\.json$/;
@@ -560,6 +559,14 @@ function hasExportDefault(content) {
       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;
         }
       }
     }
@@ -613,6 +620,7 @@ function dtsPlugin(options = {}) {
     strictOutput = true,
     afterDiagnostic = noop,
     beforeWriteFile = noop,
+    afterRollup = noop,
     afterBuild = noop
   } = options;
   let root = ensureAbsolute(options.root ?? "", process.cwd());
@@ -1032,37 +1040,30 @@ export default ${libName}
           }
           const rollupFiles = /* @__PURE__ */ new Set();
           const compilerOptions2 = configPath ? getTsConfig(configPath, host.readFile).compilerOptions : rawCompilerOptions;
-          if (multiple) {
-            for (const name of entryNames) {
-              const path = cleanPath(resolve(outDir, tsToDts(name)));
-              rollupDeclarationFiles({
-                root,
-                configPath,
-                compilerOptions: compilerOptions2,
-                outDir,
-                entryPath: path,
-                fileName: basename(path),
-                libFolder,
-                rollupConfig,
-                rollupOptions
-              });
-              emittedFiles.delete(path);
-              rollupFiles.add(path);
-            }
-          } else {
-            rollupDeclarationFiles({
+          const rollup = async (path) => {
+            const result = rollupDeclarationFiles({
               root,
               configPath,
               compilerOptions: compilerOptions2,
               outDir,
-              entryPath: typesPath,
-              fileName: basename(typesPath),
+              entryPath: path,
+              fileName: basename(path),
               libFolder,
               rollupConfig,
               rollupOptions
             });
-            emittedFiles.delete(typesPath);
-            rollupFiles.add(typesPath);
+            emittedFiles.delete(path);
+            rollupFiles.add(path);
+            if (typeof afterRollup === "function") {
+              await unwrapPromise(afterRollup(result));
+            }
+          };
+          if (multiple) {
+            await runParallel(cpus().length, entryNames, async (name) => {
+              await rollup(cleanPath(resolve(outDir, tsToDts(name))));
+            });
+          } else {
+            await rollup(typesPath);
           }
           await runParallel(cpus().length, Array.from(emittedFiles.keys()), (f) => unlink(f));
           removeDirIfEmpty(outDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "3.8.2",
+  "version": "3.9.0",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",