dtsroll 1.7.0 → 1.7.1

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/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-r9RZgCg7.mjs';
+import { b as bgYellow, a as black, d as dtsroll, l as logOutput, D as DtsrollBuildError } from './index-D25w_e6R.mjs';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';
@@ -13,7 +13,7 @@ import 'resolve-pkg-maps';
 import 'byte-size';
 
 var name = "dtsroll";
-var version = "1.7.0";
+var version = "1.7.1";
 var description = "Bundle dts files";
 
 const argv = cli({

package/dist/{index-r9RZgCg7.mjs → index-D25w_e6R.mjs}

@@ -73,10 +73,10 @@ const bgYellow = kolorist(43, 49);
 const cwd = process.cwd();
 
 const isPath = (filePath) => filePath[0] === "." || path.isAbsolute(filePath);
-const normalizePath$1 = (filepath) => filepath.replaceAll("\\", "/");
+const normalizePath = (filepath) => filepath.replaceAll("\\", "/");
 const getDisplayPath = (fullPath) => {
   const relativePath = path.relative(cwd, fullPath);
-  return normalizePath$1(
+  return normalizePath(
     relativePath.length < fullPath.length ? relativePath : fullPath
   );
 };
@@ -278,7 +278,6 @@ const getPackageName = (id) => {
   return id.slice(0, indexOfSlash);
 };
 
-const normalizePath = (filePath) => filePath.replaceAll("\\", "/");
 const getAllFiles = async (directoryPath, dontShortenPath) => {
   const directoryFiles = await fs.readdir(directoryPath, { withFileTypes: true });
   const fileTree = await Promise.all(
@@ -566,45 +565,88 @@ const loadSourceMap = async (codePath, code) => {
   } catch {
   }
 };
-const loadInputSourcemapsPlugin = () => ({
-  name: "load-input-sourcemaps",
-  async load(id) {
-    const isDts = dtsExtensions.some((extension) => id.endsWith(extension));
-    if (!isDts) {
-      return null;
-    }
-    const code = await tryReadFile(id);
-    if (!code) {
-      return null;
-    }
-    const result = await loadSourceMap(id, code);
-    if (!result) {
-      return { code };
-    }
-    const { map: inputMap, mapPath } = result;
-    const sourceRoot = path.resolve(path.dirname(mapPath), inputMap.sourceRoot ?? ".");
-    const sources = inputMap.sources.map(
-      (source) => path.isAbsolute(source) ? source : path.resolve(sourceRoot, source)
-    );
-    const sourcesContentRaw = await Promise.all(
-      sources.map(async (source, index) => inputMap.sourcesContent?.[index] ?? tryReadFile(source))
-    );
-    const sourcesContent = sourcesContentRaw.filter(
-      (content) => content !== null
-    );
-    return {
-      code,
-      map: {
-        version: inputMap.version,
-        names: inputMap.names,
+const loadInputSourcemapsPlugin = () => {
+  const inputSourcemaps = /* @__PURE__ */ new Map();
+  return {
+    name: "load-input-sourcemaps",
+    async load(id) {
+      const isDts = dtsExtensions.some((extension) => id.endsWith(extension));
+      if (!isDts) {
+        return null;
+      }
+      const code = await tryReadFile(id);
+      if (!code) {
+        return null;
+      }
+      const result = await loadSourceMap(id, code);
+      if (!result) {
+        return { code };
+      }
+      const { map: inputMap, mapPath } = result;
+      const sourceRoot = path.resolve(path.dirname(mapPath), inputMap.sourceRoot ?? ".");
+      const sources = inputMap.sources.map(
+        (source) => path.isAbsolute(source) ? source : path.resolve(sourceRoot, source)
+      );
+      const sourcesContentRaw = await Promise.all(
+        sources.map(
+          async (source, index) => inputMap.sourcesContent?.[index] ?? tryReadFile(source)
+        )
+      );
+      const sourcesContent = sourcesContentRaw.filter(
+        (content) => content !== null
+      );
+      inputSourcemaps.set(id, {
         sources,
-        mappings: inputMap.mappings,
-        ...sourcesContent.length > 0 ? { sourcesContent } : {},
-        ...inputMap.file ? { file: inputMap.file } : {}
+        sourcesContent
+      });
+      return {
+        code,
+        map: {
+          version: inputMap.version,
+          names: inputMap.names,
+          sources,
+          mappings: inputMap.mappings,
+          ...sourcesContent.length > 0 ? { sourcesContent } : {},
+          ...inputMap.file ? { file: inputMap.file } : {}
+        }
+      };
+    },
+    async writeBundle(options, bundle) {
+      const outputDir = options.dir ?? path.dirname(options.file ?? "");
+      if (!outputDir) {
+        return;
       }
-    };
-  }
-});
+      for (const [fileName, chunk] of Object.entries(bundle)) {
+        if (chunk.type !== "chunk" || !chunk.map) {
+          continue;
+        }
+        if (chunk.map.sources.length > 0) {
+          continue;
+        }
+        const entryModule = chunk.facadeModuleId;
+        if (!entryModule) {
+          continue;
+        }
+        const inputSourcemap = inputSourcemaps.get(entryModule);
+        if (!inputSourcemap || inputSourcemap.sources.length === 0) {
+          continue;
+        }
+        const mapFileName = `${fileName}.map`;
+        const mapPath = path.join(outputDir, mapFileName);
+        const outputFileDir = path.dirname(path.join(outputDir, fileName));
+        const relativeSources = inputSourcemap.sources.map(
+          (source) => normalizePath(path.relative(outputFileDir, source))
+        );
+        const fixedMap = {
+          ...chunk.map,
+          sources: relativeSources,
+          sourcesContent: inputSourcemap.sourcesContent.length > 0 ? inputSourcemap.sourcesContent : void 0
+        };
+        await fs$1.promises.writeFile(mapPath, JSON.stringify(fixedMap));
+      }
+    }
+  };
+};
 
 const nodeModules = `${path.sep}node_modules${path.sep}`;
 const removeBundledModulesPlugin = (outputDirectory, sizeRef) => {
@@ -637,7 +679,11 @@ const removeBundledModulesPlugin = (outputDirectory, sizeRef) => {
     },
     writeBundle: async () => {
       await Promise.all(
-        deleteFiles.map((moduleId) => fs.rm(moduleId))
+        deleteFiles.flatMap((moduleId) => [
+          fs.rm(moduleId),
+          // Also delete orphaned sourcemap files
+          fs.rm(`${moduleId}.map`, { force: true })
+        ])
       );
     }
   };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import 'node:path';
-export { d as dtsroll } from './index-r9RZgCg7.mjs';
+export { d as dtsroll } from './index-D25w_e6R.mjs';
 import 'node:fs/promises';
 import 'rollup';
 import 'rollup-plugin-dts';

package/dist/vite.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { d as dtsroll, l as logOutput } from './index-r9RZgCg7.mjs';
+import { d as dtsroll, l as logOutput } from './index-D25w_e6R.mjs';
 import 'node:path';
 import 'node:fs/promises';
 import 'rollup';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtsroll",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Bundle dts files",
   "keywords": [
     "bundle",