@jsenv/plugin-supervisor 1.5.23 → 1.5.25

package/dist/js/supervisor.js

@@ -737,19 +737,19 @@ window.__supervisor__ = (() => {
       message,
       stackTrace
     }) => {
-      let stack = "";
+      const parts = [];
       if (codeFrame) {
-        stack += "".concat(codeFrame, "\n");
+        parts.push(codeFrame);
       }
       if (name && message) {
-        stack += "".concat(name, ": ").concat(message);
+        parts.push("".concat(name, ": ").concat(message));
       } else if (message) {
-        stack += message;
+        parts.push(message);
       }
       if (stackTrace) {
-        stack += "\n".concat(stackTrace);
+        parts.push(stackTrace);
       }
-      return stack;
+      return parts.join("\n");
     };
     const stringifyUrlSite = ({
       url,
@@ -972,13 +972,14 @@ window.__supervisor__ = (() => {
             const {
               trace = {}
             } = cause;
+            const dataToRender = cause.code === "MODULE_NOT_FOUND" ? cause : exception;
             root.querySelector(".text").innerHTML = stringifyStack({
               codeFrame: trace.codeFrame ? generateClickableText(trace.codeFrame) : "",
-              name: exception.name,
-              message: exception.message ? generateClickableText(exception.message) : "",
-              stackTrace: exception.stackTrace ? generateClickableText(exception.stackTrace) : ""
+              name: dataToRender.name,
+              message: cause.code === "MODULE_NOT_FOUND" ? generateClickableText(dataToRender.reason) : dataToRender.message ? generateClickableText(dataToRender.message) : "",
+              stackTrace: dataToRender.stackTrace ? generateClickableText(dataToRender.stackTrace) : ""
             });
-            if (cause) {
+            if (cause && dataToRender === exception) {
               const causeText = stringifyStack({
                 name: getErrorName(cause),
                 message: cause.reason ? generateClickableText(cause.reason) : cause.stack ? generateClickableText(cause.stack) : ""
@@ -1237,6 +1238,9 @@ window.__supervisor__ = (() => {
     });
   };
   const getErrorName = value => {
+    if (value.code === "MODULE_NOT_FOUND") {
+      return "TypeError";
+    }
     const {
       constructor
     } = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-supervisor",
-  "version": "1.5.23",
+  "version": "1.5.25",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "/dist/"
   ],
   "dependencies": {
-    "@jsenv/ast": "6.3.4",
+    "@jsenv/ast": "6.3.5",
     "@jsenv/urls": "2.5.2",
     "@jsenv/sourcemap": "1.2.25",
     "launch-editor": "2.9.1"

package/src/client/supervisor.js

@@ -707,19 +707,19 @@ window.__supervisor__ = (() => {
     };
 
     const stringifyStack = ({ codeFrame, name, message, stackTrace }) => {
-      let stack = "";
+      const parts = [];
       if (codeFrame) {
-        stack += `${codeFrame}\n`;
+        parts.push(codeFrame);
       }
       if (name && message) {
-        stack += `${name}: ${message}`;
+        parts.push(`${name}: ${message}`);
       } else if (message) {
-        stack += message;
+        parts.push(message);
       }
       if (stackTrace) {
-        stack += `\n${stackTrace}`;
+        parts.push(stackTrace);
       }
-      return stack;
+      return parts.join("\n");
     };
 
     const stringifyUrlSite = ({ url, line, column }) => {
@@ -971,20 +971,24 @@ window.__supervisor__ = (() => {
           const renderException = () => {
             const { cause = {} } = exception;
             const { trace = {} } = cause;
-
+            const dataToRender =
+              cause.code === "MODULE_NOT_FOUND" ? cause : exception;
             root.querySelector(".text").innerHTML = stringifyStack({
               codeFrame: trace.codeFrame
                 ? generateClickableText(trace.codeFrame)
                 : "",
-              name: exception.name,
-              message: exception.message
-                ? generateClickableText(exception.message)
-                : "",
-              stackTrace: exception.stackTrace
-                ? generateClickableText(exception.stackTrace)
+              name: dataToRender.name,
+              message:
+                cause.code === "MODULE_NOT_FOUND"
+                  ? generateClickableText(dataToRender.reason)
+                  : dataToRender.message
+                    ? generateClickableText(dataToRender.message)
+                    : "",
+              stackTrace: dataToRender.stackTrace
+                ? generateClickableText(dataToRender.stackTrace)
                 : "",
             });
-            if (cause) {
+            if (cause && dataToRender === exception) {
               const causeText = stringifyStack({
                 name: getErrorName(cause),
                 message: cause.reason
@@ -1329,6 +1333,9 @@ window.__supervisor__ = (() => {
   };
 
   const getErrorName = (value) => {
+    if (value.code === "MODULE_NOT_FOUND") {
+      return "TypeError";
+    }
     const { constructor } = value;
     if (constructor) {
       if (constructor.name !== "Object") {