@jsenv/plugin-supervisor 1.3.9 → 1.4.1

package/src/html_supervisor.js

@@ -78,6 +78,7 @@ export const injectSupervisorIntoHTML = async (
     generateInlineScriptSrc = ({ inlineScriptUrl }) =>
       urlToRelativeUrl(inlineScriptUrl, webServer.rootDirectoryUrl),
     inlineAsRemote,
+    sourcemaps = "inline",
   },
 ) => {
   const htmlAst = parseHtml({ html: content, url });
@@ -113,7 +114,10 @@ export const injectSupervisorIntoHTML = async (
       });
       if (inlineAsRemote) {
         // prefere la version src
-        scriptInfos.push({ type, src: inlineScriptSrc });
+        scriptInfos.push({
+          type,
+          src: inlineScriptSrc,
+        });
         const remoteJsSupervised = generateCodeToSuperviseScriptWithSrc({
           type,
           src: inlineScriptSrc,
@@ -129,7 +133,11 @@ export const injectSupervisorIntoHTML = async (
           });
         });
       } else {
-        scriptInfos.push({ type, src: inlineScriptSrc, isInline: true });
+        scriptInfos.push({
+          type,
+          src: inlineScriptSrc,
+          isInline: true,
+        });
         actions.push(async () => {
           try {
             const inlineJsSupervised = await injectSupervisorIntoJs({
@@ -138,6 +146,7 @@ export const injectSupervisorIntoHTML = async (
               url: inlineScriptUrl,
               type,
               inlineSrc: inlineScriptSrc,
+              sourcemaps,
             });
             mutations.push(() => {
               setHtmlNodeText(scriptNode, inlineJsSupervised, {
@@ -228,7 +237,9 @@ export const injectSupervisorIntoHTML = async (
       htmlAst,
       createHtmlNode({
         tagName: "script",
-        textContent: `window.__supervisor__.setup({${setupParamsSource}})`,
+        textContent: `window.__supervisor__.setup({
+  ${setupParamsSource}
+});`,
       }),
       "jsenv:supervisor",
     );

package/src/js_supervisor.js

@@ -36,16 +36,15 @@
  * and create a variable named "undefined"
  */
 
-import { urlToRelativeUrl } from "@jsenv/urls";
 import { applyBabelPlugins } from "@jsenv/ast";
 import { SOURCEMAP, generateSourcemapDataUrl } from "@jsenv/sourcemap";
 
 export const injectSupervisorIntoJs = async ({
-  webServer,
   content,
   url,
   type,
   inlineSrc,
+  sourcemaps,
 }) => {
   const babelPluginJsSupervisor =
     type === "js_module"
@@ -58,15 +57,17 @@ export const injectSupervisorIntoJs = async ({
     inputUrl: url,
   });
   let code = result.code;
-  let map = result.map;
-  const sourcemapDataUrl = generateSourcemapDataUrl(map);
-  code = SOURCEMAP.writeComment({
-    contentType: "text/javascript",
-    content: code,
-    specifier: sourcemapDataUrl,
-  });
+  if (sourcemaps === "inline") {
+    const map = result.map;
+    const sourcemapDataUrl = generateSourcemapDataUrl(map);
+    code = SOURCEMAP.writeComment({
+      contentType: "text/javascript",
+      content: code,
+      specifier: sourcemapDataUrl,
+    });
+  }
   code = `${code}
-//# sourceURL=${urlToRelativeUrl(url, webServer.rootDirectoryUrl)}`;
+//# sourceURL=${inlineSrc}`;
   return code;
 };
 

package/src/jsenv_plugin_supervisor.js

@@ -6,7 +6,7 @@
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { getOriginalPosition } from "@jsenv/sourcemap";
-import { stringifyUrlSite } from "@jsenv/urls";
+import { inspectFileContent } from "@jsenv/inspect";
 
 import {
   supervisorFileUrl,
@@ -24,10 +24,10 @@ export const jsenvPluginSupervisor = ({
     name: "jsenv:supervisor",
     appliesDuring: "dev",
     serve: async (serveInfo) => {
-      if (serveInfo.request.pathname.startsWith("/__get_code_frame__/")) {
+      if (serveInfo.request.pathname.startsWith("/__get_cause_trace__/")) {
         const { pathname, searchParams } = new URL(serveInfo.request.url);
         let urlWithLineAndColumn = pathname.slice(
-          "/__get_code_frame__/".length,
+          "/__get_cause_trace__/".length,
         );
         urlWithLineAndColumn = decodeURIComponent(urlWithLineAndColumn);
         const match = urlWithLineAndColumn.match(/:([0-9]+):([0-9]+)$/);
@@ -67,20 +67,26 @@ export const jsenvPluginSupervisor = ({
             }
           }
         }
-        const codeFrame = stringifyUrlSite({
+        const causeTrace = {
           url: file,
           line,
           column,
-          content: urlInfo.originalContent,
-        });
+          codeFrame: inspectFileContent({
+            line,
+            column,
+            content: urlInfo.originalContent,
+          }),
+        };
+        const causeTraceJson = JSON.stringify(causeTrace, null, "  ");
+
         return {
           status: 200,
           headers: {
             "cache-control": "no-store",
-            "content-type": "text/plain",
-            "content-length": Buffer.byteLength(codeFrame),
+            "content-type": "application/json",
+            "content-length": Buffer.byteLength(causeTraceJson),
           },
-          body: codeFrame,
+          body: causeTraceJson,
         };
       }
       if (serveInfo.request.pathname.startsWith("/__get_error_cause__/")) {
@@ -123,7 +129,7 @@ export const jsenvPluginSupervisor = ({
                 stack: errorBaseUrl
                   ? `stack mocked for snapshot`
                   : causeInfo.stack,
-                codeFrame: causeInfo.traceMessage,
+                trace: causeInfo.trace,
               }
             : null,
           null,
@@ -216,6 +222,7 @@ export const jsenvPluginSupervisor = ({
                 });
               return inlineScriptReference.generatedSpecifier;
             },
+            sourcemaps: htmlUrlInfo.kitchen.context.sourcemaps,
           },
         );
       },