@jsenv/core 27.0.0-alpha.63 → 27.0.0-alpha.66

package/src/omega/server/file_service.js

@@ -44,24 +44,32 @@ export const createFileService = ({
     if (responseFromPlugin) {
       return responseFromPlugin
     }
-    const [reference, urlInfo] = kitchen.prepareEntryPoint({
-      parentUrl: inferParentFromRequest(request, rootDirectoryUrl),
-      type: "entry_point",
-      specifier: request.ressource,
-    })
+    let reference
+    const parentUrl = inferParentFromRequest(request, rootDirectoryUrl)
+    if (parentUrl) {
+      reference = urlGraph.inferReference(request.ressource, parentUrl)
+    }
+    if (!reference) {
+      const entryPoint = kitchen.prepareEntryPoint({
+        trace: parentUrl || rootDirectoryUrl,
+        parentUrl: parentUrl || rootDirectoryUrl,
+        type: "entry_point",
+        specifier: request.ressource,
+      })
+      reference = entryPoint[0]
+    }
+    const urlInfo = urlGraph.reuseOrCreateUrlInfo(reference.url)
+
     const ifNoneMatch = request.headers["if-none-match"]
     if (ifNoneMatch && urlInfo.contentEtag === ifNoneMatch) {
       return {
         status: 304,
         headers: {
           "cache-control": `private,max-age=0,must-revalidate`,
+          ...urlInfo.responseHeaders,
         },
       }
     }
-    const referenceFromGraph = urlGraph.inferReference(
-      reference.url,
-      reference.parentUrl,
-    )
     try {
       // urlInfo objects are reused, they must be "reset" before cooking them again
       if (
@@ -76,20 +84,21 @@ export const createFileService = ({
         urlInfo.type = null
         urlInfo.subtype = null
         urlInfo.timing = {}
+        urlInfo.responseHeaders = {}
       }
       const { runtimeName, runtimeVersion } = parseUserAgentHeader(
         request.headers["user-agent"],
       )
-      await kitchen.cook({
-        reference: referenceFromGraph || reference,
-        urlInfo,
+      await kitchen.cook(urlInfo, {
+        request,
+        reference,
+        clientRuntimeCompat: {
+          [runtimeName]: runtimeVersion,
+        },
         outDirectoryUrl:
           scenario === "dev"
             ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`
             : `${rootDirectoryUrl}.jsenv/${scenario}/${runtimeName}@${runtimeVersion}/`,
-        clientRuntimeCompat: {
-          [runtimeName]: runtimeVersion,
-        },
       })
       let { response, contentType, content, contentEtag } = urlInfo
       if (response) {
@@ -103,6 +112,7 @@ export const createFileService = ({
           "content-length": Buffer.byteLength(content),
           "cache-control": `private,max-age=0,must-revalidate`,
           "eTag": contentEtag,
+          ...urlInfo.responseHeaders,
         },
         body: content,
         timing: urlInfo.timing,
@@ -167,7 +177,6 @@ export const createFileService = ({
   }
   return async (request) => {
     let response = await getResponse(request)
-
     return response
   }
 }
@@ -175,7 +184,15 @@ export const createFileService = ({
 const inferParentFromRequest = (request, rootDirectoryUrl) => {
   const { referer } = request.headers
   if (!referer) {
-    return rootDirectoryUrl
+    return null
+  }
+  const refererUrlObject = new URL(referer)
+  refererUrlObject.searchParams.delete("hmr")
+  refererUrlObject.searchParams.delete("v")
+  const { pathname, search } = refererUrlObject
+  if (pathname.startsWith("/@fs/")) {
+    const fsRootRelativeUrl = pathname.slice("/@fs/".length)
+    return `file:///${fsRootRelativeUrl}${search}`
   }
   return moveUrl({
     url: referer,

package/src/omega/url_graph/url_graph_load.js

@@ -5,32 +5,31 @@ export const loadUrlGraph = async ({
   urlGraph,
   kitchen,
   startLoading,
+  writeGeneratedFiles,
   outDirectoryUrl,
   clientRuntimeCompat,
 }) => {
-  if (outDirectoryUrl) {
+  if (writeGeneratedFiles && outDirectoryUrl) {
     await ensureEmptyDirectory(outDirectoryUrl)
   }
   const promises = []
   const promiseMap = new Map()
-  const cook = ({ urlInfo, ...rest }) => {
+  const cook = (urlInfo, context) => {
     const promiseFromData = promiseMap.get(urlInfo)
     if (promiseFromData) return promiseFromData
-    const promise = _cook({
-      urlInfo,
+    const promise = _cook(urlInfo, {
       outDirectoryUrl,
       clientRuntimeCompat,
-      ...rest,
+      ...context,
     })
     promises.push(promise)
     promiseMap.set(urlInfo, promise)
     return promise
   }
-  const _cook = async ({ urlInfo, ...rest }) => {
-    await kitchen.cook({
-      urlInfo,
+  const _cook = async (urlInfo, context) => {
+    await kitchen.cook(urlInfo, {
       cookDuringCook: cook,
-      ...rest,
+      ...context,
     })
     const { references } = urlInfo
     references.forEach((reference) => {
@@ -46,10 +45,7 @@ export const loadUrlGraph = async ({
       const referencedUrlInfo = urlGraph.reuseOrCreateUrlInfo(
         reference.generatedUrl,
       )
-      cook({
-        reference,
-        urlInfo: referencedUrlInfo,
-      })
+      cook(referencedUrlInfo, { reference })
     })
   }
   startLoading(
@@ -61,10 +57,7 @@ export const loadUrlGraph = async ({
         specifier,
       })
       entryUrlInfo.data.isEntryPoint = true
-      cook({
-        reference: entryReference,
-        urlInfo: entryUrlInfo,
-      })
+      cook(entryUrlInfo, { reference: entryReference })
       return [entryReference, entryUrlInfo]
     },
   )

package/src/omega/url_graph/url_graph_report.js

@@ -37,8 +37,8 @@ const createUrlGraphReport = (urlGraph) => {
     const urlInfo = urlInfos[url]
     // ignore:
     // - inline files: they are already taken into account in the file where they appear
-    // - external files: we don't know their content
-    if (urlInfo.isInline || urlInfo.external) {
+    // - ignored files: we don't know their content
+    if (urlInfo.isInline || !urlInfo.shouldHandle) {
       return
     }
     // file loaded via import assertion are already inside the graph

package/src/omega/url_graph/url_info_transformations.js

@@ -91,10 +91,7 @@ export const createUrlInfoTransformer = ({
         specifierColumn: column,
       })
       try {
-        await context.cook({
-          reference: sourcemapReference,
-          urlInfo: sourcemapUrlInfo,
-        })
+        await context.cook(sourcemapUrlInfo, { reference: sourcemapReference })
         const sourcemap = JSON.parse(sourcemapUrlInfo.content)
         urlInfo.sourcemap = normalizeSourcemap(urlInfo, sourcemap)
       } catch (e) {

package/src/omega/url_graph.js

@@ -1,4 +1,5 @@
 import { urlToRelativeUrl } from "@jsenv/filesystem"
+import { urlSpecifierEncoding } from "./url_specifier_encoding.js"
 
 export const createUrlGraph = ({
   clientFileChangeCallbackList,
@@ -23,13 +24,15 @@ export const createUrlGraph = ({
     urlInfos[url] = urlInfo
     return urlInfo
   }
-  const inferReference = (url, parentUrl) => {
+  const inferReference = (specifier, parentUrl) => {
     const parentUrlInfo = urlInfos[parentUrl]
     if (!parentUrlInfo) {
       return null
     }
     const firstReferenceOnThatUrl = parentUrlInfo.references.find(
-      (reference) => reference.url === url,
+      (reference) => {
+        return urlSpecifierEncoding.decode(reference) === specifier
+      },
     )
     return firstReferenceOnThatUrl
   }
@@ -185,12 +188,13 @@ const createUrlInfo = (url) => {
     generatedUrl: null,
     isInline: false,
     inlineUrlSite: null,
-    external: false,
+    shouldHandle: undefined,
     originalContent: undefined,
     content: undefined,
     contentEtag: null,
     sourcemap: null,
     sourcemapReference: null,
     timing: {},
+    responseHeaders: {},
   }
 }

package/src/omega/url_specifier_encoding.js

@@ -0,0 +1,59 @@
+export const urlSpecifierEncoding = {
+  encode: (reference) => {
+    const { generatedSpecifier } = reference
+    if (generatedSpecifier.then) {
+      return generatedSpecifier.then((value) => {
+        reference.generatedSpecifier = value
+        return urlSpecifierEncoding.encode(reference)
+      })
+    }
+    // allow plugin to return a function to bypas default formatting
+    // (which is to use JSON.stringify when url is referenced inside js)
+    if (typeof generatedSpecifier === "function") {
+      return generatedSpecifier()
+    }
+    const formatter = formatters[reference.type]
+    const value = formatter
+      ? formatter.encode(generatedSpecifier)
+      : generatedSpecifier
+    if (reference.escape) {
+      return reference.escape(value)
+    }
+    return value
+  },
+  decode: (reference) => {
+    const formatter = formatters[reference.type]
+    return formatter
+      ? formatter.decode(reference.generatedSpecifier)
+      : reference.generatedSpecifier
+  },
+}
+const formatters = {
+  "js_import_export": { encode: JSON.stringify, decode: JSON.parse },
+  "js_url_specifier": { encode: JSON.stringify, decode: JSON.parse },
+  "css_@import": { encode: JSON.stringify, code: JSON.stringify },
+  // https://github.com/webpack-contrib/css-loader/pull/627/files
+  "css_url": {
+    encode: (url) => {
+      // If url is already wrapped in quotes, remove them
+      url = formatters.css_url.decode(url)
+      // Should url be wrapped?
+      // See https://drafts.csswg.org/css-values-3/#urls
+      if (/["'() \t\n]/.test(url)) {
+        return `"${url.replace(/"/g, '\\"').replace(/\n/g, "\\n")}"`
+      }
+      return url
+    },
+    decode: (url) => {
+      const firstChar = url[0]
+      const lastChar = url[url.length - 1]
+      if (firstChar === `"` && lastChar === `"`) {
+        return url.slice(1, -1)
+      }
+      if (firstChar === `'` && lastChar === `'`) {
+        return url.slice(1, -1)
+      }
+      return url
+    },
+  },
+}

package/src/plugins/autoreload/dev_sse/jsenv_plugin_dev_sse_client.js

@@ -1,20 +1,15 @@
-import { urlIsInsideOf } from "@jsenv/filesystem"
-
 import {
   parseHtmlString,
   stringifyHtmlAst,
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { jsenvRootDirectoryUrl } from "@jsenv/core/src/jsenv_root_directory_url.js"
 
-export const jsenvPluginDevSSEClient = ({ rootDirectoryUrl }) => {
-  const preferSourceFiles =
-    rootDirectoryUrl === jsenvRootDirectoryUrl ||
-    urlIsInsideOf(rootDirectoryUrl, jsenvRootDirectoryUrl)
-  const eventSourceClientFileUrl = preferSourceFiles
-    ? new URL("./client/event_source_client.js", import.meta.url).href
-    : new URL("./dist/event_source_client.js", jsenvRootDirectoryUrl).href
+export const jsenvPluginDevSSEClient = () => {
+  const eventSourceClientFileUrl = new URL(
+    "./client/event_source_client.js",
+    import.meta.url,
+  ).href
 
   return {
     name: "jsenv:dev_sse_client",

package/src/plugins/autoreload/jsenv_plugin_autoreload.js

@@ -14,9 +14,7 @@ export const jsenvPluginAutoreload = ({
   }
   return [
     jsenvPluginHmr(),
-    jsenvPluginDevSSEClient({
-      rootDirectoryUrl,
-    }),
+    jsenvPluginDevSSEClient(),
     jsenvPluginDevSSEServer({
       rootDirectoryUrl,
       urlGraph,

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
     },