@jsenv/core 30.4.2 → 31.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "30.4.2",
+  "version": "31.0.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -69,16 +69,16 @@
     "@jsenv/abort": "4.2.4",
     "@jsenv/ast": "3.0.3",
     "@jsenv/babel-plugins": "1.1.5",
-    "@jsenv/filesystem": "4.1.9",
+    "@jsenv/filesystem": "4.2.0",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.4",
     "@jsenv/node-esm-resolution": "1.0.1",
-    "@jsenv/plugin-bundling": "1.2.2",
-    "@jsenv/server": "14.1.16",
+    "@jsenv/plugin-bundling": "2.0.0",
+    "@jsenv/server": "15.0.0",
     "@jsenv/sourcemap": "1.0.9",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/url-meta": "7.0.2",
+    "@jsenv/url-meta": "7.1.0",
     "@jsenv/urls": "1.2.8",
     "@jsenv/utils": "2.0.1",
     "@paralleldrive/cuid2": "2.2.0",

package/src/build/build.js

@@ -28,7 +28,7 @@ import {
   urlToRelativeUrl,
 } from "@jsenv/urls"
 import {
-  assertAndNormalizeDirectoryUrl,
+  validateDirectoryUrl,
   ensureEmptyDirectory,
   writeFileSync,
   registerDirectoryLifecycle,
@@ -155,7 +155,32 @@ export const build = async ({
   writeGeneratedFiles = false,
   assetManifest = versioningMethod === "filename",
   assetManifestFileRelativeUrl = "asset-manifest.json",
+  ...rest
 }) => {
+  // param validation
+  {
+    const unexpectedParamNames = Object.keys(rest)
+    if (unexpectedParamNames.length > 0) {
+      throw new TypeError(
+        `${unexpectedParamNames.join(",")}: there is no such param`,
+      )
+    }
+    const rootDirectoryUrlValidation = validateDirectoryUrl(rootDirectoryUrl)
+    if (!rootDirectoryUrlValidation.valid) {
+      throw new TypeError(
+        `rootDirectoryUrl ${rootDirectoryUrlValidation.message}, got ${rootDirectoryUrl}`,
+      )
+    }
+    rootDirectoryUrl = rootDirectoryUrlValidation.value
+    const buildDirectoryUrlValidation = validateDirectoryUrl(buildDirectoryUrl)
+    if (!buildDirectoryUrlValidation.valid) {
+      throw new TypeError(
+        `buildDirectoryUrl ${buildDirectoryUrlValidation.message}, got ${buildDirectoryUrlValidation}`,
+      )
+    }
+    buildDirectoryUrl = buildDirectoryUrlValidation.value
+  }
+
   const operation = Abort.startOperation()
   operation.addAbortSignal(signal)
   if (handleSIGINT) {
@@ -169,8 +194,6 @@ export const build = async ({
     })
   }
 
-  rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
-  buildDirectoryUrl = assertAndNormalizeDirectoryUrl(buildDirectoryUrl)
   assertEntryPoints({ entryPoints })
   if (!["filename", "search_param"].includes(versioningMethod)) {
     throw new Error(

package/src/build/start_build_server.js

@@ -23,7 +23,7 @@ import {
   jsenvServiceErrorHandler,
 } from "@jsenv/server"
 import {
-  assertAndNormalizeDirectoryUrl,
+  validateDirectoryUrl,
   registerDirectoryLifecycle,
 } from "@jsenv/filesystem"
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
@@ -44,10 +44,8 @@ export const startBuildServer = async ({
   handleSIGINT = true,
   logLevel,
   serverLogLevel = "warn",
-  protocol = "http",
+  https,
   http2,
-  certificate,
-  privateKey,
   acceptAnyIp,
   hostname,
   port = 9779,
@@ -64,32 +62,55 @@ export const startBuildServer = async ({
   buildServerAutoreload = false,
   buildServerMainFile = getCallerPosition().url,
   cooldownBetweenFileEvents,
+  ...rest
 }) => {
-  const logger = createLogger({ logLevel })
-  rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
-  buildDirectoryUrl = assertAndNormalizeDirectoryUrl(buildDirectoryUrl)
-  if (buildIndexPath) {
-    if (typeof buildIndexPath !== "string") {
+  // params validation
+  {
+    const unexpectedParamNames = Object.keys(rest)
+    if (unexpectedParamNames.length > 0) {
+      throw new TypeError(
+        `${unexpectedParamNames.join(",")}: there is no such param`,
+      )
+    }
+    const rootDirectoryUrlValidation = validateDirectoryUrl(rootDirectoryUrl)
+    if (!rootDirectoryUrlValidation.valid) {
+      throw new TypeError(
+        `rootDirectoryUrl ${rootDirectoryUrlValidation.message}, got ${rootDirectoryUrl}`,
+      )
+    }
+    rootDirectoryUrl = rootDirectoryUrlValidation.value
+    const buildDirectoryUrlValidation = validateDirectoryUrl(buildDirectoryUrl)
+    if (!buildDirectoryUrlValidation.valid) {
       throw new TypeError(
-        `buildIndexPath must be a string, got ${buildIndexPath}`,
+        `buildDirectoryUrl ${buildDirectoryUrlValidation.message}, got ${buildDirectoryUrlValidation}`,
       )
     }
-    if (buildIndexPath[0] === "/") {
-      buildIndexPath = buildIndexPath.slice(1)
-    } else {
-      const buildIndexUrl = new URL(buildIndexPath, buildDirectoryUrl).href
-      if (!buildIndexUrl.startsWith(buildDirectoryUrl)) {
-        throw new Error(
-          `buildIndexPath must be relative, got ${buildIndexPath}`,
+    buildDirectoryUrl = buildDirectoryUrlValidation.value
+
+    if (buildIndexPath) {
+      if (typeof buildIndexPath !== "string") {
+        throw new TypeError(
+          `buildIndexPath must be a string, got ${buildIndexPath}`,
         )
       }
-      buildIndexPath = buildIndexUrl.slice(buildDirectoryUrl.length)
-    }
-    if (!existsSync(new URL(buildIndexPath, buildDirectoryUrl))) {
-      buildIndexPath = null
+      if (buildIndexPath[0] === "/") {
+        buildIndexPath = buildIndexPath.slice(1)
+      } else {
+        const buildIndexUrl = new URL(buildIndexPath, buildDirectoryUrl).href
+        if (!buildIndexUrl.startsWith(buildDirectoryUrl)) {
+          throw new Error(
+            `buildIndexPath must be relative, got ${buildIndexPath}`,
+          )
+        }
+        buildIndexPath = buildIndexUrl.slice(buildDirectoryUrl.length)
+      }
+      if (!existsSync(new URL(buildIndexPath, buildDirectoryUrl))) {
+        buildIndexPath = null
+      }
     }
   }
 
+  const logger = createLogger({ logLevel })
   const operation = Abort.startOperation()
   operation.addAbortSignal(signal)
   if (handleSIGINT) {
@@ -169,10 +190,8 @@ export const startBuildServer = async ({
     logLevel: serverLogLevel,
     startLog: false,
 
-    protocol,
+    https,
     http2,
-    certificate,
-    privateKey,
     acceptAnyIp,
     hostname,
     port,

package/src/dev/file_service.js

@@ -20,6 +20,7 @@ export const createFileService = ({
   logLevel,
   serverStopCallbacks,
   serverEventsDispatcher,
+  contextCache,
 
   rootDirectoryUrl,
   runtimeCompat,
@@ -82,7 +83,6 @@ export const createFileService = ({
   })
   serverStopCallbacks.push(stopWatchingClientFiles)
 
-  const contextCache = new Map()
   const getOrCreateContext = (request) => {
     const { runtimeName, runtimeVersion } = parseUserAgentHeader(
       request.headers["user-agent"],
@@ -150,6 +150,7 @@ export const createFileService = ({
           ribbon,
         }),
       ],
+      supervisor,
       minification: false,
       sourcemaps,
       sourcemapsSourcesProtocol,

package/src/dev/start_dev_server.js

@@ -1,6 +1,6 @@
 import { parentPort } from "node:worker_threads"
 import {
-  assertAndNormalizeDirectoryUrl,
+  validateDirectoryUrl,
   registerDirectoryLifecycle,
 } from "@jsenv/filesystem"
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
@@ -32,12 +32,10 @@ export const startDevServer = async ({
   handleSIGINT = true,
   logLevel = "info",
   serverLogLevel = "warn",
-  protocol = "http",
+  https,
   // it's better to use http1 by default because it allows to get statusText in devtools
   // which gives valuable information when there is errors
   http2 = false,
-  certificate,
-  privateKey,
   hostname,
   port = 3456,
   acceptAnyIp,
@@ -82,9 +80,26 @@ export const startDevServer = async ({
   // no real need to write files during github workflow
   // and mitigates https://github.com/actions/runner-images/issues/3885
   writeGeneratedFiles = !process.env.CI,
+  ...rest
 }) => {
+  // params type checking
+  {
+    const unexpectedParamNames = Object.keys(rest)
+    if (unexpectedParamNames.length > 0) {
+      throw new TypeError(
+        `${unexpectedParamNames.join(",")}: there is no such param`,
+      )
+    }
+    const rootDirectoryUrlValidation = validateDirectoryUrl(rootDirectoryUrl)
+    if (!rootDirectoryUrlValidation.valid) {
+      throw new TypeError(
+        `rootDirectoryUrl ${rootDirectoryUrlValidation.message}, got ${rootDirectoryUrl}`,
+      )
+    }
+    rootDirectoryUrl = rootDirectoryUrlValidation.value
+  }
+
   const logger = createLogger({ logLevel })
-  rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
   const operation = Abort.startOperation()
   operation.addAbortSignal(signal)
   if (handleSIGINT) {
@@ -158,6 +173,7 @@ export const startDevServer = async ({
   serverStopCallbacks.push(() => {
     serverEventsDispatcher.destroy()
   })
+  const contextCache = new Map()
   const server = await startServer({
     signal,
     stopOnExit: false,
@@ -167,10 +183,8 @@ export const startDevServer = async ({
     logLevel: serverLogLevel,
     startLog: false,
 
-    protocol,
+    https,
     http2,
-    certificate,
-    privateKey,
     acceptAnyIp,
     hostname,
     port,
@@ -195,6 +209,7 @@ export const startDevServer = async ({
           logLevel,
           serverStopCallbacks,
           serverEventsDispatcher,
+          contextCache,
 
           rootDirectoryUrl,
           runtimeCompat,
@@ -265,13 +280,13 @@ export const startDevServer = async ({
         sendErrorDetails: true,
       }),
     ],
-    onStop: (reason) => {
-      onStop()
-      serverStopCallbacks.forEach((serverStopCallback) => {
-        serverStopCallback(reason)
-      })
-      serverStopCallbacks.length = 0
-    },
+  })
+  server.stoppedPromise.then((reason) => {
+    onStop()
+    serverStopCallbacks.forEach((serverStopCallback) => {
+      serverStopCallback(reason)
+    })
+    serverStopCallbacks.length = 0
   })
   startDevServerTask.done()
   if (hostname) {
@@ -291,5 +306,6 @@ export const startDevServer = async ({
     stop: () => {
       server.stop()
     },
+    contextCache,
   }
 }

package/src/execute/execute.js

@@ -90,7 +90,7 @@ export const execute = async ({
   result = resultTransformer(result)
 
   try {
-    if (result.status === "errored") {
+    if (result.status === "failed") {
       if (ignoreError) {
         return result
       }

package/src/execute/run.js

@@ -119,7 +119,7 @@ export const run = async ({
               cb(runResult)
             } catch (e) {
               cb({
-                status: "errored",
+                status: "failed",
                 errors: [e],
               })
             }
@@ -147,7 +147,7 @@ export const run = async ({
         result.status = "aborted"
       }
     } else {
-      result.status = "errored"
+      result.status = "failed"
       result.errors.push(e)
     }
   } finally {

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

@@ -331,12 +331,12 @@ export const createRuntimeFromPlaywright = ({
       }
       if (winner.name === "error") {
         let error = winner.data
-        result.status = "errored"
+        result.status = "failed"
         result.errors.push(error)
         return
       }
       if (winner.name === "closed") {
-        result.status = "errored"
+        result.status = "failed"
         result.errors.push(
           isBrowserDedicatedToExecution
             ? new Error(`browser disconnected during execution`)
@@ -350,8 +350,8 @@ export const createRuntimeFromPlaywright = ({
       result.namespace = executionResults
       Object.keys(executionResults).forEach((key) => {
         const executionResult = executionResults[key]
-        if (executionResult.status === "errored") {
-          result.status = "errored"
+        if (executionResult.status === "failed") {
+          result.status = "failed"
           result.errors.push({
             ...executionResult.exception,
             stack: executionResult.exception.text,
@@ -370,7 +370,7 @@ export const createRuntimeFromPlaywright = ({
         await callback()
       }, Promise.resolve())
     } catch (e) {
-      result.status = "errored"
+      result.status = "failed"
       result.errors = [e]
     }
     if (keepRunning) {

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

@@ -219,7 +219,7 @@ nodeChildProcess.run = async ({
     if (winner.name === "error") {
       const error = winner.data
       removeOutputListener()
-      result.status = "errored"
+      result.status = "failed"
       result.errors.push(error)
       return
     }
@@ -227,7 +227,7 @@ nodeChildProcess.run = async ({
       const { code } = winner.data
       await cleanup("process exit")
       if (code === 12) {
-        result.status = "errored"
+        result.status = "failed"
         result.errors.push(
           new Error(
             `node process exited with 12 (the forked child process wanted to use a non-available port for debug)`,
@@ -242,13 +242,13 @@ nodeChildProcess.run = async ({
         code === EXIT_CODES.SIGTERM ||
         code === EXIT_CODES.SIGABORT
       ) {
-        result.status = "errored"
+        result.status = "failed"
         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.
-      result.status = "errored"
+      result.status = "failed"
       result.errors.push(
         new Error(`node process exited with code ${code} during execution`),
       )
@@ -256,7 +256,7 @@ nodeChildProcess.run = async ({
     }
     const { status, value } = winner.data
     if (status === "action-failed") {
-      result.status = "errored"
+      result.status = "failed"
       result.errors.push(value)
       return
     }
@@ -270,7 +270,7 @@ nodeChildProcess.run = async ({
   try {
     await writeResult()
   } catch (e) {
-    result.status = "errored"
+    result.status = "failed"
     result.errors.push(e)
   }
   if (keepRunning) {

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

@@ -171,7 +171,7 @@ nodeWorkerThread.run = async ({
     if (winner.name === "error") {
       const error = winner.data
       removeOutputListener()
-      result.status = "errored"
+      result.status = "failed"
       result.errors.push(error)
       return
     }
@@ -179,7 +179,7 @@ nodeWorkerThread.run = async ({
       const { code } = winner.data
       await cleanup("process exit")
       if (code === 12) {
-        result.status = "errored"
+        result.status = "failed"
         result.errors.push(
           new Error(
             `node process exited with 12 (the forked child process wanted to use a non-available port for debug)`,
@@ -194,7 +194,7 @@ nodeWorkerThread.run = async ({
         code === EXIT_CODES.SIGTERM ||
         code === EXIT_CODES.SIGABORT
       ) {
-        result.status = "errored"
+        result.status = "failed"
         result.errors.push(
           new Error(`node worker thread exited during execution`),
         )
@@ -202,7 +202,7 @@ nodeWorkerThread.run = async ({
       }
       // 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.
-      result.status = "errored"
+      result.status = "failed"
       result.errors.push(
         new Error(
           `node worker thread exited with code ${code} during execution`,
@@ -211,7 +211,7 @@ nodeWorkerThread.run = async ({
     }
     const { status, value } = winner.data
     if (status === "action-failed") {
-      result.status = "errored"
+      result.status = "failed"
       result.errors.push(value)
       return
     }
@@ -225,7 +225,7 @@ nodeWorkerThread.run = async ({
   try {
     await writeResult()
   } catch (e) {
-    result.status = "errored"
+    result.status = "failed"
     result.errors.push(e)
   }
 

package/src/kitchen/kitchen.js

@@ -673,7 +673,17 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
           // (error hapenning before urlInfo.content can be set, or 404 for instance)
           // in that case we can't write anything
         } else {
-          writeFileSync(new URL(generatedUrl), urlInfo.content)
+          let contentIsInlined = urlInfo.isInline
+          if (
+            contentIsInlined &&
+            context.supervisor &&
+            urlGraph.getUrlInfo(urlInfo.inlineUrlSite.url).type === "html"
+          ) {
+            contentIsInlined = false
+          }
+          if (!contentIsInlined) {
+            writeFileSync(new URL(generatedUrl), urlInfo.content)
+          }
           const { sourcemapGeneratedUrl, sourcemap } = urlInfo
           if (sourcemapGeneratedUrl && sourcemap) {
             writeFileSync(

package/src/plugins/supervisor/client/supervisor.js

@@ -814,7 +814,7 @@ window.__supervisor__ = (() => {
       }
 
       const onError = (e) => {
-        executionResult.status = "errored"
+        executionResult.status = "failed"
         const exception = supervisor.createException({ reason: e })
         if (exception.needsReport) {
           supervisor.reportException(exception)

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_library.js

@@ -51,10 +51,7 @@ export const jsenvPluginAsJsClassicLibrary = ({
           ...context,
           buildDirectoryUrl: context.outDirectoryUrl,
         },
-        options: {
-          babelHelpersChunk: false,
-          preserveDynamicImport: true,
-        },
+        preserveDynamicImport: true,
       })
       const jsModuleBundledUrlInfo = bundleUrlInfos[jsModuleUrlInfo.url]
       if (context.dev) {

package/src/test/execute_plan.js

@@ -225,7 +225,7 @@ export const executePlan = async (
       total: executionSteps.length,
       aborted: 0,
       timedout: 0,
-      errored: 0,
+      failed: 0,
       completed: 0,
       done: 0,
     }
@@ -306,7 +306,7 @@ export const executePlan = async (
           })
         } else {
           executionResult = {
-            status: "errored",
+            status: "failed",
             errors: [
               new Error(
                 `No file at ${fileRelativeUrl} for execution "${executionName}"`,
@@ -336,8 +336,8 @@ export const executePlan = async (
           counters.aborted++
         } else if (executionResult.status === "timedout") {
           counters.timedout++
-        } else if (executionResult.status === "errored") {
-          counters.errored++
+        } else if (executionResult.status === "failed") {
+          counters.failed++
         } else if (executionResult.status === "completed") {
           counters.completed++
         }

package/src/test/execute_test_plan.js

@@ -5,10 +5,7 @@ import {
   urlIsInsideOf,
   urlToRelativeUrl,
 } from "@jsenv/urls"
-import {
-  ensureEmptyDirectory,
-  assertAndNormalizeDirectoryUrl,
-} from "@jsenv/filesystem"
+import { ensureEmptyDirectory, validateDirectoryUrl } from "@jsenv/filesystem"
 import { createLogger, createDetailedMessage } from "@jsenv/log"
 
 import { generateCoverageJsonFile } from "./coverage/coverage_reporter_json_file.js"
@@ -82,51 +79,72 @@ export const executeTestPlan = async ({
   coverageReportTextLog = true,
   coverageReportJsonFile = process.env.CI ? null : "./.coverage/coverage.json",
   coverageReportHtmlDirectory = process.env.CI ? "./.coverage/" : null,
+  ...rest
 }) => {
-  const logger = createLogger({ logLevel })
-  rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
-  if (typeof testPlan !== "object") {
-    throw new Error(`testPlan must be an object, got ${testPlan}`)
-  }
-  if (coverageEnabled) {
-    if (typeof coverageConfig !== "object") {
+  // param validation
+  {
+    const unexpectedParamNames = Object.keys(rest)
+    if (unexpectedParamNames.length > 0) {
       throw new TypeError(
-        `coverageConfig must be an object, got ${coverageConfig}`,
+        `${unexpectedParamNames.join(",")}: there is no such param`,
       )
     }
-    if (Object.keys(coverageConfig).length === 0) {
-      logger.warn(
-        `coverageConfig is an empty object. Nothing will be instrumented for coverage so your coverage will be empty`,
+    const rootDirectoryUrlValidation = validateDirectoryUrl(rootDirectoryUrl)
+    if (!rootDirectoryUrlValidation.valid) {
+      throw new TypeError(
+        `rootDirectoryUrl ${rootDirectoryUrlValidation.message}, got ${rootDirectoryUrl}`,
       )
     }
-    if (!coverageAndExecutionAllowed) {
-      const associationsForExecute = URL_META.resolveAssociations(
-        { execute: testPlan },
-        "file:///",
-      )
-      const associationsForCover = URL_META.resolveAssociations(
-        { cover: coverageConfig },
-        "file:///",
-      )
-      const patternsMatchingCoverAndExecute = Object.keys(
-        associationsForExecute.execute,
-      ).filter((testPlanPattern) => {
-        const { cover } = URL_META.applyAssociations({
-          url: testPlanPattern,
-          associations: associationsForCover,
-        })
-        return cover
-      })
-      if (patternsMatchingCoverAndExecute.length) {
-        // It would be strange, for a given file to be both covered and executed
-        throw new Error(
-          createDetailedMessage(`some file will be both covered and executed`, {
-            patterns: patternsMatchingCoverAndExecute,
-          }),
+    rootDirectoryUrl = rootDirectoryUrlValidation.value
+    if (typeof testPlan !== "object") {
+      throw new Error(`testPlan must be an object, got ${testPlan}`)
+    }
+    if (coverageEnabled) {
+      if (typeof coverageConfig !== "object") {
+        throw new TypeError(
+          `coverageConfig must be an object, got ${coverageConfig}`,
         )
       }
+      if (!coverageAndExecutionAllowed) {
+        const associationsForExecute = URL_META.resolveAssociations(
+          { execute: testPlan },
+          "file:///",
+        )
+        const associationsForCover = URL_META.resolveAssociations(
+          { cover: coverageConfig },
+          "file:///",
+        )
+        const patternsMatchingCoverAndExecute = Object.keys(
+          associationsForExecute.execute,
+        ).filter((testPlanPattern) => {
+          const { cover } = URL_META.applyAssociations({
+            url: testPlanPattern,
+            associations: associationsForCover,
+          })
+          return cover
+        })
+        if (patternsMatchingCoverAndExecute.length) {
+          // It would be strange, for a given file to be both covered and executed
+          throw new Error(
+            createDetailedMessage(
+              `some file will be both covered and executed`,
+              {
+                patterns: patternsMatchingCoverAndExecute,
+              },
+            ),
+          )
+        }
+      }
     }
   }
+
+  const logger = createLogger({ logLevel })
+  if (Object.keys(coverageConfig).length === 0) {
+    logger.warn(
+      `coverageConfig is an empty object. Nothing will be instrumented for coverage so your coverage will be empty`,
+    )
+  }
+
   const result = await executePlan(testPlan, {
     signal,
     handleSIGINT,