@jsenv/core 27.6.0 → 27.6.1

package/dist/js/html_supervisor_installer.js

@@ -38,6 +38,8 @@ const formatError = (error, {
     line,
     column
   }) => {
+    if (typeof line === "string") line = parseInt(line);
+    if (typeof column === "string") column = parseInt(column);
     const inlineUrlMatch = url.match(/@L([0-9]+)C([0-9]+)\-L([0-9]+)C([0-9]+)(\.[\w]+)$/);
 
     if (inlineUrlMatch) {
@@ -48,7 +50,7 @@ const formatError = (error, {
       const tagColumnEnd = parseInt(inlineUrlMatch[4]);
       const extension = inlineUrlMatch[5];
       url = htmlUrl;
-      line = tagLineStart + (line === undefined ? 0 : parseInt(line)); // stackTrace formatted by V8 (chrome)
+      line = tagLineStart + (typeof line === "number" ? line : 0); // stackTrace formatted by V8 (chrome)
 
       if (Error.captureStackTrace) {
         line--;
@@ -64,7 +66,7 @@ const formatError = (error, {
         }
       }
 
-      column = tagColumnStart + (column === undefined ? 0 : parseInt(column));
+      column = tagColumnStart + (typeof column === "number" ? column : 0);
       const fileUrl = resolveFileUrl(url);
       return {
         isInline: true,
@@ -188,7 +190,13 @@ const formatError = (error, {
       }
 
       if (urlSite.line !== undefined) {
-        const response = await window.fetch(`/__get_code_frame__/${formatUrlWithLineAndColumn(urlSite)}`);
+        let ressourceToFetch = `/__get_code_frame__/${formatUrlWithLineAndColumn(urlSite)}`;
+
+        if (!Error.captureStackTrace) {
+          ressourceToFetch += `?remap`;
+        }
+
+        const response = await window.fetch(ressourceToFetch);
         const codeFrame = await response.text();
         return {
           codeFrame: formatErrorText({

package/dist/main.js

@@ -16,7 +16,7 @@ import { Readable, Stream, Writable } from "node:stream";
 import { Http2ServerResponse } from "node:http2";
 import { lookup } from "node:dns";
 import { parseHtmlString, stringifyHtmlAst, visitHtmlNodes, getHtmlNodeAttribute, analyzeScriptNode, setHtmlNodeAttributes, parseSrcSet, getHtmlNodePosition, getHtmlNodeAttributePosition, applyPostCss, postCssPluginUrlVisitor, parseJsUrls, findHtmlNode, getHtmlNodeText, removeHtmlNode, setHtmlNodeText, applyBabelPlugins, injectScriptNodeAsEarlyAsPossible, createHtmlNode, removeHtmlNodeText, transpileWithParcel, injectJsImport, minifyWithParcel, analyzeLinkNode } from "@jsenv/ast";
-import { createMagicSource, composeTwoSourcemaps, sourcemapConverter, SOURCEMAP, generateSourcemapFileUrl, generateSourcemapDataUrl } from "@jsenv/sourcemap";
+import { createMagicSource, getOriginalPosition, composeTwoSourcemaps, sourcemapConverter, SOURCEMAP, generateSourcemapFileUrl, generateSourcemapDataUrl } from "@jsenv/sourcemap";
 import { createRequire } from "node:module";
 import babelParser from "@babel/parser";
 import v8, { takeCoverage } from "node:v8";
@@ -12046,10 +12046,14 @@ const jsenvPluginHtmlSupervisor = ({
       dev: true,
       test: true
     },
-    serve: (request, context) => {
+    serve: async (request, context) => {
       if (request.ressource.startsWith("/__get_code_frame__/")) {
-        const url = request.ressource.slice("/__get_code_frame__/".length);
-        const match = url.match(/:([0-9]+):([0-9]+)$/);
+        const {
+          pathname,
+          searchParams
+        } = new URL(request.url);
+        const urlWithLineAndColumn = pathname.slice("/__get_code_frame__/".length);
+        const match = urlWithLineAndColumn.match(/:([0-9]+):([0-9]+)$/);
 
         if (!match) {
           return {
@@ -12058,9 +12062,9 @@ const jsenvPluginHtmlSupervisor = ({
           };
         }
 
-        const file = url.slice(0, match.index);
-        const line = parseInt(match[1]);
-        const column = parseInt(match[2]);
+        const file = urlWithLineAndColumn.slice(0, match.index);
+        let line = parseInt(match[1]);
+        let column = parseInt(match[2]);
         const urlInfo = context.urlGraph.getUrlInfo(file);
 
         if (!urlInfo) {
@@ -12069,6 +12073,23 @@ const jsenvPluginHtmlSupervisor = ({
           };
         }
 
+        const remap = searchParams.has("remap");
+
+        if (remap) {
+          const sourcemap = urlInfo.sourcemap;
+
+          if (sourcemap) {
+            const original = await getOriginalPosition({
+              sourcemap,
+              url: file,
+              line,
+              column
+            });
+            line = original.line;
+            column = original.column;
+          }
+        }
+
         const codeFrame = stringifyUrlSite({
           url: file,
           line,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.6.0",
+  "version": "27.6.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -74,7 +74,7 @@
     "@jsenv/log": "3.1.0",
     "@jsenv/node-esm-resolution": "0.1.0",
     "@jsenv/server": "13.0.0",
-    "@jsenv/sourcemap": "1.0.3",
+    "@jsenv/sourcemap": "1.0.4",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/url-meta": "7.0.0",
     "@jsenv/urls": "1.2.7",

package/src/plugins/html_supervisor/client/error_formatter.js

@@ -10,6 +10,9 @@ export const formatError = (
   const errorMeta = extractErrorMeta(error, { url, line, column })
 
   const resolveUrlSite = ({ url, line, column }) => {
+    if (typeof line === "string") line = parseInt(line)
+    if (typeof column === "string") column = parseInt(column)
+
     const inlineUrlMatch = url.match(
       /@L([0-9]+)C([0-9]+)\-L([0-9]+)C([0-9]+)(\.[\w]+)$/,
     )
@@ -21,7 +24,7 @@ export const formatError = (
       const tagColumnEnd = parseInt(inlineUrlMatch[4])
       const extension = inlineUrlMatch[5]
       url = htmlUrl
-      line = tagLineStart + (line === undefined ? 0 : parseInt(line))
+      line = tagLineStart + (typeof line === "number" ? line : 0)
       // stackTrace formatted by V8 (chrome)
       if (Error.captureStackTrace) {
         line--
@@ -35,7 +38,7 @@ export const formatError = (
           line -= 2
         }
       }
-      column = tagColumnStart + (column === undefined ? 0 : parseInt(column))
+      column = tagColumnStart + (typeof column === "number" ? column : 0)
       const fileUrl = resolveFileUrl(url)
       return {
         isInline: true,
@@ -149,9 +152,13 @@ export const formatError = (
         }
       }
       if (urlSite.line !== undefined) {
-        const response = await window.fetch(
-          `/__get_code_frame__/${formatUrlWithLineAndColumn(urlSite)}`,
-        )
+        let ressourceToFetch = `/__get_code_frame__/${formatUrlWithLineAndColumn(
+          urlSite,
+        )}`
+        if (!Error.captureStackTrace) {
+          ressourceToFetch += `?remap`
+        }
+        const response = await window.fetch(ressourceToFetch)
         const codeFrame = await response.text()
         return {
           codeFrame: formatErrorText({ message: codeFrame }),

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -20,6 +20,7 @@ import {
   setHtmlNodeText,
 } from "@jsenv/ast"
 import { generateInlineContentUrl, stringifyUrlSite } from "@jsenv/urls"
+import { getOriginalPosition } from "@jsenv/sourcemap"
 
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 
@@ -46,25 +47,42 @@ export const jsenvPluginHtmlSupervisor = ({
       dev: true,
       test: true,
     },
-    serve: (request, context) => {
+    serve: async (request, context) => {
       if (request.ressource.startsWith("/__get_code_frame__/")) {
-        const url = request.ressource.slice("/__get_code_frame__/".length)
-        const match = url.match(/:([0-9]+):([0-9]+)$/)
+        const { pathname, searchParams } = new URL(request.url)
+        const urlWithLineAndColumn = pathname.slice(
+          "/__get_code_frame__/".length,
+        )
+        const match = urlWithLineAndColumn.match(/:([0-9]+):([0-9]+)$/)
         if (!match) {
           return {
             status: 400,
             body: "Missing line and column in url",
           }
         }
-        const file = url.slice(0, match.index)
-        const line = parseInt(match[1])
-        const column = parseInt(match[2])
+        const file = urlWithLineAndColumn.slice(0, match.index)
+        let line = parseInt(match[1])
+        let column = parseInt(match[2])
         const urlInfo = context.urlGraph.getUrlInfo(file)
         if (!urlInfo) {
           return {
             status: 404,
           }
         }
+        const remap = searchParams.has("remap")
+        if (remap) {
+          const sourcemap = urlInfo.sourcemap
+          if (sourcemap) {
+            const original = await getOriginalPosition({
+              sourcemap,
+              url: file,
+              line,
+              column,
+            })
+            line = original.line
+            column = original.column
+          }
+        }
         const codeFrame = stringifyUrlSite({
           url: file,
           line,

package/src/plugins/html_supervisor/client/error_site_remap.js

@@ -1,85 +0,0 @@
-import { memoize } from "@jsenv/utils/src/memoize/memoize.js"
-import { remapSourcePosition } from "@jsenv/sourcemap/src/error_stack_remap/remap_source_position.js"
-import { SOURCEMAP } from "@jsenv/sourcemap/src/sourcemap_comment.js"
-import { DATA_URL } from "@jsenv/urls/src/data_url.js"
-
-const loadSourceMapConsumer = memoize(async () => {
-  const script = document.createElement("script")
-  script.src = "https://unpkg.com/source-map@0.7.3/dist/source-map.js"
-
-  const scriptLoadedPromise = new Promise((resolve) => {
-    script.onload = resolve
-  })
-  document.head.appendChild(script)
-  await scriptLoadedPromise
-  const { SourceMapConsumer } = window.sourceMap
-  await SourceMapConsumer.initialize({
-    "lib/mappings.wasm": "https://unpkg.com/source-map@0.7.3/lib/mappings.wasm",
-  })
-  return SourceMapConsumer
-})
-
-export const remapErrorSite = async ({ url, line, column }) => {
-  const asServerUrl = (url) => {
-    if (url.startsWith("file:///")) {
-      url = `${window.origin}/@fs/${url.slice("file:///".length)}`
-    }
-    return url
-  }
-
-  const SourceMapConsumer = await loadSourceMapConsumer()
-  const original = await remapSourcePosition({
-    source: url,
-    line,
-    column,
-    resolveFile: (specifier) => new URL(specifier, `${window.origin}/`).href,
-    urlToSourcemapConsumer: async (url) => {
-      const serverUrl = asServerUrl(url)
-      const fileResponse = await window.fetch(serverUrl)
-      const text = await fileResponse.text()
-      const jsSourcemapComment = SOURCEMAP.readComment({
-        contentType: "text/javascript",
-        content: text,
-      })
-
-      const jsSourcemapUrl = jsSourcemapComment.specifier
-      let sourcemapUrl
-      let sourcemapUrlContent
-      if (jsSourcemapUrl.startsWith("data:")) {
-        sourcemapUrl = url
-        sourcemapUrlContent = window.atob(DATA_URL.parse(jsSourcemapUrl).data)
-      } else {
-        sourcemapUrl = new URL(jsSourcemapUrl, url).href
-        const sourcemapResponse = await window.fetch(sourcemapUrl)
-        sourcemapUrlContent = await sourcemapResponse.text()
-      }
-
-      const sourceMap = JSON.parse(sourcemapUrlContent)
-      let { sourcesContent } = sourceMap
-      if (!sourcesContent) {
-        sourcesContent = []
-        sourceMap.sourcesContent = sourcesContent
-      }
-      let firstSourceMapSourceFailure = null
-      await Promise.all(
-        sourceMap.sources.map(async (source, index) => {
-          if (index in sourcesContent) return
-          let sourceUrl = new URL(source, sourcemapUrl).href
-          sourceUrl = asServerUrl(sourceUrl)
-          try {
-            const sourceResponse = await window.fetch(sourceUrl)
-            const sourceContent = await sourceResponse.text()
-            sourcesContent[index] = sourceContent
-          } catch (e) {
-            firstSourceMapSourceFailure = e
-          }
-        }),
-      )
-      if (firstSourceMapSourceFailure) {
-        return null
-      }
-      return new SourceMapConsumer(sourceMap)
-    },
-  })
-  return original
-}