dtsroll 1.7.2 → 1.7.3

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-DaiC_aHH.mjs';
+import { b as bgYellow, a as black, d as dtsroll, l as logOutput, D as DtsrollBuildError } from './index-J5sfIUfU.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.2";
+var version = "1.7.3";
 var description = "Bundle dts files";
 
 const argv = cli({

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

@@ -3937,8 +3937,8 @@ function hydrateSourcemap(sparseMappings, inputMap, outputCode) {
       hydratedMappings.push([]);
       continue;
     }
-    const anchor = sparseSegments[0];
-    if (!anchor || anchor.length < 4) {
+    const anchor = sparseSegments.find((segment) => segment.length >= 4);
+    if (!anchor) {
       hydratedMappings.push(sparseSegments);
       continue;
     }
@@ -4114,13 +4114,34 @@ const transform = () => {
         fileName,
         inputMap: await loadInputSourcemap(info)
       })));
+      const isUrl = (p) => /^[a-z][a-z0-9+.-]*:\/\//i.test(p);
       for (const { fileName, inputMap } of loadedMaps) {
         if (inputMap && inputMap.sources) {
           const inputMapDir = path.dirname(fileName);
+          let sourceRoot;
+          if (inputMap.sourceRoot) {
+            sourceRoot = isUrl(inputMap.sourceRoot) ? inputMap.sourceRoot : path.resolve(inputMapDir, inputMap.sourceRoot);
+          } else {
+            sourceRoot = inputMapDir;
+          }
+          const sourceRootIsUrl = isUrl(sourceRoot);
           inputSourcemaps.set(fileName, {
             version: inputMap.version ?? 3,
-            sources: inputMap.sources.map((source) => path.isAbsolute(source) ? source : path.resolve(inputMapDir, source)),
-            sourcesContent: inputMap.sourcesContent,
+            sources: inputMap.sources.map((source) => {
+              if (source === null)
+                return null;
+              if (isUrl(source))
+                return source;
+              if (sourceRootIsUrl) {
+                const base = sourceRoot.endsWith("/") ? sourceRoot : sourceRoot + "/";
+                return new URL(source, base).toString();
+              }
+              return path.isAbsolute(source) ? source : path.resolve(sourceRoot, source);
+            }),
+            // Note: sourcesContent intentionally not copied.
+            // TypeScript's declaration maps never include sourcesContent, and tsserver's
+            // getDocumentPositionMapper() rejects maps that have it (returns identity mapper).
+            // https://github.com/microsoft/TypeScript/blob/b19a9da2a3b8f2a720d314d01258dd2bdc110fef/src/services/sourcemaps.ts#L226
             mappings: inputMap.mappings,
             names: inputMap.names
           });
@@ -4132,13 +4153,18 @@ const transform = () => {
           continue;
         const chunkDir = path.join(outputDir, path.dirname(chunk.fileName));
         const toRelativeSourcePath = (source) => {
+          if (isUrl(source))
+            return source;
           const relative = path.isAbsolute(source) ? path.relative(chunkDir, source) : source;
           return relative.replaceAll("\\", "/");
         };
+        const toRelativeSourcePathOrNull = (source) => source === null ? null : toRelativeSourcePath(source);
         const sourcesToRemap = /* @__PURE__ */ new Map();
         for (const source of chunk.map.sources) {
           if (!source)
             continue;
+          if (isUrl(source))
+            continue;
           const absoluteSource = path.resolve(chunkDir, source);
           const inputMap = inputSourcemaps.get(absoluteSource);
           if (inputMap) {
@@ -4149,13 +4175,11 @@ const transform = () => {
           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(toRelativeSourcePath);
-              const newSourcesContent2 = inputMap.sourcesContent || [];
+              const newSources2 = inputMap.sources.map(toRelativeSourcePathOrNull);
               chunk.map.sources = newSources2;
-              chunk.map.sourcesContent = newSourcesContent2;
+              delete chunk.map.sourcesContent;
               updateSourcemapAsset(bundle, chunk.fileName, {
                 sources: newSources2,
-                sourcesContent: newSourcesContent2,
                 mappings: chunk.map.mappings,
                 names: chunk.map.names || []
               });
@@ -4167,12 +4191,10 @@ const transform = () => {
         const singleInputMap = isSingleSource ? Array.from(sourcesToRemap.values())[0] : null;
         const canSimplyReplace = singleInputMap && singleInputMap.sources.length === 1;
         let newSources;
-        let newSourcesContent;
         let newMappings;
         let newNames;
         if (canSimplyReplace && singleInputMap) {
-          newSources = singleInputMap.sources.map(toRelativeSourcePath);
-          newSourcesContent = singleInputMap.sourcesContent || [null];
+          newSources = singleInputMap.sources.map(toRelativeSourcePathOrNull);
           newMappings = hydrateSourcemap(chunk.map.mappings, singleInputMap, chunk.code);
           newNames = singleInputMap.names || [];
         } else {
@@ -4184,18 +4206,16 @@ const transform = () => {
             }
             return null;
           });
-          newSources = remapped.sources.filter((s) => s !== null).map(toRelativeSourcePath);
-          newSourcesContent = remapped.sourcesContent || [];
+          newSources = remapped.sources.map(toRelativeSourcePathOrNull);
           newMappings = typeof remapped.mappings === "string" ? remapped.mappings : "";
           newNames = remapped.names || [];
         }
         chunk.map.sources = newSources;
-        chunk.map.sourcesContent = newSourcesContent;
+        delete chunk.map.sourcesContent;
         chunk.map.mappings = newMappings;
         chunk.map.names = newNames;
         updateSourcemapAsset(bundle, chunk.fileName, {
           sources: newSources,
-          sourcesContent: newSourcesContent,
           mappings: newMappings,
           names: newNames
         });

package/dist/index.mjs

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

package/dist/vite.mjs

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

package/package.json

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