@jsenv/core 27.0.0-alpha.84 → 27.0.0-alpha.85

package/dist/main.js

@@ -6,24 +6,16 @@ import { urlToRelativeUrl, generateInlineContentUrl, ensurePathnameTrailingSlash
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { workerData, Worker } from "node:worker_threads";
 import { URL_META } from "@jsenv/url-meta";
-import { parseHtmlString, stringifyHtmlAst, visitHtmlAst, getHtmlNodeAttributeByName, htmlNodePosition, findNode, getHtmlNodeTextNode, removeHtmlNode, setHtmlNodeGeneratedText, removeHtmlNodeAttributeByName, parseScriptNode, injectScriptAsEarlyAsPossible, createHtmlNode, removeHtmlNodeText, assignHtmlNodeAttributes, parseLinkNode } from "@jsenv/utils/src/html_ast/html_ast.js";
-import { htmlAttributeSrcSet } from "@jsenv/utils/src/html_ast/html_attribute_src_set.js";
+import { parseHtmlString, stringifyHtmlAst, visitHtmlNodes, getHtmlNodeAttribute, setHtmlNodeAttributes, parseSrcSet, getHtmlNodePosition, getHtmlNodeAttributePosition, applyPostCss, postCssPluginUrlVisitor, parseJsUrls, findHtmlNode, getHtmlNodeText, removeHtmlNode, setHtmlNodeText, analyzeScriptNode, applyBabelPlugins, injectScriptNodeAsEarlyAsPossible, createHtmlNode, removeHtmlNodeText, transpileWithParcel, injectJsImport, minifyWithParcel, analyzeLinkNode } from "@jsenv/ast";
 import { createMagicSource, composeTwoSourcemaps, sourcemapConverter, SOURCEMAP, generateSourcemapFileUrl, generateSourcemapDataUrl } from "@jsenv/sourcemap";
-import { applyPostCss } from "@jsenv/utils/src/css_ast/apply_post_css.js";
-import { postCssPluginUrlVisitor } from "@jsenv/utils/src/css_ast/postcss_plugin_url_visitor.js";
-import { parseJsUrls } from "@jsenv/utils/src/js_ast/parse_js_urls.js";
 import { resolveImport, normalizeImportMap, composeTwoImportMaps } from "@jsenv/importmap";
 import { applyNodeEsmResolution, defaultLookupPackageScope, defaultReadPackageJson, readCustomConditionsFromProcessArgs, applyFileSystemMagicResolution, getExtensionsToTry } from "@jsenv/node-esm-resolution";
 import { statSync, realpathSync, readdirSync, readFileSync, existsSync } from "node:fs";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js";
-import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js";
-import { transpileWithParcel, minifyWithParcel } from "@jsenv/utils/src/css_ast/parcel_css.js";
 import { createRequire } from "node:module";
 import babelParser from "@babel/parser";
 import { findHighestVersion } from "@jsenv/utils/src/semantic_versioning/highest_version.js";
-import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js";
-import { applyRollupPlugins } from "@jsenv/utils/src/js_ast/apply_rollup_plugins.js";
 import { validateResponseIntegrity } from "@jsenv/integrity";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js";
 import { memoizeByFirstArgument } from "@jsenv/utils/src/memoize/memoize_by_first_argument.js";
@@ -115,9 +107,14 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
       column,
       originalLine,
       originalColumn,
-      specifier,
-      attribute
+      node,
+      attributeName,
+      specifier
     }) => {
+      const {
+        crossorigin,
+        integrity
+      } = readFetchMetas(node);
       const isRessourceHint = ["preconnect", "dns-prefetch", "prefetch", "preload", "modulepreload"].includes(subtype);
       const [reference] = referenceUtils.found({
         type,
@@ -127,10 +124,14 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
         specifier,
         specifierLine: line,
         specifierColumn: column,
-        isRessourceHint
+        isRessourceHint,
+        crossorigin,
+        integrity
       });
       actions.push(async () => {
-        attribute.value = await referenceUtils.readGeneratedSpecifier(reference);
+        setHtmlNodeAttributes(node, {
+          [attributeName]: await referenceUtils.readGeneratedSpecifier(reference)
+        });
       });
     }
   });
@@ -144,6 +145,24 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
     content: stringifyHtmlAst(htmlAst)
   };
 };
+const crossOriginCompatibleTagNames = ["script", "link", "img", "source"];
+const integrityCompatibleTagNames = ["script", "link", "img", "source"];
+
+const readFetchMetas = node => {
+  const meta = {};
+
+  if (crossOriginCompatibleTagNames.includes(node.nodeName)) {
+    const crossorigin = getHtmlNodeAttribute(node, "crossorigin") !== undefined;
+    meta.crossorigin = crossorigin;
+  }
+
+  if (integrityCompatibleTagNames.includes(node.nodeName)) {
+    const integrity = getHtmlNodeAttribute(node, "integrity");
+    meta.integrity = integrity;
+  }
+
+  return meta;
+};
 
 const visitHtmlUrls = ({
   url,
@@ -155,18 +174,18 @@ const visitHtmlUrls = ({
     subtype,
     expectedType,
     node,
-    attribute,
+    attributeName,
     specifier
   }) => {
-    const generatedFromInlineContent = Boolean(getHtmlNodeAttributeByName(node, "generated-from-inline-content"));
+    const generatedFromInlineContent = getHtmlNodeAttribute(node, "generated-from-inline-content") !== undefined;
     let position;
 
     if (generatedFromInlineContent) {
       // when generated from inline content,
       // line, column is not "src" nor "generated-from-src" but "original-position"
-      position = htmlNodePosition.readNodePosition(node);
+      position = getHtmlNodePosition(node);
     } else {
-      position = htmlNodePosition.readAttributePosition(node, attribute.name);
+      position = getHtmlNodeAttributePosition(node, attributeName);
     }
 
     const {
@@ -182,19 +201,68 @@ const visitHtmlUrls = ({
       column,
       // originalLine, originalColumn
       specifier,
-      attribute,
-      // injected:Boolean(getHtmlNodeAttributeByName(node, "injected-by"))
-      // srcGeneratedFromInlineContent
-      ...readFetchMetas(node)
+      node,
+      attributeName
     });
   };
 
-  const visitors = {
+  const visitAttributeAsUrlSpecifier = ({
+    node,
+    attributeName,
+    ...rest
+  }) => {
+    const value = getHtmlNodeAttribute(node, attributeName);
+
+    if (value) {
+      const generatedBy = getHtmlNodeAttribute(node, "generated-by");
+
+      if (generatedBy !== undefined) {
+        // during build the importmap is inlined
+        // and shoud not be considered as a dependency anymore
+        return;
+      }
+
+      addDependency({ ...rest,
+        node,
+        attributeName,
+        specifier: attributeName === "generated-from-src" || attributeName === "generated-from-href" ? new URL(value, url).href : value
+      });
+    } else if (attributeName === "src") {
+      visitAttributeAsUrlSpecifier({ ...rest,
+        node,
+        attributeName: "generated-from-src"
+      });
+    } else if (attributeName === "href") {
+      visitAttributeAsUrlSpecifier({ ...rest,
+        node,
+        attributeName: "generated-from-href"
+      });
+    }
+  };
+
+  const visitSrcset = ({
+    type,
+    node
+  }) => {
+    const srcset = getHtmlNodeAttribute(node, "srcset");
+
+    if (srcset) {
+      const srcCandidates = parseSrcSet(srcset);
+      srcCandidates.forEach(srcCandidate => {
+        addDependency({
+          type,
+          node,
+          attributeName: "srcset",
+          specifier: srcCandidate.specifier
+        });
+      });
+    }
+  };
+
+  visitHtmlNodes(htmlAst, {
     link: node => {
-      const relAttribute = getHtmlNodeAttributeByName(node, "rel");
-      const rel = relAttribute ? relAttribute.value : undefined;
-      const typeAttribute = getHtmlNodeAttributeByName(node, "type");
-      const type = typeAttribute ? typeAttribute.value : undefined;
+      const rel = getHtmlNodeAttribute(node, "rel");
+      const type = getHtmlNodeAttribute(node, "type");
       visitAttributeAsUrlSpecifier({
         type: "link_href",
         subtype: rel,
@@ -210,15 +278,16 @@ const visitHtmlUrls = ({
     },
     // style: () => {},
     script: node => {
-      const typeAttributeNode = getHtmlNodeAttributeByName(node, "type");
+      const type = getHtmlNodeAttribute(node, "type");
+      const expectedType = {
+        "undefined": "js_classic",
+        "text/javascript": "js_classic",
+        "module": "js_module",
+        "importmap": "importmap"
+      }[type];
       visitAttributeAsUrlSpecifier({
         type: "script_src",
-        expectedType: {
-          "undefined": "js_classic",
-          "text/javascript": "js_classic",
-          "module": "js_module",
-          "importmap": "importmap"
-        }[typeAttributeNode ? typeAttributeNode.value : undefined],
+        expectedType,
         node,
         attributeName: "src"
       });
@@ -274,102 +343,9 @@ const visitHtmlUrls = ({
         attributeName: "href"
       });
     }
-  };
-
-  const visitAttributeAsUrlSpecifier = ({
-    type,
-    subtype,
-    expectedType,
-    node,
-    attributeName
-  }) => {
-    const attribute = getHtmlNodeAttributeByName(node, attributeName);
-    const value = attribute ? attribute.value : undefined;
-
-    if (value) {
-      const generatedBy = getHtmlNodeAttributeByName(node, "generated-by");
-
-      if (generatedBy) {
-        // during build the importmap is inlined
-        // and shoud not be considered as a dependency anymore
-        return;
-      }
-
-      addDependency({
-        type,
-        subtype,
-        expectedType,
-        node,
-        attribute,
-        specifier: attributeName === "generated-from-src" || attributeName === "generated-from-href" ? new URL(value, url).href : value
-      });
-    } else if (attributeName === "src") {
-      visitAttributeAsUrlSpecifier({
-        type,
-        subtype,
-        expectedType,
-        node,
-        attributeName: "generated-from-src"
-      });
-    } else if (attributeName === "href") {
-      visitAttributeAsUrlSpecifier({
-        type,
-        subtype,
-        expectedType,
-        node,
-        attributeName: "generated-from-href"
-      });
-    }
-  };
-
-  const visitSrcset = ({
-    type,
-    node
-  }) => {
-    const srcsetAttribute = getHtmlNodeAttributeByName(node, "srcset");
-    const srcset = srcsetAttribute ? srcsetAttribute.value : undefined;
-
-    if (srcset) {
-      const srcCandidates = htmlAttributeSrcSet.parse(srcset);
-      srcCandidates.forEach(srcCandidate => {
-        addDependency({
-          type,
-          node,
-          attribute: srcsetAttribute,
-          specifier: srcCandidate.specifier
-        });
-      });
-    }
-  };
-
-  visitHtmlAst(htmlAst, node => {
-    const visitor = visitors[node.nodeName];
-
-    if (visitor) {
-      visitor(node);
-    }
   });
 };
 
-const crossOriginCompatibleTagNames = ["script", "link", "img", "source"];
-const integrityCompatibleTagNames = ["script", "link", "img", "source"];
-
-const readFetchMetas = node => {
-  const meta = {};
-
-  if (crossOriginCompatibleTagNames.includes(node.nodeName)) {
-    const crossoriginAttribute = getHtmlNodeAttributeByName(node, "crossorigin");
-    meta.crossorigin = crossoriginAttribute ? crossoriginAttribute.value : undefined;
-  }
-
-  if (integrityCompatibleTagNames.includes(node.nodeName)) {
-    const integrityAttribute = getHtmlNodeAttributeByName(node, "integrity");
-    meta.integrity = integrityAttribute ? integrityAttribute.value : undefined;
-  }
-
-  return meta;
-};
-
 /*
  * https://github.com/parcel-bundler/parcel/blob/v2/packages/transformers/css/src/CSSTransformer.js
  */
@@ -745,14 +721,14 @@ const jsenvPluginImportmap = () => {
     transformUrlContent: {
       html: async (htmlUrlInfo, context) => {
         const htmlAst = parseHtmlString(htmlUrlInfo.content);
-        const importmap = findNode(htmlAst, node => {
+        const importmap = findHtmlNode(htmlAst, node => {
           if (node.nodeName !== "script") {
             return false;
           }
 
-          const typeAttribute = getHtmlNodeAttributeByName(node, "type");
+          const type = getHtmlNodeAttribute(node, "type");
 
-          if (!typeAttribute || typeAttribute.value !== "importmap") {
+          if (type === undefined || type !== "importmap") {
             return false;
           }
 
@@ -771,7 +747,7 @@ const jsenvPluginImportmap = () => {
             lineEnd,
             columnEnd,
             isOriginal
-          } = htmlNodePosition.readNodePosition(importmap, {
+          } = getHtmlNodePosition(importmap, {
             preferOriginal: true
           });
           const inlineImportmapUrl = generateInlineContentUrl({
@@ -794,9 +770,9 @@ const jsenvPluginImportmap = () => {
           await context.cook(inlineImportmapUrlInfo, {
             reference: inlineImportmapReference
           });
-          setHtmlNodeGeneratedText(importmap, {
-            generatedText: inlineImportmapUrlInfo.content,
-            generatedBy: "jsenv:importmap"
+          setHtmlNodeText(importmap, inlineImportmapUrlInfo.content);
+          setHtmlNodeAttributes(importmap, {
+            "generated-by": "jsenv:importmap"
           });
           onHtmlImportmapParsed(JSON.parse(inlineImportmapUrlInfo.content), htmlUrlInfo.url);
         };
@@ -813,11 +789,11 @@ const jsenvPluginImportmap = () => {
             reference: importmapReference
           });
           onHtmlImportmapParsed(JSON.parse(importmapUrlInfo.content), htmlUrlInfo.url);
-          removeHtmlNodeAttributeByName(importmap, "src");
-          setHtmlNodeGeneratedText(importmap, {
-            generatedText: importmapUrlInfo.content,
-            generatedBy: "jsenv:importmap",
-            generatedFromSrc: src
+          setHtmlNodeText(importmap, importmapUrlInfo.content);
+          setHtmlNodeAttributes(importmap, {
+            "src": undefined,
+            "generated-by": "jsenv:importmap",
+            "generated-from-src": src
           });
           const {
             line,
@@ -825,7 +801,7 @@ const jsenvPluginImportmap = () => {
             lineEnd,
             columnEnd,
             isOriginal
-          } = htmlNodePosition.readNodePosition(importmap, {
+          } = getHtmlNodePosition(importmap, {
             preferOriginal: true
           });
           const inlineImportmapUrl = generateInlineContentUrl({
@@ -846,16 +822,15 @@ const jsenvPluginImportmap = () => {
           });
         };
 
-        const srcAttribute = getHtmlNodeAttributeByName(importmap, "src");
-        const src = srcAttribute ? srcAttribute.value : undefined;
+        const src = getHtmlNodeAttribute(importmap, "src");
 
         if (src) {
           await handleImportmapWithSrc(importmap, src);
         } else {
-          const textNode = getHtmlNodeTextNode(importmap);
+          const htmlNodeText = getHtmlNodeText(importmap);
 
-          if (textNode) {
-            await handleInlineImportmap(importmap, textNode);
+          if (htmlNodeText) {
+            await handleInlineImportmap(importmap, htmlNodeText);
           }
         } // once this plugin knows the importmap, it will use it
         // to map imports. These import specifiers will be normalized
@@ -1104,7 +1079,7 @@ const jsenvPluginUrlVersion = () => {
 const jsenvPluginFileUrls = ({
   magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
-  preservesSymlink = true,
+  preserveSymlinks = false,
   directoryReferenceAllowed = false
 }) => {
   return [{
@@ -1159,7 +1134,7 @@ const jsenvPluginFileUrls = ({
       if (foundADirectory && directoryReferenceAllowed) {
         reference.data.foundADirectory = true;
         const directoryFacadeUrl = urlObject.href;
-        const directoryUrlRaw = preservesSymlink ? directoryFacadeUrl : resolveSymlink(directoryFacadeUrl);
+        const directoryUrlRaw = preserveSymlinks ? directoryFacadeUrl : resolveSymlink(directoryFacadeUrl);
         const directoryUrl = `${directoryUrlRaw}${search}${hash}`;
         return directoryUrl;
       }
@@ -1178,7 +1153,7 @@ const jsenvPluginFileUrls = ({
 
       reference.data.foundADirectory = filesystemResolution.isDirectory;
       const fileFacadeUrl = filesystemResolution.url;
-      const fileUrlRaw = preservesSymlink ? fileFacadeUrl : resolveSymlink(fileFacadeUrl);
+      const fileUrlRaw = preserveSymlinks ? fileFacadeUrl : resolveSymlink(fileFacadeUrl);
       const fileUrl = `${fileUrlRaw}${search}${hash}`;
       return fileUrl;
     }
@@ -1298,13 +1273,9 @@ const jsenvPluginHtmlInlineContent = ({
         const actions = [];
 
         const handleInlineStyle = node => {
-          if (node.nodeName !== "style") {
-            return;
-          }
-
-          const textNode = getHtmlNodeTextNode(node);
+          const htmlNodeText = getHtmlNodeText(node);
 
-          if (!textNode) {
+          if (!htmlNodeText) {
             return;
           }
 
@@ -1315,7 +1286,7 @@ const jsenvPluginHtmlInlineContent = ({
               lineEnd,
               columnEnd,
               isOriginal
-            } = htmlNodePosition.readNodePosition(node, {
+            } = getHtmlNodePosition(node, {
               preferOriginal: true
             });
             const inlineStyleUrl = generateInlineContentUrl({
@@ -1337,55 +1308,47 @@ const jsenvPluginHtmlInlineContent = ({
               specifierColumn: column,
               specifier: inlineStyleUrl,
               contentType: "text/css",
-              content: textNode.value
+              content: htmlNodeText
             });
             await context.cook(inlineStyleUrlInfo, {
               reference: inlineStyleReference
             });
-            setHtmlNodeGeneratedText(node, {
-              generatedText: inlineStyleUrlInfo.content,
-              generatedBy: "jsenv:html_inline_content"
+            setHtmlNodeText(node, inlineStyleUrlInfo.content);
+            setHtmlNodeAttributes(node, {
+              "generated-by": "jsenv:html_inline_content"
             });
           });
         };
 
         const handleInlineScript = node => {
-          if (node.nodeName !== "script") {
-            return;
-          }
-
-          const textNode = getHtmlNodeTextNode(node);
+          const htmlNodeText = getHtmlNodeText(node);
 
-          if (!textNode) {
+          if (!htmlNodeText) {
             return;
           } // If the inline script was already handled by an other plugin, ignore it
           // - we want to preserve inline scripts generated by html supervisor during dev
           // - we want to avoid cooking twice a script during build
 
 
-          const generatedBy = getHtmlNodeAttributeByName(node, "generated-by");
+          const generatedBy = getHtmlNodeAttribute(node, "generated-by");
 
-          if (generatedBy) {
-            if (generatedBy.value === "jsenv:as_js_classic_html") {
-              if (!analyzeConvertedScripts) {
-                return;
-              }
-            }
+          if (generatedBy === "jsenv:as_js_classic_html" && !analyzeConvertedScripts) {
+            return;
+          }
 
-            if (generatedBy.value === "jsenv:html_supervisor") {
-              return;
-            }
+          if (generatedBy === "jsenv:html_supervisor") {
+            return;
           }
 
           actions.push(async () => {
-            const scriptCategory = parseScriptNode(node);
+            const scriptCategory = analyzeScriptNode(node);
             const {
               line,
               column,
               lineEnd,
               columnEnd,
               isOriginal
-            } = htmlNodePosition.readNodePosition(node, {
+            } = getHtmlNodePosition(node, {
               preferOriginal: true
             }); // from MDN about [type] attribute:
             // "Any other value: The embedded content is treated as a data block
@@ -1421,21 +1384,25 @@ const jsenvPluginHtmlInlineContent = ({
               isOriginalPosition: isOriginal,
               specifier: inlineScriptUrl,
               contentType,
-              content: textNode.value
+              content: htmlNodeText
             });
             await context.cook(inlineScriptUrlInfo, {
               reference: inlineScriptReference
             });
-            setHtmlNodeGeneratedText(node, {
-              generatedText: inlineScriptUrlInfo.content,
-              generatedBy: "jsenv:html_inline_content"
+            setHtmlNodeText(node, inlineScriptUrlInfo.content);
+            setHtmlNodeAttributes(node, {
+              "generated-by": "jsenv:html_inline_content"
             });
           });
         };
 
-        visitHtmlAst(htmlAst, node => {
-          handleInlineStyle(node);
-          handleInlineScript(node);
+        visitHtmlNodes(htmlAst, {
+          style: node => {
+            handleInlineStyle(node);
+          },
+          script: node => {
+            handleInlineScript(node);
+          }
         });
 
         if (actions.length === 0) {
@@ -1975,15 +1942,15 @@ const jsenvPluginHtmlSupervisor = ({
         const htmlAst = parseHtmlString(content);
         const scriptsToSupervise = [];
 
-        const handleInlineScript = (node, textNode) => {
-          const scriptCategory = parseScriptNode(node);
+        const handleInlineScript = (node, htmlNodeText) => {
+          const scriptCategory = analyzeScriptNode(node);
           const {
             line,
             column,
             lineEnd,
             columnEnd,
             isOriginal
-          } = htmlNodePosition.readNodePosition(node, {
+          } = getHtmlNodePosition(node, {
             preferOriginal: true
           });
           let inlineScriptUrl = generateInlineContentUrl({
@@ -2005,7 +1972,7 @@ const jsenvPluginHtmlSupervisor = ({
             specifierColumn: column,
             specifier: inlineScriptUrl,
             contentType: "text/javascript",
-            content: textNode.value
+            content: htmlNodeText
           });
           removeHtmlNodeText(node);
           scriptsToSupervise.push({
@@ -2016,21 +1983,19 @@ const jsenvPluginHtmlSupervisor = ({
           });
         };
 
-        const handleScriptWithSrc = (node, srcAttribute) => {
-          const scriptCategory = parseScriptNode(node);
-          const integrityAttribute = getHtmlNodeAttributeByName(node, "integrity");
-          const integrity = integrityAttribute ? integrityAttribute.value : undefined;
-          const crossoriginAttribute = getHtmlNodeAttributeByName(node, "crossorigin");
-          const crossorigin = crossoriginAttribute ? crossoriginAttribute.value : undefined;
-          const deferAttribute = getHtmlNodeAttributeByName(node, "crossorigin");
-          const defer = deferAttribute ? deferAttribute.value : undefined;
-          const asyncAttribute = getHtmlNodeAttributeByName(node, "crossorigin");
-          const async = asyncAttribute ? asyncAttribute.value : undefined;
-          removeHtmlNodeAttributeByName(node, "src");
+        const handleScriptWithSrc = (node, src) => {
+          const scriptCategory = analyzeScriptNode(node);
+          const integrity = getHtmlNodeAttribute(node, "integrity");
+          const crossorigin = getHtmlNodeAttribute(node, "crossorigin") !== undefined;
+          const defer = getHtmlNodeAttribute(node, "defer") !== undefined;
+          const async = getHtmlNodeAttribute(node, "async") !== undefined;
+          setHtmlNodeAttributes(node, {
+            src: undefined
+          });
           scriptsToSupervise.push({
             node,
             type: scriptCategory,
-            src: srcAttribute.value,
+            src,
             defer,
             async,
             integrity,
@@ -2038,41 +2003,39 @@ const jsenvPluginHtmlSupervisor = ({
           });
         };
 
-        visitHtmlAst(htmlAst, node => {
-          if (node.nodeName !== "script") {
-            return;
-          }
-
-          const scriptCategory = parseScriptNode(node);
+        visitHtmlNodes(htmlAst, {
+          script: node => {
+            const scriptCategory = analyzeScriptNode(node);
 
-          if (scriptCategory !== "classic" && scriptCategory !== "module") {
-            return;
-          }
+            if (scriptCategory !== "classic" && scriptCategory !== "module") {
+              return;
+            }
 
-          const injectedByAttribute = getHtmlNodeAttributeByName(node, "injected-by");
+            const injectedBy = getHtmlNodeAttribute(node, "injected-by");
 
-          if (injectedByAttribute) {
-            return;
-          }
+            if (injectedBy !== undefined) {
+              return;
+            }
 
-          const noHtmlSupervisor = getHtmlNodeAttributeByName(node, "no-html-supervisor");
+            const noHtmlSupervisor = getHtmlNodeAttribute(node, "no-html-supervisor");
 
-          if (noHtmlSupervisor) {
-            return;
-          }
+            if (noHtmlSupervisor !== undefined) {
+              return;
+            }
 
-          const textNode = getHtmlNodeTextNode(node);
+            const htmlNodeText = getHtmlNodeText(node);
 
-          if (textNode) {
-            handleInlineScript(node, textNode);
-            return;
-          }
+            if (htmlNodeText) {
+              handleInlineScript(node, htmlNodeText);
+              return;
+            }
 
-          const srcAttribute = getHtmlNodeAttributeByName(node, "src");
+            const src = getHtmlNodeAttribute(node, "src");
 
-          if (srcAttribute) {
-            handleScriptWithSrc(node, srcAttribute);
-            return;
+            if (src) {
+              handleScriptWithSrc(node, src);
+              return;
+            }
           }
         });
         const [htmlSupervisorInstallerFileReference] = referenceUtils.inject({
@@ -2080,7 +2043,7 @@ const jsenvPluginHtmlSupervisor = ({
           expectedType: "js_module",
           specifier: htmlSupervisorInstallerFileUrl
         });
-        injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+        injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
           "tagName": "script",
           "type": "module",
           "textContent": `
@@ -2096,7 +2059,7 @@ const jsenvPluginHtmlSupervisor = ({
           expectedType: "js_classic",
           specifier: htmlSupervisorSetupFileUrl
         });
-        injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+        injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
           "tagName": "script",
           "src": htmlSupervisorSetupFileReference.generatedSpecifier,
           "injected-by": "jsenv:html_supervisor"
@@ -2111,20 +2074,24 @@ const jsenvPluginHtmlSupervisor = ({
           integrity,
           crossorigin
         }) => {
-          setHtmlNodeGeneratedText(node, {
-            generatedText: generateCodeToSuperviseScript({
-              type,
-              src,
-              isInline,
-              defer,
-              async,
-              integrity,
-              crossorigin,
-              htmlSupervisorInstallerSpecifier: htmlSupervisorInstallerFileReference.generatedSpecifier
-            }),
-            generatedBy: "jsenv:html_supervisor",
-            generatedFromSrc: src,
-            generatedFromInlineContent: isInline
+          setHtmlNodeText(node, generateCodeToSuperviseScript({
+            type,
+            src,
+            isInline,
+            defer,
+            async,
+            integrity,
+            crossorigin,
+            htmlSupervisorInstallerSpecifier: htmlSupervisorInstallerFileReference.generatedSpecifier
+          }));
+          setHtmlNodeAttributes(node, {
+            "generated-by": "jsenv:html_supervisor",
+            ...(src ? {
+              "generated-from-src": src
+            } : {}),
+            ...(isInline ? {
+              "generated-from-inline-content": ""
+            } : {})
           });
         });
         const htmlModified = stringifyHtmlAst(htmlAst);
@@ -2739,12 +2706,7 @@ const jsenvPluginAsJsClassicHtml = ({
         const classicScriptNodes = [];
 
         const visitLinkNodes = node => {
-          if (node.nodeName !== "link") {
-            return;
-          }
-
-          const relAttribute = getHtmlNodeAttributeByName(node, "rel");
-          const rel = relAttribute ? relAttribute.value : undefined;
+          const rel = getHtmlNodeAttribute(node, "rel");
 
           if (rel === "modulepreload") {
             modulePreloadNodes.push(node);
@@ -2752,8 +2714,7 @@ const jsenvPluginAsJsClassicHtml = ({
           }
 
           if (rel === "preload") {
-            const asAttribute = getHtmlNodeAttributeByName(node, "as");
-            const asValue = asAttribute ? asAttribute.value : undefined;
+            const asValue = getHtmlNodeAttribute(node, "as");
 
             if (asValue === "script") {
               preloadAsScriptNodes.push(node);
@@ -2764,12 +2725,7 @@ const jsenvPluginAsJsClassicHtml = ({
         };
 
         const visitScriptNodes = node => {
-          if (node.nodeName !== "script") {
-            return;
-          }
-
-          const typeAttribute = getHtmlNodeAttributeByName(node, "type");
-          const type = typeAttribute ? typeAttribute.value : undefined;
+          const type = getHtmlNodeAttribute(node, "type");
 
           if (type === "module") {
             moduleScriptNodes.push(node);
@@ -2782,9 +2738,13 @@ const jsenvPluginAsJsClassicHtml = ({
           }
         };
 
-        visitHtmlAst(htmlAst, node => {
-          visitLinkNodes(node);
-          visitScriptNodes(node);
+        visitHtmlNodes(htmlAst, {
+          link: node => {
+            visitLinkNodes(node);
+          },
+          script: node => {
+            visitScriptNodes(node);
+          }
         });
         const actions = [];
         const jsModuleUrls = [];
@@ -2826,10 +2786,10 @@ const jsenvPluginAsJsClassicHtml = ({
         };
 
         classicScriptNodes.forEach(classicScriptNode => {
-          const srcAttribute = getHtmlNodeAttributeByName(classicScriptNode, "src");
+          const src = getHtmlNodeAttribute(classicScriptNode, "src");
 
-          if (srcAttribute) {
-            const reference = urlInfo.references.find(ref => ref.generatedSpecifier === srcAttribute.value && ref.type === "script_src");
+          if (src !== undefined) {
+            const reference = urlInfo.references.find(ref => ref.generatedSpecifier === src && ref.type === "script_src");
             const urlObject = new URL(reference.url);
 
             if (urlObject.searchParams.has("as_js_classic")) {
@@ -2848,10 +2808,10 @@ const jsenvPluginAsJsClassicHtml = ({
           }
         });
         moduleScriptNodes.forEach(moduleScriptNode => {
-          const srcAttribute = getHtmlNodeAttributeByName(moduleScriptNode, "src");
+          const src = getHtmlNodeAttribute(moduleScriptNode, "src");
 
-          if (srcAttribute) {
-            const reference = urlInfo.references.find(ref => ref.generatedSpecifier === srcAttribute.value && ref.type === "script_src" && ref.expectedType === "js_module");
+          if (src !== undefined) {
+            const reference = urlInfo.references.find(ref => ref.generatedSpecifier === src && ref.type === "script_src" && ref.expectedType === "js_module");
             jsModuleUrls.push(reference.url);
 
             if (shouldTransformScriptTypeModule) {
@@ -2859,8 +2819,10 @@ const jsenvPluginAsJsClassicHtml = ({
                 const [newReference] = await getReferenceAsJsClassic(reference, {
                   cookIt: true
                 });
-                removeHtmlNodeAttributeByName(moduleScriptNode, "type");
-                srcAttribute.value = newReference.generatedSpecifier;
+                setHtmlNodeAttributes(moduleScriptNode, {
+                  type: undefined,
+                  src: newReference.generatedSpecifier
+                });
               });
             }
 
@@ -2868,7 +2830,7 @@ const jsenvPluginAsJsClassicHtml = ({
           }
 
           if (shouldTransformScriptTypeModule) {
-            const textNode = getHtmlNodeTextNode(moduleScriptNode);
+            const htmlNodeText = getHtmlNodeText(moduleScriptNode);
             actions.push(async () => {
               const {
                 line,
@@ -2876,7 +2838,7 @@ const jsenvPluginAsJsClassicHtml = ({
                 lineEnd,
                 columnEnd,
                 isOriginal
-              } = htmlNodePosition.readNodePosition(moduleScriptNode, {
+              } = getHtmlNodePosition(moduleScriptNode, {
                 preferOriginal: true
               });
               let inlineScriptUrl = generateInlineContentUrl({
@@ -2899,15 +2861,15 @@ const jsenvPluginAsJsClassicHtml = ({
                 specifierColumn: column,
                 specifier: inlineScriptUrl,
                 contentType: "text/javascript",
-                content: textNode.value
+                content: htmlNodeText
               });
               const [, newUrlInfo] = await getReferenceAsJsClassic(inlineReference, {
                 cookIt: true
               });
-              removeHtmlNodeAttributeByName(moduleScriptNode, "type");
-              setHtmlNodeGeneratedText(moduleScriptNode, {
-                generatedText: newUrlInfo.content,
-                generatedBy: "jsenv:as_js_classic_html"
+              setHtmlNodeText(moduleScriptNode, newUrlInfo.content);
+              setHtmlNodeAttributes(moduleScriptNode, {
+                "type": undefined,
+                "generated-by": "jsenv:as_js_classic_html"
               });
             });
           }
@@ -2915,8 +2877,7 @@ const jsenvPluginAsJsClassicHtml = ({
 
         if (shouldTransformScriptTypeModule) {
           preloadAsScriptNodes.forEach(preloadAsScriptNode => {
-            const hrefAttribute = getHtmlNodeAttributeByName(preloadAsScriptNode, "href");
-            const href = hrefAttribute.value;
+            const href = getHtmlNodeAttribute(preloadAsScriptNode, "href");
             const reference = urlInfo.references.find(ref => ref.generatedSpecifier === href && ref.type === "link_href" && ref.expectedType === undefined);
             const expectedScriptType = jsModuleUrls.includes(reference.url) ? "module" : "classic";
 
@@ -2931,16 +2892,15 @@ const jsenvPluginAsJsClassicHtml = ({
                   [newReference] = await getReferenceAsJsClassic(reference);
                 }
 
-                assignHtmlNodeAttributes(preloadAsScriptNode, {
-                  href: newReference.generatedSpecifier
+                setHtmlNodeAttributes(preloadAsScriptNode, {
+                  href: newReference.generatedSpecifier,
+                  crossorigin: undefined
                 });
-                removeHtmlNodeAttributeByName(preloadAsScriptNode, "crossorigin");
               });
             }
           });
           modulePreloadNodes.forEach(modulePreloadNode => {
-            const hrefAttribute = getHtmlNodeAttributeByName(modulePreloadNode, "href");
-            const href = hrefAttribute.value;
+            const href = getHtmlNodeAttribute(modulePreloadNode, "href");
             const reference = urlInfo.references.find(ref => ref.generatedSpecifier === href && ref.type === "link_href" && ref.expectedType === "js_module");
             actions.push(async () => {
               let newReference;
@@ -2951,7 +2911,7 @@ const jsenvPluginAsJsClassicHtml = ({
                 [newReference] = await getReferenceAsJsClassic(reference);
               }
 
-              assignHtmlNodeAttributes(modulePreloadNode, {
+              setHtmlNodeAttributes(modulePreloadNode, {
                 rel: "preload",
                 as: "script",
                 href: newReference.generatedSpecifier
@@ -2975,7 +2935,7 @@ const jsenvPluginAsJsClassicHtml = ({
               expectedType: "js_classic",
               specifier: systemJsClientFileUrl
             });
-            injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+            injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
               "tagName": "script",
               "src": systemJsReference.generatedSpecifier,
               "injected-by": "jsenv:as_js_classic_html"
@@ -4054,7 +4014,7 @@ const babelPluginBabelHelpersAsJsenvImports = (babel, {
         }
 
         const babelHelperImportSpecifier = getBabelHelperFileUrl(name);
-        const helper = injectImport({
+        const helper = injectJsImport({
           programPath: file.path,
           from: getImportSpecifier(babelHelperImportSpecifier),
           nameHint: `_${name}`,
@@ -4157,7 +4117,7 @@ const babelPluginNewStylesheetAsJsenvImport = (babel, {
         });
 
         if (usesNewStylesheet) {
-          injectImport({
+          injectJsImport({
             programPath,
             from: getImportSpecifier(newStylesheetClientFileUrl),
             sideEffect: true
@@ -4222,7 +4182,7 @@ const babelPluginGlobalThisAsJsenvImport = (babel, {
         } = path; // we should do this once, tree shaking will remote it but still
 
         if (node.name === "globalThis") {
-          injectImport({
+          injectJsImport({
             programPath: path.scope.getProgramParent().path,
             from: getImportSpecifier(globalThisClientFileUrl),
             sideEffect: true
@@ -4256,7 +4216,7 @@ const babelPluginRegeneratorRuntimeAsJsenvImport = (babel, {
         } = path;
 
         if (node.name === "regeneratorRuntime") {
-          injectImport({
+          injectJsImport({
             programPath: path.scope.getProgramParent().path,
             from: getImportSpecifier(regeneratorRuntimeClientFileUrl),
             sideEffect: true
@@ -4750,71 +4710,6 @@ const bundleJsModule = async ({
   });
   return jsModuleBundleUrlInfos;
 };
-const buildWithRollup = async ({
-  signal,
-  logger,
-  rootDirectoryUrl,
-  buildDirectoryUrl,
-  urlGraph,
-  jsModuleUrlInfos,
-  runtimeCompat,
-  sourcemaps,
-  include,
-  babelHelpersChunk
-}) => {
-  const resultRef = {
-    current: null
-  };
-
-  try {
-    await applyRollupPlugins({
-      rollupPlugins: [rollupPluginJsenv({
-        signal,
-        logger,
-        rootDirectoryUrl,
-        buildDirectoryUrl,
-        urlGraph,
-        jsModuleUrlInfos,
-        runtimeCompat,
-        sourcemaps,
-        include,
-        babelHelpersChunk,
-        resultRef
-      })],
-      inputOptions: {
-        input: [],
-        onwarn: warning => {
-          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));
-        }
-      }
-    });
-    return resultRef.current;
-  } catch (e) {
-    if (e.code === "MISSING_EXPORT") {
-      const detailedMessage = createDetailedMessage(e.message, {
-        frame: e.frame
-      });
-      throw new Error(detailedMessage, {
-        cause: e
-      });
-    }
-
-    throw e;
-  }
-};
 
 const rollupPluginJsenv = ({
   // logger,
@@ -5040,6 +4935,91 @@ const rollupPluginJsenv = ({
   };
 };
 
+const buildWithRollup = async ({
+  signal,
+  logger,
+  rootDirectoryUrl,
+  buildDirectoryUrl,
+  urlGraph,
+  jsModuleUrlInfos,
+  runtimeCompat,
+  sourcemaps,
+  include,
+  babelHelpersChunk
+}) => {
+  const resultRef = {
+    current: null
+  };
+
+  try {
+    await applyRollupPlugins({
+      rollupPlugins: [rollupPluginJsenv({
+        signal,
+        logger,
+        rootDirectoryUrl,
+        buildDirectoryUrl,
+        urlGraph,
+        jsModuleUrlInfos,
+        runtimeCompat,
+        sourcemaps,
+        include,
+        babelHelpersChunk,
+        resultRef
+      })],
+      inputOptions: {
+        input: [],
+        onwarn: warning => {
+          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));
+        }
+      }
+    });
+    return resultRef.current;
+  } catch (e) {
+    if (e.code === "MISSING_EXPORT") {
+      const detailedMessage = createDetailedMessage(e.message, {
+        frame: e.frame
+      });
+      throw new Error(detailedMessage, {
+        cause: e
+      });
+    }
+
+    throw e;
+  }
+};
+
+const applyRollupPlugins = async ({
+  rollupPlugins,
+  inputOptions = {},
+  outputOptions = {}
+}) => {
+  const {
+    rollup
+  } = await import("rollup");
+  const {
+    importAssertions
+  } = await import("acorn-import-assertions");
+  const rollupReturnValue = await rollup({ ...inputOptions,
+    plugins: rollupPlugins,
+    acornInjectPlugins: [importAssertions, ...(inputOptions.acornInjectPlugins || [])]
+  });
+  const rollupOutputArray = await rollupReturnValue.generate(outputOptions);
+  return rollupOutputArray;
+};
+
 const willBeInsideJsDirectory = ({
   chunkInfo,
   fileUrlConverter,
@@ -5282,8 +5262,7 @@ const collectHotDataFromHtmlAst = htmlAst => {
     attributeName,
     hotAccepted
   }) => {
-    const attribute = getHtmlNodeAttributeByName(node, attributeName);
-    const value = attribute ? attribute.value : undefined;
+    const value = getHtmlNodeAttribute(node, attributeName);
 
     if (value) {
       onSpecifier({
@@ -5330,11 +5309,10 @@ const collectHotDataFromHtmlAst = htmlAst => {
     }
 
     if (nodeNamesWithSrcset.includes(node.nodeName)) {
-      const srcsetAttribute = getHtmlNodeAttributeByName(node, "srcset");
-      const srcset = srcsetAttribute ? srcsetAttribute.value : undefined;
+      const srcset = getHtmlNodeAttribute(node, "srcset");
 
       if (srcset) {
-        const srcCandidates = htmlAttributeSrcSet.parse(srcset);
+        const srcCandidates = parseSrcSet(srcset);
         srcCandidates.forEach(srcCandidate => {
           onSpecifier({
             node,
@@ -5375,15 +5353,15 @@ const nodeNamesWithSrcset = ["img", "source"];
 
 const getNodeContext = node => {
   const context = {};
-  const hotAcceptAttribute = getHtmlNodeAttributeByName(node, "hot-accept");
+  const hotAccept = getHtmlNodeAttribute(node, "hot-accept");
 
-  if (hotAcceptAttribute) {
+  if (hotAccept !== undefined) {
     context.hotAccepted = true;
   }
 
-  const hotDeclineAttribute = getHtmlNodeAttributeByName(node, "hot-decline");
+  const hotDecline = getHtmlNodeAttribute(node, "hot-decline");
 
-  if (hotDeclineAttribute) {
+  if (hotDecline !== undefined) {
     context.hotAccepted = false;
   }
 
@@ -5396,7 +5374,7 @@ const htmlNodeCanHotReload = node => {
       isStylesheet,
       isRessourceHint,
       rel
-    } = parseLinkNode(node);
+    } = analyzeLinkNode(node);
 
     if (isStylesheet) {
       // stylesheets can be hot replaced by default
@@ -5696,7 +5674,7 @@ const jsenvPluginDevSSEClient = () => {
           expectedType: "js_module",
           specifier: eventSourceClientFileUrl
         });
-        injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+        injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
           "tagName": "script",
           "type": "module",
           "src": eventSourceClientReference.generatedSpecifier,
@@ -7803,6 +7781,8 @@ const memoizeCook = cook => {
 const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
   if (reference.shouldHandle) {
     urlInfo.shouldHandle = true;
+  } else {
+    urlInfo.shouldHandle = false;
   }
 
   urlInfo.originalUrl = urlInfo.originalUrl || reference.url;
@@ -12366,7 +12346,7 @@ const injectors = {
     const htmlAst = parseHtmlString(urlInfo.content, {
       storeOriginalPositions: false
     });
-    injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+    injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
       "tagName": "script",
       "textContent": generateClientCodeForVersionMappings(versionMappings, {
         globalName: "window"
@@ -12494,15 +12474,12 @@ const resyncRessourceHints = async ({
       });
       const actions = [];
 
-      const visitLinkWithHref = (linkNode, hrefAttribute) => {
-        const href = hrefAttribute.value;
-
+      const visitLinkWithHref = (linkNode, href) => {
         if (!href || href.startsWith("data:")) {
           return;
         }
 
-        const relAttribute = getHtmlNodeAttributeByName(linkNode, "rel");
-        const rel = relAttribute ? relAttribute.value : undefined;
+        const rel = getHtmlNodeAttribute(linkNode, "rel");
         const isRessourceHint = ["preconnect", "dns-prefetch", "prefetch", "preload", "modulepreload"].includes(rel);
 
         if (!isRessourceHint) {
@@ -12546,22 +12523,20 @@ const resyncRessourceHints = async ({
         }
 
         actions.push(() => {
-          hrefAttribute.value = urlInfo.data.buildUrlSpecifier;
+          setHtmlNodeAttributes(linkNode, {
+            href: urlInfo.data.buildUrlSpecifier
+          });
         });
       };
 
-      visitHtmlAst(htmlAst, node => {
-        if (node.nodeName !== "link") {
-          return;
-        }
-
-        const hrefAttribute = getHtmlNodeAttributeByName(node, "href");
+      visitHtmlNodes(htmlAst, {
+        link: node => {
+          const href = getHtmlNodeAttribute(node, "href");
 
-        if (!hrefAttribute) {
-          return;
+          if (href !== undefined) {
+            visitLinkWithHref(node, href);
+          }
         }
-
-        visitLinkWithHref(node, hrefAttribute);
       });
 
       if (actions.length) {
@@ -14205,7 +14180,7 @@ const globalInjectorOnHtml = async (urlInfo, globals) => {
     globals,
     isWebWorker: false
   });
-  injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+  injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
     "tagName": "script",
     "textContent": clientCode,
     "injected-by": "jsenv:inject_globals"