@jsenv/core 28.0.0 → 28.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "28.0.0",
+  "version": "28.1.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -66,14 +66,14 @@
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/abort": "4.2.3",
-    "@jsenv/ast": "1.1.3",
+    "@jsenv/ast": "1.2.0",
     "@jsenv/babel-plugins": "1.0.6",
-    "@jsenv/filesystem": "4.1.1",
+    "@jsenv/filesystem": "4.1.2",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
-    "@jsenv/log": "3.1.0",
+    "@jsenv/log": "3.2.0",
     "@jsenv/node-esm-resolution": "0.1.0",
-    "@jsenv/server": "14.0.0",
+    "@jsenv/server": "14.1.1",
     "@jsenv/sourcemap": "1.0.4",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/url-meta": "7.0.0",
@@ -87,9 +87,9 @@
     "istanbul-lib-instrument": "5.2.0",
     "istanbul-lib-report": "3.0.0",
     "istanbul-reports": "3.1.5",
-    "launch-editor": "2.4.0",
+    "launch-editor": "2.5.0",
     "pidtree": "0.6.0",
-    "rollup": "2.77.0",
+    "rollup": "2.77.2",
     "string-width": "5.1.2",
     "strip-ansi": "7.0.1",
     "terser": "5.14.2",
@@ -97,19 +97,19 @@
     "wrap-ansi": "8.0.1"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.18.2",
+    "@babel/eslint-parser": "7.18.9",
     "@babel/plugin-syntax-import-assertions": "7.18.6",
-    "@jsenv/assert": "2.6.0",
+    "@jsenv/assert": "2.7.0",
     "@jsenv/eslint-config": "16.2.1",
     "@jsenv/file-size-impact": "13.0.1",
-    "@jsenv/https-local": "2.1.0",
+    "@jsenv/https-local": "3.0.1",
     "@jsenv/package-workspace": "0.4.1",
     "@jsenv/performance-impact": "3.0.1",
-    "eslint": "8.20.0",
-    "eslint-plugin-html": "7.0.0",
+    "eslint": "8.21.0",
+    "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-react": "7.30.1",
-    "playwright": "1.24.1",
+    "playwright": "1.24.2",
     "prettier": "2.7.1"
   }
 }

package/readme.md

@@ -1,7 +1,7 @@
 # @jsenv/core [![npm package](https://img.shields.io/npm/v/@jsenv/core.svg?logo=npm&label=package)](https://www.npmjs.com/package/@jsenv/core)
 
 Jsenv was first created to write tests that could be executed in different runtimes.
-It has naturally evolved to cover the core needs of a JavaScript project: developement, testing and building for production. 
+It has naturally evolved to cover the core needs of a JavaScript project: developement, testing and building for production.
 
 - :exploding_head: Execute HTML files as tests
 - :sparkles: A single tool for the whole developer experience
@@ -16,7 +16,7 @@ npm create jsenv@latest
 ```
 
 This command prompts to choose a demo from a list.
-Each demo contains preconfigured scripts such as:
+Each demo contains preconfigured scripts:
 
 - `npm run dev`: starts a dev server with autoreload.
 - `npm run test`: execute test files on browsers(s) and/or Node.js.

package/src/build/build.js

@@ -45,7 +45,7 @@ import { createBuilUrlsGenerator } from "./build_urls_generator.js"
 import { injectGlobalVersionMapping } from "./inject_global_version_mappings.js"
 import { createVersionGenerator } from "./version_generator.js"
 import { injectServiceWorkerUrls } from "./inject_service_worker_urls.js"
-import { resyncRessourceHints } from "./resync_ressource_hints.js"
+import { resyncResourceHints } from "./resync_resource_hints.js"
 
 // default runtimeCompat corresponds to
 // "we can keep <script type="module"> intact":
@@ -314,13 +314,13 @@ build ${entryPointKeys.length} entry points`)
           })
           rawUrlInfo.references.forEach((reference) => {
             if (
-              reference.isRessourceHint &&
+              reference.isResourceHint &&
               reference.expectedType === "js_module"
             ) {
               const referencedUrlInfo = rawGraph.getUrlInfo(reference.url)
               if (
                 referencedUrlInfo &&
-                // something else than the ressource hint is using this url
+                // something else than the resource hint is using this url
                 referencedUrlInfo.dependents.size > 0
               ) {
                 addToBundlerIfAny(referencedUrlInfo)
@@ -611,7 +611,7 @@ build ${entryPointKeys.length} entry points`)
                 `urls should be inside build directory at this stage, found "${reference.url}"`,
               )
             }
-            if (reference.isRessourceHint) {
+            if (reference.isResourceHint) {
               // return the raw url, we will resync at the end
               return rawUrls[reference.url]
             }
@@ -717,7 +717,7 @@ build ${entryPointKeys.length} entry points`)
         kitchen: finalGraphKitchen,
         outDirectoryUrl: new URL(".jsenv/postbuild/", rootDirectoryUrl),
         writeGeneratedFiles,
-        skipRessourceHint: true,
+        skipResourceHint: true,
         startLoading: (cookEntryFile) => {
           entryUrls.forEach((entryUrl) => {
             const [, postBuildEntryUrlInfo] = cookEntryFile({
@@ -786,7 +786,7 @@ ${Array.from(finalGraph.urlInfoMap.keys()).join("\n")}`,
       urlInfo.data.buildUrlIsVersioned = useVersionedUrl
       urlInfo.data.buildUrlSpecifier = buildUrlSpecifier
     })
-    await resyncRessourceHints({
+    await resyncResourceHints({
       logger,
       finalGraphKitchen,
       finalGraph,
@@ -1116,7 +1116,7 @@ const applyUrlVersioning = async ({
             if (reference.isInline || reference.url.startsWith("data:")) {
               return null
             }
-            if (reference.isRessourceHint) {
+            if (reference.isResourceHint) {
               return null
             }
             // specifier comes from "normalize" hook done a bit earlier in this file
@@ -1185,7 +1185,7 @@ const applyUrlVersioning = async ({
       operation: buildOperation,
       urlGraph: finalGraph,
       kitchen: versioningKitchen,
-      skipRessourceHint: true,
+      skipResourceHint: true,
       writeGeneratedFiles,
       startLoading: (cookEntryFile) => {
         postBuildEntryUrls.forEach((postBuildEntryUrl) => {

package/src/build/inject_global_version_mappings.js

@@ -61,12 +61,12 @@ const injectors = {
     injectScriptNodeAsEarlyAsPossible(
       htmlAst,
       createHtmlNode({
-        "tagName": "script",
-        "textContent": generateClientCodeForVersionMappings(versionMappings, {
+        tagName: "script",
+        textContent: generateClientCodeForVersionMappings(versionMappings, {
           globalName: "window",
         }),
-        "injected-by": "jsenv:versioning",
       }),
+      "jsenv:versioning",
     )
     return {
       content: stringifyHtmlAst(htmlAst),

package/src/build/{resync_ressource_hints.js → resync_resource_hints.js}

@@ -1,7 +1,7 @@
 /*
  * Update <link rel="preload"> and friends after build (once we know everything)
  *
- * - Used to remove ressource hint targeting an url that is no longer used:
+ * - Used to remove resource hint targeting an url that is no longer used:
  *   - Happens because of import assertions transpilation (file is inlined into JS)
  */
 
@@ -16,19 +16,19 @@ import {
 
 import { GRAPH } from "./graph_utils.js"
 
-export const resyncRessourceHints = async ({
+export const resyncResourceHints = async ({
   logger,
   finalGraphKitchen,
   finalGraph,
   rawUrls,
   postBuildRedirections,
 }) => {
-  const ressourceHintActions = []
+  const resourceHintActions = []
   GRAPH.forEach(finalGraph, (urlInfo) => {
     if (urlInfo.type !== "html") {
       return
     }
-    ressourceHintActions.push(async () => {
+    resourceHintActions.push(async () => {
       const htmlAst = parseHtmlString(urlInfo.content, {
         storeOriginalPositions: false,
       })
@@ -38,14 +38,14 @@ export const resyncRessourceHints = async ({
           return
         }
         const rel = getHtmlNodeAttribute(linkNode, "rel")
-        const isRessourceHint = [
+        const isresourceHint = [
           "preconnect",
           "dns-prefetch",
           "prefetch",
           "preload",
           "modulepreload",
         ].includes(rel)
-        if (!isRessourceHint) {
+        if (!isresourceHint) {
           return
         }
 
@@ -57,7 +57,7 @@ export const resyncRessourceHints = async ({
           }
         }
         if (!buildUrl) {
-          logger.warn(`remove ressource hint because cannot find "${href}"`)
+          logger.warn(`remove resource hint because cannot find "${href}"`)
           actions.push(() => {
             removeHtmlNode(linkNode)
           })
@@ -67,7 +67,7 @@ export const resyncRessourceHints = async ({
         const urlInfo = finalGraph.getUrlInfo(buildUrl)
         if (!urlInfo) {
           logger.warn(
-            `remove ressource hint because cannot find "${buildUrl}" in the graph`,
+            `remove resource hint because cannot find "${buildUrl}" in the graph`,
           )
           actions.push(() => {
             removeHtmlNode(linkNode)
@@ -75,9 +75,7 @@ export const resyncRessourceHints = async ({
           return
         }
         if (urlInfo.dependents.size === 0) {
-          logger.info(
-            `remove ressource hint because "${href}" not used anymore`,
-          )
+          logger.info(`remove resource hint because "${href}" not used anymore`)
           actions.push(() => {
             removeHtmlNode(linkNode)
           })
@@ -109,6 +107,6 @@ export const resyncRessourceHints = async ({
     })
   })
   await Promise.all(
-    ressourceHintActions.map((ressourceHintAction) => ressourceHintAction()),
+    resourceHintActions.map((resourceHintAction) => resourceHintAction()),
   )
 }

package/src/build/start_build_server.js

@@ -208,18 +208,15 @@ export const startBuildServer = async ({
 
 const createBuildFilesService = ({ buildDirectoryUrl, buildIndexPath }) => {
   return (request) => {
-    const urlIsVersioned = new URL(
-      request.ressource,
-      request.origin,
-    ).searchParams.has("v")
-    if (buildIndexPath && request.ressource === "/") {
+    const urlIsVersioned = new URL(request.url).searchParams.has("v")
+    if (buildIndexPath && request.resource === "/") {
       request = {
         ...request,
-        ressource: `/${buildIndexPath}`,
+        resource: `/${buildIndexPath}`,
       }
     }
     return fetchFileSystem(
-      new URL(request.ressource.slice(1), buildDirectoryUrl),
+      new URL(request.resource.slice(1), buildDirectoryUrl),
       {
         headers: request.headers,
         cacheControl: urlIsVersioned

package/src/dev/start_dev_server.js

@@ -48,7 +48,7 @@ export const startDevServer = async ({
   runtimeCompat = defaultRuntimeCompat,
   plugins = [],
   urlAnalysis = {},
-  htmlSupervisor = true,
+  supervisor = true,
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
@@ -160,7 +160,7 @@ export const startDevServer = async ({
 
     plugins,
     urlAnalysis,
-    htmlSupervisor,
+    supervisor,
     nodeEsmResolution,
     fileSystemMagicResolution,
     transpilation,

package/src/execute/execute.js

@@ -94,7 +94,7 @@ export const execute = async ({
   ```
   But it feels like a hack.
   */
-      throw result.error
+      throw result.errors[result.errors.length - 1]
     }
     return result
   } finally {

package/src/execute/run.js

@@ -16,7 +16,11 @@ export const run = async ({
   runtime,
   runtimeParams,
 }) => {
-  const result = {}
+  const result = {
+    status: "pending",
+    errors: [],
+    namespace: null,
+  }
   const callbacks = []
 
   const onConsoleRef = { current: () => {} }
@@ -25,6 +29,7 @@ export const run = async ({
 
   const runOperation = Abort.startOperation()
   runOperation.addAbortSignal(signal)
+  let timeoutAbortSource
   if (
     // ideally we would rather log than the timeout is ignored
     // when keepRunning is true
@@ -32,24 +37,8 @@ export const run = async ({
     typeof allocatedMs === "number" &&
     allocatedMs !== Infinity
   ) {
-    const timeoutAbortSource = runOperation.timeout(allocatedMs)
-    callbacks.push(() => {
-      if (
-        result.status === "errored" &&
-        Abort.isAbortError(result.error) &&
-        timeoutAbortSource.signal.aborted
-      ) {
-        result.status = "timedout"
-        delete result.error
-      }
-    })
+    timeoutAbortSource = runOperation.timeout(allocatedMs)
   }
-  callbacks.push(() => {
-    if (result.status === "errored" && Abort.isAbortError(result.error)) {
-      result.status = "aborted"
-      delete result.error
-    }
-  })
   const consoleCalls = []
   onConsoleRef.current = ({ type, text }) => {
     if (mirrorConsole) {
@@ -64,9 +53,7 @@ export const run = async ({
     }
   }
   if (collectConsole) {
-    callbacks.push(() => {
-      result.consoleCalls = consoleCalls
-    })
+    result.consoleCalls = consoleCalls
   }
 
   // we do not keep coverage in memory, it can grow very big
@@ -133,29 +120,30 @@ export const run = async ({
     if (winner.name === "aborted") {
       runOperation.throwIfAborted()
     }
-
-    const { status, namespace, error, performance } = winner.data
+    const { status, namespace, errors, performance } = winner.data
     result.status = status
-    if (status === "errored") {
-      result.error = error
-    } else {
-      result.namespace = namespace
-    }
+    result.errors.push(...errors)
+    result.namespace = namespace
     if (collectPerformance) {
       result.performance = performance
     }
-    callbacks.forEach((callback) => {
-      callback()
-    })
-    return result
   } catch (e) {
-    result.status = "errored"
-    result.error = e
-    callbacks.forEach((callback) => {
-      callback()
-    })
-    return result
+    if (Abort.isAbortError(e)) {
+      if (timeoutAbortSource && timeoutAbortSource.signal.aborted) {
+        result.status = "timedout"
+      } else {
+        result.status = "aborted"
+      }
+    } else {
+      result.status = "errored"
+      result.errors.push(e)
+    }
   } finally {
     await runOperation.end()
   }
+
+  callbacks.forEach((callback) => {
+    callback()
+  })
+  return result
 }

package/src/execute/runtimes/browsers/from_playwright.js

@@ -1,4 +1,3 @@
-import { Script } from "node:vm"
 import { writeFileSync } from "node:fs"
 
 import { createDetailedMessage } from "@jsenv/log"
@@ -10,7 +9,6 @@ import {
 } from "@jsenv/abort"
 import { moveUrl } from "@jsenv/urls"
 import { memoize } from "@jsenv/utils/src/memoize/memoize.js"
-import { escapeRegexpSpecialChars } from "@jsenv/utils/src/string/escape_regexp_special_chars.js"
 
 import { filterV8Coverage } from "@jsenv/core/src/test/coverage/v8_coverage.js"
 import { composeTwoFileByFileIstanbulCoverages } from "@jsenv/core/src/test/coverage/istanbul_coverage_composition.js"
@@ -121,7 +119,11 @@ export const createRuntimeFromPlaywright = ({
       }
     }
 
-    const result = {}
+    const result = {
+      status: "pending",
+      namespace: null,
+      errors: [],
+    }
     const callbacks = []
     if (coverageEnabled) {
       if (
@@ -251,18 +253,18 @@ export const createRuntimeFromPlaywright = ({
             })
           },
           // https://github.com/GoogleChrome/puppeteer/blob/v1.4.0/docs/api.md#event-pageerror
-          pageerror: (cb) => {
-            return registerEvent({
-              object: page,
-              eventType: "pageerror",
-              callback: (error) => {
-                if (ignoreErrorHook(error)) {
-                  return
-                }
-                cb(transformErrorHook(error))
-              },
-            })
-          },
+          // pageerror: () => {
+          //   return registerEvent({
+          //     object: page,
+          //     eventType: "pageerror",
+          //     callback: (error) => {
+          //       if (ignoreErrorHook(error)) {
+          //         return
+          //       }
+          //       result.errors.push(transformErrorHook(error))
+          //     },
+          //   })
+          // },
           closed: (cb) => {
             // https://github.com/GoogleChrome/puppeteer/blob/v1.4.0/docs/api.md#event-disconnected
             if (isBrowserDedicatedToExecution) {
@@ -301,32 +303,14 @@ export const createRuntimeFromPlaywright = ({
                 /* eslint-disable no-undef */
                 /* istanbul ignore next */
                 () => {
-                  if (!window.__html_supervisor__) {
-                    throw new Error(`window.__html_supervisor__ not found`)
+                  if (!window.__supervisor__) {
+                    throw new Error(`window.__supervisor__ not found`)
                   }
-                  return window.__html_supervisor__.getScriptExecutionResults()
+                  return window.__supervisor__.getScriptExecutionResults()
                 },
                 /* eslint-enable no-undef */
               )
-              const { status, scriptExecutionResults } = returnValue
-              if (status === "errored") {
-                const { exceptionSource } = returnValue
-                const error = evalException(exceptionSource, {
-                  rootDirectoryUrl,
-                  devServerOrigin,
-                  transformErrorHook,
-                })
-                cb({
-                  status: "errored",
-                  error,
-                  namespace: scriptExecutionResults,
-                })
-              } else {
-                cb({
-                  status: "completed",
-                  namespace: scriptExecutionResults,
-                })
-              }
+              cb(returnValue)
             } catch (e) {
               reject(e)
             }
@@ -336,39 +320,46 @@ export const createRuntimeFromPlaywright = ({
       )
     })
 
-    const getResult = async () => {
+    const writeResult = async () => {
       const winner = await winnerPromise
       if (winner.name === "aborted") {
-        return {
-          status: "aborted",
-        }
+        result.status = "aborted"
+        return
       }
-      if (winner.name === "error" || winner.name === "pageerror") {
-        const error = winner.data
-        return {
-          status: "errored",
-          error,
-        }
+      if (winner.name === "error") {
+        let error = winner.data
+        result.status = "errored"
+        result.errors.push(error)
+        return
       }
       if (winner.name === "closed") {
-        return {
-          status: "errored",
-          error: isBrowserDedicatedToExecution
+        result.status = "errored"
+        result.errors.push(
+          isBrowserDedicatedToExecution
             ? new Error(`browser disconnected during execution`)
             : new Error(`page closed during execution`),
-        }
+        )
+        return
       }
-      return winner.data
+      // winner.name = 'response'
+      const { executionResults } = winner.data
+      result.status = "completed"
+      result.namespace = executionResults
+      Object.keys(executionResults).forEach((key) => {
+        const executionResult = executionResults[key]
+        if (executionResult.status === "errored") {
+          result.status = "errored"
+          result.errors.push({
+            ...executionResult.exception,
+            stack: executionResult.exception.text,
+          })
+        }
+      })
+      return
     }
 
     try {
-      const { status, error, namespace, performance } = await getResult()
-      result.status = status
-      if (status === "errored") {
-        result.error = error
-      } else {
-        result.namespace = namespace
-      }
+      await writeResult()
       if (collectPerformance) {
         result.performance = performance
       }
@@ -378,7 +369,7 @@ export const createRuntimeFromPlaywright = ({
       }, Promise.resolve())
     } catch (e) {
       result.status = "errored"
-      result.error = e
+      result.errors = [e]
     }
     if (keepRunning) {
       stopSignal.notify = cleanup
@@ -533,20 +524,3 @@ const registerEvent = ({ object, eventType, callback }) => {
     object.removeListener(eventType, callback)
   }
 }
-
-const evalException = (
-  exceptionSource,
-  { rootDirectoryUrl, devServerOrigin, transformErrorHook },
-) => {
-  const script = new Script(exceptionSource, { filename: "" })
-  const error = script.runInThisContext()
-  if (error && error instanceof Error) {
-    const remoteRootRegexp = new RegExp(
-      escapeRegexpSpecialChars(`${devServerOrigin}/`),
-      "g",
-    )
-    error.stack = error.stack.replace(remoteRootRegexp, rootDirectoryUrl)
-    error.message = error.message.replace(remoteRootRegexp, rootDirectoryUrl)
-  }
-  return transformErrorHook(error)
-}