@jsenv/core 27.5.2 → 27.6.1

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

@@ -88,11 +88,15 @@ export const installHtmlSupervisor = ({
     let completed
     let result
     let error
+    const urlObject = new URL(src, window.location)
+    if (reload) {
+      urlObject.searchParams.set("hmr", Date.now())
+    }
+    __html_supervisor__.currentExecution = {
+      type: type === "module" ? "dynamic_import" : "script_injection",
+      url: urlObject.href,
+    }
     try {
-      const urlObject = new URL(src, window.location)
-      if (reload) {
-        urlObject.searchParams.set("hmr", Date.now())
-      }
       result = await execute(urlObject.href)
       completed = true
     } catch (e) {
@@ -110,6 +114,7 @@ export const installHtmlSupervisor = ({
         console.log(`${type} load ended`)
         console.groupEnd()
       }
+      __html_supervisor__.currentExecution = null
       return
     }
     const executionResult = {
@@ -140,6 +145,7 @@ export const installHtmlSupervisor = ({
     if (logs) {
       console.groupEnd()
     }
+    __html_supervisor__.currentExecution = null
   }
 
   const classicExecutionQueue = createExecutionQueue(performExecution)
@@ -220,82 +226,28 @@ export const installHtmlSupervisor = ({
   })
 
   if (errorOverlay) {
-    window.addEventListener("error", (errorEvent) => {
-      if (!errorEvent.isTrusted) {
-        // ignore custom error event (not sent by browser)
-        return
-      }
-      const { error } = errorEvent
+    const onErrorReportedByBrowser = (error, { url, line, column }) => {
       displayErrorInDocument(error, {
         rootDirectoryUrl,
         errorBaseUrl,
         openInEditor,
-        url: errorEvent.filename,
-        line: errorEvent.lineno,
-        column: errorEvent.colno,
-        reportedBy: "browser",
+        url,
+        line,
+        column,
       })
-    })
-    if (window.__server_events__) {
-      const isExecuting = () => {
-        if (pendingExecutionCount > 0) {
-          return true
-        }
-        if (
-          document.readyState === "loading" ||
-          document.readyState === "interactive"
-        ) {
-          return true
-        }
-        if (window.__reloader__ && window.__reloader__.status === "reloading") {
-          return true
-        }
-        return false
+    }
+    window.addEventListener("error", (errorEvent) => {
+      if (!errorEvent.isTrusted) {
+        // ignore custom error event (not sent by browser)
+        return
       }
-
-      window.__server_events__.addEventCallbacks({
-        error_while_serving_file: (serverErrorEvent) => {
-          if (!isExecuting()) {
-            return
-          }
-          const {
-            message,
-            stack,
-            traceUrl,
-            traceLine,
-            traceColumn,
-            traceMessage,
-            requestedRessource,
-            isFaviconAutoRequest,
-          } = JSON.parse(serverErrorEvent.data)
-          if (isFaviconAutoRequest) {
-            return
-          }
-          // setTimeout is to ensure the error
-          // dispatched on window by browser is displayed first,
-          // then the server error replaces it (because it contains more information)
-          setTimeout(() => {
-            displayErrorInDocument(
-              {
-                message,
-                stack,
-              },
-              {
-                rootDirectoryUrl,
-                errorBaseUrl,
-                openInEditor,
-                url: traceUrl,
-                line: traceLine,
-                column: traceColumn,
-                codeFrame: traceMessage,
-                reportedBy: "server",
-                requestedRessource,
-              },
-            )
-          }, 10)
-        },
+      const { error, filename, lineno, colno } = errorEvent
+      onErrorReportedByBrowser(error, {
+        url: filename,
+        line: lineno,
+        column: colno,
       })
-    }
+    })
   }
 }
 

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,44 +47,42 @@ export const jsenvPluginHtmlSupervisor = ({
       dev: true,
       test: true,
     },
-    serve: (request, context) => {
-      if (request.ressource.startsWith("/__open_in_editor__/")) {
-        const file = request.ressource.slice("/__open_in_editor__/".length)
-        if (!file) {
-          return {
-            status: 400,
-            body: "Missing file in url",
-          }
-        }
-        const launch = requireFromJsenv("launch-editor")
-        launch(fileURLToPath(file), () => {
-          // ignore error for now
-        })
-        return {
-          status: 200,
-          headers: {
-            "cache-control": "no-store",
-          },
-        }
-      }
+    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,
@@ -99,6 +98,76 @@ export const jsenvPluginHtmlSupervisor = ({
           body: codeFrame,
         }
       }
+      if (request.ressource.startsWith("/__get_error_cause__/")) {
+        const file = request.ressource.slice("/__get_error_cause__/".length)
+        if (!file) {
+          return {
+            status: 400,
+            body: "Missing file in url",
+          }
+        }
+        const getErrorCauseInfo = () => {
+          const urlInfo = context.urlGraph.getUrlInfo(file)
+          if (!urlInfo) {
+            return null
+          }
+          const { error } = urlInfo
+          if (error) {
+            return error
+          }
+          // search in direct dependencies (404 or 500)
+          const { dependencies } = urlInfo
+          for (const dependencyUrl of dependencies) {
+            const dependencyUrlInfo = context.urlGraph.getUrlInfo(dependencyUrl)
+            if (dependencyUrlInfo.error) {
+              return dependencyUrlInfo.error
+            }
+          }
+          return null
+        }
+        const causeInfo = getErrorCauseInfo()
+        const body = JSON.stringify(
+          causeInfo
+            ? {
+                code: causeInfo.code,
+                message: causeInfo.message,
+                reason: causeInfo.reason,
+                stack: causeInfo.stack,
+                codeFrame: causeInfo.traceMessage,
+              }
+            : null,
+          null,
+          "  ",
+        )
+        return {
+          status: 200,
+          headers: {
+            "cache-control": "no-cache",
+            "content-type": "application/json",
+            "content-length": Buffer.byteLength(body),
+          },
+          body,
+        }
+      }
+      if (request.ressource.startsWith("/__open_in_editor__/")) {
+        const file = request.ressource.slice("/__open_in_editor__/".length)
+        if (!file) {
+          return {
+            status: 400,
+            body: "Missing file in url",
+          }
+        }
+        const launch = requireFromJsenv("launch-editor")
+        launch(fileURLToPath(file), () => {
+          // ignore error for now
+        })
+        return {
+          status: 200,
+          headers: {
+            "cache-control": "no-store",
+          },
+        }
+      }
       return null
     },
     transformUrlContent: {

package/src/test/execute_test_plan.js

@@ -60,8 +60,7 @@ export const executeTestPlan = async ({
   cooldownBetweenExecutions = 0,
   gcBetweenExecutions = logMemoryHeapUsage,
 
-  coverageEnabled = process.argv.includes("--cover") ||
-    process.argv.includes("--coverage"),
+  coverageEnabled = process.argv.includes("--coverage"),
   coverageConfig = {
     "./src/": true,
   },