@jsenv/core 27.0.0-alpha.64 → 27.0.0-alpha.67

package/src/plugins/plugins.js

@@ -6,15 +6,17 @@ import { jsenvPluginNodeEsmResolution } from "./node_esm_resolution/jsenv_plugin
 import { jsenvPluginUrlVersion } from "./url_version/jsenv_plugin_url_version.js"
 import { jsenvPluginFileUrls } from "./file_urls/jsenv_plugin_file_urls.js"
 import { jsenvPluginHttpUrls } from "./http_urls/jsenv_plugin_http_urls.js"
-import { jsenvPluginFileSystemMagic } from "./filesystem_magic/jsenv_plugin_filesystem_magic.js"
 import { jsenvPluginInline } from "./inline/jsenv_plugin_inline.js"
 import { jsenvPluginHtmlSupervisor } from "./html_supervisor/jsenv_plugin_html_supervisor.js"
 import { jsenvPluginCommonJsGlobals } from "./commonjs_globals/jsenv_plugin_commonjs_globals.js"
 import { jsenvPluginImportMetaScenarios } from "./import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js"
 import { jsenvPluginInjectGlobals } from "./inject_globals/jsenv_plugin_inject_globals.js"
 import { jsenvPluginTranspilation } from "./transpilation/jsenv_plugin_transpilation.js"
+import { jsenvPluginNodeRuntime } from "./node_runtime/jsenv_plugin_node_runtime.js"
+// build only
 import { jsenvPluginBundling } from "./bundling/jsenv_plugin_bundling.js"
 import { jsenvPluginMinification } from "./minification/jsenv_plugin_minification.js"
+// autoreload
 import { jsenvPluginImportMetaHot } from "./import_meta_hot/jsenv_plugin_import_meta_hot.js"
 import { jsenvPluginAutoreload } from "./autoreload/jsenv_plugin_autoreload.js"
 import { jsenvPluginCacheControl } from "./cache_control/jsenv_plugin_cache_control.js"
@@ -23,10 +25,13 @@ export const getCorePlugins = ({
   rootDirectoryUrl,
   urlGraph,
   scenario,
+  runtimeCompat,
 
+  urlAnalysis = {},
   htmlSupervisor,
   nodeEsmResolution,
   fileSystemMagicResolution,
+  directoryReferenceAllowed,
   injectedGlobals,
   transpilation = true,
   minification = false,
@@ -43,42 +48,34 @@ export const getCorePlugins = ({
     nodeEsmResolution = {}
   }
   return [
-    jsenvPluginUrlAnalysis(),
-    jsenvPluginTranspilation({
-      rootDirectoryUrl,
-      ...transpilation,
-    }),
-    ...(htmlSupervisor
-      ? [
-          jsenvPluginHtmlSupervisor({
-            rootDirectoryUrl,
-            ...htmlSupervisor,
-          }),
-        ]
-      : []), // before inline as it turns inline <script> into <script src>
+    jsenvPluginUrlAnalysis({ rootDirectoryUrl, ...urlAnalysis }),
+    jsenvPluginTranspilation(transpilation),
+    ...(htmlSupervisor ? [jsenvPluginHtmlSupervisor(htmlSupervisor)] : []), // before inline as it turns inline <script> into <script src>
     jsenvPluginInline(), // before "file urls" to resolve and load inline urls
     jsenvPluginImportmap(), // before node esm to handle bare specifiers before node esm
-    jsenvPluginFileUrls(),
+    jsenvPluginFileUrls({
+      directoryReferenceAllowed,
+      ...fileSystemMagicResolution,
+    }),
     jsenvPluginHttpUrls(),
     jsenvPluginLeadingSlash(),
     // before url resolution to handle "js_import_export" resolution
     jsenvPluginNodeEsmResolution({
       rootDirectoryUrl,
+      runtimeCompat,
       ...nodeEsmResolution,
     }),
     jsenvPluginUrlResolution(),
-    jsenvPluginFileSystemMagic(fileSystemMagicResolution),
     jsenvPluginUrlVersion(),
     jsenvPluginInjectGlobals(injectedGlobals),
     jsenvPluginCommonJsGlobals(),
     jsenvPluginImportMetaScenarios(),
 
+    jsenvPluginNodeRuntime({ runtimeCompat }),
     jsenvPluginBundling(bundling),
     jsenvPluginMinification(minification),
 
-    jsenvPluginImportMetaHot({
-      rootDirectoryUrl,
-    }),
+    jsenvPluginImportMetaHot(),
     ...(clientAutoreload
       ? [
           jsenvPluginAutoreload({

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js

@@ -12,32 +12,25 @@
  */
 
 import { createRequire } from "node:module"
-import { readFileSync, urlToFilename, urlIsInsideOf } from "@jsenv/filesystem"
+import { readFileSync, urlToFilename } from "@jsenv/filesystem"
 
 import { requireBabelPlugin } from "@jsenv/babel-plugins"
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
 import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
-import { fetchOriginalUrlInfo } from "@jsenv/utils/graph/fetch_original_url_info.js"
 
-import { jsenvRootDirectoryUrl } from "@jsenv/core/src/jsenv_root_directory_url.js"
 import { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transform_import_meta_url.js"
-import { jsenvPluginAsJsClassicHtml } from "./jsenv_plugin_script_type_module_as_classic.js"
+import { jsenvPluginAsJsClassicHtml } from "./jsenv_plugin_as_js_classic_html.js"
 import { jsenvPluginAsJsClassicWorkers } from "./jsenv_plugin_as_js_classic_workers.js"
 
 const require = createRequire(import.meta.url)
 
-export const jsenvPluginAsJsClassic = ({
-  rootDirectoryUrl,
-  systemJsInjection,
-}) => {
-  const preferSourceFiles =
-    rootDirectoryUrl === jsenvRootDirectoryUrl ||
-    urlIsInsideOf(rootDirectoryUrl, jsenvRootDirectoryUrl)
-  const systemJsClientFileUrl = preferSourceFiles
-    ? new URL("./client/s.js", import.meta.url).href
-    : new URL("./dist/s.js", import.meta.url).href
+export const jsenvPluginAsJsClassic = ({ systemJsInjection }) => {
+  const systemJsClientFileUrl = new URL(
+    "./client/s.js?js_classic",
+    import.meta.url,
+  ).href
 
   return [
     jsenvPluginAsJsClassicConversion({
@@ -98,7 +91,7 @@ const jsenvPluginAsJsClassicConversion = ({
       },
     },
     fetchUrlContent: async (urlInfo, context) => {
-      const originalUrlInfo = await fetchOriginalUrlInfo({
+      const originalUrlInfo = await context.fetchOriginalUrlInfo({
         urlInfo,
         context,
         searchParam: "as_js_classic",
@@ -132,6 +125,8 @@ const jsenvPluginAsJsClassicConversion = ({
       })
       urlInfo.data.jsClassicFormat = jsClassicFormat
       return {
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
         type: "js_classic",
         contentType: "text/javascript",
         content,
@@ -198,18 +193,21 @@ const convertJsModuleToJsClassic = async ({
     ],
     urlInfo,
   })
+  let sourcemap = urlInfo.sourcemap
+  sourcemap = await composeTwoSourcemaps(sourcemap, map)
   if (systemJsInjection && jsClassicFormat === "system" && isJsEntryPoint) {
     const magicSource = createMagicSource(code)
     const systemjsCode = readFileSync(systemJsClientFileUrl, { as: "string" })
     magicSource.prepend(`${systemjsCode}\n\n`)
-    const { content, sourcemap } = magicSource.toContentAndSourcemap()
+    const magicResult = magicSource.toContentAndSourcemap()
+    sourcemap = await composeTwoSourcemaps(sourcemap, magicResult.sourcemap)
     return {
-      content,
-      sourcemap: await composeTwoSourcemaps(map, sourcemap),
+      content: magicResult.content,
+      sourcemap,
     }
   }
   return {
     content: code,
-    sourcemap: map,
+    sourcemap,
   }
 }

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -14,7 +14,6 @@ import { urlToFilename } from "@jsenv/filesystem"
 
 import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
 import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js"
-import { fetchOriginalUrlInfo } from "@jsenv/utils/graph/fetch_original_url_info.js"
 
 export const jsenvPluginImportAssertions = () => {
   const updateReference = (reference, searchParam) => {
@@ -89,7 +88,7 @@ const jsenvPluginAsModules = () => {
     name: `jsenv:as_json_module`,
     appliesDuring: "*",
     fetchUrlContent: async (urlInfo, context) => {
-      const originalUrlInfo = await fetchOriginalUrlInfo({
+      const originalUrlInfo = await context.fetchOriginalUrlInfo({
         urlInfo,
         context,
         searchParam: "as_json_module",
@@ -100,6 +99,8 @@ const jsenvPluginAsModules = () => {
       }
       const jsonText = JSON.stringify(originalUrlInfo.content.trim())
       return {
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
         type: "js_module",
         contentType: "text/javascript",
         // here we could `export default ${jsonText}`:
@@ -114,7 +115,7 @@ const jsenvPluginAsModules = () => {
     name: `jsenv:as_css_module`,
     appliesDuring: "*",
     fetchUrlContent: async (urlInfo, context) => {
-      const originalUrlInfo = await fetchOriginalUrlInfo({
+      const originalUrlInfo = await context.fetchOriginalUrlInfo({
         urlInfo,
         context,
         searchParam: "as_css_module",
@@ -130,6 +131,8 @@ const jsenvPluginAsModules = () => {
         canUseTemplateString: true,
       })
       return {
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
         type: "js_module",
         contentType: "text/javascript",
         content: `import { InlineContent } from ${JSON.stringify(
@@ -148,7 +151,7 @@ const jsenvPluginAsModules = () => {
     name: `jsenv:as_text_module`,
     appliesDuring: "*",
     fetchUrlContent: async (urlInfo, context) => {
-      const originalUrlInfo = await fetchOriginalUrlInfo({
+      const originalUrlInfo = await context.fetchOriginalUrlInfo({
         urlInfo,
         context,
         searchParam: "as_text_module",
@@ -164,6 +167,8 @@ const jsenvPluginAsModules = () => {
         canUseTemplateString: true,
       })
       return {
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
         type: "js_module",
         contentType: "text/javascript",
         content: `import { InlineContent } from ${JSON.stringify(

package/src/plugins/transpilation/jsenv_plugin_transpilation.js

@@ -14,7 +14,6 @@ import { jsenvPluginBabel } from "./babel/jsenv_plugin_babel.js"
 import { jsenvPluginTopLevelAwait } from "./jsenv_plugin_top_level_await.js"
 
 export const jsenvPluginTranspilation = ({
-  rootDirectoryUrl,
   importAssertions = true,
   css = true,
   jsModuleAsJsClassic = true,
@@ -37,7 +36,7 @@ export const jsenvPluginTranspilation = ({
     // so the build function will disable jsModuleAsJsClassic during build
     // and enable it manually during postbuild
     ...(jsModuleAsJsClassic
-      ? [jsenvPluginAsJsClassic({ rootDirectoryUrl, systemJsInjection })]
+      ? [jsenvPluginAsJsClassic({ systemJsInjection })]
       : []),
     // topLevelAwait must come after js_module_as_js_classic because it's related to the module format
     // so we want to wait to know the module format before transforming things related to top level await

package/src/plugins/url_analysis/css/css_urls.js

@@ -41,7 +41,7 @@ export const parseAndTransformCssUrls = async (urlInfo, context) => {
         },
       }),
     ],
-    url: urlInfo.data.rawUrl || urlInfo.url,
+    url: urlInfo.originalUrl,
     content: urlInfo.content,
   })
   await Promise.all(actions.map((action) => action()))

package/src/plugins/url_analysis/html/html_urls.js

@@ -8,7 +8,7 @@ import {
 import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.js"
 
 export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
-  const url = urlInfo.data.rawUrl || urlInfo.url
+  const url = urlInfo.originalUrl
   const content = urlInfo.content
   const { scenario, referenceUtils } = context
   const htmlAst = parseHtmlString(content, {
@@ -51,6 +51,9 @@ export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
       })
     },
   })
+  if (actions.length === 0) {
+    return null
+  }
   await Promise.all(actions.map((action) => action()))
   return {
     content: stringifyHtmlAst(htmlAst),

package/src/plugins/url_analysis/js/js_urls.js

@@ -5,7 +5,7 @@ import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
 export const parseAndTransformJsUrls = async (urlInfo, context) => {
   const jsMentions = await parseJsUrls({
     js: urlInfo.content,
-    url: (urlInfo.data && urlInfo.data.rawUrl) || urlInfo.url,
+    url: urlInfo.originalUrl,
     isJsModule: urlInfo.type === "js_module",
     isWebWorker: isWebWorkerUrlInfo(urlInfo),
   })
@@ -51,10 +51,11 @@ export const parseAndTransformJsUrls = async (urlInfo, context) => {
       typePropertyNode: jsMention.typePropertyNode,
     })
     actions.push(async () => {
+      const replacement = await referenceUtils.readGeneratedSpecifier(reference)
       magicSource.replace({
         start: jsMention.specifierStart,
         end: jsMention.specifierEnd,
-        replacement: await referenceUtils.readGeneratedSpecifier(reference),
+        replacement,
       })
       if (reference.mutation) {
         reference.mutation(magicSource)

package/src/plugins/url_analysis/jsenv_plugin_url_analysis.js

@@ -1,18 +1,111 @@
+import {
+  normalizeStructuredMetaMap,
+  urlToMeta,
+  urlToRelativeUrl,
+} from "@jsenv/filesystem"
+
 import { parseAndTransformHtmlUrls } from "./html/html_urls.js"
 import { parseAndTransformCssUrls } from "./css/css_urls.js"
 import { parseAndTransformJsUrls } from "./js/js_urls.js"
 import { parseAndTransformWebmanifestUrls } from "./webmanifest/webmanifest_urls.js"
 
-export const jsenvPluginUrlAnalysis = () => {
+export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
+  let getIncludeInfo = () => undefined
+  if (include) {
+    const includeMetaMap = normalizeStructuredMetaMap(
+      {
+        include,
+      },
+      rootDirectoryUrl,
+    )
+    getIncludeInfo = (url) => {
+      const meta = urlToMeta({
+        url,
+        structuredMetaMap: includeMetaMap,
+      })
+      return meta.include
+    }
+  }
+
   return {
     name: "jsenv:url_analysis",
     appliesDuring: "*",
+    redirectUrl: (reference) => {
+      if (
+        reference.specifier[0] === "#" &&
+        // For Html, css and in general "#" refer to a ressource in the page
+        // so that urls must be kept intact
+        // However for js import specifiers they have a different meaning and we want
+        // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
+        reference.type !== "js_import_export"
+      ) {
+        reference.shouldHandle = false
+        return
+      }
+      const includeInfo = getIncludeInfo(reference.url)
+      if (includeInfo === true) {
+        reference.shouldHandle = true
+        return
+      }
+      if (includeInfo === false) {
+        reference.shouldHandle = false
+        return
+      }
+      if (reference.url.startsWith("data:")) {
+        reference.shouldHandle = true
+        return
+      }
+      if (reference.url.startsWith("file:")) {
+        reference.shouldHandle = true
+        return
+      }
+    },
     transformUrlContent: {
       html: parseAndTransformHtmlUrls,
       css: parseAndTransformCssUrls,
       js_classic: parseAndTransformJsUrls,
       js_module: parseAndTransformJsUrls,
       webmanifest: parseAndTransformWebmanifestUrls,
+      directory: (urlInfo, context) => {
+        const originalDirectoryReference = findOriginalDirectoryReference(
+          urlInfo,
+          context,
+        )
+        const directoryRelativeUrl = urlToRelativeUrl(
+          urlInfo.url,
+          context.rootDirectoryUrl,
+        )
+        JSON.parse(urlInfo.content).forEach((directoryEntryName) => {
+          context.referenceUtils.found({
+            type: "filesystem",
+            subtype: "directory_entry",
+            specifier: directoryEntryName,
+            trace: `"${directoryRelativeUrl}${directoryEntryName}" entry in directory referenced by ${originalDirectoryReference.trace}`,
+          })
+        })
+      },
     },
   }
 }
+
+const findOriginalDirectoryReference = (urlInfo, context) => {
+  const findNonFileSystemAncestor = (urlInfo) => {
+    for (const dependentUrl of urlInfo.dependents) {
+      const dependentUrlInfo = context.urlGraph.getUrlInfo(dependentUrl)
+      if (dependentUrlInfo.type !== "directory") {
+        return [dependentUrlInfo, urlInfo]
+      }
+      const found = findNonFileSystemAncestor(dependentUrlInfo)
+      if (found) {
+        return found
+      }
+    }
+    return []
+  }
+  const [ancestor, child] = findNonFileSystemAncestor(urlInfo)
+  if (!ancestor) {
+    return null
+  }
+  const ref = ancestor.references.find((ref) => ref.url === child.url)
+  return ref
+}

package/src/plugins/url_analysis/webmanifest/webmanifest_urls.js

@@ -12,6 +12,9 @@ export const parseAndTransformWebmanifestUrls = async (urlInfo, context) => {
       icon.src = await context.referenceUtils.readGeneratedSpecifier(reference)
     })
   })
+  if (actions.length === 0) {
+    return null
+  }
   await Promise.all(actions.map((action) => action()))
   return JSON.stringify(manifest, null, "  ")
 }

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -1,8 +1,5 @@
 export const jsenvPluginUrlResolution = () => {
   const urlResolver = (reference) => {
-    if (reference.specifier[0] === "#") {
-      reference.external = true
-    }
     return new URL(
       reference.specifier,
       reference.baseUrl || reference.parentUrl,

package/src/test/execute_plan.js

@@ -132,6 +132,7 @@ export const executePlan = async (
         urlGraph,
         scenario,
         sourcemaps,
+        runtimeCompat: runtimes,
         writeGeneratedFiles,
         plugins: [
           ...plugins,
@@ -139,6 +140,7 @@ export const executePlan = async (
             rootDirectoryUrl,
             urlGraph,
             scenario,
+            runtimeCompat: runtimes,
 
             htmlSupervisor: true,
             nodeEsmResolution,
@@ -212,7 +214,7 @@ export const executePlan = async (
       // if there is an error during execution npm will mess up the output
       // (happens when npm runs several command in a workspace)
       // so we enable spinner only when !process.exitCode (no error so far)
-      !process.exitCode
+      process.exitCode !== 1
 
     const startMs = Date.now()
     const report = {}