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

package/src/omega/kitchen.js

@@ -1,15 +1,15 @@
 import {
   urlIsInsideOf,
-  writeFileSync,
   moveUrl,
-  ensureWindowsDriveLetter,
-} from "@jsenv/filesystem"
+  getCallerPosition,
+  stringifyUrlSite,
+  normalizeUrl,
+  setUrlFilename,
+} from "@jsenv/urls"
+import { writeFileSync, ensureWindowsDriveLetter } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 
-import { getCallerPosition } from "@jsenv/utils/src/caller_position.js"
-import { stringifyUrlSite } from "@jsenv/utils/urls/url_trace.js"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
-import { normalizeUrl, setUrlFilename } from "@jsenv/utils/urls/url_utils.js"
 
 import { createPluginController } from "../plugins/plugin_controller.js"
 import { urlSpecifierEncoding } from "./url_specifier_encoding.js"
@@ -277,6 +277,7 @@ export const createKitchen = ({
         type,
         subtype,
         contentType = "application/octet-stream",
+        originalUrl,
         originalContent,
         content,
         sourcemap,
@@ -298,7 +299,8 @@ export const createKitchen = ({
           subtype: urlInfo.subtype,
         })
       urlInfo.contentType = contentType
-      // during build urls info are reused and load returns originalContent
+      // during build urls info are reused and load returns originalUrl/originalContent
+      urlInfo.originalUrl = originalUrl || urlInfo.originalUrl
       urlInfo.originalContent =
         originalContent === undefined ? content : originalContent
       urlInfo.content = content
@@ -618,6 +620,44 @@ export const createKitchen = ({
     return [ref, urlInfo]
   }
 
+  const fetchOriginalUrlInfo = async ({
+    urlInfo,
+    context,
+    searchParam,
+    expectedType,
+  }) => {
+    const urlObject = new URL(urlInfo.url)
+    const { searchParams } = urlObject
+    if (!searchParams.has(searchParam)) {
+      return null
+    }
+    searchParams.delete(searchParam)
+    const originalUrl = urlObject.href
+    const originalReference = {
+      ...(context.reference.original || context.reference),
+      expectedType,
+    }
+    originalReference.url = originalUrl
+    const originalUrlInfo = context.urlGraph.reuseOrCreateUrlInfo(
+      originalReference.url,
+    )
+    if (originalUrlInfo.originalUrl === undefined) {
+      applyReferenceEffectsOnUrlInfo(
+        originalReference,
+        originalUrlInfo,
+        context,
+      )
+    }
+    await context.fetchUrlContent(originalUrlInfo, {
+      reference: originalReference,
+    })
+    if (originalUrlInfo.dependents.size === 0) {
+      context.urlGraph.deleteUrlInfo(originalUrlInfo.url)
+    }
+    return originalUrlInfo
+  }
+  kitchenContext.fetchOriginalUrlInfo = fetchOriginalUrlInfo
+
   return {
     pluginController,
     urlInfoTransformer,
@@ -664,6 +704,8 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
   if (reference.shouldHandle) {
     urlInfo.shouldHandle = true
   }
+  urlInfo.originalUrl = urlInfo.originalUrl || reference.url
+
   Object.assign(urlInfo.data, reference.data)
   Object.assign(urlInfo.timing, reference.timing)
   if (reference.injected) {

package/src/omega/server/file_service.js

@@ -3,7 +3,7 @@ import {
   serveDirectory,
   composeTwoResponses,
 } from "@jsenv/server"
-import { urlIsInsideOf, moveUrl } from "@jsenv/filesystem"
+import { urlIsInsideOf, moveUrl } from "@jsenv/urls"
 
 import { parseUserAgentHeader } from "./user_agent.js"
 
@@ -143,7 +143,7 @@ export const createFileService = ({
           body: urlInfo.content,
         }
       }
-      if (code === "EISDIR") {
+      if (code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
         return serveDirectory(reference.url, {
           headers: {
             accept: "text/html",

package/src/omega/url_graph/url_info_transformations.js

@@ -1,4 +1,5 @@
-import { bufferToEtag, urlToRelativeUrl } from "@jsenv/filesystem"
+import { bufferToEtag } from "@jsenv/filesystem"
+import { urlToRelativeUrl } from "@jsenv/urls"
 
 import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
 import {
@@ -34,14 +35,14 @@ export const createUrlInfoTransformer = ({
         ))
     if (sourcemap.sources && sourcemap.sources.length > 1) {
       sourcemap.sources = sourcemap.sources.map(
-        (source) => new URL(source, urlInfo.data.rawUrl || urlInfo.url).href,
+        (source) => new URL(source, urlInfo.originalUrl).href,
       )
       if (!wantSourcesContent) {
         sourcemap.sourcesContent = undefined
       }
       return sourcemap
     }
-    sourcemap.sources = [urlInfo.data.rawUrl || urlInfo.url]
+    sourcemap.sources = [urlInfo.originalUrl]
     sourcemap.sourcesContent = [urlInfo.originalContent]
     if (!wantSourcesContent) {
       sourcemap.sourcesContent = undefined
@@ -74,6 +75,7 @@ export const createUrlInfoTransformer = ({
 
     // already loaded during "load" hook (happens during build)
     if (urlInfo.sourcemap) {
+      urlInfo.sourcemap = normalizeSourcemap(urlInfo, urlInfo.sourcemap)
       return
     }
     // check for existing sourcemap for this content
@@ -92,8 +94,9 @@ export const createUrlInfoTransformer = ({
       })
       try {
         await context.cook(sourcemapUrlInfo, { reference: sourcemapReference })
-        const sourcemap = JSON.parse(sourcemapUrlInfo.content)
-        urlInfo.sourcemap = normalizeSourcemap(urlInfo, sourcemap)
+        const sourcemapRaw = JSON.parse(sourcemapUrlInfo.content)
+        const sourcemap = normalizeSourcemap(urlInfo, sourcemapRaw)
+        urlInfo.sourcemap = sourcemap
       } catch (e) {
         logger.error(`Error while handling existing sourcemap: ${e.message}`)
         return
@@ -146,7 +149,7 @@ export const createUrlInfoTransformer = ({
       if (sourcemapsRelativeSources) {
         sourcemap.sources = sourcemap.sources.map((source) => {
           const sourceRelative = urlToRelativeUrl(source, urlInfo.url)
-          return sourceRelative
+          return sourceRelative || "."
         })
       }
       sourcemapUrlInfo.content = JSON.stringify(sourcemap, null, "  ")
@@ -163,6 +166,9 @@ export const createUrlInfoTransformer = ({
               : sourcemapReference.generatedSpecifier,
         })
       }
+    } else if (urlInfo.sourcemapReference) {
+      // in the end we don't use the sourcemap placeholder
+      urlGraph.deleteUrlInfo(urlInfo.sourcemapReference.url)
     }
     urlInfo.contentEtag = bufferToEtag(Buffer.from(urlInfo.content))
   }

package/src/omega/url_graph.js

@@ -1,4 +1,4 @@
-import { urlToRelativeUrl } from "@jsenv/filesystem"
+import { urlToRelativeUrl } from "@jsenv/urls"
 import { urlSpecifierEncoding } from "./url_specifier_encoding.js"
 
 export const createUrlGraph = ({
@@ -184,8 +184,9 @@ const createUrlInfo = (url) => {
     subtype: undefined, // "worker", "service_worker", "shared_worker" for js, otherwise undefined
     contentType: "", // "text/html", "text/css", "text/javascript", "application/json", ...
     url,
-    filename: "",
+    originalUrl: undefined,
     generatedUrl: null,
+    filename: "",
     isInline: false,
     inlineUrlSite: null,
     shouldHandle: undefined,

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

@@ -1,4 +1,4 @@
-import { urlToRelativeUrl } from "@jsenv/filesystem"
+import { urlToRelativeUrl } from "@jsenv/urls"
 import { createCallbackList } from "@jsenv/abort"
 
 import { createSSEService } from "@jsenv/utils/event_source/sse_service.js"

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

@@ -1,9 +1,5 @@
 import { pathToFileURL } from "node:url"
-import {
-  isFileSystemPath,
-  normalizeStructuredMetaMap,
-  urlToMeta,
-} from "@jsenv/filesystem"
+import { isFileSystemPath, URL_META } from "@jsenv/urls"
 import { createDetailedMessage } from "@jsenv/logger"
 
 import { babelHelperNameFromUrl } from "@jsenv/babel-plugins"
@@ -145,17 +141,12 @@ const rollupPluginJsenv = ({
   }
   let importCanBeBundled = () => true
   if (include) {
-    const bundleIncludeConfig = normalizeStructuredMetaMap(
-      {
-        bundle: include,
-      },
+    const associations = URL_META.resolveAssociations(
+      { bundle: include },
       rootDirectoryUrl,
     )
     importCanBeBundled = (url) => {
-      return urlToMeta({
-        url,
-        structuredMetaMap: bundleIncludeConfig,
-      }).bundle
+      return URL_META.applyAssociations({ url, associations }).bundle
     }
   }
   const urlImporters = {}

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -4,10 +4,11 @@ import {
   urlIsInsideOf,
   urlToRelativeUrl,
   urlToExtension,
-} from "@jsenv/filesystem"
+  urlToFilename,
+  ensurePathnameTrailingSlash,
+} from "@jsenv/urls"
 
 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 = ({
@@ -53,32 +54,30 @@ export const jsenvPluginFileUrls = ({
           }
         }
         const { search, hash } = urlObject
-        const resolveSymlink = (fileUrl) => {
-          const realPath = realpathSync(new URL(fileUrl))
-          const realFileUrl = `${pathToFileURL(realPath)}${search}${hash}`
-          return realFileUrl
-        }
-
         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
+        const foundADirectory = stat && stat.isDirectory()
+        const foundSomething = stat && !foundADirectory
+        // force trailing slash on directories
+        if (foundADirectory && !pathnameUsesTrailingSlash) {
+          urlObject.pathname = `${pathname}/`
+        }
+        // otherwise remove trailing slash if any
+        if (foundSomething && pathnameUsesTrailingSlash) {
+          // a warning here? (because it's strange to reference a file with a trailing slash)
           urlObject.pathname = pathname.slice(0, -1)
         }
+        if (foundADirectory && directoryReferenceAllowed) {
+          reference.data.foundADirectory = true
+          const directoryFacadeUrl = urlObject.href
+          const directoryUrlRaw = preservesSymlink
+            ? directoryFacadeUrl
+            : resolveSymlink(directoryFacadeUrl)
+          const directoryUrl = `${directoryUrlRaw}${search}${hash}`
+          return directoryUrl
+        }
         const url = urlObject.href
         const filesystemResolution = applyFileSystemMagicResolution(url, {
           fileStat: stat,
@@ -89,11 +88,16 @@ export const jsenvPluginFileUrls = ({
           ),
         })
         if (!filesystemResolution.found) {
+          reference.data.foundADirectory = foundADirectory
           return null
         }
-        const fileUrlRaw = filesystemResolution.url
+        reference.data.foundADirectory = filesystemResolution.isDirectory
+        const fileFacadeUrl = filesystemResolution.url
+        const fileUrlRaw = preservesSymlink
+          ? fileFacadeUrl
+          : resolveSymlink(fileFacadeUrl)
         const fileUrl = `${fileUrlRaw}${search}${hash}`
-        return preservesSymlink ? fileUrl : resolveSymlink(fileUrl)
+        return fileUrl
       },
     },
     {
@@ -149,21 +153,27 @@ export const jsenvPluginFileUrls = ({
           return null
         }
         const urlObject = new URL(urlInfo.url)
-        if (context.reference.expectedType === "directory") {
+        if (context.reference.data.foundADirectory) {
           if (directoryReferenceAllowed) {
             const directoryEntries = readdirSync(urlObject)
+            let filename
+            if (context.reference.type === "filesystem") {
+              const parentUrlInfo = context.urlGraph.getUrlInfo(
+                context.reference.parentUrl,
+              )
+              filename = `${parentUrlInfo.filename}${context.reference.specifier}/`
+            } else {
+              filename = `${urlToFilename(urlInfo.url)}/`
+            }
             return {
               type: "directory",
               contentType: "application/json",
               content: JSON.stringify(directoryEntries, null, "  "),
-              filename: urlToRelativeUrl(
-                ensurePathnameTrailingSlash(urlInfo.url),
-                context.rootDirectoryUrl,
-              ),
+              filename,
             }
           }
           const error = new Error("found a directory on filesystem")
-          error.code = "EISDIR"
+          error.code = "DIRECTORY_REFERENCE_NOT_ALLOWED"
           throw error
         }
         const fileBuffer = readFileSync(urlObject)
@@ -182,3 +192,7 @@ export const jsenvPluginFileUrls = ({
     },
   ]
 }
+
+const resolveSymlink = (fileUrl) => {
+  return pathToFileURL(realpathSync(new URL(fileUrl))).href
+}

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

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

package/src/plugins/importmap/jsenv_plugin_importmap.js

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

package/src/plugins/inline/jsenv_plugin_data_urls.js

@@ -1,4 +1,4 @@
-import { DataUrl } from "@jsenv/utils/urls/data_url.js"
+import { DataUrl } from "@jsenv/urls"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 
 export const jsenvPluginDataUrls = () => {

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -8,7 +8,7 @@ import {
   setHtmlNodeGeneratedText,
   getHtmlNodeAttributeByName,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/urls"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 
 export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {

package/src/plugins/inline/jsenv_plugin_inline_query_param.js

@@ -1,4 +1,4 @@
-import { DataUrl } from "@jsenv/utils/urls/data_url.js"
+import { DataUrl } from "@jsenv/urls"
 
 export const jsenvPluginInlineQueryParam = () => {
   return {

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -2,13 +2,13 @@ import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js"
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/urls"
 
 export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
   const parseAndTransformInlineContentCalls = async (urlInfo, context) => {
     const inlineContentInfos = await parseJsInlineContentInfos({
       js: urlInfo.content,
-      url: (urlInfo.data && urlInfo.data.rawUrl) || urlInfo.url,
+      url: urlInfo.originalUrl,
       isJsModule: urlInfo.type === "js_module",
     })
     if (inlineContentInfos.length === 0) {
@@ -83,7 +83,7 @@ const parseJsInlineContentInfos = async ({ js, url, isJsModule }) => {
   const { metadata } = await applyBabelPlugins({
     babelPlugins: [babelPluginMetadataInlineContents],
     urlInfo: {
-      url,
+      originalUrl: url,
       type: isJsModule ? "js_module" : "js_classic",
       content: js,
     },

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

@@ -12,14 +12,13 @@
  */
 
 import { createRequire } from "node:module"
-import { readFileSync, urlToFilename } from "@jsenv/filesystem"
+import { urlToFilename, injectQueryParams } from "@jsenv/urls"
+import { readFileSync } 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 { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transform_import_meta_url.js"
 import { jsenvPluginAsJsClassicHtml } from "./jsenv_plugin_as_js_classic_html.js"
@@ -92,7 +91,7 @@ const jsenvPluginAsJsClassicConversion = ({
       },
     },
     fetchUrlContent: async (urlInfo, context) => {
-      const originalUrlInfo = await fetchOriginalUrlInfo({
+      const originalUrlInfo = await context.fetchOriginalUrlInfo({
         urlInfo,
         context,
         searchParam: "as_js_classic",
@@ -126,6 +125,8 @@ const jsenvPluginAsJsClassicConversion = ({
       })
       urlInfo.data.jsClassicFormat = jsClassicFormat
       return {
+        originalUrl: originalUrlInfo.originalUrl,
+        originalContent: originalUrlInfo.originalContent,
         type: "js_classic",
         contentType: "text/javascript",
         content,
@@ -192,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/as_js_classic/jsenv_plugin_as_js_classic_html.js

@@ -11,8 +11,10 @@ import {
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
-import { injectQueryParamsIntoSpecifier } from "@jsenv/utils/urls/url_utils.js"
+import {
+  generateInlineContentUrl,
+  injectQueryParamsIntoSpecifier,
+} from "@jsenv/urls"
 
 export const jsenvPluginAsJsClassicHtml = ({
   systemJsInjection,

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

@@ -1,4 +1,4 @@
-import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
+import { injectQueryParams } from "@jsenv/urls"
 
 export const jsenvPluginAsJsClassicWorkers = ({
   generateJsClassicFilename,

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

@@ -10,11 +10,9 @@
  * But for now (as it is simpler) we let the browser throw the error
  */
 
-import { urlToFilename } from "@jsenv/filesystem"
+import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 
-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 +87,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 +98,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 +114,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 +130,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 +150,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 +166,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/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, {

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