@jsenv/core 24.4.6 → 24.5.2

package/src/internal/building/ressource_builder.js

@@ -5,7 +5,7 @@ import {
   urlToParentUrl,
   urlToFilename,
 } from "@jsenv/filesystem"
-import { createLogger } from "@jsenv/logger"
+import { createLogger, loggerToLevels } from "@jsenv/logger"
 
 import { setJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
 import { racePromises } from "../promise_race.js"
@@ -143,6 +143,9 @@ export const createRessourceBuilder = (
       contentType,
       bufferBeforeBuild,
     })
+    if (!reference) {
+      return null
+    }
     await reference.ressource.getReadyPromise()
     return reference
   }
@@ -229,10 +232,18 @@ export const createRessourceBuilder = (
 
     let ressourceUrl
     let isExternal = false
+    let isWorker = false
+    let isServiceWorker = false
     if (typeof ressourceUrlResolution === "object") {
-      if (ressourceUrlResolution.external) {
+      if (ressourceUrlResolution.isExternal) {
         isExternal = true
       }
+      if (ressourceUrlResolution.isWorker) {
+        isWorker = true
+      }
+      if (ressourceUrlResolution.isServiceWorker) {
+        isServiceWorker = true
+      }
       ressourceUrl = ressourceUrlResolution.url
     } else {
       ressourceUrl = ressourceUrlResolution
@@ -292,6 +303,8 @@ export const createRessourceBuilder = (
         isExternal,
         isInline,
         isPlaceholder,
+        isWorker,
+        isServiceWorker,
         fileNamePattern,
         urlVersioningDisabled,
       })
@@ -330,14 +343,16 @@ export const createRessourceBuilder = (
     } else {
       ressource.references.push(reference)
       const effects = ressource.applyReferenceEffects(reference, { isJsModule })
-      logger.debug(
-        formatFoundReference({
-          reference,
-          referenceEffects: effects,
-          showReferenceSourceLocation,
-          shortenUrl,
-        }),
-      )
+      if (loggerToLevels(logger).debug) {
+        logger.debug(
+          formatFoundReference({
+            reference,
+            referenceEffects: effects,
+            showReferenceSourceLocation,
+            shortenUrl,
+          }),
+        )
+      }
     }
 
     return reference
@@ -356,9 +371,11 @@ export const createRessourceBuilder = (
     isExternal = false,
     isInline = false,
     isPlaceholder = false,
+    isWorker = false,
+    isServiceWorker = false,
 
     fileNamePattern,
-    urlVersioningDisabled = false,
+    urlVersioningDisabled = isServiceWorker,
   }) => {
     const ressource = {
       contentType,
@@ -373,6 +390,8 @@ export const createRessourceBuilder = (
       isInline,
       isExternal,
       isPlaceholder,
+      isWorker,
+      isServiceWorker,
 
       urlVersioningDisabled,
       fileNamePattern,
@@ -424,12 +443,13 @@ export const createRessourceBuilder = (
 
       const response = await urlFetcher.fetchUrl(ressource.url, {
         contentTypeExpected: ressource.firstStrongReference.contentTypeExpected,
-        urlTrace: () =>
-          createRessourceTrace({
+        urlTrace: () => {
+          return createRessourceTrace({
             ressource,
             createUrlSiteFromReference,
             findRessourceByUrl,
-          }),
+          })
+        },
       })
       if (response.url !== ressource.url) {
         const urlBeforeRedirection = ressource.url
@@ -875,7 +895,7 @@ export const createRessourceBuilder = (
       ? String(referenceSource)
       : ""
 
-    return {
+    const urlSite = {
       type:
         referenceRessource && referenceRessource.isJsModule
           ? "import"
@@ -885,6 +905,30 @@ export const createRessourceBuilder = (
       column: referenceColumn,
       source: referenceSourceAsString,
     }
+
+    if (!referenceRessource.isInline) {
+      return urlSite
+    }
+    const { firstStrongReference } = referenceRessource
+    if (!firstStrongReference) {
+      return urlSite
+    }
+    const htmlUrlSite = createUrlSiteFromReference(firstStrongReference)
+    // when the html node is injected there is no line in the source file to target
+    if (htmlUrlSite.line === undefined) {
+      return urlSite
+    }
+    const importerRessource = findRessourceByUrl(
+      firstStrongReference.referenceUrl,
+    )
+    if (!importerRessource || importerRessource.contentType !== "text/html") {
+      return urlSite
+    }
+    return {
+      ...htmlUrlSite,
+      line: htmlUrlSite.line + urlSite.line,
+      column: htmlUrlSite.column + urlSite.column,
+    }
   }
 
   const showReferenceSourceLocation = (reference) => {

package/src/internal/building/{createJsenvRollupPlugin.js → rollup_plugin_jsenv.js}

@@ -65,6 +65,9 @@ export const createJsenvRollupPlugin = async ({
   externalImportSpecifiers,
   externalImportUrlPatterns,
   importPaths,
+  workers,
+  serviceWorkers,
+  serviceWorkerFinalizer,
 
   format,
   systemJsUrl,
@@ -98,6 +101,15 @@ export const createJsenvRollupPlugin = async ({
     lastErrorMessage = error.message
   }
 
+  const workerUrls = Object.keys(workers).map((key) =>
+    resolveUrl(key, projectDirectoryUrl),
+  )
+  const serviceWorkerUrls = Object.keys(serviceWorkers).map((key) =>
+    resolveUrl(key, projectDirectoryUrl),
+  )
+  const isWorkerUrl = (url) => workerUrls.includes(url)
+  const isServiceWorkerUrl = (url) => serviceWorkerUrls.includes(url)
+
   let ressourceBuilder
   let importResolver
   let rollupEmitFile = () => {}
@@ -194,7 +206,7 @@ export const createJsenvRollupPlugin = async ({
     compileDirectoryRelativeUrl,
     projectDirectoryUrl,
   )
-  const compileDirectoryRemoteUrl = resolveDirectoryUrl(
+  const compileDirectoryServerUrl = resolveDirectoryUrl(
     compileDirectoryRelativeUrl,
     compileServerOrigin,
   )
@@ -371,7 +383,7 @@ export const createJsenvRollupPlugin = async ({
             )
             importMapUrl = applyUrlMappings(importMapUrl)
 
-            if (!urlIsInsideOf(importMapUrl, compileDirectoryRemoteUrl)) {
+            if (!urlIsInsideOf(importMapUrl, compileDirectoryServerUrl)) {
               logger.warn(
                 formatImportmapOutsideCompileDirectory({
                   importMapInfo: importMapInfoFromHtml,
@@ -392,7 +404,7 @@ export const createJsenvRollupPlugin = async ({
               firstHtmlEntryPoint.entryProjectRelativeUrl
             const htmlCompiledUrl = resolveUrl(
               htmlProjectRelativeUrl,
-              compileDirectoryRemoteUrl,
+              compileDirectoryServerUrl,
             )
             importMapUrl = htmlCompiledUrl
             fetchImportMap = () => {
@@ -404,7 +416,7 @@ export const createJsenvRollupPlugin = async ({
         } else if (importMapFileRelativeUrl) {
           importMapUrl = resolveUrl(
             importMapFileRelativeUrl,
-            compileDirectoryRemoteUrl,
+            compileDirectoryServerUrl,
           )
           fetchImportMap = () => {
             return fetchImportMapFromUrl(
@@ -428,7 +440,7 @@ export const createJsenvRollupPlugin = async ({
             })
             const entryCompileServerUrl = resolveUrl(
               entryProjectRelativeUrl,
-              compileDirectoryRemoteUrl,
+              compileDirectoryServerUrl,
             )
             return normalizeImportMap(defaultImportMap, entryCompileServerUrl)
           }
@@ -550,8 +562,26 @@ export const createJsenvRollupPlugin = async ({
             // and ignore them and console.info/debug about remote url (https, http, ...)
             const projectUrl = asProjectUrl(ressourceUrl)
             if (!projectUrl) {
-              return { external: true, url: ressourceUrl }
+              return {
+                isExternal: true,
+                url: ressourceUrl,
+              }
+            }
+
+            const originalUrl = asOriginalUrl(projectUrl)
+            if (isWorkerUrl(originalUrl)) {
+              return {
+                isWorker: true,
+                url: ressourceUrl,
+              }
             }
+            if (isServiceWorkerUrl(originalUrl)) {
+              return {
+                isServiceWorker: true,
+                url: ressourceUrl,
+              }
+            }
+
             return ressourceUrl
           },
           emitChunk,
@@ -565,7 +595,7 @@ export const createJsenvRollupPlugin = async ({
             urlImporterMap[jsModuleUrl] = {
               url: resolveUrl(
                 entryPointsPrepared[0].entryProjectRelativeUrl,
-                compileDirectoryRemoteUrl,
+                compileDirectoryServerUrl,
               ),
               line: undefined,
               column: undefined,
@@ -615,7 +645,7 @@ export const createJsenvRollupPlugin = async ({
             const entryUrl =
               entryContentType === "text/html"
                 ? resolveUrl(entryProjectRelativeUrl, compileServerOrigin)
-                : resolveUrl(entryProjectRelativeUrl, compileDirectoryRemoteUrl)
+                : resolveUrl(entryProjectRelativeUrl, compileDirectoryServerUrl)
             await ressourceBuilder.createReferenceForEntryPoint({
               entryContentType,
               entryUrl,
@@ -640,7 +670,7 @@ export const createJsenvRollupPlugin = async ({
         if (specifier.endsWith(".html")) {
           importer = compileServerOrigin
         } else {
-          importer = compileDirectoryRemoteUrl
+          importer = compileDirectoryServerUrl
         }
       } else {
         importer = asServerUrl(importer)
@@ -1284,6 +1314,18 @@ export const createJsenvRollupPlugin = async ({
         }
       })
 
+      await finalizeServiceWorkers({
+        serviceWorkers,
+        serviceWorkerFinalizer,
+        projectDirectoryUrl,
+        buildDirectoryUrl,
+        rollupBuild,
+        buildMappings,
+        buildManifest,
+        lineBreakNormalization,
+        minify,
+      })
+
       rollupBuild = sortObjectByPathnames(rollupBuild)
       buildManifest = sortObjectByPathnames(buildManifest)
       buildMappings = sortObjectByPathnames(buildMappings)
@@ -1505,3 +1547,33 @@ const acceptsJsonContentType = ({ node, format }) => {
   }
   return false
 }
+
+const finalizeServiceWorkers = async ({
+  serviceWorkers,
+  serviceWorkerFinalizer,
+  buildMappings,
+  buildManifest,
+  rollupBuild,
+  lineBreakNormalization,
+}) => {
+  await Promise.all(
+    Object.keys(serviceWorkers).map(async (projectRelativeUrl) => {
+      const projectUrl = resolveUrl(projectRelativeUrl, "file://")
+      projectRelativeUrl = urlToRelativeUrl(projectUrl, "file://")
+      const serviceWorkerBuildRelativeUrl = buildMappings[projectRelativeUrl]
+      if (!serviceWorkerBuildRelativeUrl) {
+        throw new Error(
+          `"${projectRelativeUrl}" service worker file missing in the build`,
+        )
+      }
+      const buildFileContent = rollupBuild[serviceWorkerBuildRelativeUrl].source
+      rollupBuild[serviceWorkerBuildRelativeUrl].source =
+        serviceWorkerFinalizer(buildFileContent, {
+          serviceWorkerBuildRelativeUrl,
+          buildManifest,
+          rollupBuild,
+          lineBreakNormalization,
+        })
+    }),
+  )
+}

package/src/internal/building/url_loader.js

@@ -24,7 +24,6 @@ export const createUrlLoader = ({
   const loadUrl = async (rollupUrl, { signal, logger, ressourceBuilder }) => {
     let url = asServerUrl(rollupUrl)
     const { importType, urlWithoutImportType } = extractImportTypeFromUrl(url)
-
     // importing CSS from JS with import assertions
     if (importType === "css") {
       const importer = urlImporterMap[url]
@@ -79,7 +78,6 @@ export const createUrlLoader = ({
         map,
       }
     }
-
     // importing json from JS with import assertion
     if (importType === "json") {
       const importer = urlImporterMap[url]

package/src/internal/compiling/createCompiledFileService.js

@@ -56,9 +56,9 @@ export const createCompiledFileService = ({
   sourcemapMethod,
   sourcemapExcludeSources,
 }) => {
-  const moduleFormats = {}
+  const compileIdModuleFormats = {}
   Object.keys(groupMap).forEach((groupName) => {
-    moduleFormats[groupName] = canAvoidSystemJs({
+    compileIdModuleFormats[groupName] = canAvoidSystemJs({
       runtimeSupport: groupMap[groupName].minRuntimeVersions,
     })
       ? "esmodule"
@@ -187,7 +187,7 @@ export const createCompiledFileService = ({
           runtimeSupport,
           moduleOutFormat:
             moduleOutFormat === undefined
-              ? moduleFormats[compileId]
+              ? compileIdModuleFormats[compileId]
               : moduleOutFormat,
           importMetaFormat,
           transformTopLevelAwait,

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

@@ -18,7 +18,7 @@
     <div id="toolbar">
       <div id="toolbar-wrapper">
         <section id="file-list-link" data-responsive-toolbar-element>
-          <a class="toolbar-icon-wrapper" href="/">
+          <a class="toolbar-icon-wrapper" href="javascript:void(0);">
             <svg
               id="fileIconSvg"
               class="iconToolbar"

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

@@ -54,6 +54,10 @@ const renderToolbar = async () => {
     hideToolbar({ animate: false })
   }
 
+  document.querySelector(".toolbar-icon-wrapper").onclick = () => {
+    window.parent.location.href = "/"
+  }
+
   renderToolbarNotification()
   makeToolbarResponsive()
   renderToolbarSettings()

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

@@ -1,7 +1,7 @@
 export const updateIframeOverflowOnParentWindow = () => {
   if (!window.parent) {
     // can happen while parent iframe reloads
-    return null
+    return
   }
 
   const aTooltipIsOpened =

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

@@ -35,9 +35,13 @@ export const visitNodeV8Directory = async ({
       await previous
 
       const dirEntryUrl = resolveUrl(dirEntry, coverageDirectoryUrl)
-      const tryReadJsonFile = async () => {
+      const tryReadJsonFile = async (timeSpentTrying = 0) => {
         const fileContent = await readFile(dirEntryUrl, { as: "string" })
         if (fileContent === "") {
+          if (timeSpentTrying < 400) {
+            await new Promise((resolve) => setTimeout(resolve, 200))
+            return tryReadJsonFile(timeSpentTrying + 200)
+          }
           console.warn(`Coverage JSON file is empty at ${dirEntryUrl}`)
           return null
         }
@@ -46,6 +50,10 @@ export const visitNodeV8Directory = async ({
           const fileAsJson = JSON.parse(fileContent)
           return fileAsJson
         } catch (e) {
+          if (timeSpentTrying < 400) {
+            await new Promise((resolve) => setTimeout(resolve, 200))
+            return tryReadJsonFile(timeSpentTrying + 200)
+          }
           console.warn(
             createDetailedMessage(`Error while reading coverage file`, {
               "error stack": e.stack,

package/src/internal/executing/createSummaryLog.js

@@ -3,12 +3,12 @@ import { ANSI } from "@jsenv/log"
 import { msAsDuration } from "../logs/msAsDuration.js"
 import { EXECUTION_COLORS } from "./execution_colors.js"
 
-export const createSummaryLog = (summary) => `
--------------- summary -----------------
+export const createSummaryLog = (
+  summary,
+) => `-------------- summary -----------------
 ${createSummaryMessage(summary)}
 total duration: ${msAsDuration(summary.duration)}
-----------------------------------------
-`
+----------------------------------------`
 
 const createSummaryMessage = ({
   executionCount,

package/src/internal/executing/executeConcurrently.js

@@ -133,6 +133,7 @@ export const executeConcurrently = async (
     }
   }
 
+  logger.info("")
   let executionLog = createLog({ newLine: "" })
   let abortedCount = 0
   let timedoutCount = 0

package/src/internal/executing/executePlan.js

@@ -129,16 +129,30 @@ export const executePlan = async (
     })
 
     logger.debug(`Generate executions`)
-    const executionSteps = await generateExecutionSteps(
-      {
-        ...plan,
-        [compileServer.outDirectoryRelativeUrl]: null,
-      },
-      {
-        signal: multipleExecutionsOperation.signal,
-        projectDirectoryUrl,
-      },
-    )
+
+    let executionSteps
+    try {
+      executionSteps = await generateExecutionSteps(
+        {
+          ...plan,
+          [compileServer.outDirectoryRelativeUrl]: null,
+        },
+        {
+          signal: multipleExecutionsOperation.signal,
+          projectDirectoryUrl,
+        },
+      )
+    } catch (e) {
+      if (Abort.isAbortError(e)) {
+        return {
+          aborted: true,
+          planSummary: {},
+          planReport: {},
+          planCoverage: null,
+        }
+      }
+      throw e
+    }
     logger.debug(`${executionSteps.length} executions planned`)
 
     const result = await executeConcurrently(executionSteps, {

package/src/internal/executing/executionLogs.js

@@ -99,7 +99,7 @@ const descriptionFormatters = {
   },
   errored: ({ executionNumber, executionCount }) => {
     return ANSI.color(
-      `${UNICODE.FAILURE_RAW} execution ${executionNumber} of ${executionCount} error`,
+      `${UNICODE.FAILURE_RAW} execution ${executionNumber} of ${executionCount} errored`,
       EXECUTION_COLORS.errored,
     )
   },

package/src/jsenvServiceWorkerFinalizer.js

@@ -1,19 +1,36 @@
+import { resolveUrl, urlToRelativeUrl } from "@jsenv/filesystem"
+
 import { generateContentHash } from "./internal/building/url-versioning.js"
 
 export const jsenvServiceWorkerFinalizer = (
   code,
-  { buildManifest, rollupBuild, lineBreakNormalization },
+  {
+    serviceWorkerBuildRelativeUrl,
+    buildManifest,
+    rollupBuild,
+    lineBreakNormalization,
+  },
 ) => {
   const generatedUrlsConfig = {}
   Object.keys(buildManifest).forEach((projectRelativeUrl) => {
     if (projectRelativeUrl.endsWith(".map")) {
       return
     }
+
     const buildRelativeUrl = buildManifest[projectRelativeUrl]
+    const buildUrl = resolveUrl(buildRelativeUrl, "file://")
+    const serviceWorkerBuildUrl = resolveUrl(
+      serviceWorkerBuildRelativeUrl,
+      "file://",
+    )
+    const urlRelativeToServiceWorker = urlToRelativeUrl(
+      buildUrl,
+      serviceWorkerBuildUrl,
+    )
     const versioned = fileNameContainsHash(buildRelativeUrl)
     const rollupFile = rollupBuild[buildRelativeUrl]
 
-    generatedUrlsConfig[buildRelativeUrl] = {
+    generatedUrlsConfig[urlRelativeToServiceWorker] = {
       versioned,
       ...(versioned
         ? {}