@jsenv/plugin-supervisor 1.5.32 → 1.6.1

package/dist/js/supervisor.js

@@ -1159,7 +1159,38 @@ window.__supervisor__ = (() => {
       }
       return exception;
     };
-    window.addEventListener("error", errorEvent => {
+    const addEventListenerCalledLast = (object, eventNameListened, eventCallback) => {
+      const eventCallbackSet = new Set();
+      object.addEventListener(eventNameListened, event => {
+        for (const callback of eventCallbackSet) {
+          callback(event);
+        }
+        eventCallback(event);
+      });
+      const addEventListener = object.addEventListener;
+      const removeEventListener = object.removeEventListener;
+      object.addEventListener = function (eventName, callback) {
+        if (eventName === eventNameListened) {
+          eventCallbackSet.add(callback);
+          return;
+        }
+        addEventListener.call(this, eventName, callback);
+      };
+      object.removeEventListener = function (eventName, callback) {
+        if (eventName === eventNameListened) {
+          eventCallbackSet.delete(callback);
+          return;
+        }
+        removeEventListener.call(this, eventName, callback);
+      };
+    };
+    addEventListenerCalledLast(window, "error", errorEvent => {
+      if (errorEvent.defaultPrevented) {
+        if (logs) {
+          console.log("ignore prevented error event", errorEvent);
+        }
+        return;
+      }
       if (!errorEvent.isTrusted) {
         // ignore custom error event (not sent by browser)
         if (logs) {
@@ -1188,7 +1219,7 @@ window.__supervisor__ = (() => {
       });
       supervisor.reportException(exception);
     });
-    window.addEventListener("unhandledrejection", event => {
+    addEventListenerCalledLast(window, "unhandledrejection", event => {
       if (event.defaultPrevented) {
         return;
       }

package/dist/jsenv_plugin_supervisor.js

@@ -27,15 +27,23 @@ if (hasFlag('no-color') || hasFlag('no-colors') || hasFlag('color=false') || has
   flagForceColor = 1;
 }
 function envForceColor() {
-  if ('FORCE_COLOR' in env) {
-    if (env.FORCE_COLOR === 'true') {
-      return 1;
-    }
-    if (env.FORCE_COLOR === 'false') {
-      return 0;
-    }
-    return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
+  if (!('FORCE_COLOR' in env)) {
+    return;
+  }
+  if (env.FORCE_COLOR === 'true') {
+    return 1;
+  }
+  if (env.FORCE_COLOR === 'false') {
+    return 0;
+  }
+  if (env.FORCE_COLOR.length === 0) {
+    return 1;
+  }
+  const level = Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
+  if (![0, 1, 2, 3].includes(level)) {
+    return;
   }
+  return level;
 }
 function translateLevel(level) {
   if (level === 0) {
@@ -91,10 +99,10 @@ function _supportsColor(haveStream, {
     return 1;
   }
   if ('CI' in env) {
-    if ('GITHUB_ACTIONS' in env || 'GITEA_ACTIONS' in env) {
+    if (['GITHUB_ACTIONS', 'GITEA_ACTIONS', 'CIRCLECI'].some(key => key in env)) {
       return 3;
     }
-    if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'BUILDKITE', 'DRONE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+    if (['TRAVIS', 'APPVEYOR', 'GITLAB_CI', 'BUILDKITE', 'DRONE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
       return 1;
     }
     return min;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-supervisor",
-  "version": "1.5.32",
+  "version": "1.6.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
   "dependencies": {
     "@jsenv/ast": "6.4.1",
     "@jsenv/urls": "2.5.4",
-    "@jsenv/sourcemap": "1.2.28",
+    "@jsenv/sourcemap": "1.2.29",
     "launch-editor": "2.9.1"
   },
   "scripts": {

package/src/client/supervisor.js

@@ -1256,7 +1256,42 @@ window.__supervisor__ = (() => {
       }
       return exception;
     };
-    window.addEventListener("error", (errorEvent) => {
+    const addEventListenerCalledLast = (
+      object,
+      eventNameListened,
+      eventCallback,
+    ) => {
+      const eventCallbackSet = new Set();
+      object.addEventListener(eventNameListened, (event) => {
+        for (const callback of eventCallbackSet) {
+          callback(event);
+        }
+        eventCallback(event);
+      });
+      const addEventListener = object.addEventListener;
+      const removeEventListener = object.removeEventListener;
+      object.addEventListener = function (eventName, callback) {
+        if (eventName === eventNameListened) {
+          eventCallbackSet.add(callback);
+          return;
+        }
+        addEventListener.call(this, eventName, callback);
+      };
+      object.removeEventListener = function (eventName, callback) {
+        if (eventName === eventNameListened) {
+          eventCallbackSet.delete(callback);
+          return;
+        }
+        removeEventListener.call(this, eventName, callback);
+      };
+    };
+    addEventListenerCalledLast(window, "error", (errorEvent) => {
+      if (errorEvent.defaultPrevented) {
+        if (logs) {
+          console.log("ignore prevented error event", errorEvent);
+        }
+        return;
+      }
       if (!errorEvent.isTrusted) {
         // ignore custom error event (not sent by browser)
         if (logs) {
@@ -1279,7 +1314,7 @@ window.__supervisor__ = (() => {
       });
       supervisor.reportException(exception);
     });
-    window.addEventListener("unhandledrejection", (event) => {
+    addEventListenerCalledLast(window, "unhandledrejection", (event) => {
       if (event.defaultPrevented) {
         return;
       }