@jsenv/core 25.3.0-alpha.0 → 25.4.2

package/src/internal/url_conversion.js

@@ -150,33 +150,28 @@ const normalizeUrlMappings = (urlMappings, baseUrl) => {
 
 export const serverUrlToCompileInfo = (
   url,
-  { compileServerOrigin, outDirectoryRelativeUrl },
+  { compileServerOrigin, jsenvDirectoryRelativeUrl },
 ) => {
-  const outDirectoryServerUrl = resolveDirectoryUrl(
-    outDirectoryRelativeUrl,
+  const jsenvDirectoryServerUrl = resolveDirectoryUrl(
+    jsenvDirectoryRelativeUrl,
     compileServerOrigin,
   )
   // not inside compile directory -> nothing to compile
-  if (!url.startsWith(outDirectoryServerUrl)) {
+  if (!url.startsWith(jsenvDirectoryServerUrl)) {
     return { insideCompileDirectory: false }
   }
-
-  const afterOutDirectory = url.slice(outDirectoryServerUrl.length)
-
+  const afterJsenvDirectory = url.slice(jsenvDirectoryServerUrl.length)
   // serve files inside /.jsenv/* directly without compilation
   // this is just to allow some files to be written inside outDirectory and read directly
-  // if asked by the client (such as __compile_server_meta__.json)
-  if (!afterOutDirectory.includes("/") || afterOutDirectory[0] === "/") {
+  if (!afterJsenvDirectory.includes("/") || afterJsenvDirectory[0] === "/") {
     return { insideCompileDirectory: true }
   }
-
-  const parts = afterOutDirectory.split("/")
+  const parts = afterJsenvDirectory.split("/")
   const compileId = parts[0]
   // no compileId, we don't know what to compile (not supposed so happen)
   if (compileId === "") {
     return { insideCompileDirectory: true, compileId: null }
   }
-
   const afterCompileId = parts.slice(1).join("/")
   // note: afterCompileId can be '' (but not supposed to happen)
   return { insideCompileDirectory: true, compileId, afterCompileId }
@@ -260,7 +255,7 @@ const originalProjectUrlFromUrl = (
   {
     projectDirectoryUrl,
     compileServerOrigin,
-    outDirectoryRelativeUrl,
+    jsenvDirectoryRelativeUrl,
     compileDirectoryRelativeUrl,
   },
 ) => {
@@ -280,7 +275,7 @@ const originalProjectUrlFromUrl = (
     compileDirectoryRelativeUrl = extractCompileDirectoryRelativeUrl({
       serverUrl,
       compileServerOrigin,
-      outDirectoryRelativeUrl,
+      jsenvDirectoryRelativeUrl,
     })
     if (!compileDirectoryRelativeUrl) {
       return projectUrl
@@ -305,14 +300,14 @@ const originalProjectUrlFromUrl = (
 const extractCompileDirectoryRelativeUrl = ({
   serverUrl,
   compileServerOrigin,
-  outDirectoryRelativeUrl,
+  jsenvDirectoryRelativeUrl,
 }) => {
   const compileInfo = serverUrlToCompileInfo(serverUrl, {
     compileServerOrigin,
-    outDirectoryRelativeUrl,
+    jsenvDirectoryRelativeUrl,
   })
   if (compileInfo.compiledId) {
-    return `${outDirectoryRelativeUrl}${compileInfo.compileId}/`
+    return `${jsenvDirectoryRelativeUrl}${compileInfo.compileId}/`
   }
   return null
 }

package/src/launchNode.js

@@ -18,7 +18,7 @@ nodeRuntime.launch = async ({
   projectDirectoryUrl,
   compileServerId,
   compileServerOrigin,
-  outDirectoryRelativeUrl,
+  jsenvDirectoryRelativeUrl,
 
   measurePerformance,
   collectPerformance,
@@ -26,6 +26,9 @@ nodeRuntime.launch = async ({
   coverageForceIstanbul,
   coverageConfig,
 
+  moduleOutFormat,
+  forceCompilation,
+
   debugPort,
   debugMode,
   debugModeInheritBreak,
@@ -36,26 +39,9 @@ nodeRuntime.launch = async ({
   stdout,
   stderr,
   stopAfterExecute,
-  forceSystemJs,
 
   remap = true,
 }) => {
-  if (typeof projectDirectoryUrl !== "string") {
-    throw new TypeError(
-      `projectDirectoryUrl must be a string, got ${projectDirectoryUrl}`,
-    )
-  }
-  if (typeof compileServerOrigin !== "string") {
-    throw new TypeError(
-      `compileServerOrigin must be a string, got ${compileServerOrigin}`,
-    )
-  }
-  if (typeof outDirectoryRelativeUrl !== "string") {
-    throw new TypeError(
-      `outDirectoryRelativeUrl must be a string, got ${outDirectoryRelativeUrl}`,
-    )
-  }
-
   env = {
     ...env,
     COVERAGE_ENABLED: collectCoverage,
@@ -100,7 +86,7 @@ nodeRuntime.launch = async ({
     const executeParams = {
       projectDirectoryUrl,
       compileServerOrigin,
-      outDirectoryRelativeUrl,
+      jsenvDirectoryRelativeUrl,
       jsenvCoreDirectoryUrl,
 
       fileRelativeUrl,
@@ -115,45 +101,47 @@ nodeRuntime.launch = async ({
       remap,
     }
 
-    // the computation of runtime features can be cached
-    const nodeFeatures = await getNodeRuntimeReport({
+    // https://nodejs.org/docs/latest-v15.x/api/cli.html#cli_node_v8_coverage_dir
+    // instrumentation CAN be handed by process.env.NODE_V8_COVERAGE
+    // "transform-instrument" becomes non mandatory
+    const coverageHandledFromOutside =
+      !coverageForceIstanbul && process.env.NODE_V8_COVERAGE
+    const nodeRuntimeReport = await getNodeRuntimeReport({
       runtime: nodeRuntime,
       compileServerId,
       compileServerOrigin,
-      outDirectoryRelativeUrl,
-      // https://nodejs.org/docs/latest-v15.x/api/cli.html#cli_node_v8_coverage_dir
-      // instrumentation CAN be handed by process.env.NODE_V8_COVERAGE
-      // "transform-instrument" becomes non mandatory
-      coverageHandledFromOutside:
-        !coverageForceIstanbul && process.env.NODE_V8_COVERAGE,
-    })
-    const { canAvoidCompilation, compileId, importDefaultExtension } =
-      nodeFeatures
 
+      moduleOutFormat,
+      forceCompilation,
+      coverageHandledFromOutside,
+    })
+    const { compileProfile, compileId } = nodeRuntimeReport
     let executionResult
-    if (canAvoidCompilation && !forceSystemJs) {
+    if (compileId) {
       executionResult = await requestActionOnChildProcess({
         signal,
-        actionType: "execute-using-dynamic-import",
-        actionParams: executeParams,
-      })
-    } else {
-      executionResult = await requestActionOnChildProcess({
-        signal,
-        actionType: "execute-using-systemjs",
+        actionType:
+          compileProfile.moduleOutFormat === "systemjs"
+            ? "execute-using-systemjs"
+            : "execute-using-dynamic-import",
         actionParams: {
           compileId,
-          importDefaultExtension,
+          importDefaultExtension:
+            compileProfile.missingFeatures["import_default_extension"],
           ...executeParams,
         },
       })
+    } else {
+      executionResult = await requestActionOnChildProcess({
+        signal,
+        actionType: "execute-using-dynamic-import",
+        actionParams: executeParams,
+      })
     }
-
     executionResult = transformExecutionResult(executionResult, {
       compileServerOrigin,
       projectDirectoryUrl,
     })
-
     return executionResult
   }