@jsenv/core 27.0.0-alpha.0 → 27.0.0-alpha.11

package/src/dev/start_dev_server.js

@@ -23,11 +23,12 @@ export const startDevServer = async ({
   certificate,
   privateKey,
   keepProcessAlive = true,
-
   rootDirectoryUrl,
-  plugins = [],
 
+  injectedGlobals,
+  plugins = [],
   sourcemaps = "inline",
+
   autoreload = true,
   autoreloadPatterns = {
     "./**": true,
@@ -58,7 +59,9 @@ export const startDevServer = async ({
     urlGraph,
     plugins: [
       ...plugins,
-      ...getCorePlugins(),
+      ...getCorePlugins({
+        injectedGlobals,
+      }),
       ...(autoreload
         ? [
             jsenvPluginAutoreload({

package/src/execute/execute.js

@@ -26,6 +26,7 @@ export const execute = async ({
   runtime,
   runtimeParams,
 
+  injectedGlobals,
   plugins = [],
   scenario = "dev",
   sourcemaps = "inline",
@@ -65,7 +66,12 @@ export const execute = async ({
       logger,
       rootDirectoryUrl,
       urlGraph,
-      plugins: [...plugins, ...getCorePlugins()],
+      plugins: [
+        ...plugins,
+        ...getCorePlugins({
+          injectedGlobals,
+        }),
+      ],
       scenario,
       sourcemaps,
     })

package/src/omega/core_plugins/babel/{babel_helper → helpers}/babel_plugin_babel_helpers_as_jsenv_imports.js

@@ -1,11 +1,10 @@
 import { pathToFileURL } from "node:url"
 
 import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
-
 import {
   getBabelHelperFileUrl,
   babelHelperNameFromUrl,
-} from "./babel_helper_directory.js"
+} from "@jsenv/babel-plugins/main.js"
 
 // named import approach found here:
 // https://github.com/rollup/rollup-plugin-babel/blob/18e4232a450f320f44c651aa8c495f21c74d59ac/src/helperPlugin.js#L1

package/src/omega/core_plugins/babel/helpers/babel_plugin_structure.js

@@ -1,10 +1,6 @@
-import { createRequire } from "node:module"
-
-import { getBabelHelperFileUrl } from "../babel_helper/babel_helper_directory.js"
+import { getBabelHelperFileUrl, requireBabelPlugin } from "@jsenv/babel-plugins"
 import { babelPluginCompatMap } from "./babel_plugins_compatibility.js"
 
-const require = createRequire(import.meta.url)
-
 export const getBaseBabelPluginStructure = ({
   url,
   isSupportedOnRuntime,
@@ -14,37 +10,32 @@ export const getBaseBabelPluginStructure = ({
   isJsModule,
 }) => {
   const isBabelPluginNeeded = (babelPluginName) => {
-    return !isSupportedOnRuntime(
-      babelPluginName,
-      babelPluginCompatMap[babelPluginName],
-    )
+    return !isSupportedOnRuntime(babelPluginCompatMap[babelPluginName])
   }
 
   const babelPluginStructure = {}
   if (isBabelPluginNeeded("proposal-numeric-separator")) {
-    babelPluginStructure[
-      "proposal-numeric-separator"
-    ] = require("@babel/plugin-proposal-numeric-separator")
+    babelPluginStructure["proposal-numeric-separator"] = requireBabelPlugin(
+      "@babel/plugin-proposal-numeric-separator",
+    )
   }
   if (isBabelPluginNeeded("proposal-json-strings")) {
-    babelPluginStructure[
-      "proposal-json-strings"
-    ] = require("@babel/plugin-proposal-json-strings")
+    babelPluginStructure["proposal-json-strings"] = requireBabelPlugin(
+      "@babel/plugin-proposal-json-strings",
+    )
   }
   if (isBabelPluginNeeded("proposal-object-rest-spread")) {
-    babelPluginStructure[
-      "proposal-object-rest-spread"
-    ] = require("@babel/plugin-proposal-object-rest-spread")
+    babelPluginStructure["proposal-object-rest-spread"] = requireBabelPlugin(
+      "@babel/plugin-proposal-object-rest-spread",
+    )
   }
   if (isBabelPluginNeeded("proposal-optional-catch-binding")) {
-    babelPluginStructure[
-      "proposal-optional-catch-binding"
-    ] = require("@babel/plugin-proposal-optional-catch-binding")
+    babelPluginStructure["proposal-optional-catch-binding"] =
+      requireBabelPlugin("@babel/plugin-proposal-optional-catch-binding")
   }
   if (isBabelPluginNeeded("proposal-unicode-property-regex")) {
-    babelPluginStructure[
-      "proposal-unicode-property-regex"
-    ] = require("@babel/plugin-proposal-unicode-property-regex")
+    babelPluginStructure["proposal-unicode-property-regex"] =
+      requireBabelPlugin("@babel/plugin-proposal-unicode-property-regex")
   }
   if (
     isJsModule &&
@@ -52,94 +43,92 @@ export const getBaseBabelPluginStructure = ({
     !isSupportedOnRuntime("top_level_await")
   ) {
     babelPluginStructure["transform-async-to-promises"] = [
-      require("babel-plugin-transform-async-to-promises"),
+      requireBabelPlugin("babel-plugin-transform-async-to-promises"),
       {
         topLevelAwait,
       },
     ]
   } else if (isBabelPluginNeeded("transform-async-to-promises")) {
-    babelPluginStructure[
-      "transform-async-to-promises"
-    ] = require("babel-plugin-transform-async-to-promises")
+    babelPluginStructure["transform-async-to-promises"] = requireBabelPlugin(
+      "babel-plugin-transform-async-to-promises",
+    )
   }
   if (isBabelPluginNeeded("transform-arrow-functions")) {
-    babelPluginStructure[
-      "transform-arrow-functions"
-    ] = require("@babel/plugin-transform-arrow-functions")
+    babelPluginStructure["transform-arrow-functions"] = requireBabelPlugin(
+      "@babel/plugin-transform-arrow-functions",
+    )
   }
   if (isBabelPluginNeeded("transform-block-scoped-functions")) {
-    babelPluginStructure[
-      "transform-block-scoped-functions"
-    ] = require("@babel/plugin-transform-block-scoped-functions")
+    babelPluginStructure["transform-block-scoped-functions"] =
+      requireBabelPlugin("@babel/plugin-transform-block-scoped-functions")
   }
   if (isBabelPluginNeeded("transform-block-scoping")) {
-    babelPluginStructure[
-      "transform-block-scoping"
-    ] = require("@babel/plugin-transform-block-scoping")
+    babelPluginStructure["transform-block-scoping"] = requireBabelPlugin(
+      "@babel/plugin-transform-block-scoping",
+    )
   }
   if (isBabelPluginNeeded("transform-classes")) {
-    babelPluginStructure[
-      "transform-classes"
-    ] = require("@babel/plugin-transform-classes")
+    babelPluginStructure["transform-classes"] = requireBabelPlugin(
+      "@babel/plugin-transform-classes",
+    )
   }
   if (isBabelPluginNeeded("transform-computed-properties")) {
-    babelPluginStructure[
-      "transform-computed-properties"
-    ] = require("@babel/plugin-transform-computed-properties")
+    babelPluginStructure["transform-computed-properties"] = requireBabelPlugin(
+      "@babel/plugin-transform-computed-properties",
+    )
   }
   if (isBabelPluginNeeded("transform-destructuring")) {
-    babelPluginStructure[
-      "transform-destructuring"
-    ] = require("@babel/plugin-transform-destructuring")
+    babelPluginStructure["transform-destructuring"] = requireBabelPlugin(
+      "@babel/plugin-transform-destructuring",
+    )
   }
   if (isBabelPluginNeeded("transform-dotall-regex")) {
-    babelPluginStructure[
-      "transform-dotall-regex"
-    ] = require("@babel/plugin-transform-dotall-regex")
+    babelPluginStructure["transform-dotall-regex"] = requireBabelPlugin(
+      "@babel/plugin-transform-dotall-regex",
+    )
   }
   if (isBabelPluginNeeded("transform-duplicate-keys")) {
-    babelPluginStructure[
-      "transform-duplicate-keys"
-    ] = require("@babel/plugin-transform-duplicate-keys")
+    babelPluginStructure["transform-duplicate-keys"] = requireBabelPlugin(
+      "@babel/plugin-transform-duplicate-keys",
+    )
   }
   if (isBabelPluginNeeded("transform-exponentiation-operator")) {
-    babelPluginStructure[
-      "transform-exponentiation-operator"
-    ] = require("@babel/plugin-transform-exponentiation-operator")
+    babelPluginStructure["transform-exponentiation-operator"] =
+      requireBabelPlugin("@babel/plugin-transform-exponentiation-operator")
   }
   if (isBabelPluginNeeded("transform-for-of")) {
-    babelPluginStructure[
-      "transform-for-of"
-    ] = require("@babel/plugin-transform-for-of")
+    babelPluginStructure["transform-for-of"] = requireBabelPlugin(
+      "@babel/plugin-transform-for-of",
+    )
   }
   if (isBabelPluginNeeded("transform-function-name")) {
-    babelPluginStructure[
-      "transform-function-name"
-    ] = require("@babel/plugin-transform-function-name")
+    babelPluginStructure["transform-function-name"] = requireBabelPlugin(
+      "@babel/plugin-transform-function-name",
+    )
   }
   if (isBabelPluginNeeded("transform-literals")) {
-    babelPluginStructure[
-      "transform-literals"
-    ] = require("@babel/plugin-transform-literals")
+    babelPluginStructure["transform-literals"] = requireBabelPlugin(
+      "@babel/plugin-transform-literals",
+    )
   }
   if (isBabelPluginNeeded("transform-new-target")) {
-    babelPluginStructure[
-      "transform-new-target"
-    ] = require("@babel/plugin-transform-new-target")
+    babelPluginStructure["transform-new-target"] = requireBabelPlugin(
+      "@babel/plugin-transform-new-target",
+    )
   }
   if (isBabelPluginNeeded("transform-object-super")) {
-    babelPluginStructure[
-      "transform-object-super"
-    ] = require("@babel/plugin-transform-object-super")
+    babelPluginStructure["transform-object-super"] = requireBabelPlugin(
+      "@babel/plugin-transform-object-super",
+    )
   }
   if (isBabelPluginNeeded("transform-parameters")) {
-    babelPluginStructure[
-      "transform-parameters"
-    ] = require("@babel/plugin-transform-parameters")
+    babelPluginStructure["transform-parameters"] = requireBabelPlugin(
+      "@babel/plugin-transform-parameters",
+    )
   }
   if (isBabelPluginNeeded("transform-regenerator")) {
     babelPluginStructure["transform-regenerator"] = [
-      require("@babel/plugin-transform-regenerator"),
+      requireBabelPlugin("@babel/plugin-transform-regenerator"),
       {
         asyncGenerators: true,
         generators: true,
@@ -149,22 +138,22 @@ export const getBaseBabelPluginStructure = ({
   }
   if (isBabelPluginNeeded("transform-shorthand-properties")) {
     babelPluginStructure["transform-shorthand-properties"] = [
-      require("@babel/plugin-transform-shorthand-properties"),
+      requireBabelPlugin("@babel/plugin-transform-shorthand-properties"),
     ]
   }
   if (isBabelPluginNeeded("transform-spread")) {
     babelPluginStructure["transform-spread"] = [
-      require("@babel/plugin-transform-spread"),
+      requireBabelPlugin("@babel/plugin-transform-spread"),
     ]
   }
   if (isBabelPluginNeeded("transform-sticky-regex")) {
     babelPluginStructure["transform-sticky-regex"] = [
-      require("@babel/plugin-transform-sticky-regex"),
+      requireBabelPlugin("@babel/plugin-transform-sticky-regex"),
     ]
   }
   if (isBabelPluginNeeded("transform-template-literals")) {
     babelPluginStructure["transform-template-literals"] = [
-      require("@babel/plugin-transform-template-literals"),
+      requireBabelPlugin("@babel/plugin-transform-template-literals"),
     ]
   }
   if (
@@ -175,12 +164,12 @@ export const getBaseBabelPluginStructure = ({
     url !== getBabelHelperFileUrl("typeof")
   ) {
     babelPluginStructure["transform-typeof-symbol"] = [
-      require("@babel/plugin-transform-typeof-symbol"),
+      requireBabelPlugin("@babel/plugin-transform-typeof-symbol"),
     ]
   }
   if (isBabelPluginNeeded("transform-unicode-regex")) {
     babelPluginStructure["transform-unicode-regex"] = [
-      require("@babel/plugin-transform-unicode-regex"),
+      requireBabelPlugin("@babel/plugin-transform-unicode-regex"),
     ]
   }
   return babelPluginStructure

package/src/omega/core_plugins/babel/jsenv_plugin_babel.js

@@ -1,10 +1,11 @@
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
 
+import { RUNTIME_SUPPORT } from "@jsenv/core/src/omega/runtime_support/runtime_support.js"
 import { getBaseBabelPluginStructure } from "./helpers/babel_plugin_structure.js"
+import { babelPluginBabelHelpersAsJsenvImports } from "./helpers/babel_plugin_babel_helpers_as_jsenv_imports.js"
 import { babelPluginNewStylesheetAsJsenvImport } from "./new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js"
 import { babelPluginGlobalThisAsJsenvImport } from "./global_this/babel_plugin_global_this_as_jsenv_import.js"
 import { babelPluginRegeneratorRuntimeAsJsenvImport } from "./regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js"
-import { babelPluginBabelHelpersAsJsenvImports } from "./babel_helper/babel_plugin_babel_helpers_as_jsenv_imports.js"
 
 export const jsenvPluginBabel = ({
   getCustomBabelPlugins,
@@ -12,16 +13,29 @@ export const jsenvPluginBabel = ({
 } = {}) => {
   const transformWithBabel = async (urlInfo, context) => {
     const isJsModule = urlInfo.type === "js_module"
-    const isWorker =
-      urlInfo.subtype === "worker" || urlInfo.subtype === "service_worker"
-    const { isSupportedOnRuntime, referenceUtils } = context
+    const isWorker = urlInfo.subtype === "worker"
+    const isServiceWorker = urlInfo.subtype === "service_worker"
+    const isWorkerContext = isWorker || isServiceWorker
+    let { runtimeSupport } = context
+    if (isServiceWorker) {
+      // when code is executed by a service worker we can assume
+      // the execution context supports more than the default one
+      // for instance arrow function are supported
+      runtimeSupport = RUNTIME_SUPPORT.add(runtimeSupport, "service_worker")
+    }
+    if (isWorker) {
+      runtimeSupport = RUNTIME_SUPPORT.add(runtimeSupport, "worker")
+    }
+    const { referenceUtils } = context
+    const isSupportedOnRuntime = (feature) =>
+      RUNTIME_SUPPORT.isSupported(runtimeSupport, feature)
     const babelPluginStructure = getBaseBabelPluginStructure({
       url: urlInfo.url,
       isSupportedOnRuntime,
       topLevelAwait,
       usesTopLevelAwait: urlInfo.data.usesTopLevelAwait,
       isJsModule,
-      isWorker,
+      isWorkerContext,
     })
     if (getCustomBabelPlugins) {
       Object.assign(babelPluginStructure, getCustomBabelPlugins(context))

package/src/omega/core_plugins/html_supervisor/client/uneval_exception.js

@@ -1,4 +1,4 @@
-import { uneval } from "@jsenv/core/node_modules/@jsenv/uneval/index.js" // WHY?
+import { uneval } from "@jsenv/uneval"
 
 export const unevalException = (value) => {
   if (value && value.hasOwnProperty("toString")) {

package/src/omega/core_plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -24,7 +24,7 @@ import {
   removeHtmlNodeText,
   getHtmlNodeTextNode,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/core/packages/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
 
 export const jsenvPluginHtmlSupervisor = ({
   logs = false,

package/src/omega/core_plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -32,26 +32,36 @@ export const jsenvPluginImportMetaScenarios = () => {
         }
         if (scenario === "dev") {
           dev.forEach((path) => {
-            replace(path, true)
+            replace(path, "true")
           })
         } else if (scenario === "test") {
+          // test is also considered a dev environment
+          // just like the dev server can be used to debug test files
+          // without this people would have to write
+          // if (import.meta.dev || import.meta.test) or if (!import.meta.build)
+          dev.forEach((path) => {
+            replace(path, "true")
+          })
           test.forEach((path) => {
-            replace(path, true)
+            replace(path, "true")
           })
         } else if (scenario === "build") {
+          // replacing by undefined might not be required
+          // as I suppose rollup would consider them as undefined
+          // but let's make it explicit to ensure code is properly tree-shaked
           dev.forEach((path) => {
-            replace(path, undefined)
+            replace(path, "undefined")
           })
           test.forEach((path) => {
-            replace(path, undefined)
+            replace(path, "undefined")
           })
           build.forEach((path) => {
-            replace(path, true)
+            replace(path, "true")
           })
         }
         const magicSource = createMagicSource(content)
         replacements.forEach(({ path, value }) => {
-          magicSource.overwrite({
+          magicSource.replace({
             start: path.node.start,
             end: path.node.end,
             replacement: value,

package/src/omega/core_plugins/importmap/jsenv_plugin_importmap.js

@@ -35,7 +35,7 @@ import {
   getHtmlNodeTextNode,
   removeHtmlNode,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/core/packages/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
 
 export const jsenvPluginImportmap = () => {
   let finalImportmap = null

package/src/omega/core_plugins/inject_globals/jsenv_plugin_inject_globals.js

@@ -0,0 +1,27 @@
+import { createMagicSource } from "@jsenv/core/packages/utils/sourcemap/magic_source.js"
+
+export const jsenvPluginInjectGlobals = (globals = {}) => {
+  if (Object.keys(globals).length === 0) {
+    return []
+  }
+  const injectGlobals = (urlInfo) => {
+    const magicSource = createMagicSource(urlInfo.content)
+    const globalName =
+      urlInfo.subtype === "worker" || urlInfo.subtype === "service_worker"
+        ? "self"
+        : "window"
+    magicSource.prepend(
+      `Object.assign(${globalName}, ${JSON.stringify(globals, null, "  ")});`,
+    )
+    return magicSource.toContentAndSourcemap()
+  }
+
+  return {
+    name: "jsenv:inject_globals",
+    appliesDuring: "*",
+    transform: {
+      js_module: injectGlobals,
+      js_classic: injectGlobals,
+    },
+  }
+}

package/src/omega/core_plugins/inline/jsenv_plugin_js_and_css_inside_html.js

@@ -9,7 +9,7 @@ import {
   getHtmlNodeAttributeByName,
 } from "@jsenv/utils/html_ast/html_ast.js"
 import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
-import { generateInlineContentUrl } from "@jsenv/core/packages/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
 
 export const jsenvPluginJsAndCssInsideHtml = () => {
   return {

package/src/omega/core_plugins/inline/jsenv_plugin_new_inline_content.js

@@ -52,10 +52,7 @@ export const jsenvPluginNewInlineContent = ({ allowEscapeForVersioning }) => {
             columnEnd: inlineContentCall.columnEnd,
           })
           let { quote } = inlineContentCall
-          if (
-            quote === "`" &&
-            !isSupportedOnRuntime("transform-template-literals")
-          ) {
+          if (quote === "`" && !isSupportedOnRuntime("template_literals")) {
             // if quote is "`" and template literals are not supported
             // we'll use a regular string (single or double quote)
             // when rendering the string

package/src/omega/core_plugins.js

@@ -10,6 +10,7 @@ import { jsenvPluginHtmlSupervisor } from "./core_plugins/html_supervisor/jsenv_
 import { jsenvPluginCommonJsGlobals } from "./core_plugins/commonjs_globals/jsenv_plugin_commonjs_globals.js"
 import { jsenvPluginImportAssertions } from "./core_plugins/import_assertions/jsenv_plugin_import_assertions.js"
 import { jsenvPluginImportMetaScenarios } from "./core_plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js"
+import { jsenvPluginInjectGlobals } from "./core_plugins/inject_globals/jsenv_plugin_inject_globals.js"
 import { jsenvPluginBabel } from "./core_plugins/babel/jsenv_plugin_babel.js"
 
 export const getCorePlugins = ({
@@ -17,6 +18,7 @@ export const getCorePlugins = ({
   nodeEsmResolution,
   fileSystemMagicResolution,
   babel,
+  injectedGlobals,
 } = {}) => {
   const asFewAsPossible = false // useful during dev
   return [
@@ -27,6 +29,7 @@ export const getCorePlugins = ({
     jsenvPluginFileUrls(),
     jsenvPluginLeadingSlash(),
     jsenvPluginNodeEsmResolution(nodeEsmResolution), // before url resolution to handle "js_import_export" resolution
+    jsenvPluginInjectGlobals(injectedGlobals),
     jsenvPluginUrlResolution(),
     ...(asFewAsPossible
       ? []

package/src/omega/file_url_converter.js

@@ -1,59 +1,17 @@
 import { fileSystemPathToUrl, urlToFileSystemPath } from "@jsenv/filesystem"
 
 export const fileUrlConverter = {
-  asUrlWithoutSpecialParams: (fileUrl) => {
-    const urlObject = new URL(fileUrl)
-    let { origin, pathname, searchParams, hash } = urlObject
-    // origin is "null" for "file://" urls with Node.js
-    if (origin === "null" && urlObject.href.startsWith("file:")) {
-      origin = "file://"
-    }
-    if (searchParams.has("json_module")) {
-      searchParams.delete("json_module")
-      return `${origin}${pathname}.json_module${stringifyQuery(
-        searchParams,
-      )}${hash}`
-    }
-    if (searchParams.has("css_module")) {
-      searchParams.delete("css_module")
-      return `${origin}${pathname}.css_module${stringifyQuery(
-        searchParams,
-      )}${hash}`
-    }
-    if (searchParams.has("text_module")) {
-      searchParams.delete("text_module")
-      return `${origin}${pathname}.text_module${stringifyQuery(
-        searchParams,
-      )}${hash}`
-    }
-    return fileUrl
-  },
   asFilePath: (fileUrl) => {
-    const fileUrlWithoutSpecialParam =
-      fileUrlConverter.asUrlWithoutSpecialParams(fileUrl)
-    const filePath = urlToFileSystemPath(fileUrlWithoutSpecialParam)
-    return filePath
+    const filePath = urlToFileSystemPath(fileUrl)
+    const urlObject = new URL(fileUrl)
+    const { searchParams } = urlObject
+    return `${filePath}${stringifyQuery(searchParams)}`
   },
   asFileUrl: (filePath) => {
-    if (filePath.endsWith(".json_module")) {
-      const jsonFileUrl = fileSystemPathToUrl(
-        filePath.slice(0, -".json_module".length),
-      )
-      return `${jsonFileUrl}?json_module`
-    }
-    if (filePath.endsWith(".css_module")) {
-      const cssFileUrl = fileSystemPathToUrl(
-        filePath.slice(0, -".css_module".length),
-      )
-      return `${cssFileUrl}?css_module`
-    }
-    if (filePath.endsWith(".text_module")) {
-      const textFileUrl = fileSystemPathToUrl(
-        filePath.slice(0, -".text_module".length),
-      )
-      return `${textFileUrl}?text_module`
-    }
-    return fileSystemPathToUrl(filePath)
+    return decodeURIComponent(fileSystemPathToUrl(filePath)).replace(
+      /[=](?=&|$)/g,
+      "",
+    )
   },
 }
 

package/src/omega/kitchen.js

@@ -8,11 +8,10 @@ import {
 } from "@jsenv/filesystem"
 
 import { stringifyUrlSite } from "@jsenv/utils/urls/url_trace.js"
+import { setUrlExtension } from "@jsenv/utils/urls/url_utils.js"
 
 import { createUrlInfoTransformer } from "./url_graph/url_info_transformations.js"
-import { featuresCompatMap } from "./runtime_support/features_compatibility.js"
-import { isFeatureSupportedOnRuntimes } from "./runtime_support/runtime_support.js"
-import { fileUrlConverter } from "./file_url_converter.js"
+import { RUNTIME_SUPPORT } from "./runtime_support/runtime_support.js"
 import { parseUrlMentions } from "./url_mentions/parse_url_mentions.js"
 import {
   createResolveError,
@@ -185,14 +184,6 @@ export const createKitchen = ({
     },
   })
 
-  const isSupported = ({
-    runtimeSupport,
-    featureName,
-    featureCompat = featuresCompatMap[featureName],
-  }) => {
-    return isFeatureSupportedOnRuntimes(runtimeSupport, featureCompat)
-  }
-
   const load = async ({ reference, urlInfo, context }) => {
     try {
       const loadReturnValue = urlInfo.isInline
@@ -274,8 +265,8 @@ export const createKitchen = ({
       reference,
       outDirectoryUrl,
       runtimeSupport,
-      isSupportedOnRuntime: (featureName, featureCompat) => {
-        return isSupported({ runtimeSupport, featureName, featureCompat })
+      isSupportedOnRuntime: (feature) => {
+        return RUNTIME_SUPPORT.isSupported(runtimeSupport, feature)
       },
       cook: (params) => {
         return cookDuringCook({
@@ -453,6 +444,7 @@ export const createKitchen = ({
           type: urlMention.type,
           subtype: urlMention.subtype,
           specifier: urlMention.specifier,
+          data: urlMention.data,
         })
         urlMention.reference = reference
       }
@@ -585,7 +577,6 @@ export const createKitchen = ({
     urlInfoTransformer,
     rootDirectoryUrl,
     jsenvDirectoryUrl,
-    isSupported,
     createReference,
     resolveReference,
     cook,
@@ -659,8 +650,16 @@ const determineFileUrlForOutDirectory = ({
   if (!urlIsInsideOf(url, rootDirectoryUrl)) {
     url = `${rootDirectoryUrl}@fs/${url.slice(fileSystemRootUrl.length)}`
   }
+  const { searchParams } = new URL(url)
+  if (
+    searchParams.has("json_module") ||
+    searchParams.has("css_module") ||
+    searchParams.has("text_module")
+  ) {
+    url = setUrlExtension(url, ".js")
+  }
   return moveUrl({
-    url: fileUrlConverter.asUrlWithoutSpecialParams(url),
+    url,
     from: rootDirectoryUrl,
     to: outDirectoryUrl,
     preferAbsolute: true,