@jsenv/core 23.1.1 → 23.2.0

package/src/internal/building/buildUsingRollup.js

@@ -1,12 +1,14 @@
-import { createOperation } from "@jsenv/cancellation"
 import {
   urlToFileSystemPath,
   ensureEmptyDirectory,
   readFile,
   urlToRelativeUrl,
+  writeFile,
+  resolveUrl,
 } 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 {
@@ -17,7 +19,7 @@ import { createRuntimeCompat } from "@jsenv/core/src/internal/generateGroupMap/r
 import { createJsenvRollupPlugin } from "./createJsenvRollupPlugin.js"
 
 export const buildUsingRollup = async ({
-  cancellationToken,
+  buildOperation,
   logger,
 
   projectDirectoryUrl,
@@ -101,7 +103,7 @@ export const buildUsingRollup = async ({
     asOriginalUrl,
     asProjectUrl,
   } = await createJsenvRollupPlugin({
-    cancellationToken,
+    buildOperation,
     logger,
 
     projectDirectoryUrl,
@@ -109,9 +111,6 @@ export const buildUsingRollup = async ({
     compileServerOrigin,
     compileDirectoryRelativeUrl,
     buildDirectoryUrl,
-    assetManifestFile,
-    assetManifestFileRelativeUrl,
-    writeOnFileSystem,
 
     format,
     systemJsUrl,
@@ -142,7 +141,7 @@ export const buildUsingRollup = async ({
 
   try {
     await useRollup({
-      cancellationToken,
+      buildOperation,
       logger,
 
       jsenvRollupPlugin,
@@ -189,9 +188,41 @@ export const buildUsingRollup = async ({
     throw e
   }
 
-  const jsenvBuild = getResult()
+  const {
+    rollupBuild,
+    urlResponseBodyMap,
+    buildMappings,
+    buildManifest,
+    buildImportMap,
+    buildFileContents,
+    buildInlineFileContents,
+    buildStats,
+  } = getResult()
 
   if (writeOnFileSystem) {
+    if (buildDirectoryClean) {
+      await ensureEmptyDirectory(buildDirectoryUrl)
+    }
+
+    if (assetManifestFile) {
+      const assetManifestFileUrl = resolveUrl(
+        assetManifestFileRelativeUrl,
+        buildDirectoryUrl,
+      )
+      await writeFile(
+        assetManifestFileUrl,
+        JSON.stringify(buildManifest, null, "  "),
+      )
+    }
+
+    const buildRelativeUrls = Object.keys(buildFileContents)
+    await Promise.all(
+      buildRelativeUrls.map(async (buildRelativeUrl) => {
+        const fileBuildUrl = resolveUrl(buildRelativeUrl, buildDirectoryUrl)
+        await writeFile(fileBuildUrl, buildFileContents[buildRelativeUrl])
+      }),
+    )
+
     await Promise.all(
       Object.keys(serviceWorkers).map(
         async (serviceWorkerProjectRelativeUrl) => {
@@ -203,7 +234,9 @@ export const buildUsingRollup = async ({
             serviceWorkerProjectRelativeUrl,
             serviceWorkerBuildRelativeUrl,
             serviceWorkerTransformer: (code) =>
-              serviceWorkerFinalizer(code, jsenvBuild, {
+              serviceWorkerFinalizer(code, {
+                buildManifest,
+                rollupBuild,
                 lineBreakNormalization,
               }),
 
@@ -214,11 +247,20 @@ export const buildUsingRollup = async ({
     )
   }
 
-  return jsenvBuild
+  return {
+    rollupBuild,
+    urlResponseBodyMap,
+    buildMappings,
+    buildManifest,
+    buildImportMap,
+    buildFileContents,
+    buildInlineFileContents,
+    buildStats,
+  }
 }
 
 const useRollup = async ({
-  cancellationToken,
+  buildOperation,
   logger,
   jsenvRollupPlugin,
   format,
@@ -228,9 +270,9 @@ const useRollup = async ({
   preserveEntrySignatures,
   // jsConcatenation,
   buildDirectoryUrl,
-  buildDirectoryClean,
   asOriginalUrl,
 }) => {
+  Abortable.throwIfAborted(buildOperation)
   const { rollup } = await import("rollup")
   const { importAssertions } = await import("acorn-import-assertions")
 
@@ -308,19 +350,13 @@ const useRollup = async ({
       : {}),
   }
 
-  const rollupReturnValue = await createOperation({
-    cancellationToken,
-    start: () => rollup(rollupInputOptions),
-  })
+  Abortable.throwIfAborted(buildOperation)
+  const rollupReturnValue = await rollup(rollupInputOptions)
 
-  if (buildDirectoryClean) {
-    await ensureEmptyDirectory(buildDirectoryUrl)
-  }
-
-  const rollupOutputArray = await createOperation({
-    cancellationToken,
-    start: () => rollupReturnValue.generate(rollupOutputOptions),
-  })
+  Abortable.throwIfAborted(buildOperation)
+  const rollupOutputArray = await rollupReturnValue.generate(
+    rollupOutputOptions,
+  )
 
   return rollupOutputArray
 }

package/src/internal/building/createJsenvRollupPlugin.js

@@ -9,7 +9,6 @@ import {
   resolveUrl,
   urlToRelativeUrl,
   resolveDirectoryUrl,
-  writeFile,
   comparePathnames,
   urlIsInsideOf,
   normalizeStructuredMetaMap,
@@ -17,6 +16,7 @@ import {
 } from "@jsenv/filesystem"
 import { createWorkersForJavaScriptModules } from "@jsenv/workers"
 
+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"
@@ -50,7 +50,7 @@ import { injectSourcemapInRollupBuild } from "./rollup_build_sourcemap.js"
 import { createBuildStats } from "./build_stats.js"
 
 export const createJsenvRollupPlugin = async ({
-  cancellationToken,
+  buildOperation,
   logger,
 
   projectDirectoryUrl,
@@ -58,9 +58,6 @@ export const createJsenvRollupPlugin = async ({
   compileServerOrigin,
   compileDirectoryRelativeUrl,
   buildDirectoryUrl,
-  assetManifestFile,
-  assetManifestFileRelativeUrl,
-  writeOnFileSystem,
 
   urlMappings,
   importResolutionMethod,
@@ -755,11 +752,17 @@ export const createJsenvRollupPlugin = async ({
       }
 
       let url = asServerUrl(rollupUrl)
-      const loadResult = await urlLoader.loadUrl(rollupUrl, {
-        cancellationToken,
-        logger,
-        ressourceBuilder,
-      })
+
+      const loadResult = await Abortable.asyncCallback(
+        buildOperation,
+        (signal) => {
+          return urlLoader.loadUrl(rollupUrl, {
+            signal,
+            logger,
+            ressourceBuilder,
+          })
+        },
+      )
 
       url = loadResult.url
       const code = loadResult.code
@@ -1266,27 +1269,6 @@ export const createJsenvRollupPlugin = async ({
         buildDuration,
       })
 
-      if (assetManifestFile) {
-        const assetManifestFileUrl = resolveUrl(
-          assetManifestFileRelativeUrl,
-          buildDirectoryUrl,
-        )
-        await writeFile(
-          assetManifestFileUrl,
-          JSON.stringify(buildManifest, null, "  "),
-        )
-      }
-
-      if (writeOnFileSystem) {
-        const buildRelativeUrls = Object.keys(buildFileContents)
-        await Promise.all(
-          buildRelativeUrls.map(async (buildRelativeUrl) => {
-            const fileBuildUrl = resolveUrl(buildRelativeUrl, buildDirectoryUrl)
-            await writeFile(fileBuildUrl, buildFileContents[buildRelativeUrl])
-          }),
-        )
-      }
-
       logger.info(
         formatBuildDoneInfo({
           buildStats,

package/src/internal/building/ressource_builder.js

@@ -9,7 +9,7 @@ import {
 import { createLogger } from "@jsenv/logger"
 
 import { setJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
-import { promiseTrackRace } from "../promise_track_race.js"
+import { racePromises } from "../promise_race.js"
 import { parseDataUrl } from "../dataUrl.utils.js"
 
 import {
@@ -400,11 +400,8 @@ export const createRessourceBuilder = (
         //    and this asset builder fetching to avoid fetching twice.
         //    This scenario would be reproduced for every js module preloaded
         const { usedPromise, rollupBuildDonePromise } = ressource
-        const { winner } = await promiseTrackRace([
-          usedPromise,
-          rollupBuildDonePromise,
-        ])
-        if (winner === rollupBuildDonePromise) {
+        const winner = await racePromises([usedPromise, rollupBuildDonePromise])
+        if (winner.promise === rollupBuildDonePromise) {
           return
         }
       }

package/src/internal/building/sourcemap_loader.js

@@ -1,6 +1,5 @@
-import { createCancellationToken } from "@jsenv/cancellation"
 import { resolveUrl } from "@jsenv/filesystem"
-import { createLogger, createDetailedMessage } from "@jsenv/logger"
+import { createDetailedMessage } from "@jsenv/logger"
 
 import {
   dataUrlToRawData,
@@ -10,8 +9,8 @@ import { fetchUrl } from "@jsenv/core/src/internal/fetchUrl.js"
 import { validateResponse } from "@jsenv/core/src/internal/response_validation.js"
 
 export const loadSourcemap = async ({
-  cancellationToken = createCancellationToken(),
-  logger = createLogger(),
+  signal,
+  logger,
 
   code,
   url,
@@ -33,7 +32,7 @@ export const loadSourcemap = async ({
   }
 
   const sourcemapResponse = await fetchUrl(sourcemapUrl, {
-    cancellationToken,
+    signal,
     ignoreHttpsError: true,
   })
   const { isValid, details } = await validateResponse(sourcemapResponse, {

package/src/internal/building/url_fetcher.js

@@ -13,14 +13,11 @@ export const createUrlFetcher = ({
 }) => {
   const urlRedirectionMap = {}
 
-  const fetchUrl = async (
-    url,
-    { cancellationToken, urlTrace, contentTypeExpected },
-  ) => {
+  const fetchUrl = async (url, { signal, urlTrace, contentTypeExpected }) => {
     const urlToFetch = applyUrlMappings(url)
 
     const response = await jsenvFetchUrl(urlToFetch, {
-      cancellationToken,
+      signal,
       ignoreHttpsError: true,
     })
     const responseUrl = response.url

package/src/internal/building/url_loader.js

@@ -21,10 +21,7 @@ export const createUrlLoader = ({
 }) => {
   const urlResponseBodyMap = {}
 
-  const loadUrl = async (
-    rollupUrl,
-    { cancellationToken, logger, ressourceBuilder },
-  ) => {
+  const loadUrl = async (rollupUrl, { signal, logger, ressourceBuilder }) => {
     let url = asServerUrl(rollupUrl)
     const { importType, urlWithoutImportType } = extractImportTypeFromUrl(url)
 
@@ -133,7 +130,7 @@ export const createUrlLoader = ({
     }
 
     const response = await urlFetcher.fetchUrl(url, {
-      cancellationToken,
+      signal,
       contentTypeExpected: [
         "application/javascript",
         ...(allowJson ? ["application/json"] : []),
@@ -154,7 +151,7 @@ export const createUrlLoader = ({
       const jsText = await response.text()
       saveUrlResponseBody(response.url, jsText)
       const map = await loadSourcemap({
-        cancellationToken,
+        signal,
         logger,
 
         url,

package/src/internal/compiling/compileFile.js

@@ -1,16 +1,15 @@
-import { convertFileSystemErrorToResponseProperties } from "@jsenv/server"
 import {
   urlToRelativeUrl,
   fileSystemPathToUrl,
   resolveUrl,
   bufferToEtag,
 } from "@jsenv/filesystem"
+import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js"
 
 import { getOrGenerateCompiledFile } from "./compile-directory/getOrGenerateCompiledFile.js"
 import { updateMeta } from "./compile-directory/updateMeta.js"
 
 export const compileFile = async ({
-  // cancellatioToken,
   logger,
 
   projectDirectoryUrl,

package/src/internal/compiling/createCompiledFileService.js

@@ -1,4 +1,4 @@
-import { serveFile } from "@jsenv/server"
+import { serveFile, nextService } from "@jsenv/server"
 import {
   resolveUrl,
   resolveDirectoryUrl,
@@ -31,8 +31,7 @@ const jsenvCompilers = {
 }
 
 export const createCompiledFileService = ({
-  sourceFileService,
-  cancellationToken,
+  compileServerOperation,
   logger,
 
   projectDirectoryUrl,
@@ -51,6 +50,7 @@ export const createCompiledFileService = ({
   projectFileRequestedCallback,
   useFilesystemAsCache,
   compileCacheStrategy,
+  sourcemapMethod,
   sourcemapExcludeSources,
 }) => {
   Object.keys(customCompilers).forEach((key) => {
@@ -80,7 +80,7 @@ export const createCompiledFileService = ({
 
     // not inside compile directory -> nothing to compile
     if (!requestCompileInfo.insideCompileDirectory) {
-      return sourceFileService(request)
+      return null
     }
 
     const { compileId, afterCompileId } = requestCompileInfo
@@ -110,7 +110,7 @@ export const createCompiledFileService = ({
 
     // nothing after compileId, we don't know what to compile (not supposed to happen)
     if (afterCompileId === "") {
-      return sourceFileService(request)
+      return null
     }
 
     const originalFileRelativeUrl = afterCompileId
@@ -132,7 +132,7 @@ export const createCompiledFileService = ({
     // we don't redirect otherwise it complexify ressource tracking
     // and url resolution
     if (!compiler) {
-      return sourceFileService({
+      return nextService({
         ...request,
         ressource: `/${originalFileRelativeUrl}`,
       })
@@ -140,7 +140,7 @@ export const createCompiledFileService = ({
 
     // compile this if needed
     const compileResponsePromise = compileFile({
-      cancellationToken,
+      compileServerOperation,
       logger,
 
       projectDirectoryUrl,
@@ -152,9 +152,9 @@ export const createCompiledFileService = ({
       compileCacheStrategy,
       projectFileRequestedCallback,
       request,
-      compile: ({ code, map }) => {
+      compile: ({ signal, code, map }) => {
         return compiler({
-          cancellationToken,
+          signal,
           logger,
 
           code,
@@ -175,7 +175,7 @@ export const createCompiledFileService = ({
             groupMap,
           }),
 
-          sourcemapMethod: "comment", // "inline" is also possible
+          sourcemapMethod,
           sourcemapExcludeSources,
           jsenvToolbarInjection,
         })

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