@jsenv/core 27.0.0-alpha.83 → 27.0.0-alpha.86

package/src/plugins/import_meta_hot/html_hot_dependencies.js

@@ -1,8 +1,4 @@
-import {
-  getHtmlNodeAttributeByName,
-  parseLinkNode,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.js"
+import { getHtmlNodeAttribute, analyzeLinkNode, parseSrcSet } from "@jsenv/ast"
 
 // Some "smart" default applied to decide what should hot reload / fullreload:
 // By default:
@@ -28,8 +24,7 @@ export const collectHotDataFromHtmlAst = (htmlAst) => {
   }
 
   const visitUrlSpecifierAttribute = ({ node, attributeName, hotAccepted }) => {
-    const attribute = getHtmlNodeAttributeByName(node, attributeName)
-    const value = attribute ? attribute.value : undefined
+    const value = getHtmlNodeAttribute(node, attributeName)
     if (value) {
       onSpecifier({
         specifier: value,
@@ -70,10 +65,9 @@ export 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,
@@ -112,12 +106,12 @@ const nodeNamesWithSrcset = ["img", "source"]
 
 const getNodeContext = (node) => {
   const context = {}
-  const hotAcceptAttribute = getHtmlNodeAttributeByName(node, "hot-accept")
-  if (hotAcceptAttribute) {
+  const hotAccept = getHtmlNodeAttribute(node, "hot-accept")
+  if (hotAccept !== undefined) {
     context.hotAccepted = true
   }
-  const hotDeclineAttribute = getHtmlNodeAttributeByName(node, "hot-decline")
-  if (hotDeclineAttribute) {
+  const hotDecline = getHtmlNodeAttribute(node, "hot-decline")
+  if (hotDecline !== undefined) {
     context.hotAccepted = false
   }
   return context
@@ -125,7 +119,7 @@ const getNodeContext = (node) => {
 
 const htmlNodeCanHotReload = (node) => {
   if (node.nodeName === "link") {
-    const { isStylesheet, isRessourceHint, rel } = parseLinkNode(node)
+    const { isStylesheet, isRessourceHint, rel } = analyzeLinkNode(node)
     if (isStylesheet) {
       // stylesheets can be hot replaced by default
       return true

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -1,6 +1,6 @@
-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 { createMagicSource } from "@jsenv/sourcemap"
+import { parseHtmlString, applyBabelPlugins } from "@jsenv/ast"
+
 import { collectHotDataFromHtmlAst } from "./html_hot_dependencies.js"
 import { babelPluginMetadataImportMetaHot } from "./babel_plugin_metadata_import_meta_hot.js"
 

package/src/plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -9,8 +9,8 @@
  * - replaced by undefined (import.meta.dev but it's build; the goal is to ensure it's tree-shaked)
  */
 
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { applyBabelPlugins } from "@jsenv/ast"
 
 export const jsenvPluginImportMetaScenarios = () => {
   return {

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -22,19 +22,18 @@ import {
   composeTwoImportMaps,
   normalizeImportMap,
 } from "@jsenv/importmap"
-
+import { generateInlineContentUrl } from "@jsenv/urls"
 import {
   parseHtmlString,
   stringifyHtmlAst,
-  findNode,
-  getHtmlNodeAttributeByName,
-  htmlNodePosition,
-  removeHtmlNodeAttributeByName,
-  setHtmlNodeGeneratedText,
-  getHtmlNodeTextNode,
+  findHtmlNode,
+  getHtmlNodeAttribute,
+  setHtmlNodeAttributes,
+  getHtmlNodePosition,
+  getHtmlNodeText,
+  setHtmlNodeText,
   removeHtmlNode,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/urls"
+} from "@jsenv/ast"
 
 export const jsenvPluginImportmap = () => {
   let finalImportmap = null
@@ -93,12 +92,12 @@ export 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")
-          if (!typeAttribute || typeAttribute.value !== "importmap") {
+          const type = getHtmlNodeAttribute(node, "type")
+          if (type === undefined || type !== "importmap") {
             return false
           }
           return true
@@ -109,7 +108,7 @@ export const jsenvPluginImportmap = () => {
         }
         const handleInlineImportmap = async (importmap, textNode) => {
           const { line, column, lineEnd, columnEnd, isOriginal } =
-            htmlNodePosition.readNodePosition(importmap, {
+            getHtmlNodePosition(importmap, {
               preferOriginal: true,
             })
           const inlineImportmapUrl = generateInlineContentUrl({
@@ -133,9 +132,9 @@ export 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),
@@ -160,15 +159,15 @@ export const jsenvPluginImportmap = () => {
             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, column, lineEnd, columnEnd, isOriginal } =
-            htmlNodePosition.readNodePosition(importmap, {
+            getHtmlNodePosition(importmap, {
               preferOriginal: true,
             })
           const inlineImportmapUrl = generateInlineContentUrl({
@@ -189,14 +188,13 @@ export 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)
-          if (textNode) {
-            await handleInlineImportmap(importmap, textNode)
+          const htmlNodeText = getHtmlNodeText(importmap)
+          if (htmlNodeText) {
+            await handleInlineImportmap(importmap, htmlNodeText)
           }
         }
         // once this plugin knows the importmap, it will use it

package/src/plugins/inject_globals/inject_globals.js

@@ -1,10 +1,10 @@
+import { createMagicSource } from "@jsenv/sourcemap"
 import {
   parseHtmlString,
-  injectScriptAsEarlyAsPossible,
+  injectScriptNodeAsEarlyAsPossible,
   createHtmlNode,
   stringifyHtmlAst,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+} from "@jsenv/ast"
 
 export const injectGlobals = (urlInfo, globals) => {
   if (urlInfo.type === "html") {
@@ -27,7 +27,7 @@ const globalInjectorOnHtml = async (urlInfo, globals) => {
     globals,
     isWebWorker: false,
   })
-  injectScriptAsEarlyAsPossible(
+  injectScriptNodeAsEarlyAsPossible(
     htmlAst,
     createHtmlNode({
       "tagName": "script",

package/src/plugins/inline/jsenv_plugin_data_urls.js

@@ -1,5 +1,5 @@
 import { DATA_URL } from "@jsenv/urls"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
 export const jsenvPluginDataUrls = () => {
   return {

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -1,15 +1,16 @@
+import { generateInlineContentUrl } from "@jsenv/urls"
 import {
   parseHtmlString,
   stringifyHtmlAst,
-  visitHtmlAst,
-  getHtmlNodeTextNode,
-  htmlNodePosition,
-  parseScriptNode,
-  setHtmlNodeGeneratedText,
-  getHtmlNodeAttributeByName,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/urls"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
+  visitHtmlNodes,
+  getHtmlNodeText,
+  getHtmlNodePosition,
+  analyzeScriptNode,
+  setHtmlNodeAttributes,
+  setHtmlNodeText,
+  getHtmlNodeAttribute,
+} from "@jsenv/ast"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
 export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
   return {
@@ -20,16 +21,13 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
         const htmlAst = parseHtmlString(urlInfo.content)
         const actions = []
         const handleInlineStyle = (node) => {
-          if (node.nodeName !== "style") {
-            return
-          }
-          const textNode = getHtmlNodeTextNode(node)
-          if (!textNode) {
+          const htmlNodeText = getHtmlNodeText(node)
+          if (!htmlNodeText) {
             return
           }
           actions.push(async () => {
             const { line, column, lineEnd, columnEnd, isOriginal } =
-              htmlNodePosition.readNodePosition(node, {
+              getHtmlNodePosition(node, {
                 preferOriginal: true,
               })
             const inlineStyleUrl = generateInlineContentUrl({
@@ -52,43 +50,39 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
                 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)
-          if (!textNode) {
+          const htmlNodeText = getHtmlNodeText(node)
+          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")
-          if (generatedBy) {
-            if (generatedBy.value === "jsenv:as_js_classic_html") {
-              if (!analyzeConvertedScripts) {
-                return
-              }
-            }
-            if (generatedBy.value === "jsenv:html_supervisor") {
-              return
-            }
+          const generatedBy = getHtmlNodeAttribute(node, "generated-by")
+          if (
+            generatedBy === "jsenv:as_js_classic_html" &&
+            !analyzeConvertedScripts
+          ) {
+            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:
@@ -131,21 +125,25 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
                 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) {
           return null

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -1,8 +1,8 @@
-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/urls"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { applyBabelPlugins } from "@jsenv/ast"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js"
 
 export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
   const parseAndTransformInlineContentCalls = async (urlInfo, context) => {

package/src/plugins/minification/css/minify_css.js

@@ -1,4 +1,4 @@
-import { minifyWithParcel } from "@jsenv/utils/css_ast/parcel_css.js"
+import { minifyWithParcel } from "@jsenv/ast"
 
 export const minifyCss = ({ cssUrlInfo, context }) => {
   const { code, map } = minifyWithParcel(cssUrlInfo, context)

package/src/plugins/transpilation/as_js_classic/client/s.js

@@ -43,7 +43,7 @@
     }
     System.register = (deps, declare) => {
       if (!document.currentScript) {
-        throw new Error("unexpected call")
+        throw new Error("unexpected call to System.register (document.currentScript is undefined)")
       }
       if (document.currentScript.__s__) {
         registerRegistry[document.currentScript.src] = [deps, declare]
@@ -169,7 +169,7 @@
 
     System.register = async (deps, declare) => {
       System.register = () => {
-        throw new Error("unexpected call")
+        throw new Error("unexpected call to System.register (called outside url instantiation)")
       }
       const url = self.location.href
       registerRegistry[url] = [deps, declare]

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

@@ -13,12 +13,10 @@
 
 import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 import { readFileSync } from "@jsenv/filesystem"
+import { createMagicSource, composeTwoSourcemaps } from "@jsenv/sourcemap"
+import { applyBabelPlugins } from "@jsenv/ast"
 
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
-
 import { requireBabelPlugin } from "../babel/require_babel_plugin.js"
 import { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transform_import_meta_url.js"
 import { jsenvPluginAsJsClassicHtml } from "./jsenv_plugin_as_js_classic_html.js"

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

@@ -1,20 +1,19 @@
-import {
-  getHtmlNodeAttributeByName,
-  getHtmlNodeTextNode,
-  parseHtmlString,
-  removeHtmlNodeAttributeByName,
-  assignHtmlNodeAttributes,
-  stringifyHtmlAst,
-  visitHtmlAst,
-  htmlNodePosition,
-  setHtmlNodeGeneratedText,
-  injectScriptAsEarlyAsPossible,
-  createHtmlNode,
-} from "@jsenv/utils/html_ast/html_ast.js"
 import {
   generateInlineContentUrl,
   injectQueryParamsIntoSpecifier,
 } from "@jsenv/urls"
+import {
+  parseHtmlString,
+  visitHtmlNodes,
+  stringifyHtmlAst,
+  getHtmlNodeAttribute,
+  getHtmlNodeText,
+  getHtmlNodePosition,
+  setHtmlNodeAttributes,
+  setHtmlNodeText,
+  injectScriptNodeAsEarlyAsPossible,
+  createHtmlNode,
+} from "@jsenv/ast"
 
 export const jsenvPluginAsJsClassicHtml = ({
   systemJsInjection,
@@ -35,18 +34,13 @@ export const jsenvPluginAsJsClassicHtml = ({
         const moduleScriptNodes = []
         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)
             return
           }
           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)
             }
@@ -54,11 +48,7 @@ export 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)
             return
@@ -68,9 +58,13 @@ export const jsenvPluginAsJsClassicHtml = ({
             return
           }
         }
-        visitHtmlAst(htmlAst, (node) => {
-          visitLinkNodes(node)
-          visitScriptNodes(node)
+        visitHtmlNodes(htmlAst, {
+          link: (node) => {
+            visitLinkNodes(node)
+          },
+          script: (node) => {
+            visitScriptNodes(node)
+          },
         })
 
         const actions = []
@@ -113,15 +107,11 @@ export const jsenvPluginAsJsClassicHtml = ({
         }
 
         classicScriptNodes.forEach((classicScriptNode) => {
-          const srcAttribute = getHtmlNodeAttributeByName(
-            classicScriptNode,
-            "src",
-          )
-          if (srcAttribute) {
+          const src = getHtmlNodeAttribute(classicScriptNode, "src")
+          if (src !== undefined) {
             const reference = urlInfo.references.find(
               (ref) =>
-                ref.generatedSpecifier === srcAttribute.value &&
-                ref.type === "script_src",
+                ref.generatedSpecifier === src && ref.type === "script_src",
             )
             const urlObject = new URL(reference.url)
             if (urlObject.searchParams.has("as_js_classic")) {
@@ -138,14 +128,11 @@ export const jsenvPluginAsJsClassicHtml = ({
           }
         })
         moduleScriptNodes.forEach((moduleScriptNode) => {
-          const srcAttribute = getHtmlNodeAttributeByName(
-            moduleScriptNode,
-            "src",
-          )
-          if (srcAttribute) {
+          const src = getHtmlNodeAttribute(moduleScriptNode, "src")
+          if (src !== undefined) {
             const reference = urlInfo.references.find(
               (ref) =>
-                ref.generatedSpecifier === srcAttribute.value &&
+                ref.generatedSpecifier === src &&
                 ref.type === "script_src" &&
                 ref.expectedType === "js_module",
             )
@@ -158,17 +145,19 @@ export const jsenvPluginAsJsClassicHtml = ({
                     cookIt: true,
                   },
                 )
-                removeHtmlNodeAttributeByName(moduleScriptNode, "type")
-                srcAttribute.value = newReference.generatedSpecifier
+                setHtmlNodeAttributes(moduleScriptNode, {
+                  type: undefined,
+                  src: newReference.generatedSpecifier,
+                })
               })
             }
             return
           }
           if (shouldTransformScriptTypeModule) {
-            const textNode = getHtmlNodeTextNode(moduleScriptNode)
+            const htmlNodeText = getHtmlNodeText(moduleScriptNode)
             actions.push(async () => {
               const { line, column, lineEnd, columnEnd, isOriginal } =
-                htmlNodePosition.readNodePosition(moduleScriptNode, {
+                getHtmlNodePosition(moduleScriptNode, {
                   preferOriginal: true,
                 })
               let inlineScriptUrl = generateInlineContentUrl({
@@ -191,27 +180,23 @@ export 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",
               })
             })
           }
         })
         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 &&
@@ -233,22 +218,15 @@ export const jsenvPluginAsJsClassicHtml = ({
                   // but it's unlikely to happen and people should use "modulepreload" in that case anyway
                   ;[newReference] = await getReferenceAsJsClassic(reference)
                 }
-                assignHtmlNodeAttributes(preloadAsScriptNode, {
+                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 &&
@@ -262,7 +240,7 @@ export const jsenvPluginAsJsClassicHtml = ({
               } else {
                 ;[newReference] = await getReferenceAsJsClassic(reference)
               }
-              assignHtmlNodeAttributes(modulePreloadNode, {
+              setHtmlNodeAttributes(modulePreloadNode, {
                 rel: "preload",
                 as: "script",
                 href: newReference.generatedSpecifier,
@@ -287,7 +265,7 @@ export const jsenvPluginAsJsClassicHtml = ({
               expectedType: "js_classic",
               specifier: systemJsClientFileUrl,
             })
-            injectScriptAsEarlyAsPossible(
+            injectScriptNodeAsEarlyAsPossible(
               htmlAst,
               createHtmlNode({
                 "tagName": "script",

package/src/plugins/transpilation/babel/global_this/babel_plugin_global_this_as_jsenv_import.js

@@ -1,6 +1,5 @@
 import { pathToFileURL } from "node:url"
-
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectJsImport } from "@jsenv/ast"
 
 export const babelPluginGlobalThisAsJsenvImport = (
   babel,
@@ -23,7 +22,7 @@ export const babelPluginGlobalThisAsJsenvImport = (
         const { node } = 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,