@jsenv/core 27.3.1 → 27.3.4

package/dist/main.js

@@ -2654,6 +2654,22 @@ const statusIsClientError = status => status >= 400 && status < 500;
 
 const statusIsServerError = status => status >= 500 && status < 600;
 
+const applyDnsResolution = async hostname => {
+  const dnsResolution = await new Promise((resolve, reject) => {
+    lookup(hostname, (error, address, family) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve({
+          address,
+          family
+        });
+      }
+    });
+  });
+  return dnsResolution;
+};
+
 const getServerOrigins = async ({
   protocol,
   ip,
@@ -2684,22 +2700,6 @@ const getServerOrigins = async ({
   };
 };
 
-const applyDnsResolution = async hostname => {
-  const dnsResolution = await new Promise((resolve, reject) => {
-    lookup(hostname, (error, address, family) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve({
-          address,
-          family
-        });
-      }
-    });
-  });
-  return dnsResolution;
-};
-
 const createServerOrigin = ({
   protocol,
   hostname,
@@ -8470,22 +8470,11 @@ const parseAndTransformJsUrls = async (urlInfo, context) => {
   } = context;
   const actions = [];
   const magicSource = createMagicSource(urlInfo.content);
-  urlInfo.data.usesImport = false;
-  urlInfo.data.usesExport = false;
-  urlInfo.data.usesImportAssertion = false;
   jsMentions.forEach(jsMention => {
-    if (jsMention.assert) {
-      urlInfo.data.usesImportAssertion = true;
-    }
-
     if (jsMention.subtype === "import_static" || jsMention.subtype === "import_dynamic") {
       urlInfo.data.usesImport = true;
     }
 
-    if (jsMention.subtype === "export") {
-      urlInfo.data.usesExport = true;
-    }
-
     const [reference] = referenceUtils.found({
       type: jsMention.type,
       subtype: jsMention.subtype,
@@ -10927,9 +10916,7 @@ const jsenvPluginNodeEsmResolution = ({
   const onFileChange = () => {
     packageScopesCache.clear();
     packageJsonsCache.clear();
-    Object.keys(urlGraph.urlInfos).forEach(url => {
-      const urlInfo = urlGraph.getUrlInfo(url);
-
+    urlGraph.urlInfoMap.forEach(urlInfo => {
       if (urlInfo.dependsOnPackageJson) {
         urlGraph.considerModified(urlInfo);
       }
@@ -19338,8 +19325,7 @@ const rollupPluginJsenv = ({
             data: {
               generatedBy: "rollup",
               bundleRelativeUrl: rollupFileInfo.fileName,
-              usesImport: rollupFileInfo.imports.length > 0 || rollupFileInfo.dynamicImports.length > 0,
-              usesExport: rollupFileInfo.exports.length > 0
+              usesImport: rollupFileInfo.imports.length > 0 || rollupFileInfo.dynamicImports.length > 0
             },
             contentType: "text/javascript",
             content: rollupFileInfo.code,
@@ -20338,8 +20324,6 @@ const jsenvPluginDevSSEServer = ({
   };
 
   const propagateUpdate = firstUrlInfo => {
-    const urlInfos = urlGraph.urlInfos;
-
     const iterate = (urlInfo, trace) => {
       if (urlInfo.data.hotAcceptSelf) {
         return {
@@ -20359,7 +20343,7 @@ const jsenvPluginDevSSEServer = ({
       const instructions = [];
 
       for (const dependentUrl of dependents) {
-        const dependentUrlInfo = urlInfos[dependentUrl];
+        const dependentUrlInfo = urlGraph.getUrlInfo(dependentUrl);
 
         if (dependentUrlInfo.data.hotDecline) {
           return {
@@ -20722,15 +20706,15 @@ const createUrlGraph = ({
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList
 } = {}) => {
-  const urlInfos = {};
+  const urlInfoMap = new Map();
 
-  const getUrlInfo = url => urlInfos[url];
+  const getUrlInfo = url => urlInfoMap.get(url);
 
   const deleteUrlInfo = url => {
-    const urlInfo = urlInfos[url];
+    const urlInfo = urlInfoMap.get(url);
 
     if (urlInfo) {
-      delete urlInfos[url];
+      urlInfoMap.delete(url);
 
       if (urlInfo.sourcemapReference) {
         deleteUrlInfo(urlInfo.sourcemapReference.url);
@@ -20739,15 +20723,15 @@ const createUrlGraph = ({
   };
 
   const reuseOrCreateUrlInfo = url => {
-    const existingUrlInfo = urlInfos[url];
+    const existingUrlInfo = getUrlInfo(url);
     if (existingUrlInfo) return existingUrlInfo;
     const urlInfo = createUrlInfo(url);
-    urlInfos[url] = urlInfo;
+    urlInfoMap.set(url, urlInfo);
     return urlInfo;
   };
 
   const inferReference = (specifier, parentUrl) => {
-    const parentUrlInfo = urlInfos[parentUrl];
+    const parentUrlInfo = getUrlInfo(parentUrl);
 
     if (!parentUrlInfo) {
       return null;
@@ -20760,7 +20744,7 @@ const createUrlGraph = ({
   };
 
   const findDependent = (url, predicate) => {
-    const urlInfo = urlInfos[url];
+    const urlInfo = getUrlInfo(url);
 
     if (!urlInfo) {
       return null;
@@ -20768,7 +20752,7 @@ const createUrlGraph = ({
 
     const visitDependents = urlInfo => {
       for (const dependentUrl of urlInfo.dependents) {
-        const dependent = urlInfos[dependentUrl];
+        const dependent = getUrlInfo(dependentUrl);
 
         if (predicate(dependent)) {
           return dependent;
@@ -20818,7 +20802,7 @@ const createUrlGraph = ({
     const removeDependencies = (urlInfo, urlsToPrune) => {
       urlsToPrune.forEach(urlToPrune => {
         urlInfo.dependencies.delete(urlToPrune);
-        const dependency = urlInfos[urlToPrune];
+        const dependency = getUrlInfo(urlToPrune);
 
         if (!dependency) {
           return;
@@ -20858,7 +20842,7 @@ const createUrlGraph = ({
     clientFileChangeCallbackList.push(({
       url
     }) => {
-      const urlInfo = urlInfos[url];
+      const urlInfo = getUrlInfo(url);
 
       if (urlInfo) {
         considerModified(urlInfo, Date.now());
@@ -20878,7 +20862,7 @@ const createUrlGraph = ({
       urlInfo.modifiedTimestamp = modifiedTimestamp;
       urlInfo.contentEtag = undefined;
       urlInfo.dependents.forEach(dependentUrl => {
-        const dependentUrlInfo = urlInfos[dependentUrl];
+        const dependentUrlInfo = getUrlInfo(dependentUrl);
         const {
           hotAcceptDependencies = []
         } = dependentUrlInfo.data;
@@ -20887,6 +20871,13 @@ const createUrlGraph = ({
           iterate(dependentUrlInfo);
         }
       });
+      urlInfo.dependencies.forEach(dependencyUrl => {
+        const dependencyUrlInfo = getUrlInfo(dependencyUrl);
+
+        if (dependencyUrlInfo.isInline) {
+          iterate(dependencyUrlInfo);
+        }
+      });
     };
 
     iterate(urlInfo);
@@ -20908,7 +20899,7 @@ const createUrlGraph = ({
   };
 
   return {
-    urlInfos,
+    urlInfoMap,
     reuseOrCreateUrlInfo,
     getUrlInfo,
     deleteUrlInfo,
@@ -20917,13 +20908,20 @@ const createUrlGraph = ({
     updateReferences,
     considerModified,
     getRelatedUrlInfos,
+    toObject: () => {
+      const data = {};
+      urlInfoMap.forEach(urlInfo => {
+        data[urlInfo.url] = urlInfo;
+      });
+      return data;
+    },
     toJSON: rootDirectoryUrl => {
       const data = {};
-      Object.keys(urlInfos).forEach(url => {
-        const dependencyUrls = Array.from(urlInfos[url].dependencies);
+      urlInfoMap.forEach(urlInfo => {
+        const dependencyUrls = Array.from(urlInfo.dependencies);
 
         if (dependencyUrls.length) {
-          const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
+          const relativeUrl = urlToRelativeUrl(urlInfo.url, rootDirectoryUrl);
           data[relativeUrl] = dependencyUrls.map(dependencyUrl => urlToRelativeUrl(dependencyUrl, rootDirectoryUrl));
         }
       });
@@ -24003,7 +24001,7 @@ const reportToCoverage = async (report, {
       // coverDescription will generate empty coverage for files
       // that were suppose to be coverage but were not.
       if (executionResult.status === "completed" && executionResult.type === "node" && coverageMethodForNodeJs !== "NODE_V8_COVERAGE") {
-        logger.warn(`No "coverageFileUrl" from execution named "${executionName}" of ${file}`);
+        logger.warn(`"${executionName}" execution of ${file} did not properly write coverage into ${executionResult.coverageFileUrl}`);
       }
     }
   });
@@ -24084,17 +24082,22 @@ const getCoverageFromReport = async ({
         const {
           coverageFileUrl
         } = executionResultForFileOnRuntime;
+        let executionCoverage;
 
-        if (!coverageFileUrl) {
-          onMissing({
-            executionName,
-            file,
-            executionResult: executionResultForFileOnRuntime
-          });
-          return;
-        }
+        try {
+          executionCoverage = JSON.parse(String(readFileSync$1(new URL(coverageFileUrl))));
+        } catch (e) {
+          if (e.code === "ENOENT" || e.name === "SyntaxError") {
+            onMissing({
+              executionName,
+              file,
+              executionResult: executionResultForFileOnRuntime
+            });
+            return;
+          }
 
-        const executionCoverage = JSON.parse(String(readFileSync$1(new URL(coverageFileUrl))));
+          throw e;
+        }
 
         if (isV8Coverage(executionCoverage)) {
           v8Coverage = v8Coverage ? composeTwoV8Coverages(v8Coverage, executionCoverage) : executionCoverage;
@@ -24127,7 +24130,7 @@ const run = async ({
   runtime,
   runtimeParams
 }) => {
-  let result = {};
+  const result = {};
   const callbacks = [];
   const onConsoleRef = {
     current: () => {}
@@ -24145,18 +24148,16 @@ const run = async ({
     const timeoutAbortSource = runOperation.timeout(allocatedMs);
     callbacks.push(() => {
       if (result.status === "errored" && Abort.isAbortError(result.error) && timeoutAbortSource.signal.aborted) {
-        result = {
-          status: "timedout"
-        };
+        result.status = "timedout";
+        delete result.error;
       }
     });
   }
 
   callbacks.push(() => {
     if (result.status === "errored" && Abort.isAbortError(result.error)) {
-      result = {
-        status: "aborted"
-      };
+      result.status = "aborted";
+      delete result.error;
     }
   });
   const consoleCalls = [];
@@ -24185,6 +24186,22 @@ const run = async ({
     callbacks.push(() => {
       result.consoleCalls = consoleCalls;
     });
+  } // we do not keep coverage in memory, it can grow very big
+  // instead we store it on the filesystem
+  // and they can be read later at "coverageFileUrl"
+
+
+  let coverageFileUrl;
+
+  if (coverageEnabled) {
+    coverageFileUrl = new URL(`./${runtime.name}/${cuid()}.json`, coverageTempDirectoryUrl).href;
+    await ensureParentDirectories(coverageFileUrl);
+
+    if (coverageEnabled) {
+      result.coverageFileUrl = coverageFileUrl; // written within the child_process/worker_thread or during runtime.run()
+      // for browsers
+      // (because it takes time to serialize and transfer the coverage object)
+    }
   }
 
   const startMs = Date.now();
@@ -24209,7 +24226,9 @@ const run = async ({
               signal: runOperation.signal,
               logger,
               ...runtimeParams,
+              collectConsole,
               collectPerformance,
+              coverageFileUrl,
               keepRunning,
               stopSignal,
               onConsole: log => onConsoleRef.current(log)
@@ -24234,8 +24253,7 @@ const run = async ({
       status,
       namespace,
       error,
-      performance,
-      coverage
+      performance
     } = winner.data;
     result.status = status;
 
@@ -24249,27 +24267,13 @@ const run = async ({
       result.performance = performance;
     }
 
-    if (coverageEnabled) {
-      if (coverage) {
-        // we do not keep coverage in memory, it can grow very big
-        // instead we store it on the filesystem
-        // and they can be read later at "coverageFileUrl"
-        const coverageFileUrl = new URL(`./${runtime.name}/${cuid()}.json`, coverageTempDirectoryUrl);
-        writeFileSync(coverageFileUrl, JSON.stringify(coverage, null, "  "));
-        result.coverageFileUrl = coverageFileUrl.href;
-      } else {// will eventually log a warning in report_to_coverage.js
-      }
-    }
-
     callbacks.forEach(callback => {
       callback();
     });
     return result;
   } catch (e) {
-    result = {
-      status: "errored",
-      error: e
-    };
+    result.status = "errored";
+    result.error = e;
     callbacks.forEach(callback => {
       callback();
     });
@@ -24767,7 +24771,7 @@ const executePlan = async (plan, {
       } else {
         coverageMethodForNodeJs = "Profiler";
         logger.warn(createDetailedMessage$1(`process.env.NODE_V8_COVERAGE is required to generate coverage for Node.js subprocesses`, {
-          "suggestion": `Preprend NODE_V8_COVERAGE=.coverage/node to the command executing this process`,
+          "suggestion": `set process.env.NODE_V8_COVERAGE`,
           "suggestion 2": `use coverageMethodForNodeJs: "Profiler". But it means coverage for child_process and worker_thread cannot be collected`
         }));
       }
@@ -24845,7 +24849,7 @@ const executePlan = async (plan, {
             getCustomBabelPlugins: ({
               clientRuntimeCompat
             }) => {
-              if (coverageEnabled && Object.keys(clientRuntimeCompat)[0] !== "chrome") {
+              if (coverageEnabled && (coverageMethodForBrowsers !== "playwright_api" || Object.keys(clientRuntimeCompat)[0] !== "chrome")) {
                 return {
                   "transform-instrument": [babelPluginInstrument, {
                     rootDirectoryUrl,
@@ -25269,8 +25273,7 @@ const executeTestPlan = async ({
   },
   coverageIncludeMissing = true,
   coverageAndExecutionAllowed = false,
-  coverageMethodForNodeJs = "NODE_V8_COVERAGE",
-  // "Profiler" also accepted
+  coverageMethodForNodeJs = process.env.NODE_V8_COVERAGE ? "NODE_V8_COVERAGE" : "Profiler",
   coverageMethodForBrowsers = "playwright_api",
   // "istanbul" also accepted
   coverageV8ConflictWarning = true,
@@ -25508,6 +25511,7 @@ const createRuntimeFromPlaywright = ({
     coverageEnabled = false,
     coverageConfig,
     coverageMethodForBrowsers,
+    coverageFileUrl,
     stopAfterAllSignal,
     stopSignal,
     keepRunning,
@@ -25590,13 +25594,14 @@ const createRuntimeFromPlaywright = ({
       }
     };
 
-    let resultTransformer = result => result;
+    const result = {};
+    const callbacks = [];
 
     if (coverageEnabled) {
       if (coveragePlaywrightAPIAvailable && coverageMethodForBrowsers === "playwright_api") {
         await page.coverage.startJSCoverage({// reportAnonymousScripts: true,
         });
-        resultTransformer = composeTransformer(resultTransformer, async result => {
+        callbacks.push(async () => {
           const v8CoveragesWithWebUrls = await page.coverage.stopJSCoverage(); // we convert urls starting with http:// to file:// because we later
           // convert the url to filesystem path in istanbulCoverageFromV8Coverage function
 
@@ -25617,23 +25622,20 @@ const createRuntimeFromPlaywright = ({
             rootDirectoryUrl,
             coverageConfig
           });
-          return { ...result,
-            coverage
-          };
+          writeFileSync$1(new URL(coverageFileUrl), JSON.stringify(coverage, null, "  "));
         });
       } else {
-        resultTransformer = composeTransformer(resultTransformer, async result => {
+        callbacks.push(() => {
           const scriptExecutionResults = result.namespace;
 
           if (scriptExecutionResults) {
-            result.coverage = generateCoverageForPage(scriptExecutionResults);
+            const coverage = generateCoverageForPage(scriptExecutionResults) || {};
+            writeFileSync$1(new URL(coverageFileUrl), JSON.stringify(coverage, null, "  "));
           }
-
-          return result;
         });
       }
     } else {
-      resultTransformer = composeTransformer(resultTransformer, result => {
+      callbacks.push(() => {
         const scriptExecutionResults = result.namespace;
 
         if (scriptExecutionResults) {
@@ -25641,13 +25643,11 @@ const createRuntimeFromPlaywright = ({
             delete scriptExecutionResults[fileRelativeUrl].coverage;
           });
         }
-
-        return result;
       });
     }
 
     if (collectPerformance) {
-      resultTransformer = composeTransformer(resultTransformer, async result => {
+      callbacks.push(async () => {
         const performance = await page.evaluate(
         /* eslint-disable no-undef */
 
@@ -25676,7 +25676,6 @@ const createRuntimeFromPlaywright = ({
         /* eslint-enable no-undef */
         );
         result.performance = performance;
-        return result;
       });
     }
 
@@ -25770,7 +25769,7 @@ const createRuntimeFromPlaywright = ({
             await page.goto(fileClientUrl, {
               timeout: 0
             });
-            const result = await page.evaluate(
+            const returnValue = await page.evaluate(
             /* eslint-disable no-undef */
 
             /* istanbul ignore next */
@@ -25786,12 +25785,12 @@ const createRuntimeFromPlaywright = ({
             const {
               status,
               scriptExecutionResults
-            } = result;
+            } = returnValue;
 
             if (status === "errored") {
               const {
                 exceptionSource
-              } = result;
+              } = returnValue;
               const error = evalException(exceptionSource, {
                 rootDirectoryUrl,
                 server,
@@ -25842,16 +25841,32 @@ const createRuntimeFromPlaywright = ({
       return winner.data;
     };
 
-    let result;
-
     try {
-      result = await getResult();
-      result = await resultTransformer(result);
+      const {
+        status,
+        error,
+        namespace,
+        performance
+      } = await getResult();
+      result.status = status;
+
+      if (status === "errored") {
+        result.error = error;
+      } else {
+        result.namespace = namespace;
+      }
+
+      if (collectPerformance) {
+        result.performance = performance;
+      }
+
+      await callbacks.reduce(async (previous, callback) => {
+        await previous;
+        await callback();
+      }, Promise.resolve());
     } catch (e) {
-      result = {
-        status: "errored",
-        error: e
-      };
+      result.status = "errored";
+      result.error = e;
     }
 
     if (keepRunning) {
@@ -25969,13 +25984,6 @@ const isTargetClosedError = error => {
   return false;
 };
 
-const composeTransformer = (previousTransformer, transformer) => {
-  return async value => {
-    const transformedValue = await previousTransformer(value);
-    return transformer(transformedValue);
-  };
-};
-
 const extractTextFromConsoleMessage = consoleMessage => {
   return consoleMessage.text(); // ensure we use a string so that istanbul won't try
   // to put any coverage statement inside it
@@ -26385,6 +26393,7 @@ nodeChildProcess.run = async ({
   coverageEnabled = false,
   coverageConfig,
   coverageMethodForNodeJs,
+  coverageFileUrl,
   collectPerformance,
   env,
   debugPort,
@@ -26548,6 +26557,7 @@ nodeChildProcess.run = async ({
           coverageEnabled,
           coverageConfig,
           coverageMethodForNodeJs,
+          coverageFileUrl,
           exitAfterAction: true
         }
       }
@@ -26728,10 +26738,12 @@ nodeWorkerThread.run = async ({
   keepRunning,
   stopSignal,
   onConsole,
+  collectConsole = false,
+  collectPerformance,
+  coverageEnabled = false,
   coverageConfig,
   coverageMethodForNodeJs,
-  coverageEnabled = false,
-  collectPerformance,
+  coverageFileUrl,
   env,
   debugPort,
   debugMode,
@@ -26795,6 +26807,16 @@ nodeWorkerThread.run = async ({
     onceWorkerThreadMessage(workerThread, "ready", resolve);
   });
   const stop = memoize(async () => {
+    // read all stdout before terminating
+    // (no need for stderr because it's sync)
+    if (collectConsole) {
+      while (workerThread.stdout.read() !== null) {}
+
+      await new Promise(resolve => {
+        setTimeout(resolve, 50);
+      });
+    }
+
     await workerThread.terminate();
   });
   const winnerPromise = new Promise(resolve => {
@@ -26834,6 +26856,7 @@ nodeWorkerThread.run = async ({
           coverageEnabled,
           coverageConfig,
           coverageMethodForNodeJs,
+          coverageFileUrl,
           exitAfterAction: true
         }
       }
@@ -27091,9 +27114,6 @@ ${createRepartitionMessage(graphReport)}
 };
 
 const createUrlGraphReport = urlGraph => {
-  const {
-    urlInfos
-  } = urlGraph;
   const countGroups = {
     sourcemaps: 0,
     html: 0,
@@ -27112,15 +27132,14 @@ const createUrlGraphReport = urlGraph => {
     other: 0,
     total: 0
   };
-  Object.keys(urlInfos).forEach(url => {
-    if (url.startsWith("data:")) {
+  urlGraph.urlInfoMap.forEach(urlInfo => {
+    if (urlInfo.url.startsWith("data:")) {
       return;
-    }
-
-    const urlInfo = urlInfos[url]; // ignore:
+    } // ignore:
     // - inline files: they are already taken into account in the file where they appear
     // - ignored files: we don't know their content
 
+
     if (urlInfo.isInline || !urlInfo.shouldHandle) {
       return;
     } // file loaded via import assertion are already inside the graph
@@ -27298,20 +27317,18 @@ const createRepartitionMessage = ({
 
 const GRAPH = {
   map: (graph, callback) => {
-    return Object.keys(graph.urlInfos).map(url => {
-      return callback(graph.urlInfos[url]);
+    const array = [];
+    graph.urlInfoMap.forEach(urlInfo => {
+      array.push(callback(urlInfo));
     });
+    return array;
   },
   forEach: (graph, callback) => {
-    Object.keys(graph.urlInfos).forEach(url => {
-      callback(graph.urlInfos[url], url);
-    });
+    graph.urlInfoMap.forEach(callback);
   },
   filter: (graph, callback) => {
     const urlInfos = [];
-    Object.keys(graph.urlInfos).forEach(url => {
-      const urlInfo = graph.urlInfos[url];
-
+    graph.urlInfoMap.forEach(urlInfo => {
       if (callback(urlInfo)) {
         urlInfos.push(urlInfo);
       }
@@ -27319,10 +27336,16 @@ const GRAPH = {
     return urlInfos;
   },
   find: (graph, callback) => {
-    const urlFound = Object.keys(graph.urlInfos).find(url => {
-      return callback(graph.urlInfos[url]);
-    });
-    return graph.urlInfos[urlFound];
+    let found = null;
+
+    for (const urlInfo of graph.urlInfoMap.values()) {
+      if (callback(urlInfo)) {
+        found = urlInfo;
+        break;
+      }
+    }
+
+    return found;
   }
 };
 
@@ -28468,7 +28491,7 @@ build ${entryPointKeys.length} entry points`);
 
     buildTask.done();
     logger.debug(`graph urls pre-versioning:
-${Object.keys(finalGraph.urlInfos).join("\n")}`);
+${Array.from(finalGraph.urlInfoMap.keys()).join("\n")}`);
 
     if (versioning) {
       await applyUrlVersioning({
@@ -28724,7 +28747,7 @@ const applyUrlVersioning = async ({
   });
 
   try {
-    const urlsSorted = sortByDependencies(finalGraph.urlInfos);
+    const urlsSorted = sortByDependencies(finalGraph.toObject());
     urlsSorted.forEach(url => {
       if (url.startsWith("data:")) {
         return;