@jsenv/sourcemap 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/sourcemap",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -21,6 +21,6 @@
   "dependencies": {
     "@jsenv/urls": "1.2.7",
     "magic-string": "0.26.2",
-    "source-map": "0.7.4"
+    "source-map-js": "1.0.2"
   }
 }

package/src/error_stack_remap/remap_call_site.js

@@ -16,13 +16,12 @@ export const remapCallSite = async (
     const line = callSite.getLineNumber()
     const column = callSite.getColumnNumber() - 1
     const originalPosition = await remapSourcePosition({
-      source,
+      url: resolveFile(source),
       line,
       column,
       resolveFile,
       urlToSourcemapConsumer,
       readErrorStack,
-      onFailure,
     })
 
     const callSiteClone = cloneCallSite(callSite)
@@ -194,12 +193,11 @@ const remapEvalOrigin = async (
     const line = Number(topLevelEvalMatch[3])
     const column = topLevelEvalMatch[4] - 1
     const originalPosition = await remapSourcePosition({
-      source,
+      url: resolveFile(source),
       line,
       column,
       resolveFile,
       urlToSourcemapConsumer,
-      onFailure,
     })
     return `eval at ${topLevelEvalMatch[1]} (${originalPosition.source}:${
       originalPosition.line

package/src/error_stack_remap/remap_source_position.js

@@ -1,22 +1,19 @@
 import { createDetailedMessage } from "./detailed_message.js"
 
 export const remapSourcePosition = async ({
-  source,
+  url,
   line,
   column,
   resolveFile,
   urlToSourcemapConsumer,
-  readErrorStack,
-  onFailure,
+  readErrorStack = (e) => e.stack,
 }) => {
-  const position = { source, line, column }
-
-  const url = sourceToUrl(source, { resolveFile })
-  if (!url) return position
-
+  const position = { url, line, column }
   const sourceMapConsumer = await urlToSourcemapConsumer(url)
 
-  if (!sourceMapConsumer) return position
+  if (!sourceMapConsumer) {
+    return position
+  }
 
   try {
     const originalPosition = sourceMapConsumer.originalPositionFor(position)
@@ -27,18 +24,19 @@ export const remapSourcePosition = async ({
     // better to give a precise location in the compiled file than a vague
     // location in the original file.
     const originalSource = originalPosition.source
-
-    if (originalSource === null) return position
-    originalPosition.source = resolveFile(originalSource, url, {
-      type: "file-original",
-    })
-
-    return originalPosition
+    if (originalSource === null) {
+      return position
+    }
+    return {
+      url: resolveFile(originalSource, url),
+      line: originalPosition.line,
+      column: originalPosition.column,
+    }
   } catch (e) {
-    onFailure(
+    console.warn(
       createDetailedMessage(`error while remapping position.`, {
         ["error stack"]: readErrorStack(e),
-        ["source"]: source,
+        ["url"]: url,
         ["line"]: line,
         ["column"]: column,
       }),
@@ -46,61 +44,3 @@ export const remapSourcePosition = async ({
     return position
   }
 }
-
-const sourceToUrl = (source, { resolveFile }) => {
-  if (startsWithScheme(source)) {
-    return source
-  }
-
-  // linux filesystem path
-  if (source[0] === "/") {
-    return resolveFile(source)
-  }
-
-  // be careful, due to babel or something like that we might receive paths like
-  // C:/directory/file.js (without backslashes we would expect on windows)
-  // In that case we consider C: is the signe we are on windows
-  // And I avoid to rely on process.platform === "win32" because this file might be executed in chrome
-  if (startsWithWindowsDriveLetter(source)) {
-    return windowsFilePathToUrl(source)
-  }
-
-  // I don't think we will ever encounter relative file in the stack trace
-  // but if it ever happens we are safe :)
-  if (source.slice(0, 2) === "./" || source.slice(0, 3) === "../") {
-    return resolveFile(source)
-  }
-
-  // we have received a "bare specifier" for the source
-  // it happens for internal/process/task_queues.js for instance
-  // if we do return resolveFile(source) it will be converted to
-  // file:///C:/project-directory/internal/process/task_queues.js in node
-  // and
-  // http://domain.com/internal/process/task_queues.js
-  // but the file will certainly be a 404
-  // and if not it won't be the right file anyway
-  // for now we assume "bare specifier" in the stack trace
-  // are internal files that are pointless to try to remap
-  return null
-}
-
-const startsWithScheme = (string) => {
-  return /^[a-zA-Z]{2,}:/.test(string)
-}
-
-const startsWithWindowsDriveLetter = (string) => {
-  const firstChar = string[0]
-  if (!/[a-zA-Z]/.test(firstChar)) return false
-
-  const secondChar = string[1]
-  if (secondChar !== ":") return false
-
-  return true
-}
-
-const windowsFilePathToUrl = (windowsFilePath) => {
-  return `file:///${replaceBackSlashesWithSlashes(windowsFilePath)}`
-}
-
-export const replaceBackSlashesWithSlashes = (string) =>
-  string.replace(/\\/g, "/")

package/src/original_position.js

@@ -1,15 +1,10 @@
 import { requireSourcemap } from "./require_sourcemap.js"
 
 // https://github.com/mozilla/source-map#sourcemapconsumerprototypeoriginalpositionforgeneratedposition
-export const getOriginalPosition = async ({
-  sourcemap,
-  line,
-  column,
-  bias,
-}) => {
+export const getOriginalPosition = ({ sourcemap, line, column, bias }) => {
   const { SourceMapConsumer } = requireSourcemap()
 
-  const sourceMapConsumer = await new SourceMapConsumer(sourcemap)
+  const sourceMapConsumer = new SourceMapConsumer(sourcemap)
   const originalPosition = sourceMapConsumer.originalPositionFor({
     line,
     column,

package/src/require_sourcemap.js

@@ -4,6 +4,6 @@ const require = createRequire(import.meta.url)
 // consider using https://github.com/7rulnik/source-map-js
 
 export const requireSourcemap = () => {
-  const namespace = require("source-map")
+  const namespace = require("source-map-js")
   return namespace
 }

package/src/sourcemap_composition_v3.js

@@ -6,7 +6,7 @@ import { requireSourcemap } from "./require_sourcemap.js"
 
 const { SourceMapConsumer, SourceMapGenerator } = requireSourcemap()
 
-export const composeTwoSourcemaps = async (firstSourcemap, secondSourcemap) => {
+export const composeTwoSourcemaps = (firstSourcemap, secondSourcemap) => {
   if (!firstSourcemap && !secondSourcemap) {
     return null
   }
@@ -17,8 +17,8 @@ export const composeTwoSourcemaps = async (firstSourcemap, secondSourcemap) => {
     return firstSourcemap
   }
   const sourcemapGenerator = new SourceMapGenerator()
-  const firstSourcemapConsumer = await new SourceMapConsumer(firstSourcemap)
-  const secondSourcemapConsumer = await new SourceMapConsumer(secondSourcemap)
+  const firstSourcemapConsumer = new SourceMapConsumer(firstSourcemap)
+  const secondSourcemapConsumer = new SourceMapConsumer(secondSourcemap)
   const firstMappings = readMappings(firstSourcemapConsumer)
   firstMappings.forEach((mapping) => {
     sourcemapGenerator.addMapping(mapping)