@jsenv/ast 6.4.4 → 6.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "6.4.4",
+  "version": "6.5.0",
   "description": "Parse and transform HTML, CSS and JS",
   "license": "MIT",
   "repository": {

package/src/html/html_inline_content_url.js

@@ -5,7 +5,7 @@ import { analyzeScriptNode } from "./html_analysis.js";
 import { getHtmlNodeAttribute } from "./html_node_attributes.js";
 import { getHtmlNodePosition } from "./html_node_position.js";
 
-export const getUrlForContentInsideHtml = (node, { htmlUrl, url }) => {
+export const getUrlForContentInsideHtml = (node, htmlUrlInfo, reference) => {
   let externalSpecifierAttributeName;
   let basename;
   let extension;
@@ -18,8 +18,8 @@ export const getUrlForContentInsideHtml = (node, { htmlUrl, url }) => {
     externalSpecifierAttributeName = "inlined-from-href";
     extension = ".css";
   } else if (node.nodeName === "link") {
-    basename = urlToBasename(url);
-    extension = urlToExtension(url);
+    basename = urlToBasename(reference.url);
+    extension = urlToExtension(reference.url);
   }
 
   if (externalSpecifierAttributeName) {
@@ -38,7 +38,7 @@ export const getUrlForContentInsideHtml = (node, { htmlUrl, url }) => {
     preferOriginal: true,
   });
   const inlineContentUrl = generateUrlForInlineContent({
-    url: htmlUrl,
+    url: htmlUrlInfo.originalUrl || htmlUrlInfo.url,
     basename,
     extension,
     line,

package/src/inline_content_url.js

@@ -26,8 +26,8 @@ export const generateUrlForInlineContent = ({
 
   const filenameRaw = urlToFilename(url);
   const filename = `${filenameRaw}@${generatedName}${extension}`;
-  // ideally we should keep query params from url
-  // maybe we could use a custom scheme like "inline:"
-  const inlineContentUrl = new URL(filename, url).href;
-  return inlineContentUrl;
+  const inlineContentUrl = new URL(filename, url);
+  const { search } = new URL(url);
+  inlineContentUrl.search = search;
+  return inlineContentUrl.href;
 };

package/src/js/js_inline_content_url.js

@@ -1,15 +1,14 @@
 import { injectQueryParams } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
-
 import { generateUrlForInlineContent } from "../inline_content_url.js";
 
-export const getUrlForContentInsideJs = (inlineReferenceInfo, { url }) => {
+export const getUrlForContentInsideJs = (inlineReferenceInfo, jsUrlInfo) => {
   const { inlinedFromUrl } = inlineReferenceInfo;
   if (inlinedFromUrl) {
     return injectQueryParams(inlinedFromUrl, { inlined: "" });
   }
   return generateUrlForInlineContent({
-    url,
+    url: jsUrlInfo.originalUrl || jsUrlInfo.url,
     extension: CONTENT_TYPE.asFileExtension(inlineReferenceInfo.contentType),
     line: inlineReferenceInfo.line,
     column: inlineReferenceInfo.column,