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

package/src/plugins/bundling/js_module/bundle_js_module.js

@@ -1,18 +1,26 @@
+import { pathToFileURL } from "node:url"
 import {
   isFileSystemPath,
   normalizeStructuredMetaMap,
-  urlIsInsideOf,
   urlToMeta,
 } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 
+import { babelHelperNameFromUrl } from "@jsenv/babel-plugins"
 import { applyRollupPlugins } from "@jsenv/utils/js_ast/apply_rollup_plugins.js"
 import { sourcemapConverter } from "@jsenv/utils/sourcemap/sourcemap_converter.js"
 import { fileUrlConverter } from "@jsenv/core/src/omega/file_url_converter.js"
-import { babelHelperNameFromUrl } from "@jsenv/babel-plugins"
 
-const jsenvBabelPluginDirectoryUrl = new URL(
-  "../../transpilation/babel/",
+const globalThisClientFileUrl = new URL(
+  "../../transpilation/babel/global_this/client/global_this.js",
+  import.meta.url,
+).href
+const newStylesheetClientFileUrl = new URL(
+  "../../transpilation/babel/new_stylesheet/client/new_stylesheet.js",
+  import.meta.url,
+).href
+const regeneratorRuntimeClientFileUrl = new URL(
+  "../../transpilation/babel/regenerator_runtime/client/regenerator_runtime.js",
   import.meta.url,
 ).href
 
@@ -30,6 +38,7 @@ export const bundleJsModule = async ({
     runtimeCompat,
     sourcemaps,
   } = context
+  const { babelHelpersChunk = true, include } = options
   const { jsModuleBundleUrlInfos } = await buildWithRollup({
     signal,
     logger,
@@ -40,7 +49,9 @@ export const bundleJsModule = async ({
 
     runtimeCompat,
     sourcemaps,
-    options,
+
+    include,
+    babelHelpersChunk,
   })
   return jsModuleBundleUrlInfos
 }
@@ -55,7 +66,9 @@ export const buildWithRollup = async ({
 
   runtimeCompat,
   sourcemaps,
-  options,
+
+  include,
+  babelHelpersChunk,
 }) => {
   const resultRef = { current: null }
   try {
@@ -71,7 +84,8 @@ export const buildWithRollup = async ({
 
           runtimeCompat,
           sourcemaps,
-          options,
+          include,
+          babelHelpersChunk,
           resultRef,
         }),
       ],
@@ -81,6 +95,16 @@ export const buildWithRollup = async ({
           if (warning.code === "CIRCULAR_DEPENDENCY") {
             return
           }
+          if (
+            warning.code === "THIS_IS_UNDEFINED" &&
+            pathToFileURL(warning.id).href === globalThisClientFileUrl
+          ) {
+            return
+          }
+          if (warning.code === "EVAL") {
+            // ideally we should disable only for jsenv files
+            return
+          }
           logger.warn(String(warning))
         },
       },
@@ -104,7 +128,9 @@ const rollupPluginJsenv = ({
   urlGraph,
   jsModuleUrlInfos,
   sourcemaps,
-  options,
+
+  include,
+  babelHelpersChunk,
 
   resultRef,
 }) => {
@@ -118,10 +144,10 @@ const rollupPluginJsenv = ({
     })
   }
   let importCanBeBundled = () => true
-  if (options.include) {
+  if (include) {
     const bundleIncludeConfig = normalizeStructuredMetaMap(
       {
-        bundle: options.include,
+        bundle: include,
       },
       rootDirectoryUrl,
     )
@@ -152,7 +178,7 @@ const rollupPluginJsenv = ({
           implicitlyLoadedAfterOneOf: previousNonEntryPointModuleId
             ? [previousNonEntryPointModuleId]
             : null,
-          preserveSignature: "allow-extension",
+          // preserveSignature: "allow-extension",
         })
         previousNonEntryPointModuleId = id
       })
@@ -224,19 +250,27 @@ const rollupPluginJsenv = ({
           return insideJs ? `js/${name}` : `${name}`
         },
         manualChunks: (id) => {
-          const fileUrl = fileUrlConverter.asFileUrl(id)
-          if (
-            fileUrl.endsWith(
-              "babel-plugin-transform-async-to-promises/helpers.mjs",
-            )
-          ) {
-            return "babel_helpers"
-          }
-          if (babelHelperNameFromUrl(fileUrl)) {
-            return "babel_helpers"
-          }
-          if (urlIsInsideOf(fileUrl, jsenvBabelPluginDirectoryUrl)) {
-            return "babel_helpers"
+          if (babelHelpersChunk) {
+            const fileUrl = fileUrlConverter.asFileUrl(id)
+            if (
+              fileUrl.endsWith(
+                "babel-plugin-transform-async-to-promises/helpers.mjs",
+              )
+            ) {
+              return "babel_helpers"
+            }
+            if (babelHelperNameFromUrl(fileUrl)) {
+              return "babel_helpers"
+            }
+            if (fileUrl === globalThisClientFileUrl) {
+              return "babel_helpers"
+            }
+            if (fileUrl === newStylesheetClientFileUrl) {
+              return "babel_helpers"
+            }
+            if (fileUrl === regeneratorRuntimeClientFileUrl) {
+              return "babel_helpers"
+            }
           }
           return null
         },
@@ -261,6 +295,14 @@ const rollupPluginJsenv = ({
       if (!importCanBeBundled(url)) {
         return { id: url, external: true }
       }
+      const urlInfo = urlGraph.getUrlInfo(url)
+      if (!urlInfo) {
+        // happen when excluded by urlAnalysis.include
+        return { id: url, external: true }
+      }
+      if (!urlInfo.shouldHandle) {
+        return { id: url, external: true }
+      }
       const filePath = fileUrlConverter.asFilePath(url)
       return filePath
     },

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -1,66 +1,184 @@
-import { readFileSync } from "node:fs"
-import { urlIsInsideOf, urlToRelativeUrl } from "@jsenv/filesystem"
+import { readFileSync, readdirSync, realpathSync, statSync } from "node:fs"
+import { pathToFileURL } from "node:url"
+import {
+  urlIsInsideOf,
+  urlToRelativeUrl,
+  urlToExtension,
+} from "@jsenv/filesystem"
 
+import { applyFileSystemMagicResolution } from "@jsenv/node-esm-resolution"
+import { ensurePathnameTrailingSlash } from "@jsenv/utils/urls/url_utils.js"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 
-export const jsenvPluginFileUrls = () => {
-  return [jsenvPluginResolveAbsoluteFileUrls(), jsenvPluginFetchFileUrls()]
-}
+export const jsenvPluginFileUrls = ({
+  magicExtensions = ["inherit", ".js"],
+  magicDirectoryIndex = true,
+  preservesSymlink = true,
+  directoryReferenceAllowed = false,
+}) => {
+  const getExtensionsToTry = (magicExtensions, importer) => {
+    const extensionsSet = new Set()
+    magicExtensions.forEach((magicExtension) => {
+      if (magicExtension === "inherit") {
+        const importerExtension = urlToExtension(importer)
+        extensionsSet.add(importerExtension)
+      } else {
+        extensionsSet.add(magicExtension)
+      }
+    })
+    return Array.from(extensionsSet.values())
+  }
+
+  return [
+    {
+      name: "jsenv:file_url_resolution",
+      appliesDuring: "*",
+      redirectUrl: (reference) => {
+        // http, https, data, about, ...
+        if (!reference.url.startsWith("file:")) {
+          return null
+        }
+        if (reference.isInline) {
+          return null
+        }
+        const urlObject = new URL(reference.url)
+        let stat
+        try {
+          stat = statSync(urlObject)
+        } catch (e) {
+          if (e.code === "ENOENT") {
+            stat = null
+          } else {
+            throw e
+          }
+        }
+        const { search, hash } = urlObject
+        const resolveSymlink = (fileUrl) => {
+          const realPath = realpathSync(new URL(fileUrl))
+          const realFileUrl = `${pathToFileURL(realPath)}${search}${hash}`
+          return realFileUrl
+        }
 
-const jsenvPluginResolveAbsoluteFileUrls = () => {
-  return {
-    name: "jsenv:resolve_absolute_file_urls",
-    appliesDuring: {
-      // during dev and test it's a browser running the code
-      // so absolute file urls needs to be relativized
-      dev: true,
-      test: true,
-      // during build it's fine to use file:// urls
-      build: false,
+        let { pathname } = urlObject
+        const pathnameUsesTrailingSlash = pathname.endsWith("/")
+        urlObject.search = ""
+        urlObject.hash = ""
+        // force trailing slash on directories and remove eventual trailing slash on files
+        if (stat && stat.isDirectory()) {
+          reference.expectedType = "directory"
+          if (!pathnameUsesTrailingSlash) {
+            urlObject.pathname = `${pathname}/`
+          }
+          if (directoryReferenceAllowed) {
+            return preservesSymlink
+              ? urlObject.href
+              : resolveSymlink(urlObject.href)
+          }
+          // give a chane to magic resolution if enabled
+        } else if (pathnameUsesTrailingSlash) {
+          // a warning would be great because it's strange to reference a file with a trailing slash
+          urlObject.pathname = pathname.slice(0, -1)
+        }
+        const url = urlObject.href
+        const filesystemResolution = applyFileSystemMagicResolution(url, {
+          fileStat: stat,
+          magicDirectoryIndex,
+          magicExtensions: getExtensionsToTry(
+            magicExtensions,
+            reference.parentUrl,
+          ),
+        })
+        if (!filesystemResolution.found) {
+          return null
+        }
+        const fileUrlRaw = filesystemResolution.url
+        const fileUrl = `${fileUrlRaw}${search}${hash}`
+        return preservesSymlink ? fileUrl : resolveSymlink(fileUrl)
+      },
     },
-    resolveUrl: (reference) => {
-      if (!reference.specifier.startsWith("/@fs/")) {
-        return null
-      }
-      const fsRootRelativeUrl = reference.specifier.slice("/@fs/".length)
-      return `file:///${fsRootRelativeUrl}`
+    {
+      name: "jsenv:filesystem_resolution",
+      appliesDuring: "*",
+      resolveUrl: {
+        filesystem: (reference, context) => {
+          const { parentUrl } = reference
+          const parentUrlInfo = context.urlGraph.getUrlInfo(parentUrl)
+          const baseUrl =
+            parentUrlInfo && parentUrlInfo.type === "directory"
+              ? ensurePathnameTrailingSlash(parentUrl)
+              : parentUrl
+          return new URL(reference.specifier, baseUrl).href
+        },
+      },
     },
-    formatUrl: (reference, context) => {
-      if (!reference.generatedUrl.startsWith("file:")) {
+    {
+      name: "jsenv:@fs_resolution",
+      appliesDuring: {
+        // during dev and test it's a browser running the code
+        // so absolute file urls needs to be relativized
+        dev: true,
+        test: true,
+        // during build it's fine to use file:// urls
+        build: false,
+      },
+      resolveUrl: (reference) => {
+        if (reference.specifier.startsWith("/@fs/")) {
+          const fsRootRelativeUrl = reference.specifier.slice("/@fs/".length)
+          return `file:///${fsRootRelativeUrl}`
+        }
         return null
-      }
-      if (urlIsInsideOf(reference.generatedUrl, context.rootDirectoryUrl)) {
-        return `/${urlToRelativeUrl(
-          reference.generatedUrl,
-          context.rootDirectoryUrl,
-        )}`
-      }
-      return `/@fs/${reference.generatedUrl.slice("file:///".length)}`
+      },
+      formatUrl: (reference, context) => {
+        if (!reference.generatedUrl.startsWith("file:")) {
+          return null
+        }
+        if (urlIsInsideOf(reference.generatedUrl, context.rootDirectoryUrl)) {
+          return `/${urlToRelativeUrl(
+            reference.generatedUrl,
+            context.rootDirectoryUrl,
+          )}`
+        }
+        return `/@fs/${reference.generatedUrl.slice("file:///".length)}`
+      },
     },
-  }
-}
-
-const jsenvPluginFetchFileUrls = () => {
-  return {
-    name: "jsenv:fetch_file_urls",
-    appliesDuring: "*",
-    fetchUrlContent: (urlInfo) => {
-      if (!urlInfo.url.startsWith("file:")) {
-        return null
-      }
-      const urlObject = new URL(urlInfo.url)
-      const fileBuffer = readFileSync(urlObject)
-      const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url)
-      if (CONTENT_TYPE.isTextual(contentType)) {
+    {
+      name: "jsenv:file_url_fetching",
+      appliesDuring: "*",
+      fetchUrlContent: (urlInfo, context) => {
+        if (!urlInfo.url.startsWith("file:")) {
+          return null
+        }
+        const urlObject = new URL(urlInfo.url)
+        if (context.reference.expectedType === "directory") {
+          if (directoryReferenceAllowed) {
+            const directoryEntries = readdirSync(urlObject)
+            return {
+              type: "directory",
+              contentType: "application/json",
+              content: JSON.stringify(directoryEntries, null, "  "),
+              filename: urlToRelativeUrl(
+                ensurePathnameTrailingSlash(urlInfo.url),
+                context.rootDirectoryUrl,
+              ),
+            }
+          }
+          const error = new Error("found a directory on filesystem")
+          error.code = "EISDIR"
+          throw error
+        }
+        const fileBuffer = readFileSync(urlObject)
+        const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url)
+        if (CONTENT_TYPE.isTextual(contentType)) {
+          return {
+            contentType,
+            content: String(fileBuffer),
+          }
+        }
         return {
           contentType,
-          content: String(fileBuffer),
+          content: fileBuffer,
         }
-      }
-      return {
-        contentType,
-        content: fileBuffer,
-      }
+      },
     },
-  }
+  ]
 }

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -4,8 +4,6 @@
  * - scripts are wrapped to be supervised
  */
 
-import { urlIsInsideOf } from "@jsenv/filesystem"
-
 import {
   parseHtmlString,
   stringifyHtmlAst,
@@ -21,22 +19,20 @@ import {
   setHtmlNodeGeneratedText,
 } from "@jsenv/utils/html_ast/html_ast.js"
 import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
-import { jsenvRootDirectoryUrl } from "@jsenv/core/src/jsenv_root_directory_url.js"
 
 export const jsenvPluginHtmlSupervisor = ({
-  rootDirectoryUrl,
   logs = false,
   measurePerf = false,
 }) => {
-  const preferSourceFiles =
-    rootDirectoryUrl === jsenvRootDirectoryUrl ||
-    urlIsInsideOf(rootDirectoryUrl, jsenvRootDirectoryUrl)
-  const htmlSupervisorSetupFileUrl = preferSourceFiles
-    ? new URL("./client/html_supervisor_setup.js", import.meta.url).href
-    : new URL("./dist/html_supervisor_setup.js", jsenvRootDirectoryUrl).href
-  const htmlSupervisorInstallerFileUrl = preferSourceFiles
-    ? new URL("./client/html_supervisor_installer.js", import.meta.url).href
-    : new URL("./dist/html_supervisor_installer.js", jsenvRootDirectoryUrl).href
+  const htmlSupervisorSetupFileUrl = new URL(
+    "./client/html_supervisor_setup.js?js_classic",
+    import.meta.url,
+  ).href
+
+  const htmlSupervisorInstallerFileUrl = new URL(
+    "./client/html_supervisor_installer.js",
+    import.meta.url,
+  ).href
 
   return {
     name: "jsenv:html_supervisor",

package/src/plugins/http_urls/jsenv_plugin_http_urls.js

@@ -2,11 +2,11 @@ export const jsenvPluginHttpUrls = () => {
   return {
     name: "jsenv:http_urls",
     appliesDuring: "*",
-    fetchUrlContent: (urlInfo) => {
-      if (urlInfo.url.startsWith("http") || urlInfo.url.startsWith("https")) {
-        return { external: true }
-      }
-      return null
-    },
+    // fetchUrlContent: (urlInfo) => {
+    //   if (urlInfo.url.startsWith("http") || urlInfo.url.startsWith("https")) {
+    //     return { shouldHandle: false }
+    //   }
+    //   return null
+    // },
   }
 }

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -1,19 +1,14 @@
-import { urlIsInsideOf } from "@jsenv/filesystem"
-
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { parseHtmlString } from "@jsenv/utils/html_ast/html_ast.js"
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { jsenvRootDirectoryUrl } from "@jsenv/core/src/jsenv_root_directory_url.js"
 import { collectHotDataFromHtmlAst } from "./html_hot_dependencies.js"
 import { babelPluginMetadataImportMetaHot } from "./babel_plugin_metadata_import_meta_hot.js"
 
-export const jsenvPluginImportMetaHot = ({ rootDirectoryUrl }) => {
-  const preferSourceFiles =
-    rootDirectoryUrl === jsenvRootDirectoryUrl ||
-    urlIsInsideOf(rootDirectoryUrl, jsenvRootDirectoryUrl)
-  const importMetaHotClientFileUrl = preferSourceFiles
-    ? new URL("./client/import_meta_hot.js", import.meta.url).href
-    : new URL("./dist/import_meta_hot.js", jsenvRootDirectoryUrl).href
+export const jsenvPluginImportMetaHot = () => {
+  const importMetaHotClientFileUrl = new URL(
+    "./client/import_meta_hot.js",
+    import.meta.url,
+  ).href
 
   return {
     name: "jsenv:import_meta_hot",

package/src/plugins/node_esm_resolution/jsenv_plugin_node_esm_resolution.js

@@ -13,12 +13,13 @@ import {
   applyNodeEsmResolution,
   defaultLookupPackageScope,
   defaultReadPackageJson,
+  readCustomConditionsFromProcessArgs,
 } from "@jsenv/node-esm-resolution"
 
 export const jsenvPluginNodeEsmResolution = ({
   rootDirectoryUrl,
-  // https://nodejs.org/api/esm.html#resolver-algorithm-specification
-  packageConditions = ["browser", "import"],
+  runtimeCompat,
+  packageConditions,
   filesInvalidatingCache = ["package.json", "package-lock.json"],
 }) => {
   const packageScopesCache = new Map()
@@ -64,6 +65,7 @@ export const jsenvPluginNodeEsmResolution = ({
 
   return [
     jsenvPluginNodeEsmResolver({
+      runtimeCompat,
       packageConditions,
       lookupPackageScope,
       readPackageJson,
@@ -76,10 +78,18 @@ export const jsenvPluginNodeEsmResolution = ({
 }
 
 const jsenvPluginNodeEsmResolver = ({
+  runtimeCompat,
   packageConditions,
   lookupPackageScope,
   readPackageJson,
 }) => {
+  const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node")
+  // https://nodejs.org/api/esm.html#resolver-algorithm-specification
+  packageConditions = packageConditions || [
+    ...readCustomConditionsFromProcessArgs(),
+    nodeRuntimeEnabled ? "node" : "browser",
+    "import",
+  ]
   return {
     name: "jsenv:node_esm_resolve",
     appliesDuring: "*",

package/src/plugins/node_runtime/jsenv_plugin_node_runtime.js

@@ -0,0 +1,12 @@
+export const jsenvPluginNodeRuntime = ({ runtimeCompat }) => {
+  const nodeFound = Object.keys(runtimeCompat).includes("node")
+  if (!nodeFound) {
+    return []
+  }
+
+  // what do we need to do?
+  return {
+    name: "jsenv:node_runtime",
+    appliesDuring: "*",
+  }
+}

package/src/plugins/plugin_controller.js

@@ -159,6 +159,9 @@ const flattenAndFilterPlugins = (pluginsRaw, { scenario }) => {
       return
     }
     if (typeof pluginEntry === "object" && pluginEntry !== null) {
+      if (!pluginEntry.name) {
+        pluginEntry.name = "anonymous"
+      }
       const { appliesDuring } = pluginEntry
       if (appliesDuring === undefined) {
         console.warn(`"appliesDuring" is undefined on ${pluginEntry.name}`)
@@ -168,9 +171,20 @@ const flattenAndFilterPlugins = (pluginsRaw, { scenario }) => {
         plugins.push(pluginEntry)
         return
       }
+      if (typeof appliesDuring === "string") {
+        if (!["dev", "build", "test"].includes(appliesDuring)) {
+          throw new Error(
+            `"appliesDuring" must be "dev", "test" or "build", got ${appliesDuring}`,
+          )
+        }
+        if (appliesDuring === scenario) {
+          plugins.push(pluginEntry)
+        }
+        return
+      }
       if (typeof appliesDuring !== "object") {
         throw new Error(
-          `"appliesDuring" must be an object or "*", got ${appliesDuring}`,
+          `"appliesDuring" must be an object or a string, got ${appliesDuring}`,
         )
       }
       if (appliesDuring[scenario]) {
@@ -252,8 +266,8 @@ const returnValueAssertions = [
         return { content: valueReturned }
       }
       if (typeof valueReturned === "object") {
-        const { external, content } = valueReturned
-        if (external) {
+        const { shouldHandle, content } = valueReturned
+        if (shouldHandle === false) {
           return undefined
         }
         if (typeof content !== "string" && !Buffer.isBuffer(content)) {