vite-plugin-dts 4.5.1 → 4.5.4

package/dist/index.cjs

@@ -472,7 +472,7 @@ function VueResolver() {
       const sourceFile = program.getSourceFile(id) || program.getSourceFile(id + ".ts") || program.getSourceFile(id + ".js") || program.getSourceFile(id + ".tsx") || program.getSourceFile(id + ".jsx");
       if (!sourceFile) return [];
       const outputs = [];
-      program.emit(
+      const { emitSkipped, diagnostics } = program.emit(
         sourceFile,
         (path, content) => {
           outputs.push({ path, content });
@@ -480,7 +480,13 @@ function VueResolver() {
         undefined,
         true
       );
-      if (!program.getCompilerOptions().declarationMap) return outputs;
+      if (!program.getCompilerOptions().declarationMap) {
+        return {
+          outputs,
+          emitSkipped,
+          diagnostics
+        };
+      }
       const [beforeScript] = code.split(/\s*<script.*>/);
       const beforeLines = beforeScript.split("\n").length;
       for (const output of outputs) {
@@ -498,7 +504,11 @@ function VueResolver() {
           }
         }
       }
-      return outputs;
+      return {
+        outputs,
+        emitSkipped,
+        diagnostics
+      };
     }
   };
 }
@@ -803,6 +813,7 @@ function dtsPlugin(options = {}) {
   const rootFiles = /* @__PURE__ */ new Set();
   const outputFiles = /* @__PURE__ */ new Map();
   const transformedFiles = /* @__PURE__ */ new Set();
+  const diagnostics = [];
   const setOutputFile = (path, content) => {
     outputFiles.set(path, content);
   };
@@ -853,7 +864,7 @@ function dtsPlugin(options = {}) {
           entries = { ...input };
         }
         const filename = config.build.lib.fileName ?? defaultIndex;
-        const entry = typeof config.build.lib.entry === "string" ? config.build.lib.entry : Object.values(config.build.lib.entry)[0];
+        const entry = typeof config.build.lib.entry === "string" ? config.build.lib.entry : Object.keys(config.build.lib.entry)[0];
         libName = config.build.lib.name || "_default";
         indexName = typeof filename === "string" ? filename : filename("es", entry);
         if (!dtsRE.test(indexName)) {
@@ -981,17 +992,11 @@ ${logPrefix} ${kolorist.yellow(
       publicRoot = normalizePath(publicRoot);
       entryRoot = entryRoot || publicRoot;
       entryRoot = ensureAbsolute(entryRoot, root);
-      const diagnostics = [
+      diagnostics.push(
         ...program.getDeclarationDiagnostics(),
         ...program.getSemanticDiagnostics(),
         ...program.getSyntacticDiagnostics()
-      ];
-      if (diagnostics?.length) {
-        logger.error(ts__default.formatDiagnosticsWithColorAndContext(diagnostics, host));
-      }
-      if (typeof afterDiagnostic === "function") {
-        await unwrapPromise(afterDiagnostic(diagnostics));
-      }
+      );
       for (const file of rootNames) {
         this.addWatchFile(file);
         rootFiles.add(file);
@@ -1018,7 +1023,16 @@ ${logPrefix} ${kolorist.yellow(
           host,
           program
         });
-        for (const { path, content } of result) {
+        let output;
+        if (Array.isArray(result)) {
+          output = result;
+        } else {
+          output = result.outputs;
+          if (result.emitSkipped && result.diagnostics?.length) {
+            diagnostics.push(...result.diagnostics);
+          }
+        }
+        for (const { path, content } of output) {
           setOutputFile(
             resolve(publicRoot, node_path.relative(outDir, ensureAbsolute(path, outDir))),
             content
@@ -1027,7 +1041,7 @@ ${logPrefix} ${kolorist.yellow(
       } else {
         const sourceFile = program.getSourceFile(id);
         if (sourceFile) {
-          program.emit(
+          const result = program.emit(
             sourceFile,
             (name, text) => {
               setOutputFile(
@@ -1038,6 +1052,9 @@ ${logPrefix} ${kolorist.yellow(
             undefined,
             true
           );
+          if (result.emitSkipped && result.diagnostics.length) {
+            diagnostics.push(...result.diagnostics);
+          }
         }
       }
       const dtsId = id.replace(tjsRE, "") + ".d.ts";
@@ -1070,6 +1087,12 @@ ${logPrefix} ${kolorist.yellow(
       logger.info(kolorist.green(`
 ${logPrefix} Start generate declaration files...`));
       const startTime = Date.now();
+      if (diagnostics?.length) {
+        logger.error(ts__default.formatDiagnosticsWithColorAndContext(diagnostics, host));
+      }
+      if (typeof afterDiagnostic === "function") {
+        await unwrapPromise(afterDiagnostic(diagnostics));
+      }
       const outDir = outDirs[0];
       const emittedFiles = /* @__PURE__ */ new Map();
       const declareModules = [];
@@ -1244,7 +1267,7 @@ ${content}`;
           const compilerOptions2 = configPath ? getTsConfig(configPath, host.readFile).compilerOptions : rawCompilerOptions;
           const rollup = async (path) => {
             const result = rollupDeclarationFiles({
-              root,
+              root: publicRoot,
               configPath,
               compilerOptions: compilerOptions2,
               outDir,
@@ -1299,6 +1322,7 @@ ${declared}` : ""),
           );
         });
       }
+      diagnostics.length = 0;
       if (typeof afterBuild === "function") {
         await unwrapPromise(afterBuild(emittedFiles));
       }

package/dist/index.d.cts

@@ -29,6 +29,13 @@ interface Resolver {
         host: ts.CompilerHost;
         program: ts.Program;
     }) => MaybePromise<{
+        outputs: {
+            path: string;
+            content: string;
+        }[];
+        emitSkipped?: boolean;
+        diagnostics?: readonly ts.Diagnostic[];
+    } | {
         path: string;
         content: string;
     }[]>;

package/dist/index.d.mts

@@ -29,6 +29,13 @@ interface Resolver {
         host: ts.CompilerHost;
         program: ts.Program;
     }) => MaybePromise<{
+        outputs: {
+            path: string;
+            content: string;
+        }[];
+        emitSkipped?: boolean;
+        diagnostics?: readonly ts.Diagnostic[];
+    } | {
         path: string;
         content: string;
     }[]>;

package/dist/index.d.ts

@@ -29,6 +29,13 @@ interface Resolver {
         host: ts.CompilerHost;
         program: ts.Program;
     }) => MaybePromise<{
+        outputs: {
+            path: string;
+            content: string;
+        }[];
+        emitSkipped?: boolean;
+        diagnostics?: readonly ts.Diagnostic[];
+    } | {
         path: string;
         content: string;
     }[]>;

package/dist/index.mjs

@@ -468,7 +468,7 @@ function VueResolver() {
       const sourceFile = program.getSourceFile(id) || program.getSourceFile(id + ".ts") || program.getSourceFile(id + ".js") || program.getSourceFile(id + ".tsx") || program.getSourceFile(id + ".jsx");
       if (!sourceFile) return [];
       const outputs = [];
-      program.emit(
+      const { emitSkipped, diagnostics } = program.emit(
         sourceFile,
         (path, content) => {
           outputs.push({ path, content });
@@ -476,7 +476,13 @@ function VueResolver() {
         undefined,
         true
       );
-      if (!program.getCompilerOptions().declarationMap) return outputs;
+      if (!program.getCompilerOptions().declarationMap) {
+        return {
+          outputs,
+          emitSkipped,
+          diagnostics
+        };
+      }
       const [beforeScript] = code.split(/\s*<script.*>/);
       const beforeLines = beforeScript.split("\n").length;
       for (const output of outputs) {
@@ -494,7 +500,11 @@ function VueResolver() {
           }
         }
       }
-      return outputs;
+      return {
+        outputs,
+        emitSkipped,
+        diagnostics
+      };
     }
   };
 }
@@ -799,6 +809,7 @@ function dtsPlugin(options = {}) {
   const rootFiles = /* @__PURE__ */ new Set();
   const outputFiles = /* @__PURE__ */ new Map();
   const transformedFiles = /* @__PURE__ */ new Set();
+  const diagnostics = [];
   const setOutputFile = (path, content) => {
     outputFiles.set(path, content);
   };
@@ -849,7 +860,7 @@ function dtsPlugin(options = {}) {
           entries = { ...input };
         }
         const filename = config.build.lib.fileName ?? defaultIndex;
-        const entry = typeof config.build.lib.entry === "string" ? config.build.lib.entry : Object.values(config.build.lib.entry)[0];
+        const entry = typeof config.build.lib.entry === "string" ? config.build.lib.entry : Object.keys(config.build.lib.entry)[0];
         libName = config.build.lib.name || "_default";
         indexName = typeof filename === "string" ? filename : filename("es", entry);
         if (!dtsRE.test(indexName)) {
@@ -977,17 +988,11 @@ ${logPrefix} ${yellow(
       publicRoot = normalizePath(publicRoot);
       entryRoot = entryRoot || publicRoot;
       entryRoot = ensureAbsolute(entryRoot, root);
-      const diagnostics = [
+      diagnostics.push(
         ...program.getDeclarationDiagnostics(),
         ...program.getSemanticDiagnostics(),
         ...program.getSyntacticDiagnostics()
-      ];
-      if (diagnostics?.length) {
-        logger.error(ts.formatDiagnosticsWithColorAndContext(diagnostics, host));
-      }
-      if (typeof afterDiagnostic === "function") {
-        await unwrapPromise(afterDiagnostic(diagnostics));
-      }
+      );
       for (const file of rootNames) {
         this.addWatchFile(file);
         rootFiles.add(file);
@@ -1014,7 +1019,16 @@ ${logPrefix} ${yellow(
           host,
           program
         });
-        for (const { path, content } of result) {
+        let output;
+        if (Array.isArray(result)) {
+          output = result;
+        } else {
+          output = result.outputs;
+          if (result.emitSkipped && result.diagnostics?.length) {
+            diagnostics.push(...result.diagnostics);
+          }
+        }
+        for (const { path, content } of output) {
           setOutputFile(
             resolve(publicRoot, relative(outDir, ensureAbsolute(path, outDir))),
             content
@@ -1023,7 +1037,7 @@ ${logPrefix} ${yellow(
       } else {
         const sourceFile = program.getSourceFile(id);
         if (sourceFile) {
-          program.emit(
+          const result = program.emit(
             sourceFile,
             (name, text) => {
               setOutputFile(
@@ -1034,6 +1048,9 @@ ${logPrefix} ${yellow(
             undefined,
             true
           );
+          if (result.emitSkipped && result.diagnostics.length) {
+            diagnostics.push(...result.diagnostics);
+          }
         }
       }
       const dtsId = id.replace(tjsRE, "") + ".d.ts";
@@ -1066,6 +1083,12 @@ ${logPrefix} ${yellow(
       logger.info(green(`
 ${logPrefix} Start generate declaration files...`));
       const startTime = Date.now();
+      if (diagnostics?.length) {
+        logger.error(ts.formatDiagnosticsWithColorAndContext(diagnostics, host));
+      }
+      if (typeof afterDiagnostic === "function") {
+        await unwrapPromise(afterDiagnostic(diagnostics));
+      }
       const outDir = outDirs[0];
       const emittedFiles = /* @__PURE__ */ new Map();
       const declareModules = [];
@@ -1240,7 +1263,7 @@ ${content}`;
           const compilerOptions2 = configPath ? getTsConfig(configPath, host.readFile).compilerOptions : rawCompilerOptions;
           const rollup = async (path) => {
             const result = rollupDeclarationFiles({
-              root,
+              root: publicRoot,
               configPath,
               compilerOptions: compilerOptions2,
               outDir,
@@ -1295,6 +1318,7 @@ ${declared}` : ""),
           );
         });
       }
+      diagnostics.length = 0;
       if (typeof afterBuild === "function") {
         await unwrapPromise(afterBuild(emittedFiles));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "4.5.1",
+  "version": "4.5.4",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",
@@ -39,7 +39,7 @@
     "@microsoft/api-extractor": "^7.50.1",
     "@rollup/pluginutils": "^5.1.4",
     "@volar/typescript": "^2.4.11",
-    "@vue/language-core": "2.2.4",
+    "@vue/language-core": "2.2.0",
     "compare-versions": "^6.1.1",
     "debug": "^4.4.0",
     "kolorist": "^1.8.0",