@jsenv/core 25.2.0 → 25.4.0

package/src/internal/compiling/createCompiledFileService.js

@@ -4,19 +4,14 @@ import {
   resolveDirectoryUrl,
   normalizeStructuredMetaMap,
   urlToMeta,
+  urlToRelativeUrl,
 } from "@jsenv/filesystem"
 
-import { createRuntimeCompat } from "@jsenv/core/src/internal/generateGroupMap/runtime_compat.js"
-import { shakeBabelPluginMap } from "@jsenv/core/src/internal/generateGroupMap/shake_babel_plugin_map.js"
+import { REDIRECTOR_BUILD_URL } from "@jsenv/core/dist/build_manifest.js"
 import { serverUrlToCompileInfo } from "@jsenv/core/src/internal/url_conversion.js"
-
 import { setUrlExtension } from "../url_utils.js"
-import {
-  COMPILE_ID_BUILD_GLOBAL,
-  COMPILE_ID_BUILD_GLOBAL_FILES,
-  COMPILE_ID_BUILD_COMMONJS,
-  COMPILE_ID_BUILD_COMMONJS_FILES,
-} from "../CONSTANTS.js"
+
+import { shakeBabelPluginMap } from "./jsenv_directory/compile_profile.js"
 import { compileFile } from "./compileFile.js"
 import { compileHtml } from "./jsenvCompilerForHtml.js"
 import { compileImportmap } from "./jsenvCompilerForImportmap.js"
@@ -39,20 +34,15 @@ export const createCompiledFileService = ({
 
   projectDirectoryUrl,
   jsenvDirectoryRelativeUrl,
-  outDirectoryRelativeUrl,
+  jsenvDirectory,
   jsenvRemoteDirectory,
 
-  runtimeSupport,
   babelPluginMap,
-  moduleOutFormat,
-  importMetaFormat,
   topLevelAwait,
   prependSystemJs,
-  groupMap,
   customCompilers,
   workerUrls,
   serviceWorkerUrls,
-  importMapInWebWorkers,
 
   jsenvEventSourceClientInjection,
   jsenvToolbarInjection,
@@ -62,17 +52,6 @@ export const createCompiledFileService = ({
   sourcemapMethod,
   sourcemapExcludeSources,
 }) => {
-  const compileIdModuleFormats = {}
-  Object.keys(groupMap).forEach((groupName) => {
-    compileIdModuleFormats[groupName] = canAvoidSystemJs({
-      runtimeSupport: groupMap[groupName].minRuntimeVersions,
-      workerUrls,
-      importMapInWebWorkers,
-    })
-      ? "esmodule"
-      : "systemjs"
-  })
-
   Object.keys(customCompilers).forEach((key) => {
     const value = customCompilers[key]
     if (typeof value !== "function") {
@@ -88,27 +67,26 @@ export const createCompiledFileService = ({
     },
     projectDirectoryUrl,
   )
-
   const importmapInfos = {}
-
+  const redirectorRelativeUrlForProject = urlToRelativeUrl(
+    REDIRECTOR_BUILD_URL,
+    projectDirectoryUrl,
+  )
   return async (request, { pushResponse, redirectRequest }) => {
     const { origin, ressource } = request
     const requestUrl = `${origin}${ressource}`
-
     const requestCompileInfo = serverUrlToCompileInfo(requestUrl, {
-      outDirectoryRelativeUrl,
       compileServerOrigin: origin,
+      jsenvDirectoryRelativeUrl,
     })
-
     // not inside compile directory -> nothing to compile
     if (!requestCompileInfo.insideCompileDirectory) {
       return null
     }
-
     const { compileId, afterCompileId } = requestCompileInfo
     // serve files inside /.jsenv/* directly without compilation
     // this is just to allow some files to be written inside outDirectory and read directly
-    // if asked by the client (such __compile_server_meta__.json)
+    // if asked by the client
     if (!compileId) {
       return fetchFileSystem(
         new URL(request.ressource.slice(1), projectDirectoryUrl),
@@ -118,29 +96,27 @@ export const createCompiledFileService = ({
         },
       )
     }
-
-    const allowedCompileIds = [
-      ...Object.keys(groupMap),
-      COMPILE_ID_BUILD_GLOBAL,
-      COMPILE_ID_BUILD_GLOBAL_FILES,
-      COMPILE_ID_BUILD_COMMONJS,
-      COMPILE_ID_BUILD_COMMONJS_FILES,
-    ]
-    if (!allowedCompileIds.includes(compileId)) {
+    const compileDirectory = jsenvDirectory.compileDirectories[compileId]
+    if (!compileDirectory) {
       return {
-        status: 400,
-        statusText: `compileId must be one of ${allowedCompileIds}, received ${compileId}`,
+        status: 307,
+        headers: {
+          location: `${
+            request.origin
+          }/${redirectorRelativeUrlForProject}?redirect=${encodeURIComponent(
+            afterCompileId,
+          )}`,
+        },
       }
     }
-
     // nothing after compileId, we don't know what to compile (not supposed to happen)
     if (afterCompileId === "") {
       return null
     }
-
+    const { compileProfile } = compileDirectory
     const originalFileRelativeUrl = afterCompileId
     const originalFileUrl = `${projectDirectoryUrl}${originalFileRelativeUrl}`
-    const compileDirectoryRelativeUrl = `${outDirectoryRelativeUrl}${compileId}/`
+    const compileDirectoryRelativeUrl = `${jsenvDirectoryRelativeUrl}${compileId}/`
     const compileDirectoryUrl = resolveDirectoryUrl(
       compileDirectoryRelativeUrl,
       projectDirectoryUrl,
@@ -181,24 +157,18 @@ export const createCompiledFileService = ({
           jsenvRemoteDirectory,
           compileServerOrigin: request.origin,
           jsenvDirectoryRelativeUrl,
-          outDirectoryRelativeUrl,
           url: originalFileUrl,
           compiledUrl: compiledFileUrl,
           request,
 
+          compileProfile,
           compileId,
           babelPluginMap: shakeBabelPluginMap({
             babelPluginMap,
-            missingFeatureNames: groupMap[compileId].missingFeatureNames,
+            compileProfile,
           }),
-          runtimeSupport,
           workerUrls,
           serviceWorkerUrls,
-          moduleOutFormat:
-            moduleOutFormat === undefined
-              ? compileIdModuleFormats[compileId]
-              : moduleOutFormat,
-          importMetaFormat,
           topLevelAwait,
           prependSystemJs,
 
@@ -217,25 +187,6 @@ export const createCompiledFileService = ({
   }
 }
 
-const canAvoidSystemJs = ({
-  runtimeSupport,
-  workerUrls,
-  importMapInWebWorkers,
-}) => {
-  const runtimeCompatMap = createRuntimeCompat({
-    featureNames: [
-      "module",
-      "importmap",
-      "import_assertion_type_json",
-      "import_assertion_type_css",
-      ...(workerUrls.length > 0 ? ["worker_type_module"] : []),
-      ...(importMapInWebWorkers ? ["worker_importmap"] : []),
-    ],
-    runtimeSupport,
-  })
-  return runtimeCompatMap.missingFeatureNames.length === 0
-}
-
 const getCompiler = ({ originalFileUrl, compileMeta }) => {
   // we remove eventual query param from the url
   // Without this a pattern like "**/*.js" would not match "file.js?t=1"

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

@@ -1,7 +1,6 @@
 // https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-core/src/tools/build-external-helpers.js
 // the list of possible helpers:
 // https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-helpers/src/helpers.js#L13
-import { fileSystemPathToUrl } from "@jsenv/filesystem"
 import { require } from "../../require.js"
 
 const babelHelperNameInsideJsenvCoreArray = [
@@ -113,13 +112,14 @@ export const babelHelperNameToImportSpecifier = (babelHelperName) => {
   return `${babelHelperAbstractScope}${babelHelperName}/${babelHelperName}.js`
 }
 
-export const filePathToBabelHelperName = (filePath) => {
-  const fileUrl = fileSystemPathToUrl(filePath)
-
+export const babelHelperNameFromUrl = (url) => {
+  if (!url.startsWith("file://")) {
+    return null
+  }
   const babelHelperPrefix = "core/helpers/babel/"
-  if (fileUrl.includes(babelHelperPrefix)) {
-    const afterBabelHelper = fileUrl.slice(
-      fileUrl.indexOf(babelHelperPrefix) + babelHelperPrefix.length,
+  if (url.includes(babelHelperPrefix)) {
+    const afterBabelHelper = url.slice(
+      url.indexOf(babelHelperPrefix) + babelHelperPrefix.length,
     )
     const babelHelperName = afterBabelHelper.slice(
       0,
@@ -127,11 +127,9 @@ export const filePathToBabelHelperName = (filePath) => {
     )
     return babelHelperName
   }
-
-  if (fileUrl.includes(babelHelperAbstractScope)) {
-    const afterBabelHelper = fileUrl.slice(
-      fileUrl.indexOf(babelHelperAbstractScope) +
-        babelHelperAbstractScope.length,
+  if (url.includes(babelHelperAbstractScope)) {
+    const afterBabelHelper = url.slice(
+      url.indexOf(babelHelperAbstractScope) + babelHelperAbstractScope.length,
     )
     const babelHelperName = afterBabelHelper.slice(
       0,
@@ -139,7 +137,6 @@ export const filePathToBabelHelperName = (filePath) => {
     )
     return babelHelperName
   }
-
   return null
 }
 

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

@@ -1,6 +1,8 @@
+import { fileSystemPathToUrl } from "@jsenv/filesystem"
+
 import { require } from "../../require.js"
 import {
-  filePathToBabelHelperName,
+  babelHelperNameFromUrl,
   babelHelperNameToImportSpecifier,
 } from "./babelHelper.js"
 
@@ -37,7 +39,7 @@ export const babelPluginBabelHelpersAsJsenvImports = (api) => {
         const babelHelperImportSpecifier =
           babelHelperNameToImportSpecifier(name)
 
-        if (filePathToBabelHelperName(filePath) === name) {
+        if (babelHelperNameFromUrl(fileSystemPathToUrl(filePath)) === name) {
           return undefined
         }
 

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

@@ -1,6 +1,20 @@
-import { urlToRelativeUrl } from "@jsenv/filesystem"
+import { urlToRelativeUrl, urlToFileSystemPath } from "@jsenv/filesystem"
 
-import { jsenvTransform } from "./jsenvTransform.js"
+import { require } from "@jsenv/core/src/internal/require.js"
+import { createParseError } from "@jsenv/core/src/internal/compiling/babel_parse_error.js"
+import { babelPluginTransformImportMeta } from "@jsenv/core/src/internal/compiling/babel_plugin_transform_import_meta.js"
+import {
+  getMinimalBabelPluginMap,
+  babelPluginsFromBabelPluginMap,
+} from "@jsenv/core/src/internal/compiling/babel_plugins.js"
+import { babelPluginProxyExternalImports } from "@jsenv/core/src/internal/compiling/babel_plugin_proxy_external_imports.js"
+import { babelPluginImportMetadata } from "@jsenv/core/src/internal/compiling/babel_plugin_import_metadata.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"
+import { babelPluginSystemJsPrepend } from "./babel_plugin_systemjs_prepend.js"
+import { babelHelperNameFromUrl } from "./babelHelper.js"
 
 export const transformJs = async ({
   projectDirectoryUrl,
@@ -17,6 +31,7 @@ export const transformJs = async ({
   sourcemapEnabled = true,
 
   map,
+  ast,
   code,
 }) => {
   if (typeof projectDirectoryUrl !== "string") {
@@ -40,29 +55,144 @@ export const transformJs = async ({
       `babelHelpersInjectionAsImport can be enabled only when "moduleOutFormat" is "esmodule"`,
     )
   }
+  const relativeUrl = url.startsWith(projectDirectoryUrl)
+    ? urlToRelativeUrl(url, projectDirectoryUrl)
+    : undefined
 
-  const transformResult = await jsenvTransform({
-    url,
-    relativeUrl: url.startsWith(projectDirectoryUrl)
-      ? urlToRelativeUrl(url, projectDirectoryUrl)
-      : undefined,
-    projectDirectoryUrl,
-    jsenvRemoteDirectory,
+  const inputPath = computeInputPath(url)
+  // https://babeljs.io/docs/en/options
+  const options = {
+    filename: inputPath,
+    filenameRelative: relativeUrl,
+    inputSourceMap: map,
+    configFile: false,
+    babelrc: false, // trust only these options, do not read any babelrc config file
+    ast: true,
+    sourceMaps: sourcemapEnabled,
+    sourceFileName: inputPath,
+    // https://babeljs.io/docs/en/options#parseropts
+    parserOpts: {
+      allowAwaitOutsideFunction:
+        topLevelAwait === undefined ||
+        topLevelAwait === "return" ||
+        topLevelAwait === "simple" ||
+        topLevelAwait === "ignore",
+    },
+    generatorOpts: {
+      compact: false,
+    },
+  }
+  const babelHelperName = babelHelperNameFromUrl(url)
+  // to prevent typeof circular dependency
+  if (babelHelperName === "typeof") {
+    const babelPluginMapWithoutTransformTypeOf = { ...babelPluginMap }
+    delete babelPluginMapWithoutTransformTypeOf["transform-typeof-symbol"]
+    babelPluginMap = babelPluginMapWithoutTransformTypeOf
+  }
+  if (transformGenerator) {
+    babelPluginMap = {
+      ...babelPluginMap,
+      "regenerator-runtime-as-jsenv-import": [
+        babelPluginRegeneratorRuntimeAsJsenvImport,
+      ],
+    }
+  }
+  babelPluginMap = {
+    ...getMinimalBabelPluginMap(),
+    "transform-import-meta": [
+      babelPluginTransformImportMeta,
+      {
+        importMetaFormat,
+      },
+    ],
+    ...babelPluginMap,
+    ...(babelHelpersInjectionAsImport
+      ? {
+          "babel-helpers-as-jsenv-imports": [
+            babelPluginBabelHelpersAsJsenvImports,
+          ],
+        }
+      : {}),
+    ...(jsenvRemoteDirectory
+      ? {
+          "proxy-external-imports": [
+            babelPluginProxyExternalImports,
+            { jsenvRemoteDirectory },
+          ],
+        }
+      : {}),
+    "import-metadata": [babelPluginImportMetadata],
+  }
+  if (moduleOutFormat === "systemjs") {
+    const transformModulesSystemJs = require("@babel/plugin-transform-modules-systemjs")
+    const proposalDynamicImport = require("@babel/plugin-proposal-dynamic-import")
+    babelPluginMap = {
+      ...babelPluginMap,
+      "proposal-dynamic-import": [proposalDynamicImport],
+      "transform-modules-systemjs": [transformModulesSystemJs],
+    }
+  }
+  if (prependSystemJs) {
+    babelPluginMap = {
+      ...babelPluginMap,
+      "systemjs-prepend": [babelPluginSystemJsPrepend],
+    }
+  }
+
+  const asyncToPromise = babelPluginMap["transform-async-to-promises"]
+  if (topLevelAwait && asyncToPromise) {
+    asyncToPromise.options.topLevelAwait = topLevelAwait
+  }
+  const babelTransformReturnValue = await babelTransform({
+    ast,
     code,
-    map,
+    options: {
+      ...options,
+      plugins: babelPluginsFromBabelPluginMap(babelPluginMap),
+    },
+  })
+  code = babelTransformReturnValue.code
+  map = babelTransformReturnValue.map
+  ast = babelTransformReturnValue.ast
+  const { metadata } = babelTransformReturnValue
+  return { code, map, metadata, ast }
+}
+
+const computeInputPath = (url) => {
+  if (url.startsWith("file://")) {
+    return urlToFileSystemPath(url)
+  }
+  return url
+}
 
-    babelPluginMap,
-    moduleOutFormat,
-    importMetaFormat,
+const babelTransform = async ({ ast, code, options }) => {
+  const { transformAsync, transformFromAstAsync } = await import("@babel/core")
 
-    babelHelpersInjectionAsImport,
-    prependSystemJs,
-    topLevelAwait,
-    transformGenerator,
-    sourcemapEnabled,
-  })
-  code = transformResult.code
-  map = transformResult.map
-  const { metadata } = transformResult
-  return { code, map, metadata }
+  try {
+    if (ast) {
+      const result = await transformFromAstAsync(ast, code, options)
+      return result
+    }
+    return await transformAsync(code, options)
+  } catch (error) {
+    if (error && error.code === "BABEL_PARSE_ERROR") {
+      const message = error.message
+      const messageWithoutAnsi = message.replace(ansiRegex, "")
+      throw createParseError({
+        cause: error,
+        message: messageWithoutAnsi,
+        messageHTML: ansiToHTML(message),
+        filename: options.filename,
+        lineNumber: error.loc.line,
+        columnNumber: error.loc.column,
+      })
+    }
+    throw error
+  }
 }
+
+const pattern = [
+  "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
+  "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))",
+].join("|")
+const ansiRegex = new RegExp(pattern, "g")