@jsenv/core 24.6.1 → 24.6.5

package/src/internal/building/rollup_plugin_jsenv.js

@@ -17,6 +17,7 @@ import {
 } from "@jsenv/filesystem"
 import { UNICODE } from "@jsenv/log"
 
+import { transformJs } from "@jsenv/core/src/internal/compiling/js-compilation-service/transformJs.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"
@@ -48,7 +49,7 @@ import { getDefaultImportMap } from "../import-resolution/importmap-default.js"
 import { injectSourcemapInRollupBuild } from "./rollup_build_sourcemap.js"
 import { createBuildStats } from "./build_stats.js"
 
-export const createJsenvRollupPlugin = async ({
+export const createRollupPlugins = async ({
   buildOperation,
   logger,
 
@@ -72,7 +73,6 @@ export const createJsenvRollupPlugin = async ({
   format,
   systemJsUrl,
   babelPluginMap,
-  transformTopLevelAwait,
   node,
   importAssertionsSupport,
 
@@ -239,8 +239,40 @@ export const createJsenvRollupPlugin = async ({
   let minifyJs
   let minifyHtml
 
-  const jsenvRollupPlugin = {}
-
+  const rollupPlugins = []
+  // When format is systemjs, rollup add async/await
+  // that might be unsupported by the runtime.
+  // in that case we have to transform the rollup output
+  if (babelPluginMap["transform-async-to-promises"] && format === "systemjs") {
+    rollupPlugins.push({
+      name: "jsenv_fix_async_await",
+      async renderChunk(code, chunk) {
+        let map = chunk.map
+        const result = await transformJs({
+          code,
+          url: chunk.facadeModuleId
+            ? asOriginalUrl(chunk.facadeModuleId)
+            : resolveUrl(chunk.fileName, buildDirectoryUrl),
+          projectDirectoryUrl,
+          babelPluginMap: {
+            "transform-async-to-promises":
+              babelPluginMap["transform-async-to-promises"],
+          },
+          // pass undefined when format is "systemjs" to avoid
+          // re-wrapping the code in systemjs format
+          moduleOutFormat: undefined,
+          babelHelpersInjectionAsImport: false,
+          transformGenerator: false,
+        })
+        code = result.code
+        map = result.map
+        return {
+          code,
+          map,
+        }
+      },
+    })
+  }
   if (minify) {
     const methodHooks = {
       minifyJs: async (...args) => {
@@ -271,27 +303,29 @@ export const createJsenvRollupPlugin = async ({
       return methodHooks.minifyHtml(html, minifyHtmlOptions)
     }
 
-    jsenvRollupPlugin.renderChunk = async (code, chunk) => {
-      let map = chunk.map
-      const result = await minifyJs({
-        url: chunk.facadeModuleId
-          ? asOriginalUrl(chunk.facadeModuleId)
-          : resolveUrl(chunk.fileName, buildDirectoryUrl),
-        code,
-        map,
-        ...(format === "global" ? { toplevel: false } : { toplevel: true }),
-      })
+    rollupPlugins.push({
+      name: "jsenv_minifier",
+      async renderChunk(code, chunk) {
+        let map = chunk.map
+        const result = await minifyJs({
+          url: chunk.facadeModuleId
+            ? asOriginalUrl(chunk.facadeModuleId)
+            : resolveUrl(chunk.fileName, buildDirectoryUrl),
+          code,
+          map,
+          ...(format === "global" ? { toplevel: false } : { toplevel: true }),
+        })
 
-      code = result.code
-      map = result.map
-      return {
-        code,
-        map,
-      }
-    }
+        code = result.code
+        map = result.map
+        return {
+          code,
+          map,
+        }
+      },
+    })
   }
-
-  Object.assign(jsenvRollupPlugin, {
+  rollupPlugins.unshift({
     name: "jsenv",
 
     async buildStart() {
@@ -1105,8 +1139,8 @@ export const createJsenvRollupPlugin = async ({
 
     async generateBundle(outputOptions, rollupResult) {
       const jsChunks = {}
-      // rollupResult can be mutated by late asset emission
-      // howeverl late chunk (js module) emission is not possible
+      // To keep in mind: rollupResult object can be mutated by late asset emission
+      // however late chunk (js module) emission is not possible
       // as rollup rightfully prevent late js emission
       Object.keys(rollupResult).forEach((fileName) => {
         const file = rollupResult[fileName]
@@ -1137,10 +1171,6 @@ export const createJsenvRollupPlugin = async ({
           jsChunks[fileName] = fileCopy
         }
       })
-      await ensureTopLevelAwaitTranspilationIfNeeded({
-        format,
-        transformTopLevelAwait,
-      })
 
       const jsModuleBuild = {}
       Object.keys(jsChunks).forEach((fileName) => {
@@ -1152,10 +1182,12 @@ export const createJsenvRollupPlugin = async ({
           !file.isEntry
 
         if (file.url in inlineModuleScripts && format === "systemjs") {
-          const magicString = new MagicString(file.code)
+          const code = file.code
+          const systemRegisterIndex = code.indexOf("System.register([")
+          const magicString = new MagicString(code)
           magicString.overwrite(
-            0,
-            "System.register([".length,
+            systemRegisterIndex,
+            systemRegisterIndex + "System.register([".length,
             `System.register("${fileName}", [`,
           )
           file.code = magicString.toString()
@@ -1366,7 +1398,7 @@ export const createJsenvRollupPlugin = async ({
   }
 
   return {
-    jsenvRollupPlugin,
+    rollupPlugins,
     getLastErrorMessage: () => lastErrorMessage,
     getResult: () => {
       return {
@@ -1386,26 +1418,6 @@ export const createJsenvRollupPlugin = async ({
   }
 }
 
-const ensureTopLevelAwaitTranspilationIfNeeded = async ({
-  format,
-  transformTopLevelAwait,
-}) => {
-  if (!transformTopLevelAwait) {
-    return
-  }
-
-  if (format === "esmodule") {
-    // transform-async-to-promises won't be able to transform top level await
-    // for "esmodule", so it would be useless
-    return
-  }
-
-  if (format === "systemjs") {
-    // top level await is an async function for systemjs
-    return
-  }
-}
-
 const prepareEntryPoints = async (
   entryPointMap,
   {

package/src/internal/building/url_loader.js

@@ -119,6 +119,9 @@ export const createUrlLoader = ({
         projectDirectoryUrl,
         babelPluginMap,
         // moduleOutFormat: format // we are compiling for rollup output must be "esmodule"
+        // we compile for rollup, let top level await untouched
+        // it will be converted, if needed, during "renderChunk" hook
+        topLevelAwait: "ignore",
       })
       let code = transformResult.code
       let map = transformResult.map

package/src/internal/compiling/createCompiledFileService.js

@@ -41,10 +41,10 @@ export const createCompiledFileService = ({
   outDirectoryRelativeUrl,
 
   runtimeSupport,
-  transformTopLevelAwait,
+  babelPluginMap,
   moduleOutFormat,
   importMetaFormat,
-  babelPluginMap,
+  topLevelAwait,
   groupMap,
   customCompilers,
 
@@ -185,16 +185,16 @@ export const createCompiledFileService = ({
           request,
 
           runtimeSupport,
+          babelPluginMap: babelPluginMapFromCompileId(compileId, {
+            babelPluginMap,
+            groupMap,
+          }),
           moduleOutFormat:
             moduleOutFormat === undefined
               ? compileIdModuleFormats[compileId]
               : moduleOutFormat,
           importMetaFormat,
-          transformTopLevelAwait,
-          babelPluginMap: babelPluginMapFromCompileId(compileId, {
-            babelPluginMap,
-            groupMap,
-          }),
+          topLevelAwait,
 
           sourcemapMethod,
           sourcemapExcludeSources,

package/src/internal/compiling/js-compilation-service/jsenvTransform.js

@@ -5,11 +5,9 @@ import { babelPluginTransformImportMeta } from "@jsenv/core/src/internal/babel_p
 import {
   getMinimalBabelPluginMap,
   babelPluginsFromBabelPluginMap,
-  extractSyntaxBabelPluginMap,
 } from "@jsenv/core/src/internal/compiling/babel_plugins.js"
 import { babelPluginImportMetadata } from "@jsenv/core/src/internal/compiling/babel_plugin_import_metadata.js"
 
-import { findAsyncPluginNameInBabelPluginMap } from "./findAsyncPluginNameInBabelPluginMap.js"
 import { ansiToHTML } from "./ansiToHTML.js"
 import { babelPluginRegeneratorRuntimeAsJsenvImport } from "./babel_plugin_regenerator_runtime_as_jsenv_import.js"
 import { babelPluginBabelHelpersAsJsenvImports } from "./babel_plugin_babel_helpers_as_jsenv_imports.js"
@@ -25,10 +23,9 @@ export const jsenvTransform = async ({
   babelPluginMap,
   moduleOutFormat,
   importMetaFormat = moduleOutFormat,
+  topLevelAwait,
 
   babelHelpersInjectionAsImport,
-  allowTopLevelAwait,
-  transformTopLevelAwait,
   transformGenerator,
   regeneratorRuntimeImportPath,
   sourcemapEnabled,
@@ -50,7 +47,11 @@ export const jsenvTransform = async ({
     sourceFileName: inputPath,
     // https://babeljs.io/docs/en/options#parseropts
     parserOpts: {
-      allowAwaitOutsideFunction: allowTopLevelAwait,
+      allowAwaitOutsideFunction:
+        topLevelAwait === undefined ||
+        topLevelAwait === "return" ||
+        topLevelAwait === "simple" ||
+        topLevelAwait === "ignore",
     },
     generatorOpts: {
       compact: false,
@@ -147,56 +148,9 @@ export const jsenvTransform = async ({
     "import-metadata": [babelPluginImportMetadata],
   }
 
-  const asyncPluginName = findAsyncPluginNameInBabelPluginMap(babelPluginMap)
-
-  if (
-    moduleOutFormat === "systemjs" &&
-    transformTopLevelAwait &&
-    asyncPluginName
-  ) {
-    const babelPluginMapWithoutAsync = {
-      ...babelPluginMap,
-      "proposal-dynamic-import": [proposalDynamicImport],
-      "transform-modules-systemjs": [transformModulesSystemJs],
-    }
-    delete babelPluginMapWithoutAsync[asyncPluginName]
-
-    // put body inside something like (async () => {})()
-    const result = await babelTransform({
-      ast,
-      code,
-      options: {
-        ...options,
-        plugins: babelPluginsFromBabelPluginMap(babelPluginMapWithoutAsync),
-      },
-    })
-
-    // we need to retranspile the await keywords now wrapped
-    // inside Systemjs function.
-    // They are ignored, at least by transform-async-to-promises
-    // see https://github.com/rpetrich/babel-plugin-transform-async-to-promises/issues/26
-    const { babelSyntaxPluginMap } = extractSyntaxBabelPluginMap(babelPluginMap)
-    const finalResult = await babelTransform({
-      // ast: result.ast,
-      code: result.code,
-      options: {
-        ...options,
-        // about inputSourceMap see
-        // https://github.com/babel/babel/blob/eac4c5bc17133c2857f2c94c1a6a8643e3b547a7/packages/babel-core/src/transformation/file/generate.js#L57
-        // https://github.com/babel/babel/blob/090c364a90fe73d36a30707fc612ce037bdbbb24/packages/babel-core/src/transformation/file/merge-map.js#L6s
-        inputSourceMap: result.map,
-        plugins: babelPluginsFromBabelPluginMap({
-          ...babelSyntaxPluginMap,
-          [asyncPluginName]: babelPluginMap[asyncPluginName],
-        }),
-      },
-    })
-
-    return {
-      ...result,
-      ...finalResult,
-      metadata: { ...result.metadata, ...finalResult.metadata },
-    }
+  const asyncToPromise = babelPluginMap["transform-async-to-promises"]
+  if (topLevelAwait && asyncToPromise) {
+    asyncToPromise.options.topLevelAwait = topLevelAwait
   }
 
   const babelTransformReturnValue = await babelTransform({

package/src/internal/compiling/js-compilation-service/transformJs.js

@@ -11,9 +11,8 @@ export const transformJs = async ({
   babelPluginMap,
   moduleOutFormat = "esmodule",
   importMetaFormat = moduleOutFormat,
-  babelHelpersInjectionAsImport = true,
-  allowTopLevelAwait = true,
-  transformTopLevelAwait = true,
+  babelHelpersInjectionAsImport = moduleOutFormat === "esmodule",
+  topLevelAwait,
   transformGenerator = true,
   sourcemapEnabled = true,
 }) => {
@@ -33,6 +32,11 @@ export const transformJs = async ({
   if (typeof url !== "string") {
     throw new TypeError(`url must be a string, got ${url}`)
   }
+  if (babelHelpersInjectionAsImport && moduleOutFormat !== "esmodule") {
+    throw new Error(
+      `babelHelpersInjectionAsImport can be enabled only when "moduleOutFormat" is "esmodule"`,
+    )
+  }
 
   const transformResult = await jsenvTransform({
     code,
@@ -47,8 +51,7 @@ export const transformJs = async ({
     importMetaFormat,
 
     babelHelpersInjectionAsImport,
-    allowTopLevelAwait,
-    transformTopLevelAwait,
+    topLevelAwait,
     transformGenerator,
     sourcemapEnabled,
   })

package/src/internal/compiling/jsenvCompilerForHtml.js

@@ -42,10 +42,10 @@ export const compileHtml = async ({
   outDirectoryRelativeUrl,
   compileId,
 
-  transformTopLevelAwait,
+  babelPluginMap,
   moduleOutFormat,
   importMetaFormat,
-  babelPluginMap,
+  topLevelAwait,
 
   sourcemapMethod,
 
@@ -284,10 +284,10 @@ export const compileHtml = async ({
           compiledUrl: scriptCompiledFileUrl,
           projectDirectoryUrl,
 
-          transformTopLevelAwait,
+          babelPluginMap,
           moduleOutFormat,
           importMetaFormat,
-          babelPluginMap,
+          topLevelAwait,
         })
       } catch (e) {
         // If there is a syntax error in inline script

package/src/internal/compiling/jsenvCompilerForJavaScript.js

@@ -9,9 +9,9 @@ export const compileJavascript = async ({
   projectDirectoryUrl,
 
   babelPluginMap,
-  transformTopLevelAwait,
   moduleOutFormat,
   importMetaFormat,
+  topLevelAwait,
 
   sourcemapExcludeSources,
   sourcemapMethod,
@@ -24,9 +24,9 @@ export const compileJavascript = async ({
     projectDirectoryUrl,
 
     babelPluginMap,
-    transformTopLevelAwait,
     moduleOutFormat,
     importMetaFormat,
+    topLevelAwait,
   })
 
   return transformResultToCompilationResult(

package/src/internal/compiling/startCompileServer.js

@@ -82,9 +82,9 @@ export const startCompileServer = async ({
   projectFileCacheStrategy = "mtime",
 
   // js compile options
-  transformTopLevelAwait = true,
   moduleOutFormat,
   importMetaFormat,
+  topLevelAwait,
   env = {},
   processEnvNodeEnv = process.env.NODE_ENV,
   replaceProcessEnvNodeEnv = true,
@@ -310,7 +310,7 @@ export const startCompileServer = async ({
       importDefaultExtension,
 
       runtimeSupport,
-      transformTopLevelAwait,
+      topLevelAwait,
       groupMap: compileServerGroupMap,
       babelPluginMap,
       customCompilers,

package/src/internal/compiling/js-compilation-service/findAsyncPluginNameInBabelPluginMap.js

@@ -1,9 +0,0 @@
-export const findAsyncPluginNameInBabelPluginMap = (babelPluginMap) => {
-  if ("transform-async-to-promises" in babelPluginMap) {
-    return "transform-async-to-promises"
-  }
-  if ("transform-async-to-generator" in babelPluginMap) {
-    return "transform-async-to-generator"
-  }
-  return ""
-}