dtsroll 1.7.4 → 1.7.6

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-DJ_g9wqZ.mjs';
+import { b as bgYellow, a as black, d as dtsroll, l as logOutput } from './index-CqO1yLQ_.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.4";
+var version = "1.7.6";
 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-DJ_g9wqZ.mjs → index-CqO1yLQ_.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));
 
@@ -3142,6 +3132,23 @@ declare const ${defaultExport}: {`,
     }
     code.remove(start, end);
   }
+  const fullText = sourceFile.getFullText();
+  const eofTrivia = ts.getLeadingCommentRanges(fullText, sourceFile.endOfFileToken.getFullStart());
+  const lastStatement = sourceFile.statements[sourceFile.statements.length - 1];
+  const trailingTrivia = lastStatement ? ts.getTrailingCommentRanges(fullText, lastStatement.getEnd()) : void 0;
+  for (const comment of [...eofTrivia ?? [], ...trailingTrivia ?? []]) {
+    if (comment.kind !== ts.SyntaxKind.SingleLineCommentTrivia)
+      continue;
+    const text = fullText.slice(comment.pos, comment.end);
+    if (!/\/\/[#@]\s*sourceMappingURL=/.test(text))
+      continue;
+    let start = comment.pos;
+    if (start > 0 && fullText[start - 1] === "\n") {
+      start -= 1;
+    }
+    code.remove(start, comment.end);
+    break;
+  }
   return {
     code,
     typeReferences,
@@ -4065,6 +4072,7 @@ const transform = (enableSourcemap) => {
       const moduleId = Array.from(moduleIds).find((id) => trimExtension(id) === name);
       const isEntry = Boolean(moduleId && this.getModuleInfo(moduleId)?.isEntry);
       const isJSON = Boolean(moduleId && JSON_EXTENSIONS.test(moduleId));
+      const rawCode = code;
       let sourceFile = parse(fileName, code);
       const preprocessed = preProcess({ sourceFile, isEntry, isJSON });
       allTypeReferences.set(sourceFile.fileName, preprocessed.typeReferences);
@@ -4077,11 +4085,14 @@ const transform = (enableSourcemap) => {
         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 (enableSourcemap && DTS_EXTENSIONS.test(fileName)) {
+      if (DTS_EXTENSIONS.test(fileName)) {
         pendingSourcemaps.set(fileName, {
           fileName,
-          originalCode: code,
+          originalCode: rawCode,
           inputMapText
         });
       }
@@ -4494,39 +4505,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 = [];
@@ -4632,7 +4610,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),
@@ -4643,7 +4620,7 @@ const build = async (input, outputDirectory, externals, mode, conditions, source
       chunkFileNames: "_dtsroll-chunks/[hash]-[name].ts"
     },
     plugins: [
-      importChainPlugin,
+      importTrace(),
       externalizePlugin,
       removeBundledModulesPlugin(outputDirectory, sizeRef),
       resolveSubpathImportsPlugin(),
@@ -4664,26 +4641,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 ({
@@ -4780,4 +4746,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-DJ_g9wqZ.mjs';
+export { d as dtsroll } from './index-CqO1yLQ_.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-DJ_g9wqZ.mjs';
+import { d as dtsroll, l as logOutput } from './index-CqO1yLQ_.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.4",
+  "version": "1.7.6",
   "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",