@jsenv/core 23.2.1 → 23.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "23.2.1",
+  "version": "23.4.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -11,7 +11,8 @@
     "node": ">=14.9.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "type": "module",
   "exports": {
@@ -51,7 +52,7 @@
     "postpublish": "node ./script/publish/restore_postinstall.mjs"
   },
   "dependencies": {
-    "@babel/core": "7.15.8",
+    "@babel/core": "7.16.0",
     "@babel/helper-module-imports": "7.15.4",
     "@babel/helpers": "7.15.4",
     "@babel/parser": "7.15.8",
@@ -62,11 +63,12 @@
     "@babel/plugin-syntax-numeric-separator": "7.10.4",
     "@babel/plugin-transform-modules-systemjs": "7.15.4",
     "@c88/v8-coverage": "0.1.1",
-    "@jsenv/abort": "1.0.0",
-    "@jsenv/filesystem": "2.3.1",
+    "@jsenv/abort": "4.0.0",
+    "@jsenv/filesystem": "2.5.0",
     "@jsenv/importmap": "1.1.0",
+    "@jsenv/log": "1.1.0",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/server": "9.2.4",
+    "@jsenv/server": "10.0.0",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/workers": "1.2.0",
     "@rollup/plugin-commonjs": "21.0.0",
@@ -78,13 +80,12 @@
     "bytes": "3.1.0",
     "cjs-module-lexer": "1.2.2",
     "construct-style-sheets-polyfill": "3.0.4",
-    "cssnano": "5.0.8",
-    "cssnano-preset-default": "5.1.4",
+    "cssnano": "5.0.9",
+    "cssnano-preset-default": "5.1.5",
     "cuid": "2.1.8",
     "estree-walker": "3.0.0",
     "html-minifier": "4.0.0",
     "humanize-duration": "3.27.0",
-    "is-unicode-supported": "1.1.0",
     "is-valid-identifier": "2.0.2",
     "istanbul-lib-coverage": "3.0.2",
     "istanbul-lib-instrument": "5.0.3",
@@ -104,8 +105,6 @@
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-polyfill-node": "0.7.0",
     "source-map": "0.7.3",
-    "string-width": "5.0.1",
-    "supports-color": "9.0.2",
     "systemjs": "6.11.0",
     "terser": "5.9.0",
     "v8-to-istanbul": "8.1.0",
@@ -113,7 +112,7 @@
     "wrap-ansi": "8.0.1"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.15.8",
+    "@babel/eslint-parser": "7.16.0",
     "@babel/plugin-syntax-jsx": "7.14.5",
     "@babel/plugin-transform-block-scoping": "7.15.3",
     "@babel/plugin-transform-react-jsx": "7.14.9",
@@ -127,7 +126,7 @@
     "@jsenv/importmap-eslint-resolver": "5.1.2",
     "@jsenv/importmap-node-module": "2.4.1",
     "@jsenv/package-publish": "1.6.2",
-    "@jsenv/performance-impact": "2.2.0",
+    "@jsenv/performance-impact": "2.2.1",
     "@jsenv/prettier-check-project": "5.6.1",
     "@jsenv/pwa": "4.0.0",
     "babel-plugin-transform-async-to-promises": "0.8.15",
@@ -140,7 +139,7 @@
     "prettier": "2.4.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "redux": "4.1.1",
+    "redux": "4.1.2",
     "rollup-plugin-import-assert": "1.1.1"
   }
 }

package/readme.md

@@ -99,16 +99,16 @@ executeTestPlan({
 ✔ execution 1 of 2 completed (all completed)
 file: animals.test.html
 runtime: chromium/82.0.4057.0
-duration: 1.28 seconds
+duration: 1.2 seconds
 
 ✔ execution 2 of 2 completed (all completed)
 file: animals.test.html
 runtime: firefox/73.0b13
-duration: 2.42 seconds
+duration: 2.4 seconds
 
 -------------- summary -----------------
-2 execution: all completed
-total duration: 3.72 seconds
+2 executions: all completed
+total duration: 3.6 seconds
 ----------------------------------------
 ```
 

package/src/buildProject.js

@@ -1,10 +1,7 @@
 import { createLogger, createDetailedMessage } from "@jsenv/logger"
 import { resolveDirectoryUrl } from "@jsenv/filesystem"
+import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 
-import {
-  Abortable,
-  raceProcessTeardownEvents,
-} from "@jsenv/core/src/abort/main.js"
 import { COMPILE_ID_BEST } from "./internal/CONSTANTS.js"
 import {
   assertProjectDirectoryUrl,
@@ -136,16 +133,18 @@ export const buildProject = async ({
     projectDirectoryUrl,
   })
 
-  const buildOperation = Abortable.fromSignal(signal)
+  const buildOperation = Abort.startOperation()
+  buildOperation.addAbortSignal(signal)
+
   if (handleSIGINT) {
-    Abortable.effect(buildOperation, (cb) =>
-      raceProcessTeardownEvents(
+    buildOperation.addAbortSource((abort) => {
+      return raceProcessTeardownEvents(
         {
           SIGINT: true,
         },
-        cb,
-      ),
-    )
+        abort,
+      )
+    })
   }
 
   const compileServer = await startCompileServer({
@@ -183,7 +182,7 @@ export const buildProject = async ({
     transformHtmlSourceFiles: false,
   })
 
-  buildOperation.cleaner.addCallback(async () => {
+  buildOperation.addEndCallback(async () => {
     await compileServer.stop(`build cleanup`)
   })
 
@@ -239,13 +238,13 @@ export const buildProject = async ({
 
     return result
   } catch (e) {
-    if (Abortable.isAbortError(e)) {
+    if (Abort.isAbortError(e)) {
       logger.info("build aborted")
       return null
     }
     throw e
   } finally {
-    await buildOperation.cleaner.clean()
+    await buildOperation.end()
   }
 }
 

package/src/execute.js

@@ -1,7 +1,5 @@
-import {
-  Abortable,
-  raceProcessTeardownEvents,
-} from "@jsenv/core/src/abort/main.js"
+import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
+
 import { normalizeRuntimeSupport } from "@jsenv/core/src/internal/generateGroupMap/runtime_support.js"
 import {
   assertProjectDirectoryUrl,
@@ -58,7 +56,7 @@ export const execute = async ({
   runtimeStartedCallback,
   runtimeStoppedCallback,
   runtimeErrorAfterExecutionCallback,
-  runtimeDisconnectCallback = () => {},
+  runtimeDisconnectCallback,
 }) => {
   projectDirectoryUrl = assertProjectDirectoryUrl({ projectDirectoryUrl })
   await assertProjectDirectoryExists({ projectDirectoryUrl })
@@ -79,101 +77,99 @@ export const execute = async ({
     )
   }
 
-  const executeOperation = Abortable.fromSignal(signal)
+  const executeOperation = Abort.startOperation()
+  executeOperation.addAbortSignal(signal)
   if (handleSIGINT) {
-    Abortable.effect(executeOperation, (cb) =>
-      raceProcessTeardownEvents(
+    executeOperation.addAbortSource((abort) => {
+      return raceProcessTeardownEvents(
         {
           SIGINT: true,
         },
-        cb,
-      ),
-    )
+        abort,
+      )
+    })
   }
 
-  const {
-    outDirectoryRelativeUrl,
-    origin: compileServerOrigin,
-    stop,
-  } = await startCompileServer({
-    signal: executeOperation.signal,
-    compileServerLogLevel,
-
-    projectDirectoryUrl,
-    jsenvDirectoryRelativeUrl,
-    jsenvDirectoryClean,
-    outDirectoryName: "out-dev",
-
-    importDefaultExtension,
-
-    compileServerProtocol,
-    compileServerPrivateKey,
-    compileServerCertificate,
-    compileServerIp,
-    compileServerPort,
-    babelPluginMap,
-    customCompilers,
-    runtimeSupport: normalizeRuntimeSupport({
-      [runtime.name]: runtime.version,
-    }),
-    compileServerCanReadFromFilesystem,
-    compileServerCanWriteOnFilesystem,
-  })
-  executeOperation.cleaner.addCallback(() => {
-    return stop()
-  })
-
-  const result = await launchAndExecute({
-    signal: executeOperation.signal,
-    launchAndExecuteLogLevel,
-
-    runtime,
-    runtimeParams: {
-      projectDirectoryUrl,
-      compileServerOrigin,
+  try {
+    const {
       outDirectoryRelativeUrl,
-      ...runtimeParams,
-    },
-    executeParams: {
-      fileRelativeUrl,
-    },
-
-    allocatedMs,
-    measureDuration,
-    mirrorConsole,
-    captureConsole,
-    collectRuntimeName,
-    collectRuntimeVersion,
-    inheritCoverage,
-    collectCoverage,
-    measurePerformance,
-    collectPerformance,
-
-    stopAfterExecute,
-    stopAfterExecuteReason,
-    gracefulStopAllocatedMs,
-
-    runtimeConsoleCallback,
-    runtimeStartedCallback,
-    runtimeStoppedCallback,
-    runtimeErrorAfterExecutionCallback,
-    runtimeDisconnectCallback: () => {
-      // stop server when runtime disconnects
-      executeOperation.cleaner.clean("runtime-stopped")
-      runtimeDisconnectCallback()
-    },
-  })
-
-  if (collectCompileServerInfo) {
-    result.outDirectoryRelativeUrl = outDirectoryRelativeUrl
-    result.compileServerOrigin = compileServerOrigin
-  }
+      origin: compileServerOrigin,
+      stop,
+    } = await startCompileServer({
+      signal: executeOperation.signal,
+      compileServerLogLevel,
+
+      projectDirectoryUrl,
+      jsenvDirectoryRelativeUrl,
+      jsenvDirectoryClean,
+      outDirectoryName: "out-dev",
+
+      importDefaultExtension,
+
+      compileServerProtocol,
+      compileServerPrivateKey,
+      compileServerCertificate,
+      compileServerIp,
+      compileServerPort,
+      babelPluginMap,
+      customCompilers,
+      runtimeSupport: normalizeRuntimeSupport({
+        [runtime.name]: runtime.version,
+      }),
+      compileServerCanReadFromFilesystem,
+      compileServerCanWriteOnFilesystem,
+    })
+    executeOperation.addEndCallback(async () => {
+      await stop("execution done")
+    })
 
-  if (result.status === "errored") {
-    if (ignoreError) {
-      return result
+    const result = await launchAndExecute({
+      signal: executeOperation.signal,
+      launchAndExecuteLogLevel,
+
+      runtime,
+      runtimeParams: {
+        projectDirectoryUrl,
+        compileServerOrigin,
+        outDirectoryRelativeUrl,
+        ...runtimeParams,
+      },
+      executeParams: {
+        fileRelativeUrl,
+      },
+
+      allocatedMs,
+      measureDuration,
+      mirrorConsole,
+      captureConsole,
+      collectRuntimeName,
+      collectRuntimeVersion,
+      inheritCoverage,
+      collectCoverage,
+      measurePerformance,
+      collectPerformance,
+
+      stopAfterExecute,
+      stopAfterExecuteReason,
+      gracefulStopAllocatedMs,
+
+      runtimeConsoleCallback,
+      runtimeStartedCallback,
+      runtimeStoppedCallback,
+      runtimeErrorAfterExecutionCallback,
+      runtimeDisconnectCallback,
+    })
+
+    if (collectCompileServerInfo) {
+      result.outDirectoryRelativeUrl = outDirectoryRelativeUrl
+      result.compileServerOrigin = compileServerOrigin
     }
-    /*
+
+    if (result.status === "errored") {
+      if (ignoreError) {
+        return result
+      }
+      /*
     Warning: when node launched with --unhandled-rejections=strict, despites
     this promise being rejected by throw result.error node will compltely ignore it.
 
@@ -185,7 +181,10 @@ export const execute = async ({
     ```
     But it feels like a hack.
     */
-    throw result.error
+      throw result.error
+    }
+    return result
+  } finally {
+    await executeOperation.end()
   }
-  return result
 }

package/src/executeTestPlan.js

@@ -14,9 +14,9 @@ import {
 } from "./internal/argUtils.js"
 import { executePlan } from "./internal/executing/executePlan.js"
 import { executionIsPassed } from "./internal/executing/executionIsPassed.js"
-import { generateCoverageJsonFile } from "./internal/executing/coverage/generateCoverageJsonFile.js"
-import { generateCoverageHtmlDirectory } from "./internal/executing/coverage/generateCoverageHtmlDirectory.js"
-import { generateCoverageTextLog } from "./internal/executing/coverage/generateCoverageTextLog.js"
+import { generateCoverageJsonFile } from "./internal/executing/coverage_reporter/coverage_reporter_json_file.js"
+import { generateCoverageHtmlDirectory } from "./internal/executing/coverage_reporter/coverage_reporter_html_directory.js"
+import { generateCoverageTextLog } from "./internal/executing/coverage_reporter/coverage_reporter_text_log.js"
 import { jsenvCoverageConfig } from "./jsenvCoverageConfig.js"
 
 export const executeTestPlan = async ({
@@ -44,18 +44,18 @@ export const executeTestPlan = async ({
 
   coverage = process.argv.includes("--cover") ||
     process.argv.includes("--coverage"),
+  coverageTempDirectoryRelativeUrl = "./coverage/tmp/",
   coverageConfig = jsenvCoverageConfig,
   coverageIncludeMissing = true,
   coverageAndExecutionAllowed = false,
   coverageForceIstanbul = false,
-  coverageV8MergeConflictIsExpected = false,
-
+  coverageV8ConflictWarning = true,
   coverageTextLog = true,
   coverageJsonFile = Boolean(process.env.CI),
   coverageJsonFileLog = true,
   coverageJsonFileRelativeUrl = "./coverage/coverage.json",
   coverageHtmlDirectory = !process.env.CI,
-  coverageHtmlDirectoryRelativeUrl = "./coverage",
+  coverageHtmlDirectoryRelativeUrl = "./coverage/",
   coverageHtmlDirectoryIndexLog = true,
   // skip empty means empty files won't appear in the coverage reports (log and html)
   coverageSkipEmpty = false,
@@ -153,7 +153,8 @@ export const executeTestPlan = async ({
     coverageConfig,
     coverageIncludeMissing,
     coverageForceIstanbul,
-    coverageV8MergeConflictIsExpected,
+    coverageV8ConflictWarning,
+    coverageTempDirectoryRelativeUrl,
 
     jsenvDirectoryClean,
     compileServerProtocol,
@@ -173,7 +174,7 @@ export const executeTestPlan = async ({
   }
 
   const planCoverage = result.planCoverage
-  // planCoverage can be null when execution is abortes
+  // planCoverage can be null when execution is aborted
   if (planCoverage) {
     const promises = []
     // keep this one first because it does ensureEmptyDirectory

package/src/internal/browser-launcher/executeHtmlFile.js

@@ -5,17 +5,16 @@ import {
   urlToExtension,
 } from "@jsenv/filesystem"
 
-import { Abortable } from "@jsenv/core/src/abort/main.js"
 import { jsenvCompileProxyHtmlFileInfo } from "@jsenv/core/src/internal/jsenvInternalFiles.js"
-import { v8CoverageFromAllV8Coverages } from "@jsenv/core/src/internal/executing/coverage/v8CoverageFromAllV8Coverages.js"
-import { composeIstanbulCoverages } from "@jsenv/core/src/internal/executing/coverage/composeIstanbulCoverages.js"
+import { filterV8Coverage } from "@jsenv/core/src/internal/executing/coverage_utils/v8_coverage_from_directory.js"
+import { composeTwoFileByFileIstanbulCoverages } from "@jsenv/core/src/internal/executing/coverage_utils/istanbul_coverage_composition.js"
 import { evalSource } from "../runtime/createNodeRuntime/evalSource.js"
 import { escapeRegexpSpecialCharacters } from "../escapeRegexpSpecialCharacters.js"
 
 export const executeHtmlFile = async (
   fileRelativeUrl,
   {
-    launchBrowserOperation,
+    executeOperation,
     projectDirectoryUrl,
     compileServerOrigin,
     outDirectoryRelativeUrl,
@@ -24,7 +23,7 @@ export const executeHtmlFile = async (
     // measurePerformance,
     collectPerformance,
     collectCoverage,
-    coverageConfig,
+    coverageIgnorePredicate,
     coverageForceIstanbul,
     coveragePlaywrightAPIAvailable,
     transformErrorHook,
@@ -47,13 +46,13 @@ export const executeHtmlFile = async (
     compileProxyProjectRelativeUrl,
     compileServerOrigin,
   )
-  Abortable.throwIfAborted(launchBrowserOperation)
+  executeOperation.throwIfAborted()
   await page.goto(compileProxyClientUrl)
 
   const coverageHandledFromOutside =
     coveragePlaywrightAPIAvailable && !coverageForceIstanbul
 
-  Abortable.throwIfAborted(launchBrowserOperation)
+  executeOperation.throwIfAborted()
   const browserRuntimeFeaturesReport = await page.evaluate(
     /* istanbul ignore next */
     ({ coverageHandledFromOutside }) => {
@@ -69,7 +68,7 @@ export const executeHtmlFile = async (
   try {
     let executionResult
     const { canAvoidCompilation, compileId } = browserRuntimeFeaturesReport
-    Abortable.throwIfAborted(launchBrowserOperation)
+    executeOperation.throwIfAborted()
     if (canAvoidCompilation) {
       executionResult = await executeSource({
         projectDirectoryUrl,
@@ -77,7 +76,7 @@ export const executeHtmlFile = async (
         fileRelativeUrl,
         page,
         collectCoverage,
-        coverageConfig,
+        coverageIgnorePredicate,
         transformErrorHook,
       })
     } else {
@@ -125,8 +124,8 @@ export const executeHtmlFile = async (
     // if browser is closed due to abort
     // before it is able to finish evaluate we can safely ignore
     // and rethrow with current abort error
-    if (launchBrowserOperation.signal.aborted && isBrowserClosedError(error)) {
-      Abortable.throwIfAborted(launchBrowserOperation)
+    if (executeOperation.signal.aborted && isBrowserClosedError(error)) {
+      executeOperation.throwIfAborted()
     }
     throw error
   }
@@ -150,7 +149,7 @@ const executeSource = async ({
   fileRelativeUrl,
   page,
   collectCoverage,
-  coverageConfig,
+  coverageIgnorePredicate,
   transformErrorHook,
 }) => {
   let transformResult = (result) => result
@@ -176,11 +175,12 @@ const executeSource = async ({
           }
         },
       )
-      const allV8Coverages = [{ result: v8CoveragesWithFsUrls }]
-      const coverage = v8CoverageFromAllV8Coverages(allV8Coverages, {
-        coverageRootUrl: projectDirectoryUrl,
-        coverageConfig,
-      })
+      const coverage = filterV8Coverage(
+        { result: v8CoveragesWithFsUrls },
+        {
+          coverageIgnorePredicate,
+        },
+      )
       return {
         ...result,
         coverage,
@@ -298,15 +298,18 @@ const executeCompiledVersion = async ({
 }
 
 const generateCoverageForPage = (fileExecutionResultMap) => {
-  const istanbulCoverages = []
+  let istanbulCoverageComposed = null
   Object.keys(fileExecutionResultMap).forEach((fileRelativeUrl) => {
     const istanbulCoverage = fileExecutionResultMap[fileRelativeUrl].coverage
-    if (istanbulCoverage) {
-      istanbulCoverages.push(istanbulCoverage)
-    }
+    istanbulCoverageComposed = istanbulCoverageComposed
+      ? composeTwoFileByFileIstanbulCoverages(
+          istanbulCoverageComposed,
+          istanbulCoverage,
+        )
+      : istanbulCoverage
   })
-  const istanbulCoverage = composeIstanbulCoverages(istanbulCoverages)
-  return istanbulCoverage
+
+  return istanbulCoverageComposed
 }
 
 const evalException = (

package/src/internal/building/buildUsingRollup.js

@@ -8,7 +8,6 @@ import {
 } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 
-import { Abortable } from "@jsenv/core/src/abort/main.js"
 import { buildServiceWorker } from "@jsenv/core/src/internal/building/buildServiceWorker.js"
 import { humanizeUrl } from "@jsenv/core/src/internal/building/url_trace.js"
 import {
@@ -272,7 +271,7 @@ const useRollup = async ({
   buildDirectoryUrl,
   asOriginalUrl,
 }) => {
-  Abortable.throwIfAborted(buildOperation)
+  buildOperation.throwIfAborted()
   const { rollup } = await import("rollup")
   const { importAssertions } = await import("acorn-import-assertions")
 
@@ -350,10 +349,10 @@ const useRollup = async ({
       : {}),
   }
 
-  Abortable.throwIfAborted(buildOperation)
+  buildOperation.throwIfAborted()
   const rollupReturnValue = await rollup(rollupInputOptions)
 
-  Abortable.throwIfAborted(buildOperation)
+  buildOperation.throwIfAborted()
   const rollupOutputArray = await rollupReturnValue.generate(
     rollupOutputOptions,
   )

package/src/internal/building/build_logs.js

@@ -1,5 +1,6 @@
+import { ANSI, UNICODE } from "@jsenv/log"
+
 import { getHtmlNodeLocation } from "@jsenv/core/src/internal/compiling/compileHtml.js"
-import { setANSIColor, ANSI_GREY, okSign } from "../logs/log_style.js"
 import { byteAsFileSize } from "../logs/byteAsFileSize.js"
 import { msAsDuration } from "../logs/msAsDuration.js"
 import { stringifyUrlSite } from "./url_trace.js"
@@ -47,7 +48,7 @@ export const formatBuildDoneInfo = ({
 }) => {
   return `${formatBuildDoneDetails({ buildStats, buildDirectoryRelativeUrl })}
 ${formatBuildSummary({ buildStats })}
-${okSign} build end
+${UNICODE.OK} build end
 `
 }
 
@@ -107,14 +108,14 @@ const formatBuildSummary = ({ buildStats }) => {
   const buildFileCount = Object.keys(buildFileSizes).length
 
   return `------- build summary -------
-${setANSIColor(
+${ANSI.color(
   `project files:`,
-  ANSI_GREY,
+  ANSI.GREY,
 )} ${projectFileCount} (${byteAsFileSize(projectTotalFileSize)})
-${setANSIColor(`build files:`, ANSI_GREY)} ${buildFileCount} (${byteAsFileSize(
+${ANSI.color(`build files:`, ANSI.GREY)} ${buildFileCount} (${byteAsFileSize(
     buildTotalFileSize,
   )})
-${setANSIColor(`build duration:`, ANSI_GREY)} ${msAsDuration(buildDuration)}
+${ANSI.color(`build duration:`, ANSI.GREY)} ${msAsDuration(buildDuration)}
 ------------------------------`
 }