@jsenv/core 28.0.0 → 28.1.0

package/src/execute/runtimes/node/node_child_process.js

@@ -185,7 +185,13 @@ nodeChildProcess.run = async ({
       resolve,
     )
   })
-  const getResult = async () => {
+  const result = {
+    status: "executing",
+    errors: [],
+    namespace: null,
+  }
+
+  const writeResult = async () => {
     actionOperation.throwIfAborted()
     await childProcessReadyPromise
     actionOperation.throwIfAborted()
@@ -207,28 +213,27 @@ nodeChildProcess.run = async ({
     })
     const winner = await winnerPromise
     if (winner.name === "aborted") {
-      return {
-        status: "aborted",
-      }
+      result.status = "aborted"
+      return
     }
     if (winner.name === "error") {
       const error = winner.data
       removeOutputListener()
-      return {
-        status: "errored",
-        error,
-      }
+      result.status = "errored"
+      result.errors.push(error)
+      return
     }
     if (winner.name === "exit") {
       const { code } = winner.data
       await cleanup("process exit")
       if (code === 12) {
-        return {
-          status: "errored",
-          error: new Error(
+        result.status = "errored"
+        result.errors.push(
+          new Error(
             `node process exited with 12 (the forked child process wanted to use a non-available port for debug)`,
           ),
-        }
+        )
+        return
       }
       if (
         code === null ||
@@ -237,41 +242,36 @@ nodeChildProcess.run = async ({
         code === EXIT_CODES.SIGTERM ||
         code === EXIT_CODES.SIGABORT
       ) {
-        return {
-          status: "errored",
-          error: new Error(`node process exited during execution`),
-        }
+        result.status = "errored"
+        result.errors.push(new Error(`node process exited during execution`))
+        return
       }
       // process.exit(1) in child process or process.exitCode = 1 + process.exit()
       // means there was an error even if we don't know exactly what.
-      return {
-        status: "errored",
-        error: new Error(
-          `node process exited with code ${code} during execution`,
-        ),
-      }
+      result.status = "errored"
+      result.errors.push(
+        new Error(`node process exited with code ${code} during execution`),
+      )
+      return
     }
     const { status, value } = winner.data
     if (status === "action-failed") {
-      return {
-        status: "errored",
-        error: value,
-      }
-    }
-    return {
-      status: "completed",
-      ...value,
+      result.status = "errored"
+      result.errors.push(value)
+      return
     }
+    const { namespace, performance, coverage } = value
+    result.status = "completed"
+    result.namespace = namespace
+    result.performance = performance
+    result.coverage = coverage
   }
 
-  let result
   try {
-    result = await getResult()
+    await writeResult()
   } catch (e) {
-    result = {
-      status: "errored",
-      error: e,
-    }
+    result.status = "errored"
+    result.errors.push(e)
   }
   if (keepRunning) {
     stopSignal.notify = stop

package/src/execute/runtimes/node/node_worker_thread.js

@@ -137,7 +137,13 @@ nodeWorkerThread.run = async ({
     )
   })
 
-  const getResult = async () => {
+  const result = {
+    status: "executing",
+    errors: [],
+    namespace: null,
+  }
+
+  const writeResult = async () => {
     actionOperation.throwIfAborted()
     await workerThreadReadyPromise
     actionOperation.throwIfAborted()
@@ -159,28 +165,27 @@ nodeWorkerThread.run = async ({
     })
     const winner = await winnerPromise
     if (winner.name === "aborted") {
-      return {
-        status: "aborted",
-      }
+      result.status = "aborted"
+      return
     }
     if (winner.name === "error") {
       const error = winner.data
       removeOutputListener()
-      return {
-        status: "errored",
-        error,
-      }
+      result.status = "errored"
+      result.errors.push(error)
+      return
     }
     if (winner.name === "exit") {
       const { code } = winner.data
       await cleanup("process exit")
       if (code === 12) {
-        return {
-          status: "errored",
-          error: new Error(
+        result.status = "errored"
+        result.errors.push(
+          new Error(
             `node process exited with 12 (the forked child process wanted to use a non-available port for debug)`,
           ),
-        }
+        )
+        return
       }
       if (
         code === null ||
@@ -189,44 +194,39 @@ nodeWorkerThread.run = async ({
         code === EXIT_CODES.SIGTERM ||
         code === EXIT_CODES.SIGABORT
       ) {
-        return {
-          status: "errored",
-          error: new Error(`node worker thread exited during execution`),
-        }
+        result.status = "errored"
+        result.errors.push(
+          new Error(`node worker thread exited during execution`),
+        )
+        return
       }
       // process.exit(1) in child process or process.exitCode = 1 + process.exit()
       // means there was an error even if we don't know exactly what.
-      return {
-        status: "errored",
-        error: new Error(
+      result.status = "errored"
+      result.errors.push(
+        new Error(
           `node worker thread exited with code ${code} during execution`,
         ),
-      }
+      )
     }
     const { status, value } = winner.data
     if (status === "action-failed") {
-      return {
-        status: "errored",
-        error: value,
-      }
+      result.status = "errored"
+      result.errors.push(value)
+      return
     }
     const { namespace, performance, coverage } = value
-    return {
-      status: "completed",
-      namespace,
-      performance,
-      coverage,
-    }
+    result.status = "completed"
+    result.namespace = namespace
+    result.performance = performance
+    result.coverage = coverage
   }
 
-  let result
   try {
-    result = await getResult()
+    await writeResult()
   } catch (e) {
-    result = {
-      status: "errored",
-      error: e,
-    }
+    result.status = "errored"
+    result.errors.push(e)
   }
 
   if (keepRunning) {

package/src/omega/kitchen.js

@@ -88,7 +88,8 @@ export const createKitchen = ({
     isEntryPoint = false,
     isInline = false,
     injected = false,
-    isRessourceHint = false,
+    isResourceHint = false,
+    dependsOnPackageJson,
     content,
     contentType,
     assert,
@@ -125,8 +126,9 @@ export const createKitchen = ({
       isEntryPoint,
       isInline,
       injected,
-      isRessourceHint,
-      // for inline ressources the reference contains the content
+      isResourceHint,
+      dependsOnPackageJson,
+      // for inline resources the reference contains the content
       content,
       contentType,
       timing: {},
@@ -141,12 +143,12 @@ export const createKitchen = ({
     newReference.original = reference.original || reference
     //  newReference.isEntryPoint = reference.isEntryPoint
   }
-  const resolveReference = (reference) => {
+  const resolveReference = (reference, context = kitchenContext) => {
     try {
       let resolvedUrl = pluginController.callHooksUntil(
         "resolveUrl",
         reference,
-        kitchenContext,
+        context,
       )
       if (!resolvedUrl) {
         throw new Error(`NO_RESOLVE`)
@@ -156,7 +158,7 @@ export const createKitchen = ({
       pluginController.callHooks(
         "redirectUrl",
         reference,
-        kitchenContext,
+        context,
         (returnValue) => {
           const normalizedReturnValue = normalizeUrl(returnValue)
           if (normalizedReturnValue === reference.url) {
@@ -176,18 +178,18 @@ export const createKitchen = ({
       }
 
       const urlInfo = urlGraph.reuseOrCreateUrlInfo(reference.url)
-      applyReferenceEffectsOnUrlInfo(reference, urlInfo, kitchenContext)
+      applyReferenceEffectsOnUrlInfo(reference, urlInfo, context)
 
       // This hook must touch reference.generatedUrl, NOT reference.url
       // And this is because this hook inject query params used to:
       // - bypass browser cache (?v)
       // - convey information (?hmr)
-      // But do not represent an other ressource, it is considered as
-      // the same ressource under the hood
+      // But do not represent an other resource, it is considered as
+      // the same resource under the hood
       pluginController.callHooks(
         "transformUrlSearchParams",
         reference,
-        kitchenContext,
+        context,
         (returnValue) => {
           Object.keys(returnValue).forEach((key) => {
             referenceUrlObject.searchParams.set(key, returnValue[key])
@@ -198,7 +200,7 @@ export const createKitchen = ({
       const returnValue = pluginController.callHooksUntil(
         "formatUrl",
         reference,
-        kitchenContext,
+        context,
       )
       reference.generatedSpecifier = returnValue || reference.generatedUrl
       reference.generatedSpecifier = urlSpecifierEncoding.encode(reference)
@@ -384,7 +386,7 @@ export const createKitchen = ({
           ...props,
         })
         references.push(reference)
-        const referencedUrlInfo = resolveReference(reference)
+        const referencedUrlInfo = resolveReference(reference, context)
         return [reference, referencedUrlInfo]
       }
       const referenceUtils = {
@@ -458,7 +460,7 @@ export const createKitchen = ({
           })
           references[index] = nextReference
           mutateReference(previousReference, nextReference)
-          const newUrlInfo = resolveReference(nextReference)
+          const newUrlInfo = resolveReference(nextReference, context)
           const currentUrlInfo = context.urlGraph.getUrlInfo(
             currentReference.url,
           )
@@ -675,7 +677,10 @@ export const createKitchen = ({
     await context.fetchUrlContent(originalUrlInfo, {
       reference: originalReference,
     })
-    if (originalUrlInfo.dependents.size === 0) {
+    if (
+      originalUrlInfo.dependents.size === 0
+      // && context.scenarios.build
+    ) {
       context.urlGraph.deleteUrlInfo(originalUrlInfo.url)
     }
     return originalUrlInfo
@@ -772,6 +777,20 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
       : reference.content
     urlInfo.content = reference.content
   }
+
+  const { dependsOnPackageJson } = reference
+  urlInfo.dependsOnPackageJson = dependsOnPackageJson
+  const relatedUrlInfos = context.urlGraph.getRelatedUrlInfos(
+    reference.parentUrl,
+  )
+  relatedUrlInfos.forEach((relatedUrlInfo) => {
+    if (relatedUrlInfo.dependsOnPackageJson) {
+      // the url may depend due to an other reference
+      // in that case keep dependsOnPackageJson to true
+      return
+    }
+    relatedUrlInfo.dependsOnPackageJson = dependsOnPackageJson
+  })
 }
 
 const adjustUrlSite = (urlInfo, { urlGraph, url, line, column }) => {

package/src/omega/omega_server.js

@@ -30,7 +30,7 @@ export const startOmegaServer = async ({
 
   plugins,
   urlAnalysis,
-  htmlSupervisor,
+  supervisor,
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
@@ -92,7 +92,7 @@ export const startOmegaServer = async ({
 
           plugins,
           urlAnalysis,
-          htmlSupervisor,
+          supervisor,
           nodeEsmResolution,
           fileSystemMagicResolution,
           transpilation,

package/src/omega/server/file_service.js

@@ -25,7 +25,7 @@ export const createFileService = ({
 
   plugins,
   urlAnalysis,
-  htmlSupervisor,
+  supervisor,
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
@@ -118,7 +118,7 @@ export const createFileService = ({
           runtimeCompat,
 
           urlAnalysis,
-          htmlSupervisor,
+          supervisor,
           nodeEsmResolution,
           fileSystemMagicResolution,
           transpilation,
@@ -185,7 +185,7 @@ export const createFileService = ({
 
   return async (request) => {
     // serve file inside ".jsenv" directory
-    const requestFileUrl = new URL(request.ressource.slice(1), rootDirectoryUrl)
+    const requestFileUrl = new URL(request.resource.slice(1), rootDirectoryUrl)
       .href
     if (urlIsInsideOf(requestFileUrl, jsenvDirectoryUrl)) {
       return fetchFileSystem(requestFileUrl, {
@@ -206,14 +206,14 @@ export const createFileService = ({
     let reference
     const parentUrl = inferParentFromRequest(request, rootDirectoryUrl)
     if (parentUrl) {
-      reference = urlGraph.inferReference(request.ressource, parentUrl)
+      reference = urlGraph.inferReference(request.resource, parentUrl)
     }
     if (!reference) {
       const entryPoint = kitchen.injectReference({
         trace: { message: parentUrl || rootDirectoryUrl },
         parentUrl: parentUrl || rootDirectoryUrl,
         type: "http_request",
-        specifier: request.ressource,
+        specifier: request.resource,
       })
       reference = entryPoint[0]
     }

package/src/omega/url_graph/url_graph_load.js

@@ -31,11 +31,11 @@ export const loadUrlGraph = async ({
     })
     const { references } = urlInfo
     references.forEach((reference) => {
-      // we don't cook ressource hints
-      // because they might refer to ressource that will be modified during build
+      // we don't cook resource hints
+      // because they might refer to resource that will be modified during build
       // It also means something else have to reference that url in order to cook it
-      // so that the preload is deleted by "resync_ressource_hints.js" otherwise
-      if (reference.isRessourceHint) {
+      // so that the preload is deleted by "resync_resource_hints.js" otherwise
+      if (reference.isResourceHint) {
         return
       }
       // we use reference.generatedUrl to mimic what a browser would do:

package/src/omega/url_graph/url_info_transformations.js

@@ -81,6 +81,9 @@ export const createUrlInfoTransformer = ({
     if (!SOURCEMAP.enabledOnContentType(urlInfo.contentType)) {
       return
     }
+    if (urlInfo.generatedUrl.startsWith("data:")) {
+      return
+    }
     // sourcemap is a special kind of reference:
     // It's a reference to a content generated dynamically the content itself.
     // For this reason sourcemap are not added to urlInfo.references
@@ -173,7 +176,11 @@ export const createUrlInfoTransformer = ({
     if (transformations) {
       await applyIntermediateTransformations(urlInfo, transformations)
     }
-    if (sourcemapsEnabled && urlInfo.sourcemap) {
+    if (
+      sourcemapsEnabled &&
+      urlInfo.sourcemap &&
+      !urlInfo.generatedUrl.startsWith("data:")
+    ) {
       // during build this function can be called after the file is cooked
       // - to update content and sourcemap after "optimize" hook
       // - to inject versioning into the entry point content

package/src/omega/url_graph.js

@@ -70,10 +70,10 @@ export const createUrlGraph = ({
     }
 
     references.forEach((reference) => {
-      if (reference.isRessourceHint) {
-        // ressource hint are a special kind of reference.
+      if (reference.isResourceHint) {
+        // resource hint are a special kind of reference.
         // They are a sort of weak reference to an url.
-        // We ignore them so that url referenced only by ressource hints
+        // We ignore them so that url referenced only by resource hints
         // have url.dependents.size === 0 and can be considered as not used
         // It means html won't consider url referenced solely
         // by <link> as dependency and it's fine

package/src/plugins/autoreload/client/reload.js

@@ -32,7 +32,20 @@ export const getDOMNodesUsingUrl = (urlToReload) => {
     nodes.push({
       node,
       reload: () => {
-        node[attributeName] = injectQuery(attribute, { hmr: Date.now() })
+        if (node.nodeName === "SCRIPT") {
+          const copy = document.createElement("script")
+          Array.from(node.attributes).forEach((attribute) => {
+            copy.setAttribute(attribute.nodeName, attribute.nodeValue)
+          })
+          copy.src = injectQuery(node.src, { hmr: Date.now() })
+          if (node.parentNode) {
+            node.parentNode.replaceChild(copy, node)
+          } else {
+            document.body.appendChild(copy)
+          }
+        } else {
+          node[attributeName] = injectQuery(attribute, { hmr: Date.now() })
+        }
       },
     })
   }
@@ -46,24 +59,24 @@ export const getDOMNodesUsingUrl = (urlToReload) => {
   })
   Array.from(document.querySelectorAll("script")).forEach((script) => {
     visitNodeAttributeAsUrl(script, "src")
-    const generatedFromSrc = script.getAttribute("generated-from-src")
-    if (generatedFromSrc) {
-      const generatedFromUrl = new URL(generatedFromSrc, window.location.origin)
+    const inlinedFromSrc = script.getAttribute("inlined-from-src")
+    if (inlinedFromSrc) {
+      const inlinedFromUrl = new URL(inlinedFromSrc, window.location.origin)
         .href
-      if (shouldReloadUrl(generatedFromUrl)) {
+      if (shouldReloadUrl(inlinedFromUrl)) {
         nodes.push({
           node: script,
           reload: () =>
-            window.__html_supervisor__.reloadSupervisedScript({
+            window.__supervisor__.reloadSupervisedScript({
               type: script.type,
-              src: generatedFromSrc,
+              src: inlinedFromSrc,
             }),
         })
       }
     }
   })
-  // There is no real need to update a.href because the ressource will be fetched when clicked.
-  // But in a scenario where the ressource was already visited and is in browser cache, adding
+  // There is no real need to update a.href because the resource will be fetched when clicked.
+  // But in a scenario where the resource was already visited and is in browser cache, adding
   // the dynamic query param ensure the cache is invalidated
   Array.from(document.querySelectorAll("a")).forEach((a) => {
     visitNodeAttributeAsUrl(a, "href")

package/src/plugins/autoreload/jsenv_plugin_autoreload_client.js

@@ -13,7 +13,7 @@ export const jsenvPluginAutoreloadClient = () => {
 
   return {
     name: "jsenv:autoreload_client",
-    appliesDuring: { dev: true, test: false },
+    appliesDuring: "dev",
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
         const htmlAst = parseHtmlString(htmlUrlInfo.content)
@@ -25,11 +25,11 @@ export const jsenvPluginAutoreloadClient = () => {
         injectScriptNodeAsEarlyAsPossible(
           htmlAst,
           createHtmlNode({
-            "tagName": "script",
-            "type": "module",
-            "src": autoreloadClientReference.generatedSpecifier,
-            "injected-by": "jsenv:autoreload_client",
+            tagName: "script",
+            type: "module",
+            src: autoreloadClientReference.generatedSpecifier,
           }),
+          "jsenv:autoreload_client",
         )
         const htmlModified = stringifyHtmlAst(htmlAst)
         return {

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -6,7 +6,7 @@ export const jsenvPluginAutoreloadServer = ({
 }) => {
   return {
     name: "jsenv:autoreload_server",
-    appliesDuring: { dev: true, test: false },
+    appliesDuring: "dev",
     serverEvents: {
       reload: ({ sendServerEvent, rootDirectoryUrl, urlGraph }) => {
         const formatUrlForClient = (url) => {
@@ -140,7 +140,7 @@ export const jsenvPluginAutoreloadServer = ({
             const cause = `following files are no longer referenced: ${prunedUrlInfos.map(
               (prunedUrlInfo) => formatUrlForClient(prunedUrlInfo.url),
             )}`
-            // now check if we can hot update the main ressource
+            // now check if we can hot update the main resource
             // then if we can hot update all dependencies
             if (mainHotUpdate.declined) {
               notifyDeclined({
@@ -179,7 +179,7 @@ export const jsenvPluginAutoreloadServer = ({
       },
     },
     serve: (request, { rootDirectoryUrl, urlGraph }) => {
-      if (request.ressource === "/__graph__") {
+      if (request.pathname === "/__graph__") {
         const graphJson = JSON.stringify(urlGraph.toJSON(rootDirectoryUrl))
         return {
           status: 200,

package/src/plugins/autoreload/jsenv_plugin_hmr.js

@@ -1,7 +1,7 @@
 export const jsenvPluginHmr = () => {
   return {
     name: "jsenv:hmr",
-    appliesDuring: { dev: true, test: false },
+    appliesDuring: "dev",
     redirectUrl: (reference) => {
       const urlObject = new URL(reference.url)
       if (!urlObject.searchParams.has("hmr")) {

package/src/plugins/explorer/jsenv_plugin_explorer.js

@@ -11,7 +11,7 @@ export const jsenvPluginExplorer = ({ groups }) => {
     name: "jsenv:explorer",
     appliesDuring: "dev",
     serve: async (request, { rootDirectoryUrl }) => {
-      if (request.ressource !== "/") {
+      if (request.pathname !== "/") {
         return null
       }
       const associationsForExplorable = {}

package/src/plugins/import_meta_hot/html_hot_dependencies.js

@@ -48,7 +48,7 @@ export const collectHotDataFromHtmlAst = (htmlAst) => {
       })
       visitUrlSpecifierAttribute({
         node,
-        attributeName: "generated-from-href",
+        attributeName: "inlined-from-href",
         hotAccepted,
       })
     }
@@ -60,7 +60,7 @@ export const collectHotDataFromHtmlAst = (htmlAst) => {
       })
       visitUrlSpecifierAttribute({
         node,
-        attributeName: "generated-from-src",
+        attributeName: "inlined-from-src",
         hotAccepted,
       })
     }
@@ -119,14 +119,14 @@ const getNodeContext = (node) => {
 
 const htmlNodeCanHotReload = (node) => {
   if (node.nodeName === "link") {
-    const { isStylesheet, isRessourceHint, rel } = analyzeLinkNode(node)
+    const { isStylesheet, isResourceHint, rel } = analyzeLinkNode(node)
     if (isStylesheet) {
       // stylesheets can be hot replaced by default
       return true
     }
-    if (isRessourceHint) {
-      // for ressource hints html will be notified the underlying ressource has changed
-      // but we won't do anything (if the ressource is deleted we should?)
+    if (isResourceHint) {
+      // for resource hints html will be notified the underlying resource has changed
+      // but we won't do anything (if the resource is deleted we should?)
       return true
     }
     if (rel === "icon") {

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -134,7 +134,8 @@ export const jsenvPluginImportmap = () => {
           })
           setHtmlNodeText(importmap, inlineImportmapUrlInfo.content)
           setHtmlNodeAttributes(importmap, {
-            "generated-by": "jsenv:importmap",
+            "jsenv-plugin-owner": "jsenv:importmap",
+            "jsenv-plugin-action": "content_cooked",
           })
           onHtmlImportmapParsed(
             JSON.parse(inlineImportmapUrlInfo.content),
@@ -162,8 +163,9 @@ export const jsenvPluginImportmap = () => {
           setHtmlNodeText(importmap, importmapUrlInfo.content)
           setHtmlNodeAttributes(importmap, {
             "src": undefined,
-            "generated-by": "jsenv:importmap",
-            "generated-from-src": src,
+            "jsenv-plugin-owner": "jsenv:importmap",
+            "jsenv-plugin-action": "inlined",
+            "inlined-from-src": src,
           })
 
           const { line, column, lineEnd, columnEnd, isOriginal } =