@jsenv/core 23.2.2 → 23.4.2

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,
@@ -71,7 +71,10 @@ export const createCompiledFileService = ({
 
   return (request) => {
     const { origin, ressource } = request
-    const requestUrl = `${origin}${ressource}`
+    // we use "ressourceToPathname" to remove eventual query param from the url
+    // Without this a pattern like "**/*.js" would not match "file.js?t=1"
+    // This would result in file not being compiled when they should
+    const requestUrl = `${origin}${ressourceToPathname(ressource)}`
 
     const requestCompileInfo = serverUrlToCompileInfo(requestUrl, {
       outDirectoryRelativeUrl,
@@ -88,10 +91,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 = [
@@ -273,3 +279,12 @@ const babelPluginMapFromCompileId = (
 
   return babelPluginMapForGroup
 }
+
+const ressourceToPathname = (ressource) => {
+  const searchSeparatorIndex = ressource.indexOf("?")
+  const pathname =
+    searchSeparatorIndex === -1
+      ? ressource
+      : ressource.slice(0, searchSeparatorIndex)
+  return pathname
+}

package/src/internal/compiling/startCompileServer.js

@@ -2,7 +2,7 @@ import { readFileSync } from "node:fs"
 import {
   jsenvAccessControlAllowedHeaders,
   startServer,
-  serveFile,
+  fetchFileSystem,
   createSSERoom,
   composeServicesWithTiming,
   urlToContentType,
@@ -23,13 +23,15 @@ import {
   urlIsInsideOf,
   urlToBasename,
 } from "@jsenv/filesystem"
+import {
+  createCallbackList,
+  createCallbackListNotifiedOnce,
+} from "@jsenv/abort"
 
-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"
 import { generateGroupMap } from "../generateGroupMap/generateGroupMap.js"
-import { createCallbackList } from "../createCallbackList.js"
 import {
   jsenvCompileProxyFileInfo,
   sourcemapMainFileInfo,
@@ -46,6 +48,7 @@ import { createTransformHtmlSourceFileService } from "./html_source_file_service
 
 export const startCompileServer = async ({
   signal = new AbortController().signal,
+  handleSIGINT,
   compileServerLogLevel,
 
   projectDirectoryUrl,
@@ -215,12 +218,12 @@ export const startCompileServer = async ({
     ...babelPluginMap,
   }
 
-  const compileServerOperation = Abortable.fromSignal(signal)
+  const serverStopCallbackList = createCallbackListNotifiedOnce()
 
   let projectFileRequestedCallback = () => {}
   if (livereloadSSE) {
     const sseSetup = setupServerSentEventsForLivereload({
-      compileServerOperation,
+      serverStopCallbackList,
       projectDirectoryUrl,
       jsenvDirectoryRelativeUrl,
       outDirectoryRelativeUrl,
@@ -230,7 +233,7 @@ export const startCompileServer = async ({
 
     projectFileRequestedCallback = sseSetup.projectFileRequestedCallback
     const serveSSEForLivereload = createSSEForLivereloadService({
-      compileServerOperation,
+      serverStopCallbackList,
       outDirectoryRelativeUrl,
       trackMainAndDependencies: sseSetup.trackMainAndDependencies,
     })
@@ -296,7 +299,6 @@ export const startCompileServer = async ({
       projectDirectoryUrl,
     }),
     "service:compiled file": createCompiledFileService({
-      compileServerOperation,
       logger,
 
       projectDirectoryUrl,
@@ -345,9 +347,9 @@ export const startCompileServer = async ({
   }
 
   const compileServer = await startServer({
-    signal: compileServerOperation.signal,
+    signal,
     stopOnExit: false,
-    stopOnSIGINT: false,
+    stopOnSIGINT: handleSIGINT,
     stopOnInternalError: false,
     sendServerInternalErrorDetails: true,
     keepProcessAlive,
@@ -380,9 +382,9 @@ export const startCompileServer = async ({
       ...customServices,
       ...jsenvServices,
     }),
-    onStop: () => {
+    onStop: (reason) => {
       onStop()
-      compileServerOperation.cleaner.clean()
+      serverStopCallbackList.notify(reason)
     },
   })
 
@@ -559,7 +561,7 @@ const compareValueJson = (left, right) => {
  *
  */
 const setupServerSentEventsForLivereload = ({
-  compileServerOperation,
+  serverStopCallbackList,
   projectDirectoryUrl,
   jsenvDirectoryRelativeUrl,
   outDirectoryRelativeUrl,
@@ -582,7 +584,7 @@ const setupServerSentEventsForLivereload = ({
       return
     }
 
-    projectFileRequested.notify(relativeUrl, request)
+    projectFileRequested.notify({ relativeUrl, request })
   }
   const watchDescription = {
     ...livereloadWatchConfig,
@@ -605,7 +607,7 @@ const setupServerSentEventsForLivereload = ({
       recursive: true,
     },
   )
-  compileServerOperation.cleaner.addCallback(unregisterDirectoryLifecyle)
+  serverStopCallbackList.add(unregisterDirectoryLifecyle)
 
   const getDependencySet = (mainRelativeUrl) => {
     if (trackerMap.has(mainRelativeUrl)) {
@@ -618,7 +620,7 @@ const setupServerSentEventsForLivereload = ({
   }
 
   // each time a file is requested for the first time its dependencySet is computed
-  projectFileRequested.register((mainRelativeUrl) => {
+  projectFileRequested.add(({ relativeUrl: mainRelativeUrl }) => {
     // for now no use case of livereloading on node.js
     // and for browsers only html file can be main files
     // this avoid collecting dependencies of non html files that will never be used
@@ -632,8 +634,8 @@ const setupServerSentEventsForLivereload = ({
     dependencySet.add(mainRelativeUrl)
     trackerMap.set(mainRelativeUrl, dependencySet)
 
-    const unregisterDependencyRequested = projectFileRequested.register(
-      (relativeUrl, request) => {
+    const removeDependencyRequestedCallback = projectFileRequested.add(
+      ({ relativeUrl, request }) => {
         if (dependencySet.has(relativeUrl)) {
           return
         }
@@ -656,10 +658,10 @@ const setupServerSentEventsForLivereload = ({
         dependencySet.add(relativeUrl)
       },
     )
-    const unregisterMainRemoved = projectFileRemoved.register((relativeUrl) => {
+    const removeMainRemovedCallback = projectFileRemoved.add((relativeUrl) => {
       if (relativeUrl === mainRelativeUrl) {
-        unregisterDependencyRequested()
-        unregisterMainRemoved()
+        removeDependencyRequestedCallback()
+        removeMainRemovedCallback()
         trackerMap.delete(mainRelativeUrl)
       }
     })
@@ -671,19 +673,19 @@ const setupServerSentEventsForLivereload = ({
   ) => {
     livereloadLogger.debug(`track ${mainRelativeUrl} and its dependencies`)
 
-    const unregisterModified = projectFileModified.register((relativeUrl) => {
+    const removeModifiedCallback = projectFileModified.add((relativeUrl) => {
       const dependencySet = getDependencySet(mainRelativeUrl)
       if (dependencySet.has(relativeUrl)) {
         modified(relativeUrl)
       }
     })
-    const unregisterRemoved = projectFileRemoved.register((relativeUrl) => {
+    const removeRemovedCallback = projectFileRemoved.add((relativeUrl) => {
       const dependencySet = getDependencySet(mainRelativeUrl)
       if (dependencySet.has(relativeUrl)) {
         removed(relativeUrl)
       }
     })
-    const unregisterAdded = projectFileAdded.register((relativeUrl) => {
+    const removeAddedCallback = projectFileAdded.add((relativeUrl) => {
       const dependencySet = getDependencySet(mainRelativeUrl)
       if (dependencySet.has(relativeUrl)) {
         added(relativeUrl)
@@ -694,9 +696,9 @@ const setupServerSentEventsForLivereload = ({
       livereloadLogger.debug(
         `stop tracking ${mainRelativeUrl} and its dependencies.`,
       )
-      unregisterModified()
-      unregisterRemoved()
-      unregisterAdded()
+      removeModifiedCallback()
+      removeRemovedCallback()
+      removeAddedCallback()
     }
   }
 
@@ -768,7 +770,7 @@ const setupServerSentEventsForLivereload = ({
 }
 
 const createSSEForLivereloadService = ({
-  compileServerOperation,
+  serverStopCallbackList,
   outDirectoryRelativeUrl,
   trackMainAndDependencies,
 }) => {
@@ -802,13 +804,11 @@ const createSSEForLivereloadService = ({
       },
     })
 
-    const removeSSECleanupCallback = compileServerOperation.cleaner.addCallback(
-      () => {
-        removeSSECleanupCallback()
-        sseRoom.close()
-        stopTracking()
-      },
-    )
+    const removeSSECleanupCallback = serverStopCallbackList.add(() => {
+      removeSSECleanupCallback()
+      sseRoom.close()
+      stopTracking()
+    })
     cache.push({
       mainFileRelativeUrl,
       sseRoom,
@@ -857,10 +857,13 @@ const createCompilationAssetFileService = ({ projectDirectoryUrl }) => {
     const { origin, ressource } = request
     const requestUrl = `${origin}${ressource}`
     if (urlIsCompilationAsset(requestUrl)) {
-      return serveFile(request, {
-        rootDirectoryUrl: projectDirectoryUrl,
-        etagEnabled: true,
-      })
+      return fetchFileSystem(
+        new URL(request.ressource.slice(1), projectDirectoryUrl),
+        {
+          headers: request.headers,
+          etagEnabled: true,
+        },
+      )
     }
     return null
   }
@@ -916,10 +919,13 @@ const createSourceFileService = ({
     const relativeUrl = ressource.slice(1)
     projectFileRequestedCallback(relativeUrl, request)
 
-    const responsePromise = serveFile(request, {
-      rootDirectoryUrl: projectDirectoryUrl,
-      etagEnabled: projectFileEtagEnabled,
-    })
+    const responsePromise = fetchFileSystem(
+      new URL(request.ressource.slice(1), projectDirectoryUrl),
+      {
+        headers: request.headers,
+        etagEnabled: projectFileEtagEnabled,
+      },
+    )
 
     return responsePromise
   }
@@ -1051,10 +1057,13 @@ const createOutFilesService = async ({
       if (!isOutRootFile(requestUrl)) {
         return null
       }
-      return serveFile(request, {
-        rootDirectoryUrl: projectDirectoryUrl,
-        etagEnabled: true,
-      })
+      return fetchFileSystem(
+        new URL(request.ressource.slice(1), projectDirectoryUrl),
+        {
+          headers: request.headers,
+          etagEnabled: true,
+        },
+      )
     }
   }
   // serve from memory

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

@@ -3,6 +3,7 @@ import {
   normalizeStructuredMetaMap,
   urlToMeta,
 } from "@jsenv/filesystem"
+
 import { require } from "../../require.js"
 
 // https://github.com/istanbuljs/babel-plugin-istanbul/blob/321740f7b25d803f881466ea819d870f7ed6a254/src/index.js