@jsenv/core 23.1.2 → 23.2.1

package/src/internal/compiling/jsenvCompilerForHtml.js

@@ -6,7 +6,10 @@ import {
   jsenvToolbarInjectorFileInfo,
 } from "@jsenv/core/src/internal/jsenvInternalFiles.js"
 import { getDefaultImportMap } from "@jsenv/core/src/internal/import-resolution/importmap-default.js"
-import { setJavaScriptSourceMappingUrl } from "../sourceMappingURLUtils.js"
+import {
+  setJavaScriptSourceMappingUrl,
+  sourcemapToBase64Url,
+} from "../sourceMappingURLUtils.js"
 import { transformJs } from "./js-compilation-service/transformJs.js"
 import {
   parseHtmlString,
@@ -41,6 +44,7 @@ export const compileHtml = async ({
   babelPluginMap,
 
   jsenvToolbarInjection,
+  sourcemapMethod,
 }) => {
   const jsenvBrowserBuildUrlRelativeToProject = urlToRelativeUrl(
     jsenvBrowserSystemFileInfo.jsenvBuildUrl,
@@ -203,12 +207,22 @@ export const compileHtml = async ({
         sourcemapFileUrl,
         compiledUrl,
       )
-      code = setJavaScriptSourceMappingUrl(
-        code,
-        sourcemapFileRelativePathForModule,
-      )
-      assets = [...assets, scriptAssetUrl, sourcemapFileUrl]
-      assetsContent = [...assetsContent, code, JSON.stringify(map, null, "  ")]
+
+      if (sourcemapMethod === "inline") {
+        code = setJavaScriptSourceMappingUrl(code, sourcemapToBase64Url(map))
+      } else {
+        // TODO: respect "sourcemapMethod" parameter
+        code = setJavaScriptSourceMappingUrl(
+          code,
+          sourcemapFileRelativePathForModule,
+        )
+        assets = [...assets, scriptAssetUrl, sourcemapFileUrl]
+        assetsContent = [
+          ...assetsContent,
+          code,
+          JSON.stringify(map, null, "  "),
+        ]
+      }
     }),
   )
 

package/src/internal/compiling/jsenvCompilerForJavaScript.js

@@ -14,6 +14,7 @@ export const compileJavascript = async ({
   importMetaFormat,
 
   sourcemapExcludeSources,
+  sourcemapMethod,
 }) => {
   const transformResult = await transformJs({
     code,
@@ -42,6 +43,7 @@ export const compileJavascript = async ({
       compiledFileUrl: compiledUrl,
       sourcemapFileUrl: `${compiledUrl}.map`,
       sourcemapExcludeSources,
+      sourcemapMethod,
     },
   )
 }

package/src/internal/compiling/startCompileServer.js

@@ -1,10 +1,4 @@
-/* eslint-disable import/max-dependencies */
 import { readFileSync } from "node:fs"
-import {
-  createCancellationToken,
-  createCancellationSource,
-  composeCancellationToken,
-} from "@jsenv/cancellation"
 import {
   jsenvAccessControlAllowedHeaders,
   startServer,
@@ -12,6 +6,9 @@ import {
   createSSERoom,
   composeServicesWithTiming,
   urlToContentType,
+  pluginServerTiming,
+  pluginRequestWaitingCheck,
+  pluginCORS,
 } from "@jsenv/server"
 import { createLogger, createDetailedMessage } from "@jsenv/logger"
 import {
@@ -22,12 +19,12 @@ import {
   readFile,
   writeFile,
   ensureEmptyDirectory,
-  registerFileLifecycle,
   registerDirectoryLifecycle,
   urlIsInsideOf,
   urlToBasename,
 } from "@jsenv/filesystem"
 
+import { Abortable } from "@jsenv/core/src/abort/main.js"
 import { isBrowserPartOfSupportedRuntimes } from "@jsenv/core/src/internal/generateGroupMap/runtime_support.js"
 import { loadBabelPluginMapFromFile } from "./load_babel_plugin_map_from_file.js"
 import { extractSyntaxBabelPluginMap } from "./babel_plugins.js"
@@ -48,7 +45,7 @@ import { urlIsCompilationAsset } from "./compile-directory/compile-asset.js"
 import { createTransformHtmlSourceFileService } from "./html_source_file_service.js"
 
 export const startCompileServer = async ({
-  cancellationToken = createCancellationToken(),
+  signal = new AbortController().signal,
   compileServerLogLevel,
 
   projectDirectoryUrl,
@@ -59,6 +56,7 @@ export const startCompileServer = async ({
   jsenvDirectoryClean = false,
   outDirectoryName = "out",
 
+  sourcemapMethod = "comment", // "inline" is also possible
   sourcemapExcludeSources = false, // this should increase perf (no need to download source for browser)
   compileServerCanReadFromFilesystem = true,
   compileServerCanWriteOnFilesystem = true,
@@ -88,7 +86,7 @@ export const startCompileServer = async ({
   compileServerIp = "0.0.0.0",
   compileServerPort = 0,
   keepProcessAlive = false,
-  stopOnPackageVersionChange = false,
+  onStop = () => {},
 
   // remaining options
   runtimeSupport,
@@ -217,15 +215,12 @@ export const startCompileServer = async ({
     ...babelPluginMap,
   }
 
-  const serverStopCancellationSource = createCancellationSource()
+  const compileServerOperation = Abortable.fromSignal(signal)
 
   let projectFileRequestedCallback = () => {}
   if (livereloadSSE) {
     const sseSetup = setupServerSentEventsForLivereload({
-      cancellationToken: composeCancellationToken(
-        cancellationToken,
-        serverStopCancellationSource.token,
-      ),
+      compileServerOperation,
       projectDirectoryUrl,
       jsenvDirectoryRelativeUrl,
       outDirectoryRelativeUrl,
@@ -235,7 +230,7 @@ export const startCompileServer = async ({
 
     projectFileRequestedCallback = sseSetup.projectFileRequestedCallback
     const serveSSEForLivereload = createSSEForLivereloadService({
-      cancellationToken,
+      compileServerOperation,
       outDirectoryRelativeUrl,
       trackMainAndDependencies: sseSetup.trackMainAndDependencies,
     })
@@ -269,6 +264,8 @@ export const startCompileServer = async ({
     babelPluginMap,
     customCompilers,
     jsenvToolbarInjection,
+    sourcemapMethod,
+    sourcemapExcludeSources,
   })
   if (compileServerCanWriteOnFilesystem) {
     await setupOutDirectory({
@@ -280,31 +277,6 @@ export const startCompileServer = async ({
     })
   }
 
-  const sourceFileService = composeServicesWithTiming({
-    ...(transformHtmlSourceFiles
-      ? {
-          "service:transform html source file":
-            createTransformHtmlSourceFileService({
-              logger,
-              projectDirectoryUrl,
-              inlineImportMapIntoHTML,
-              jsenvScriptInjection,
-              jsenvToolbarInjection,
-            }),
-        }
-      : {}),
-    "service:source file": createSourceFileService({
-      logger,
-      projectDirectoryUrl,
-      projectFileRequestedCallback,
-      projectFileEtagEnabled,
-      transformHtmlSourceFiles,
-      inlineImportMapIntoHTML,
-      jsenvScriptInjection,
-      jsenvToolbarInjection,
-    }),
-  })
-
   const jsenvServices = {
     "service:compilation asset": createCompilationAssetFileService({
       projectDirectoryUrl,
@@ -324,8 +296,7 @@ export const startCompileServer = async ({
       projectDirectoryUrl,
     }),
     "service:compiled file": createCompiledFileService({
-      sourceFileService,
-      cancellationToken,
+      compileServerOperation,
       logger,
 
       projectDirectoryUrl,
@@ -345,13 +316,42 @@ export const startCompileServer = async ({
       projectFileRequestedCallback,
       useFilesystemAsCache: compileServerCanReadFromFilesystem,
       writeOnFilesystem: compileServerCanWriteOnFilesystem,
+      sourcemapMethod,
       sourcemapExcludeSources,
       compileCacheStrategy,
     }),
+    ...(transformHtmlSourceFiles
+      ? {
+          "service:transform html source file":
+            createTransformHtmlSourceFileService({
+              logger,
+              projectDirectoryUrl,
+              inlineImportMapIntoHTML,
+              jsenvScriptInjection,
+              jsenvToolbarInjection,
+            }),
+        }
+      : {}),
+    "service:source file": createSourceFileService({
+      logger,
+      projectDirectoryUrl,
+      projectFileRequestedCallback,
+      projectFileEtagEnabled,
+      transformHtmlSourceFiles,
+      inlineImportMapIntoHTML,
+      jsenvScriptInjection,
+      jsenvToolbarInjection,
+    }),
   }
 
   const compileServer = await startServer({
-    cancellationToken,
+    signal: compileServerOperation.signal,
+    stopOnExit: false,
+    stopOnSIGINT: false,
+    stopOnInternalError: false,
+    sendServerInternalErrorDetails: true,
+    keepProcessAlive,
+
     logLevel: compileServerLogLevel,
 
     protocol: compileServerProtocol,
@@ -360,43 +360,32 @@ export const startCompileServer = async ({
     serverCertificatePrivateKey: compileServerPrivateKey,
     ip: compileServerIp,
     port: compileServerPort,
-    sendServerTiming: true,
-    nagle: false,
-    sendServerInternalErrorDetails: true,
+    plugins: {
+      ...pluginCORS({
+        accessControlAllowRequestOrigin: true,
+        accessControlAllowRequestMethod: true,
+        accessControlAllowRequestHeaders: true,
+        accessControlAllowedRequestHeaders: [
+          ...jsenvAccessControlAllowedHeaders,
+          "x-jsenv-execution-id",
+        ],
+        accessControlAllowCredentials: true,
+      }),
+      ...pluginServerTiming,
+      ...pluginRequestWaitingCheck({
+        requestWaitingMs: 60 * 1000,
+      }),
+    },
     requestToResponse: composeServicesWithTiming({
       ...customServices,
       ...jsenvServices,
     }),
-    accessControlAllowRequestOrigin: true,
-    accessControlAllowRequestMethod: true,
-    accessControlAllowRequestHeaders: true,
-    accessControlAllowedRequestHeaders: [
-      ...jsenvAccessControlAllowedHeaders,
-      "x-jsenv-execution-id",
-    ],
-    accessControlAllowCredentials: true,
-    keepProcessAlive,
+    onStop: () => {
+      onStop()
+      compileServerOperation.cleaner.clean()
+    },
   })
 
-  compileServer.stoppedPromise.then(serverStopCancellationSource.cancel)
-
-  if (stopOnPackageVersionChange) {
-    const stopListeningJsenvPackageVersionChange =
-      listenJsenvPackageVersionChange({
-        projectDirectoryUrl,
-        jsenvDirectoryRelativeUrl,
-        onJsenvPackageVersionChange: () => {
-          compileServer.stop(STOP_REASON_PACKAGE_VERSION_CHANGED)
-        },
-      })
-    compileServer.stoppedPromise.then(
-      () => {
-        stopListeningJsenvPackageVersionChange()
-      },
-      () => {},
-    )
-  }
-
   return {
     jsenvDirectoryRelativeUrl,
     outDirectoryRelativeUrl,
@@ -570,7 +559,7 @@ const compareValueJson = (left, right) => {
  *
  */
 const setupServerSentEventsForLivereload = ({
-  cancellationToken,
+  compileServerOperation,
   projectDirectoryUrl,
   jsenvDirectoryRelativeUrl,
   outDirectoryRelativeUrl,
@@ -616,7 +605,7 @@ const setupServerSentEventsForLivereload = ({
       recursive: true,
     },
   )
-  cancellationToken.register(unregisterDirectoryLifecyle)
+  compileServerOperation.cleaner.addCallback(unregisterDirectoryLifecyle)
 
   const getDependencySet = (mainRelativeUrl) => {
     if (trackerMap.has(mainRelativeUrl)) {
@@ -772,11 +761,14 @@ const setupServerSentEventsForLivereload = ({
     }
   }
 
-  return { projectFileRequestedCallback, trackMainAndDependencies }
+  return {
+    projectFileRequestedCallback,
+    trackMainAndDependencies,
+  }
 }
 
 const createSSEForLivereloadService = ({
-  cancellationToken,
+  compileServerOperation,
   outDirectoryRelativeUrl,
   trackMainAndDependencies,
 }) => {
@@ -810,17 +802,18 @@ const createSSEForLivereloadService = ({
       },
     })
 
-    const cancelRegistration = cancellationToken.register(() => {
-      cancelRegistration.unregister()
-
-      sseRoom.close()
-      stopTracking()
-    })
+    const removeSSECleanupCallback = compileServerOperation.cleaner.addCallback(
+      () => {
+        removeSSECleanupCallback()
+        sseRoom.close()
+        stopTracking()
+      },
+    )
     cache.push({
       mainFileRelativeUrl,
       sseRoom,
       cleanup: () => {
-        cancelRegistration.unregister()
+        removeSSECleanupCallback()
         sseRoom.close()
         stopTracking()
       },
@@ -945,6 +938,8 @@ const createOutJSONFiles = ({
   inlineImportMapIntoHTML,
   customCompilers,
   jsenvToolbarInjection,
+  sourcemapMethod,
+  sourcemapExcludeSources,
 }) => {
   const outJSONFiles = {}
   const outDirectoryUrl = resolveUrl(
@@ -968,6 +963,8 @@ const createOutJSONFiles = ({
     processEnvNodeEnv,
     customCompilerPatterns,
     jsenvToolbarInjection,
+    sourcemapMethod,
+    sourcemapExcludeSources,
   }
   outJSONFiles.meta = {
     url: metaOutFileUrl,
@@ -1113,51 +1110,6 @@ const createCompileProxyService = ({ projectDirectoryUrl }) => {
   }
 }
 
-const listenJsenvPackageVersionChange = ({
-  projectDirectoryUrl,
-  jsenvDirectoryRelativeUrl,
-  onJsenvPackageVersionChange = () => {},
-}) => {
-  const jsenvCoreDirectoryUrl = resolveUrl(
-    jsenvDirectoryRelativeUrl,
-    projectDirectoryUrl,
-  )
-  const packageFileUrl = resolveUrl("./package.json", jsenvCoreDirectoryUrl)
-  const packageFilePath = urlToFileSystemPath(packageFileUrl)
-  let packageVersion
-
-  try {
-    packageVersion = readPackage(packageFilePath).version
-  } catch (e) {
-    if (e.code === "ENOENT") return () => {}
-  }
-
-  const checkPackageVersion = () => {
-    let packageObject
-    try {
-      packageObject = readPackage(packageFilePath)
-    } catch (e) {
-      // package json deleted ? not a problem
-      // let's wait for it to show back
-      if (e.code === "ENOENT") return
-      // package.json malformed ? not a problem
-      // let's wait for use to fix it or filesystem to finish writing the file
-      if (e.name === "SyntaxError") return
-      throw e
-    }
-
-    if (packageVersion !== packageObject.version) {
-      onJsenvPackageVersionChange()
-    }
-  }
-
-  return registerFileLifecycle(packageFilePath, {
-    added: checkPackageVersion,
-    updated: checkPackageVersion,
-    keepProcessAlive: false,
-  })
-}
-
 const readPackage = (packagePath) => {
   const buffer = readFileSync(packagePath)
   const string = String(buffer)
@@ -1165,10 +1117,6 @@ const readPackage = (packagePath) => {
   return packageObject
 }
 
-export const STOP_REASON_PACKAGE_VERSION_CHANGED = {
-  toString: () => `package version changed`,
-}
-
 const __filenameReplacement = `import.meta.url.slice('file:///'.length)`
 
 const __dirnameReplacement = `import.meta.url.slice('file:///'.length).replace(/[\\\/\\\\][^\\\/\\\\]*$/, '')`

package/src/internal/executing/coverage/generateCoverageJsonFile.js

@@ -1,5 +1,22 @@
-import { writeFile } from "@jsenv/filesystem"
+import { writeFile, urlToFileSystemPath } from "@jsenv/filesystem"
 
-export const generateCoverageJsonFile = async (coverage, coverageJsonFileUrl) => {
-  await writeFile(coverageJsonFileUrl, JSON.stringify(coverage, null, "  "))
+import { byteAsFileSize } from "@jsenv/core/src/internal/logs/byteAsFileSize.js"
+
+export const generateCoverageJsonFile = async ({
+  coverage,
+  coverageJsonFileUrl,
+  coverageJsonFileLog,
+  logger,
+}) => {
+  const coverageAsText = JSON.stringify(coverage, null, "  ")
+
+  if (coverageJsonFileLog) {
+    logger.info(
+      `-> ${urlToFileSystemPath(coverageJsonFileUrl)} (${byteAsFileSize(
+        Buffer.byteLength(coverageAsText),
+      )})`,
+    )
+  }
+
+  await writeFile(coverageJsonFileUrl, coverageAsText)
 }

package/src/internal/executing/coverage/relativeUrlToEmptyCoverage.js

@@ -1,52 +1,41 @@
-import { createOperation } from "@jsenv/cancellation"
 import { resolveUrl, urlToFileSystemPath, readFile } from "@jsenv/filesystem"
 
+import { Abortable } from "@jsenv/core/src/abort/main.js"
 import {
   babelPluginsFromBabelPluginMap,
   getMinimalBabelPluginMap,
 } from "@jsenv/core/src/internal/compiling/babel_plugins.js"
-
 import { babelPluginInstrument } from "./babel_plugin_instrument.js"
 import { createEmptyCoverage } from "./createEmptyCoverage.js"
 
 export const relativeUrlToEmptyCoverage = async (
   relativeUrl,
-  { cancellationToken, projectDirectoryUrl, babelPluginMap },
+  { multipleExecutionsOperation, projectDirectoryUrl, babelPluginMap },
 ) => {
   const { transformAsync } = await import("@babel/core")
 
   const fileUrl = resolveUrl(relativeUrl, projectDirectoryUrl)
-  const source = await createOperation({
-    cancellationToken,
-    start: () => readFile(fileUrl),
-  })
+  Abortable.throwIfAborted(multipleExecutionsOperation)
+  const source = await readFile(fileUrl)
 
   try {
-    const { metadata } = await createOperation({
-      cancellationToken,
-      start: async () => {
-        babelPluginMap = {
-          ...getMinimalBabelPluginMap(),
-          ...babelPluginMap,
-          "transform-instrument": [
-            babelPluginInstrument,
-            { projectDirectoryUrl },
-          ],
-        }
+    babelPluginMap = {
+      ...getMinimalBabelPluginMap(),
+      ...babelPluginMap,
+      "transform-instrument": [babelPluginInstrument, { projectDirectoryUrl }],
+    }
 
-        const { metadata } = await transformAsync(source, {
-          filename: urlToFileSystemPath(fileUrl),
-          filenameRelative: relativeUrl,
-          configFile: false,
-          babelrc: false,
-          ast: true,
-          parserOpts: {
-            allowAwaitOutsideFunction: true,
-          },
-          plugins: babelPluginsFromBabelPluginMap(babelPluginMap),
-        })
-        return { metadata }
+    Abortable.throwIfAborted(multipleExecutionsOperation)
+    const { metadata } = await transformAsync(source, {
+      filename: urlToFileSystemPath(fileUrl),
+      filenameRelative: relativeUrl,
+      configFile: false,
+      babelrc: false,
+      ast: true,
+      parserOpts: {
+        allowAwaitOutsideFunction: true,
       },
+      plugins: babelPluginsFromBabelPluginMap(babelPluginMap),
     })
 
     const { coverage } = metadata

package/src/internal/executing/coverage/reportToCoverage.js

@@ -1,4 +1,5 @@
 import { collectFiles } from "@jsenv/filesystem"
+
 import { relativeUrlToEmptyCoverage } from "./relativeUrlToEmptyCoverage.js"
 import { istanbulCoverageFromCoverages } from "./istanbulCoverageFromCoverages.js"
 import { normalizeIstanbulCoverage } from "./normalizeIstanbulCoverage.js"
@@ -6,8 +7,8 @@ import { normalizeIstanbulCoverage } from "./normalizeIstanbulCoverage.js"
 export const reportToCoverage = async (
   report,
   {
+    multipleExecutionsOperation,
     logger,
-    cancellationToken,
     projectDirectoryUrl,
     babelPluginMap,
     coverageConfig,
@@ -15,50 +16,66 @@ export const reportToCoverage = async (
     coverageV8MergeConflictIsExpected,
   },
 ) => {
-  const istanbulCoverageFromExecution = await executionReportToCoverage(report, {
-    logger,
-    projectDirectoryUrl,
-    coverageV8MergeConflictIsExpected,
-  })
+  // here we should forward multipleExecutionsOperation.signal
+  // to allow aborting this too
+  const istanbulCoverageFromExecution = await executionReportToCoverage(
+    report,
+    {
+      logger,
+      projectDirectoryUrl,
+      coverageV8MergeConflictIsExpected,
+    },
+  )
 
   if (!coverageIncludeMissing) {
     return istanbulCoverageFromExecution
   }
 
   const relativeFileUrlToCoverArray = await listRelativeFileUrlToCover({
-    cancellationToken,
+    multipleExecutionsOperation,
     projectDirectoryUrl,
     coverageConfig,
   })
 
-  const relativeFileUrlMissingCoverageArray = relativeFileUrlToCoverArray.filter(
-    (relativeFileUrlToCover) =>
+  const relativeFileUrlMissingCoverageArray =
+    relativeFileUrlToCoverArray.filter((relativeFileUrlToCover) =>
       Object.keys(istanbulCoverageFromExecution).every((key) => {
         return key !== `./${relativeFileUrlToCover}`
       }),
-  )
+    )
 
   const istanbulCoverageFromMissedFiles = {}
+  // maybe we should prefer reduce over Promise.all here
+  // because it creates a LOT of things to do
   await Promise.all(
-    relativeFileUrlMissingCoverageArray.map(async (relativeFileUrlMissingCoverage) => {
-      const emptyCoverage = await relativeUrlToEmptyCoverage(relativeFileUrlMissingCoverage, {
-        cancellationToken,
-        projectDirectoryUrl,
-        babelPluginMap,
-      })
-      istanbulCoverageFromMissedFiles[relativeFileUrlMissingCoverage] = emptyCoverage
-      return emptyCoverage
-    }),
+    relativeFileUrlMissingCoverageArray.map(
+      async (relativeFileUrlMissingCoverage) => {
+        const emptyCoverage = await relativeUrlToEmptyCoverage(
+          relativeFileUrlMissingCoverage,
+          {
+            multipleExecutionsOperation,
+            projectDirectoryUrl,
+            babelPluginMap,
+          },
+        )
+        istanbulCoverageFromMissedFiles[relativeFileUrlMissingCoverage] =
+          emptyCoverage
+        return emptyCoverage
+      },
+    ),
   )
 
   return {
     ...istanbulCoverageFromExecution, // already normalized
-    ...normalizeIstanbulCoverage(istanbulCoverageFromMissedFiles, projectDirectoryUrl),
+    ...normalizeIstanbulCoverage(
+      istanbulCoverageFromMissedFiles,
+      projectDirectoryUrl,
+    ),
   }
 }
 
 const listRelativeFileUrlToCover = async ({
-  cancellationToken,
+  multipleExecutionsOperation,
   projectDirectoryUrl,
   coverageConfig,
 }) => {
@@ -67,7 +84,7 @@ const listRelativeFileUrlToCover = async ({
   }
 
   const matchingFileResultArray = await collectFiles({
-    cancellationToken,
+    signal: multipleExecutionsOperation.signal,
     directoryUrl: projectDirectoryUrl,
     structuredMetaMap: structuredMetaMapForCoverage,
     predicate: ({ cover }) => cover,
@@ -85,7 +102,8 @@ const executionReportToCoverage = async (
   Object.keys(report).forEach((file) => {
     const executionResultForFile = report[file]
     Object.keys(executionResultForFile).forEach((executionName) => {
-      const executionResultForFileOnRuntime = executionResultForFile[executionName]
+      const executionResultForFileOnRuntime =
+        executionResultForFile[executionName]
 
       const { status, coverage } = executionResultForFileOnRuntime
       if (!coverage) {
@@ -108,7 +126,9 @@ const executionReportToCoverage = async (
         // that were suppose to be coverage but were not.
 
         if (status === "completed") {
-          logger.warn(`No execution.coverage from execution named "${executionName}" of ${file}`)
+          logger.warn(
+            `No execution.coverage from execution named "${executionName}" of ${file}`,
+          )
         }
         return
       }