@jsenv/core 23.2.2 → 23.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "23.2.2",
+  "version": "23.3.0",
   "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/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/internal/browser-launcher/executeHtmlFile.js

@@ -5,7 +5,6 @@ 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"
@@ -15,7 +14,7 @@ import { escapeRegexpSpecialCharacters } from "../escapeRegexpSpecialCharacters.
 export const executeHtmlFile = async (
   fileRelativeUrl,
   {
-    launchBrowserOperation,
+    executeOperation,
     projectDirectoryUrl,
     compileServerOrigin,
     outDirectoryRelativeUrl,
@@ -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,
@@ -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
   }

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)}
 ------------------------------`
 }
 

package/src/internal/building/createJsenvRollupPlugin.js

@@ -1,4 +1,3 @@
-/* eslint-disable import/max-dependencies */
 import { extname } from "node:path"
 import { normalizeImportMap } from "@jsenv/importmap"
 import { isSpecifierForNodeCoreModule } from "@jsenv/importmap/src/isSpecifierForNodeCoreModule.js"
@@ -15,15 +14,14 @@ import {
   urlToMeta,
 } from "@jsenv/filesystem"
 import { createWorkersForJavaScriptModules } from "@jsenv/workers"
+import { UNICODE } from "@jsenv/log"
 
-import { Abortable } from "@jsenv/core/src/abort/main.js"
 import { createUrlConverter } from "@jsenv/core/src/internal/url_conversion.js"
 import { createUrlFetcher } from "@jsenv/core/src/internal/building/url_fetcher.js"
 import { createUrlLoader } from "@jsenv/core/src/internal/building/url_loader.js"
 import { stringifyUrlTrace } from "@jsenv/core/src/internal/building/url_trace.js"
 import { sortObjectByPathnames } from "@jsenv/core/src/internal/building/sortObjectByPathnames.js"
 import { jsenvHelpersDirectoryInfo } from "@jsenv/core/src/internal/jsenvInternalFiles.js"
-import { infoSign } from "@jsenv/core/src/internal/logs/log_style.js"
 import { setUrlSearchParamsDescriptor } from "@jsenv/core/src/internal/url_utils.js"
 
 import {
@@ -753,16 +751,13 @@ export const createJsenvRollupPlugin = async ({
 
       let url = asServerUrl(rollupUrl)
 
-      const loadResult = await Abortable.asyncCallback(
-        buildOperation,
-        (signal) => {
-          return urlLoader.loadUrl(rollupUrl, {
-            signal,
-            logger,
-            ressourceBuilder,
-          })
-        },
-      )
+      const loadResult = await buildOperation.withSignal((signal) => {
+        return urlLoader.loadUrl(rollupUrl, {
+          signal,
+          logger,
+          ressourceBuilder,
+        })
+      })
 
       url = loadResult.url
       const code = loadResult.code
@@ -1368,7 +1363,7 @@ const prepareEntryPoints = async (
       buildDirectoryUrl,
     )
 
-    logger.debug(`${infoSign} load entry point ${entryProjectRelativeUrl}`)
+    logger.debug(`${UNICODE.INFO} load entry point ${entryProjectRelativeUrl}`)
 
     const entryServerUrl = resolveUrl(
       entryProjectRelativeUrl,

package/src/internal/building/url_trace.js

@@ -4,8 +4,7 @@
 // https://github.com/babel/babel/blob/eea156b2cb8deecfcf82d52aa1b71ba4995c7d68/packages/babel-code-frame/src/index.js#L1
 
 import { urlToFileSystemPath } from "@jsenv/filesystem"
-
-import { setANSIColor, ANSI_GREY, ANSI_RED } from "../logs/log_style.js"
+import { ANSI } from "@jsenv/log"
 
 export const stringifyUrlTrace = (trace) => {
   let string = ""
@@ -89,8 +88,8 @@ export const showSourceLocation = ({
   let mark = (string) => string
   let aside = (string) => string
   if (color) {
-    mark = (string) => setANSIColor(string, ANSI_RED)
-    aside = (string) => setANSIColor(string, ANSI_GREY)
+    mark = (string) => ANSI.color(string, ANSI.RED)
+    aside = (string) => ANSI.color(string, ANSI.GREY)
   }
 
   const lines = source.split(/\r?\n/)

package/src/internal/compiling/createCompiledFileService.js

@@ -1,4 +1,4 @@
-import { serveFile, nextService } from "@jsenv/server"
+import { nextService, fetchFileSystem } from "@jsenv/server"
 import {
   resolveUrl,
   resolveDirectoryUrl,
@@ -88,10 +88,13 @@ export const createCompiledFileService = ({
     // this is just to allow some files to be written inside outDirectory and read directly
     // if asked by the client (such as env.json, groupMap.json, meta.json)
     if (!compileId) {
-      return serveFile(request, {
-        rootDirectoryUrl: projectDirectoryUrl,
-        etagEnabled: true,
-      })
+      return fetchFileSystem(
+        new URL(request.ressource.slice(1), projectDirectoryUrl),
+        {
+          headers: request.headers,
+          etagEnabled: true,
+        },
+      )
     }
 
     const allowedCompileIds = [