dtsroll 1.7.3 → 1.7.5

package/README.md

@@ -1,7 +1,10 @@
-<p align="center">
-  <img width="200" src="./.github/logo.webp">
-</p>
-<h2 align="center">dtsroll</h2>
+<h2 align="center">
+    <img width="180" src="./.github/logo.webp">
+    <br>
+    dtsroll
+    <br><br>
+<a href="https://npm.im/dtsroll"><img src="https://badgen.net/npm/v/dtsroll"></a> <a href="https://npm.im/dtsroll"><img src="https://badgen.net/npm/dm/dtsroll"></a>
+</h2>
 
 Are you publishing a TypeScript project where consumers encounter type-checking errors like:
 

package/dist/cli.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { cli } from 'cleye';
-import { b as bgYellow, a as black, d as dtsroll, l as logOutput, D as DtsrollBuildError } from './index-J5sfIUfU.mjs';
+import { b as bgYellow, a as black, d as dtsroll, l as logOutput } from './index-CcbG5cCp.mjs';
+import { patchErrorWithTrace } from 'rollup-plugin-import-trace';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';
@@ -13,7 +14,7 @@ import 'resolve-pkg-maps';
 import 'byte-size';
 
 var name = "dtsroll";
-var version = "1.7.3";
+var version = "1.7.5";
 var description = "Bundle dts files";
 
 const argv = cli({
@@ -66,19 +67,9 @@ dtsroll({
   }
 ).catch(
   (error) => {
-    let errorMessage = "\nFailed to build";
-    if (error instanceof DtsrollBuildError) {
-      errorMessage += `
-  File: ${error.id}`;
-      if (error.importChain.length > 1) {
-        errorMessage += "\n\n  Import chain:\n    ";
-        errorMessage += error.importChain.join("\n    \u2192 ");
-      }
-    }
-    errorMessage += `
-
-${error instanceof Error ? error.message : String(error)}`;
-    console.error(errorMessage);
+    console.error("\nFailed to build\n");
+    patchErrorWithTrace(error);
+    console.error(error instanceof Error ? error.message : String(error));
     process.exitCode = 1;
   }
 );

package/dist/{index-J5sfIUfU.mjs → index-CcbG5cCp.mjs}

@@ -6,6 +6,7 @@ import ts from 'typescript';
 import { createRequire } from 'node:module';
 import convert$1 from 'convert-source-map';
 import nodeResolve from '@rollup/plugin-node-resolve';
+import { importTrace } from 'rollup-plugin-import-trace';
 import { up } from 'empathic/find';
 import { resolveImports } from 'resolve-pkg-maps';
 import byteSize from 'byte-size';
@@ -176,17 +177,6 @@ ${moduleIds.sort().map((moduleId, index) => {
   }
 };
 
-class DtsrollBuildError extends Error {
-  id;
-  importChain;
-  constructor(message, id, importChain) {
-    super(message);
-    this.name = "DtsrollBuildError";
-    this.id = id;
-    this.importChain = importChain;
-  }
-}
-
 const dtsExtensions = [".d.ts", ".d.cts", ".d.mts"];
 const isDts = (fileName) => dtsExtensions.some((extension) => fileName.endsWith(extension));
 
@@ -2217,7 +2207,8 @@ function resolveDefaultOptions(options) {
     ...options,
     compilerOptions: options.compilerOptions ?? {},
     respectExternal: options.respectExternal ?? false,
-    includeExternal: options.includeExternal ?? []
+    includeExternal: options.includeExternal ?? [],
+    sourcemap: options.sourcemap ?? false
   };
 }
 const DTS_EXTENSIONS = /\.d\.(c|m)?tsx?$/;
@@ -2270,8 +2261,15 @@ function cacheConfig([fromPath, toPath], config) {
     configByPath.set(fromPath, config);
   }
 }
-function getCompilerOptions(input, overrideOptions, overrideConfigPath) {
-  const compilerOptions = { ...DEFAULT_OPTIONS, ...overrideOptions };
+function getCompilerOptions(input, overrideOptions, overrideConfigPath, enableDeclarationMap) {
+  const compilerOptions = {
+    ...DEFAULT_OPTIONS,
+    ...overrideOptions,
+    // When plugin's sourcemap option is explicitly true, force declarationMap
+    // regardless of user's compilerOptions setting.
+    // When sourcemap is false/undefined, respect user's compilerOptions.declarationMap.
+    ...enableDeclarationMap === true && { declarationMap: true }
+  };
   let dirName = path.dirname(input);
   let dtsFiles = [];
   const cacheKey = overrideConfigPath || dirName;
@@ -2313,11 +2311,11 @@ function getCompilerOptions(input, overrideOptions, overrideConfigPath) {
     }
   };
 }
-function createProgram$1(fileName, overrideOptions, tsconfig) {
-  const { dtsFiles, compilerOptions } = getCompilerOptions(fileName, overrideOptions, tsconfig);
+function createProgram$1(fileName, overrideOptions, tsconfig, enableDeclarationMap) {
+  const { dtsFiles, compilerOptions } = getCompilerOptions(fileName, overrideOptions, tsconfig, enableDeclarationMap);
   return ts.createProgram([fileName].concat(Array.from(dtsFiles)), compilerOptions, ts.createCompilerHost(compilerOptions, true));
 }
-function createPrograms(input, overrideOptions, tsconfig) {
+function createPrograms(input, overrideOptions, tsconfig, enableDeclarationMap) {
   const programs = [];
   const dtsFiles = /* @__PURE__ */ new Set();
   let inputs = [];
@@ -2328,7 +2326,7 @@ function createPrograms(input, overrideOptions, tsconfig) {
       continue;
     }
     main = path.resolve(main);
-    const options = getCompilerOptions(main, overrideOptions, tsconfig);
+    const options = getCompilerOptions(main, overrideOptions, tsconfig, enableDeclarationMap);
     options.dtsFiles.forEach(dtsFiles.add, dtsFiles);
     if (!inputs.length) {
       inputs.push(main);
@@ -3975,7 +3973,14 @@ function hydrateSourcemap(sparseMappings, inputMap, outputCode) {
   return encode(hydratedMappings);
 }
 async function loadInputSourcemap(info) {
-  const { fileName, originalCode } = info;
+  const { fileName, originalCode, inputMapText } = info;
+  if (inputMapText) {
+    try {
+      return JSON.parse(inputMapText);
+    } catch {
+      return null;
+    }
+  }
   const inlineConverter = convert$1.fromSource(originalCode);
   if (inlineConverter) {
     return inlineConverter.toObject();
@@ -3999,7 +4004,7 @@ async function loadInputSourcemap(info) {
     return null;
   }
 }
-const transform = () => {
+const transform = (enableSourcemap) => {
   const allTypeReferences = /* @__PURE__ */ new Map();
   const allFileReferences = /* @__PURE__ */ new Map();
   const pendingSourcemaps = /* @__PURE__ */ new Map();
@@ -4044,7 +4049,7 @@ const transform = () => {
         strict: false
       };
     },
-    transform(code, fileName) {
+    transform(code, fileName, inputMapText) {
       const name = trimExtension(fileName);
       const moduleIds = this.getModuleIds();
       const moduleId = Array.from(moduleIds).find((id) => trimExtension(id) === name);
@@ -4062,11 +4067,15 @@ const transform = () => {
         console.log(code);
         console.log(JSON.stringify(converted.ast.body, void 0, 2));
       }
+      if (!enableSourcemap) {
+        return { code, ast: converted.ast };
+      }
       const map = preprocessed.code.generateMap({ hires: true, source: fileName });
       if (DTS_EXTENSIONS.test(fileName)) {
         pendingSourcemaps.set(fileName, {
           fileName,
-          originalCode: code
+          originalCode: code,
+          inputMapText
         });
       }
       return { code, ast: converted.ast, map };
@@ -4166,25 +4175,29 @@ const transform = () => {
           if (isUrl(source))
             continue;
           const absoluteSource = path.resolve(chunkDir, source);
-          const inputMap = inputSourcemaps.get(absoluteSource);
+          let inputMap = inputSourcemaps.get(absoluteSource);
+          if (!inputMap && /\.[cm]?[tj]sx?$/.test(absoluteSource) && !absoluteSource.endsWith(".d.ts")) {
+            const dtsPath = absoluteSource.replace(/\.[cm]?[tj]sx?$/, ".d.ts");
+            inputMap = inputSourcemaps.get(dtsPath);
+          }
           if (inputMap) {
             sourcesToRemap.set(absoluteSource, inputMap);
           }
         }
         if (sourcesToRemap.size === 0) {
+          delete chunk.map.sourcesContent;
           if (chunk.map.sources.length === 0 && chunk.facadeModuleId) {
             const inputMap = inputSourcemaps.get(chunk.facadeModuleId);
             if (inputMap && inputMap.sources.length > 0) {
               const newSources2 = inputMap.sources.map(toRelativeSourcePathOrNull);
               chunk.map.sources = newSources2;
-              delete chunk.map.sourcesContent;
-              updateSourcemapAsset(bundle, chunk.fileName, {
-                sources: newSources2,
-                mappings: chunk.map.mappings,
-                names: chunk.map.names || []
-              });
             }
           }
+          updateSourcemapAsset(bundle, chunk.fileName, {
+            sources: chunk.map.sources.map(toRelativeSourcePathOrNull),
+            mappings: chunk.map.mappings,
+            names: chunk.map.names || []
+          });
           continue;
         }
         const isSingleSource = chunk.map.sources.length === 1 && sourcesToRemap.size === 1;
@@ -4198,8 +4211,13 @@ const transform = () => {
           newMappings = hydrateSourcemap(chunk.map.mappings, singleInputMap, chunk.code);
           newNames = singleInputMap.names || [];
         } else {
+          const visitedFiles = /* @__PURE__ */ new Set();
           const remapped = remapping(chunk.map, (file) => {
             const absolutePath = path.resolve(chunkDir, file);
+            if (visitedFiles.has(absolutePath)) {
+              return null;
+            }
+            visitedFiles.add(absolutePath);
             const inputMap = sourcesToRemap.get(absolutePath);
             if (inputMap) {
               return inputMap;
@@ -4273,7 +4291,7 @@ function getModule({ entries, programs, resolvedOptions }, fileName, code) {
         return { code };
       }
     }
-    const newProgram = createProgram$1(fileName, compilerOptions, tsconfig);
+    const newProgram = createProgram$1(fileName, compilerOptions, tsconfig, resolvedOptions.sourcemap);
     programs.push(newProgram);
     const source = newProgram.getSourceFile(fileName);
     return {
@@ -4286,8 +4304,8 @@ function getModule({ entries, programs, resolvedOptions }, fileName, code) {
   }
 }
 const plugin = (options = {}) => {
-  const transformPlugin = transform();
   const ctx = { entries: [], programs: [], resolvedOptions: resolveDefaultOptions(options) };
+  const transformPlugin = transform(ctx.resolvedOptions.sourcemap);
   return {
     name: "dts",
     // pass outputOptions, renderChunk, and generateBundle hooks to the inner transform plugin
@@ -4310,7 +4328,7 @@ const plugin = (options = {}) => {
           options2.input[name] = filename;
         }
       }
-      ctx.programs = createPrograms(Object.values(input), ctx.resolvedOptions.compilerOptions, ctx.resolvedOptions.tsconfig);
+      ctx.programs = createPrograms(Object.values(input), ctx.resolvedOptions.compilerOptions, ctx.resolvedOptions.tsconfig, ctx.resolvedOptions.sourcemap);
       return transformPlugin.options.call(this, options2);
     },
     transform(code, id) {
@@ -4347,11 +4365,16 @@ const plugin = (options = {}) => {
           return null;
         watchFiles(module);
         const declarationId = getDeclarationId(id);
-        let generated;
+        let declarationText;
+        let declarationMapText;
         const { emitSkipped, diagnostics } = module.program.emit(
           module.source,
-          (_, declarationText) => {
-            generated = transformPlugin.transform.call(this, declarationText, declarationId);
+          (emitFileName, text) => {
+            if (emitFileName.endsWith(".map")) {
+              declarationMapText = text;
+            } else {
+              declarationText = text;
+            }
           },
           void 0,
           // cancellationToken
@@ -4369,7 +4392,10 @@ const plugin = (options = {}) => {
             this.error("Failed to compile. Check the logs above.");
           }
         }
-        return generated;
+        if (!declarationText)
+          return null;
+        const cleanDeclarationText = declarationText.replace(/\n?\/\/# sourceMappingURL=[^\n]+/, "");
+        return transformPlugin.transform.call(this, cleanDeclarationText, declarationId, declarationMapText);
       };
       if (DTS_EXTENSIONS.test(id))
         return handleDtsFile();
@@ -4386,7 +4412,7 @@ const plugin = (options = {}) => {
       let resolvedCompilerOptions = ctx.resolvedOptions.compilerOptions;
       if (ctx.resolvedOptions.tsconfig) {
         const resolvedSource = source.startsWith(".") ? path.resolve(path.dirname(importer), source) : source;
-        resolvedCompilerOptions = getCompilerOptions(resolvedSource, ctx.resolvedOptions.compilerOptions, ctx.resolvedOptions.tsconfig).compilerOptions;
+        resolvedCompilerOptions = getCompilerOptions(resolvedSource, ctx.resolvedOptions.compilerOptions, ctx.resolvedOptions.tsconfig, ctx.resolvedOptions.sourcemap).compilerOptions;
       }
       const { resolvedModule } = ts.resolveModuleName(source, importer, resolvedCompilerOptions, ts.sys);
       if (!resolvedModule) {
@@ -4461,39 +4487,6 @@ const createExternalizePlugin = (configuredExternals) => {
   };
 };
 
-const createImportChainPlugin = () => {
-  const importerMap = /* @__PURE__ */ new Map();
-  const plugin = {
-    name: "import-chain-tracker",
-    buildStart: () => {
-      importerMap.clear();
-    },
-    async resolveId(source, importer) {
-      if (!importer) {
-        return null;
-      }
-      const resolved = await this.resolve(source, importer, { skipSelf: true });
-      if (resolved && !resolved.external && !importerMap.has(resolved.id)) {
-        importerMap.set(resolved.id, importer);
-      }
-      return null;
-    }
-  };
-  const getImportChain = (errorFileId) => {
-    const chain = [];
-    let current = errorFileId;
-    while (current) {
-      chain.unshift(current);
-      current = importerMap.get(current);
-    }
-    return chain;
-  };
-  return {
-    plugin,
-    getImportChain
-  };
-};
-
 const nodeModules = `${path__default.sep}node_modules${path__default.sep}`;
 const removeBundledModulesPlugin = (outputDirectory, sizeRef) => {
   let deleteFiles = [];
@@ -4599,7 +4592,6 @@ const build = async (input, outputDirectory, externals, mode, conditions, source
     externalized,
     getPackageEntryPoint
   } = createExternalizePlugin(externals);
-  const { plugin: importChainPlugin, getImportChain } = createImportChainPlugin();
   const sizeRef = {};
   const rollupConfig = {
     input: createInputMap(input, outputDirectory),
@@ -4610,7 +4602,7 @@ const build = async (input, outputDirectory, externals, mode, conditions, source
       chunkFileNames: "_dtsroll-chunks/[hash]-[name].ts"
     },
     plugins: [
-      importChainPlugin,
+      importTrace(),
       externalizePlugin,
       removeBundledModulesPlugin(outputDirectory, sizeRef),
       resolveSubpathImportsPlugin(),
@@ -4619,7 +4611,8 @@ const build = async (input, outputDirectory, externals, mode, conditions, source
         exportConditions: conditions
       }),
       plugin({
-        respectExternal: true
+        respectExternal: true,
+        sourcemap
         /**
          * Setting a tsconfig or compilerOptions shouldn't be necessary since
          * we're dealing with pre-compiled d.ts files
@@ -4630,26 +4623,15 @@ const build = async (input, outputDirectory, externals, mode, conditions, source
       })
     ]
   };
-  try {
-    const rollupBuild = await rollup(rollupConfig);
-    const built = await rollupBuild[mode](rollupConfig.output);
-    await rollupBuild.close();
-    return {
-      built,
-      externalized,
-      getPackageEntryPoint,
-      sourceSize: sizeRef.value ?? 0
-    };
-  } catch (error) {
-    if (error instanceof Error && "id" in error && typeof error.id === "string") {
-      throw new DtsrollBuildError(
-        error.message,
-        error.id,
-        getImportChain(error.id)
-      );
-    }
-    throw error;
-  }
+  const rollupBuild = await rollup(rollupConfig);
+  const built = await rollupBuild[mode](rollupConfig.output);
+  await rollupBuild.close();
+  return {
+    built,
+    externalized,
+    getPackageEntryPoint,
+    sourceSize: sizeRef.value ?? 0
+  };
 };
 
 const dtsroll = async ({
@@ -4746,4 +4728,4 @@ const dtsroll = async ({
   };
 };
 
-export { DtsrollBuildError as D, black as a, bgYellow as b, dtsroll as d, logOutput as l };
+export { black as a, bgYellow as b, dtsroll as d, logOutput as l };

package/dist/index.mjs

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import 'node:path';
-export { d as dtsroll } from './index-J5sfIUfU.mjs';
+export { d as dtsroll } from './index-CcbG5cCp.mjs';
 import 'node:fs/promises';
 import 'rollup';
 import 'typescript';
 import 'node:module';
 import 'convert-source-map';
 import '@rollup/plugin-node-resolve';
+import 'rollup-plugin-import-trace';
 import 'empathic/find';
 import 'resolve-pkg-maps';
 import 'byte-size';

package/dist/vite.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { d as dtsroll, l as logOutput } from './index-J5sfIUfU.mjs';
+import { d as dtsroll, l as logOutput } from './index-CcbG5cCp.mjs';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';
@@ -7,6 +7,7 @@ import 'typescript';
 import 'node:module';
 import 'convert-source-map';
 import '@rollup/plugin-node-resolve';
+import 'rollup-plugin-import-trace';
 import 'empathic/find';
 import 'resolve-pkg-maps';
 import 'byte-size';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtsroll",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "Bundle dts files",
   "keywords": [
     "bundle",
@@ -43,7 +43,8 @@
     "convert-source-map": "^2.0.0",
     "empathic": "^2.0.0",
     "resolve-pkg-maps": "^1.0.0",
-    "rollup": "^4.55.3"
+    "rollup": "^4.55.3",
+    "rollup-plugin-import-trace": "^1.0.0"
   },
   "peerDependencies": {
     "typescript": "^4.5 || ^5.0",