@jsenv/core 25.4.5 → 25.6.1

package/src/internal/dev_server/toolbar/notification/toolbar.notification.js

@@ -6,51 +6,80 @@ const notificationPreference = createPreference("notification")
 
 const arrayOfOpenedNotifications = []
 export const renderToolbarNotification = () => {
-  const notifCheckbox = document.querySelector("#toggle-notifs")
   if (!notificationAvailable) {
-    const notifSetting = document.querySelector(".settings-notification")
-    notifSetting.setAttribute("data-disabled", "true")
-    notifSetting.setAttribute(
-      "title",
-      `Notification not available in the browser`,
-    )
-    notifCheckbox.disabled = true
+    applyNotificationNotAvailableEffects()
     return
   }
+  updatePermission()
+}
 
-  const updatePermission = () => {
-    if (Notification.permission === "denied") {
-      const notifSetting = document.querySelector(".settings-notification")
-      notifSetting.setAttribute("data-disabled", "true")
-      notifSetting.setAttribute("title", `Notification denied`)
-      notifCheckbox.disabled = true
-      return
-    }
+const updatePermission = () => {
+  const notifPermission = Notification.permission
+  if (notifPermission === "default") {
+    applyNotificationDefaultEffects()
+    return
+  }
+  if (notifPermission === "denied") {
+    applyNotificationDeniedEffects()
+    return
+  }
+  if (notifPermission === "granted") {
+    applyNotificationGrantedEffects()
+    return
+  }
+}
 
-    notifCheckbox.checked = getNotificationPreference()
-    notifCheckbox.onchange = () => {
-      setNotificationPreference(notifCheckbox.checked)
-      if (!notifCheckbox.checked) {
-        // slice because arrayOfOpenedNotifications can be mutated while looping
-        arrayOfOpenedNotifications.slice().forEach((notification) => {
-          notification.close()
-        })
-      }
+const notifCheckbox = document.querySelector("#toggle-notifs")
+
+const applyNotificationNotAvailableEffects = () => {
+  const notifSetting = document.querySelector(".settings-notification")
+  notifSetting.setAttribute("data-disabled", "true")
+  notifSetting.setAttribute(
+    "title",
+    `Notification not available in the browser`,
+  )
+  notifCheckbox.disabled = true
+}
+const applyNotificationDefaultEffects = () => {
+  applyNotificationNOTGrantedEffects()
+  const notifSetting = document.querySelector(".settings-notification")
+  notifSetting.removeAttribute("data-disabled")
+  notifSetting.removeAttribute("title")
+}
+const applyNotificationDeniedEffects = () => {
+  applyNotificationNOTGrantedEffects()
+  const notifSetting = document.querySelector(".settings-notification")
+  notifSetting.setAttribute("data-disabled", "true")
+  notifSetting.setAttribute("title", `Notification denied`)
+}
+const applyNotificationGrantedEffects = () => {
+  enableVariant(document.querySelector(".notification-text"), {
+    notif_granted: "yes",
+  })
+  notifCheckbox.disabled = false
+  notifCheckbox.checked = getNotificationPreference()
+  notifCheckbox.onchange = () => {
+    setNotificationPreference(notifCheckbox.checked)
+    if (!notifCheckbox.checked) {
+      // slice because arrayOfOpenedNotifications can be mutated while looping
+      arrayOfOpenedNotifications.slice().forEach((notification) => {
+        notification.close()
+      })
     }
-    const notifPermission = Notification.permission
-    enableVariant(document.querySelector(".notification-text"), {
-      notif_permission: notifPermission === "granted" ? "yes" : "no",
+  }
+}
+const applyNotificationNOTGrantedEffects = () => {
+  enableVariant(document.querySelector(".notification-text"), {
+    notif_granted: "no",
+  })
+  notifCheckbox.disabled = true
+  notifCheckbox.checked = false
+  document.querySelector("a.request_notification_permission").onclick = () => {
+    requestPermission().then(() => {
+      setNotificationPreference(true)
+      updatePermission()
     })
-    if (notifPermission === "default") {
-      document.querySelector("a.request_notification_permission").onclick =
-        () => {
-          requestPermission().then(() => {
-            updatePermission()
-          })
-        }
-    }
   }
-  updatePermission()
 }
 
 export const notifyExecutionResult = (

package/src/internal/dev_server/toolbar/settings/settings.css

@@ -3,8 +3,7 @@
 }
 
 #settings-button[data-warning] svg {
-  fill: orange;
-  stroke: darkorange;
+  fill: #cb5909;
 }
 
 #settings-button[data-warning] svg:hover {

package/src/internal/dev_server/toolbar/toolbar.html

@@ -281,7 +281,7 @@
                     Send system notification when execution fails or is fixed.
                     <div class="notification-text">
                       <a
-                        data-when="notif_permission:no"
+                        data-when="notif_granted:no"
                         class="request_notification_permission"
                         href="javascript:void(0);"
                         >Enable notification</a
@@ -475,13 +475,17 @@
             <div data-when="has_warning:yes">
               <svg
                 xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 511.999 511.999"
-                width="24px"
-                height="24px"
+                viewBox="0 0 45.818 45.818"
+                width="20px"
+                height="20px"
                 class="iconToolbar"
+                style="transform: rotate(180deg)"
               >
                 <path
-                  d="M506.43 421.536 291.573 49.394c-15.814-27.391-55.327-27.401-71.147 0L5.568 421.536c-15.814 27.391 3.934 61.616 35.574 61.616h429.714c31.629.001 51.394-34.214 35.574-61.616zm-231.609-36.502c0 10.394-8.427 18.821-18.821 18.821s-18.821-8.427-18.821-18.821v-11.239c0-10.394 8.427-18.821 18.821-18.821s18.821 8.427 18.821 18.821v11.239zm0-73.332c0 10.394-8.427 18.821-18.821 18.821s-18.821-8.427-18.821-18.821v-107.89c0-10.394 8.427-18.821 18.821-18.821s18.821 8.427 18.821 18.821v107.89z"
+                  d="M22.909,0C10.258,0,0,10.257,0,22.908c0,12.652,10.258,22.91,22.909,22.91s22.909-10.258,22.909-22.91
+               C45.818,10.257,35.561,0,22.909,0z M26.411,35.417c0,1.921-1.573,3.478-3.492,3.478c-1.92,0-3.492-1.557-3.492-3.478V20.201
+               c0-1.92,1.572-3.477,3.492-3.477c1.919,0,3.492,1.556,3.492,3.477V35.417z M22.909,13.851c-2.119,0-3.837-1.718-3.837-3.836
+               c0-2.12,1.718-3.836,3.837-3.836c2.118,0,3.837,1.716,3.837,3.836C26.746,12.133,25.027,13.851,22.909,13.851z"
                 />
               </svg>
             </div>

package/src/internal/dev_server/toolbar/toolbar.main.js

@@ -3,6 +3,7 @@ import { urlToRelativeUrl } from "@jsenv/filesystem/src/urlToRelativeUrl.js"
 
 import { startJavaScriptAnimation } from "../toolbar/util/animation.js"
 import "./focus/toolbar.focus.js"
+import { setLinkHrefForParentWindow } from "./util/iframe_to_parent_href.js"
 import {
   getToolbarIframe,
   deactivateToolbarSection,
@@ -52,9 +53,10 @@ const renderToolbar = async ({ exploringJSON }) => {
     hideToolbar({ animate: false })
   }
 
-  document.querySelector(".toolbar-icon-wrapper").onclick = () => {
-    window.parent.location.href = "/"
-  }
+  setLinkHrefForParentWindow(
+    document.querySelector(".toolbar-icon-wrapper"),
+    "/",
+  )
 
   renderToolbarNotification()
   makeToolbarResponsive()

package/src/internal/dev_server/toolbar/util/iframe_to_parent_href.js

@@ -0,0 +1,10 @@
+export const setLinkHrefForParentWindow = (a, href) => {
+  a.href = href
+  a.onclick = (e) => {
+    if (e.ctrlKey || e.metaKey) {
+      return
+    }
+    e.preventDefault()
+    window.parent.location.href = href
+  }
+}

package/src/internal/executing/coverage/reportToCoverage.js

@@ -62,6 +62,7 @@ export const reportToCoverage = async (
 
   if (!coverageForceIstanbul && process.env.NODE_V8_COVERAGE) {
     await visitNodeV8Directory({
+      logger,
       signal,
       NODE_V8_COVERAGE: process.env.NODE_V8_COVERAGE,
       onV8Coverage: (nodeV8Coverage) => {

package/src/internal/executing/coverage_utils/v8_coverage_from_directory.js

@@ -8,6 +8,7 @@ import { createDetailedMessage } from "@jsenv/logger"
 import { Abort } from "@jsenv/abort"
 
 export const visitNodeV8Directory = async ({
+  logger,
   signal,
   NODE_V8_COVERAGE,
   onV8Coverage,
@@ -20,7 +21,7 @@ export const visitNodeV8Directory = async ({
     if (dirContent.length > 0) {
       return dirContent
     }
-    console.warn(`v8 coverage directory is empty at ${NODE_V8_COVERAGE}`)
+    logger.warn(`v8 coverage directory is empty at ${NODE_V8_COVERAGE}`)
     return dirContent
   }