@jsenv/core 24.3.1 → 24.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "24.3.1",
+  "version": "24.3.2",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -11,8 +11,7 @@
     "node": ">=14.9.0"
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
+    "access": "public"
   },
   "type": "module",
   "exports": {
@@ -142,4 +141,4 @@
     "redux": "4.1.2",
     "rollup-plugin-import-assert": "1.1.1"
   }
-}
+}

package/src/execute.js

@@ -88,11 +88,7 @@ export const execute = async ({
   }
 
   try {
-    const {
-      outDirectoryRelativeUrl,
-      origin: compileServerOrigin,
-      stop,
-    } = await startCompileServer({
+    const compileServer = await startCompileServer({
       signal: executeOperation.signal,
       logLevel: compileServerLogLevel,
 
@@ -117,7 +113,7 @@ export const execute = async ({
       compileServerCanWriteOnFilesystem,
     })
     executeOperation.addEndCallback(async () => {
-      await stop("execution done")
+      await compileServer.stop("execution done")
     })
 
     const result = await launchAndExecute({
@@ -127,8 +123,9 @@ export const execute = async ({
       runtime,
       runtimeParams: {
         projectDirectoryUrl,
-        compileServerOrigin,
-        outDirectoryRelativeUrl,
+        compileServerOrigin: compileServer.origin,
+        compileServerId: compileServer.id,
+        outDirectoryRelativeUrl: compileServer.outDirectoryRelativeUrl,
         ...runtimeParams,
       },
       executeParams: {
@@ -155,8 +152,8 @@ export const execute = async ({
     })
 
     if (collectCompileServerInfo) {
-      result.outDirectoryRelativeUrl = outDirectoryRelativeUrl
-      result.compileServerOrigin = compileServerOrigin
+      result.compileServerOrigin = compileServer.origin
+      result.outDirectoryRelativeUrl = compileServer.outDirectoryRelativeUrl
     }
 
     if (result.status === "errored") {

package/src/internal/browser_launcher/browser_runtime_report.js

@@ -0,0 +1,75 @@
+export const getBrowserRuntimeReport = async ({
+  page,
+  coverageHandledFromOutside,
+  runtime,
+  compileServerId,
+}) => {
+  const cache = cacheFromParams({
+    runtime,
+    compileServerId,
+    coverageHandledFromOutside,
+  })
+  const entry = cache.read()
+  if (entry) {
+    return entry
+  }
+  const browserRuntimeFeaturesReport = await page.evaluate(
+    /* istanbul ignore next */
+    async ({ coverageHandledFromOutside }) => {
+      // eslint-disable-next-line no-undef
+      await window.readyPromise
+
+      // eslint-disable-next-line no-undef
+      return window.scanBrowserRuntimeFeatures({
+        coverageHandledFromOutside,
+        failFastOnFeatureDetection: true,
+      })
+    },
+    { coverageHandledFromOutside },
+  )
+  cache.write(browserRuntimeFeaturesReport)
+  return browserRuntimeFeaturesReport
+}
+
+let currentCacheParams
+let currentCacheValue
+const cacheFromParams = ({
+  runtime,
+  compileServerId,
+  coverageHandledFromOutside,
+}) => {
+  const params = {
+    compileServerId,
+    coverageHandledFromOutside,
+  }
+  const runtimeLabel = `${runtime.name}/${runtime.version}`
+
+  if (!currentCacheParams) {
+    currentCacheParams = params
+    currentCacheValue = {}
+    return {
+      read: () => null,
+      write: (value) => {
+        currentCacheValue[runtimeLabel] = value
+      },
+    }
+  }
+
+  if (JSON.stringify(currentCacheParams) !== JSON.stringify(params)) {
+    return {
+      read: () => null,
+      write: (value) => {
+        currentCacheParams = params
+        currentCacheValue = {}
+        currentCacheValue[runtimeLabel] = value
+      },
+    }
+  }
+
+  return {
+    read: () => currentCacheValue[runtimeLabel],
+    write: (value) => {
+      currentCacheValue[runtimeLabel] = value
+    },
+  }
+}

package/src/internal/browser_launcher/executeHtmlFile.js

@@ -10,13 +10,16 @@ import { filterV8Coverage } from "@jsenv/core/src/internal/executing/coverage_ut
 import { composeTwoFileByFileIstanbulCoverages } from "@jsenv/core/src/internal/executing/coverage_utils/istanbul_coverage_composition.js"
 import { evalSource } from "../node_runtime/evalSource.js"
 import { escapeRegexpSpecialCharacters } from "../escapeRegexpSpecialCharacters.js"
+import { getBrowserRuntimeReport } from "./browser_runtime_report.js"
 
 export const executeHtmlFile = async (
   fileRelativeUrl,
   {
+    runtime,
     executeOperation,
     projectDirectoryUrl,
     compileServerOrigin,
+    compileServerId,
     outDirectoryRelativeUrl,
     page,
 
@@ -48,25 +51,16 @@ export const executeHtmlFile = async (
   )
   executeOperation.throwIfAborted()
   await page.goto(compileProxyClientUrl)
+  executeOperation.throwIfAborted()
 
   const coverageHandledFromOutside =
     coveragePlaywrightAPIAvailable && !coverageForceIstanbul
-
-  executeOperation.throwIfAborted()
-  const browserRuntimeFeaturesReport = await page.evaluate(
-    /* istanbul ignore next */
-    async ({ coverageHandledFromOutside }) => {
-      // eslint-disable-next-line no-undef
-      await window.readyPromise
-
-      // eslint-disable-next-line no-undef
-      return window.scanBrowserRuntimeFeatures({
-        coverageHandledFromOutside,
-        failFastOnFeatureDetection: true,
-      })
-    },
-    { coverageHandledFromOutside },
-  )
+  const browserRuntimeFeaturesReport = await getBrowserRuntimeReport({
+    page,
+    coverageHandledFromOutside,
+    compileServerId,
+    runtime,
+  })
 
   try {
     let executionResult

package/src/internal/compiling/startCompileServer.js

@@ -51,6 +51,8 @@ import { createCompiledFileService } from "./createCompiledFileService.js"
 import { urlIsCompilationAsset } from "./compile-directory/compile-asset.js"
 import { createTransformHtmlSourceFileService } from "./html_source_file_service.js"
 
+let compileServerId = 0
+
 export const startCompileServer = async ({
   signal = new AbortController().signal,
   handleSIGINT,
@@ -389,6 +391,7 @@ export const startCompileServer = async ({
   })
 
   return {
+    id: compileServerId++,
     jsenvDirectoryRelativeUrl,
     outDirectoryRelativeUrl,
     ...compileServer,

package/src/internal/executing/executeConcurrently.js

@@ -27,8 +27,7 @@ export const executeConcurrently = async (
     launchAndExecuteLogLevel,
 
     projectDirectoryUrl,
-    compileServerOrigin,
-    outDirectoryRelativeUrl,
+    compileServer,
 
     babelPluginMap,
 
@@ -206,8 +205,10 @@ export const executeConcurrently = async (
           coverageTempDirectoryUrl,
           runtimeParams: {
             projectDirectoryUrl,
-            compileServerOrigin,
-            outDirectoryRelativeUrl,
+            compileServerOrigin: compileServer.origin,
+            compileServerId: compileServer.id,
+            outDirectoryRelativeUrl: compileServer.outDirectoryRelativeUrl,
+
             collectCoverage: coverage,
             coverageIgnorePredicate,
             coverageForceIstanbul,

package/src/internal/executing/executePlan.js

@@ -146,8 +146,7 @@ export const executePlan = async (
       launchAndExecuteLogLevel,
 
       projectDirectoryUrl,
-      compileServerOrigin: compileServer.origin,
-      outDirectoryRelativeUrl: compileServer.outDirectoryRelativeUrl,
+      compileServer,
 
       // not sure we actually have to pass import params to executeConcurrently
       importResolutionMethod,

package/src/internal/node_launcher/node_runtime_report.js

@@ -0,0 +1,71 @@
+import { scanNodeRuntimeFeatures } from "@jsenv/core/src/internal/node_feature_detection/node_feature_detection.js"
+
+export const getNodeRuntimeReport = async ({
+  runtime,
+  compileServerId,
+  compileServerOrigin,
+  outDirectoryRelativeUrl,
+  coverageHandledFromOutside,
+}) => {
+  const cache = cacheFromParams({
+    runtime,
+    compileServerId,
+    compileServerOrigin,
+    outDirectoryRelativeUrl,
+    coverageHandledFromOutside,
+  })
+  const entry = cache.read()
+  if (entry) {
+    return entry
+  }
+  const nodeRuntimeFeaturesReport = await scanNodeRuntimeFeatures({
+    compileServerOrigin,
+    outDirectoryRelativeUrl,
+    coverageHandledFromOutside,
+  })
+  cache.write(nodeRuntimeFeaturesReport)
+  return nodeRuntimeFeaturesReport
+}
+
+let currentCacheParams
+let currentCacheValue
+const cacheFromParams = ({
+  compileServerId,
+  compileServerOrigin,
+  outDirectoryRelativeUrl,
+  coverageHandledFromOutside,
+}) => {
+  const params = {
+    compileServerId,
+    compileServerOrigin,
+    outDirectoryRelativeUrl,
+    coverageHandledFromOutside,
+  }
+
+  if (!currentCacheParams) {
+    currentCacheParams = params
+    return {
+      read: () => null,
+      write: (value) => {
+        currentCacheValue = value
+      },
+    }
+  }
+
+  if (JSON.stringify(currentCacheParams) !== JSON.stringify(params)) {
+    return {
+      read: () => null,
+      write: (value) => {
+        currentCacheParams = params
+        currentCacheValue = value
+      },
+    }
+  }
+
+  return {
+    read: () => currentCacheValue,
+    write: (value) => {
+      currentCacheValue = value
+    },
+  }
+}

package/src/launchBrowser.js

@@ -32,6 +32,7 @@ chromiumRuntime.launch = async ({
 
   projectDirectoryUrl,
   compileServerOrigin,
+  compileServerId,
   outDirectoryRelativeUrl,
 
   collectPerformance,
@@ -106,10 +107,12 @@ chromiumRuntime.launch = async ({
   }
 
   const browserHooks = browserToRuntimeHooks(browser, {
+    runtime: chromiumRuntime,
     browserServerLogLevel,
 
     projectDirectoryUrl,
     compileServerOrigin,
+    compileServerId,
     outDirectoryRelativeUrl,
 
     collectPerformance,
@@ -184,6 +187,7 @@ firefoxRuntime.launch = async ({
   const browser = await browserPromise
 
   const browserHooks = browserToRuntimeHooks(browser, {
+    runtime: firefoxRuntime,
     launchBrowserOperation,
     browserServerLogLevel,
 
@@ -262,6 +266,7 @@ webkitRuntime.launch = async ({
   const browser = await browserPromise
 
   const browserHooks = browserToRuntimeHooks(browser, {
+    runtime: webkitRuntime,
     launchBrowserOperation,
     browserServerLogLevel,
 
@@ -391,8 +396,10 @@ const stopBrowser = async (browser) => {
 const browserToRuntimeHooks = (
   browser,
   {
+    runtime,
     projectDirectoryUrl,
     compileServerOrigin,
+    compileServerId,
     outDirectoryRelativeUrl,
 
     collectPerformance,
@@ -461,10 +468,12 @@ const browserToRuntimeHooks = (
     stoppedCallbackList.add(stopTrackingToNotify)
 
     const result = await executeHtmlFile(fileRelativeUrl, {
+      runtime,
       executeOperation,
 
       projectDirectoryUrl,
       compileServerOrigin,
+      compileServerId,
       outDirectoryRelativeUrl,
 
       page,

package/src/launchNode.js

@@ -4,7 +4,7 @@ import { loggerToLogLevel } from "@jsenv/logger"
 import { jsenvCoreDirectoryUrl } from "@jsenv/core/src/internal/jsenvCoreDirectoryUrl.js"
 import { escapeRegexpSpecialCharacters } from "./internal/escapeRegexpSpecialCharacters.js"
 import { createControllableNodeProcess } from "./internal/node_launcher/createControllableNodeProcess.js"
-import { scanNodeRuntimeFeatures } from "./internal/node_feature_detection/node_feature_detection.js"
+import { getNodeRuntimeReport } from "./internal/node_launcher/node_runtime_report.js"
 
 export const nodeRuntime = {
   name: "node",
@@ -16,6 +16,7 @@ nodeRuntime.launch = async ({
   logProcessCommand,
 
   projectDirectoryUrl,
+  compileServerId,
   compileServerOrigin,
   outDirectoryRelativeUrl,
 
@@ -115,7 +116,9 @@ nodeRuntime.launch = async ({
     }
 
     // the computation of runtime features can be cached
-    const nodeFeatures = await scanNodeRuntimeFeatures({
+    const nodeFeatures = await getNodeRuntimeReport({
+      runtime: nodeRuntime,
+      compileServerId,
       compileServerOrigin,
       outDirectoryRelativeUrl,
       // https://nodejs.org/docs/latest-v15.x/api/cli.html#cli_node_v8_coverage_dir