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

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

@@ -3,18 +3,17 @@ import {
   injectQueryParamsIntoSpecifier,
 } from "@jsenv/urls"
 import {
-  getHtmlNodeAttributeByName,
-  getHtmlNodeTextNode,
   parseHtmlString,
-  removeHtmlNodeAttributeByName,
-  assignHtmlNodeAttributes,
+  visitHtmlNodes,
   stringifyHtmlAst,
-  visitHtmlAst,
-  htmlNodePosition,
-  setHtmlNodeGeneratedText,
-  injectScriptAsEarlyAsPossible,
+  getHtmlNodeAttribute,
+  getHtmlNodeText,
+  getHtmlNodePosition,
+  setHtmlNodeAttributes,
+  setHtmlNodeText,
+  injectScriptNodeAsEarlyAsPossible,
   createHtmlNode,
-} from "@jsenv/utils/src/html_ast/html_ast.js"
+} 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/src/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,

package/src/plugins/transpilation/babel/helpers/babel_plugin_babel_helpers_as_jsenv_imports.js

@@ -1,5 +1,5 @@
 import { pathToFileURL } from "node:url"
-import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
+import { injectJsImport } from "@jsenv/ast"
 import {
   getBabelHelperFileUrl,
   babelHelperNameFromUrl,
@@ -36,7 +36,7 @@ export const babelPluginBabelHelpersAsJsenvImports = (
           return undefined
         }
         const babelHelperImportSpecifier = getBabelHelperFileUrl(name)
-        const helper = injectImport({
+        const helper = injectJsImport({
           programPath: file.path,
           from: getImportSpecifier(babelHelperImportSpecifier),
           nameHint: `_${name}`,

package/src/plugins/transpilation/babel/jsenv_plugin_babel.js

@@ -1,4 +1,4 @@
-import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/ast"
 
 import { RUNTIME_COMPAT } from "@jsenv/core/src/omega/compat/runtime_compat.js"
 import { getBaseBabelPluginStructure } from "./helpers/babel_plugin_structure.js"

package/src/plugins/transpilation/babel/new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js

@@ -1,5 +1,5 @@
 import { pathToFileURL } from "node:url"
-import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
+import { injectJsImport } from "@jsenv/ast"
 
 export const babelPluginNewStylesheetAsJsenvImport = (
   babel,
@@ -84,7 +84,7 @@ export const babelPluginNewStylesheetAsJsenvImport = (
           },
         })
         if (usesNewStylesheet) {
-          injectImport({
+          injectJsImport({
             programPath,
             from: getImportSpecifier(newStylesheetClientFileUrl),
             sideEffect: true,

package/src/plugins/transpilation/babel/regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js

@@ -1,5 +1,5 @@
 import { pathToFileURL } from "node:url"
-import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
+import { injectJsImport } from "@jsenv/ast"
 
 export const babelPluginRegeneratorRuntimeAsJsenvImport = (
   babel,
@@ -21,7 +21,7 @@ export const babelPluginRegeneratorRuntimeAsJsenvImport = (
         }
         const { node } = path
         if (node.name === "regeneratorRuntime") {
-          injectImport({
+          injectJsImport({
             programPath: path.scope.getProgramParent().path,
             from: getImportSpecifier(regeneratorRuntimeClientFileUrl),
             sideEffect: true,

package/src/plugins/transpilation/css_parcel/jsenv_plugin_css_parcel.js

@@ -1,4 +1,4 @@
-import { transpileWithParcel } from "@jsenv/utils/src/css_ast/parcel_css.js"
+import { transpileWithParcel } from "@jsenv/ast"
 
 // https://github.com/parcel-bundler/parcel-css
 export const jsenvPluginCssParcel = () => {

package/src/plugins/transpilation/jsenv_plugin_top_level_await.js

@@ -1,4 +1,4 @@
-import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/ast"
 
 import { requireBabelPlugin } from "./babel/require_babel_plugin.js"
 

package/src/plugins/url_analysis/css/css_urls.js

@@ -3,8 +3,7 @@
  */
 
 import { createMagicSource } 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 { applyPostCss, postCssPluginUrlVisitor } from "@jsenv/ast"
 
 export const parseAndTransformCssUrls = async (urlInfo, context) => {
   const actions = []

package/src/plugins/url_analysis/html/html_urls.js

@@ -1,11 +1,13 @@
 import {
   parseHtmlString,
+  visitHtmlNodes,
+  getHtmlNodeAttribute,
+  getHtmlNodePosition,
+  setHtmlNodeAttributes,
+  getHtmlNodeAttributePosition,
+  parseSrcSet,
   stringifyHtmlAst,
-  getHtmlNodeAttributeByName,
-  htmlNodePosition,
-  visitHtmlAst,
-} from "@jsenv/utils/src/html_ast/html_ast.js"
-import { htmlAttributeSrcSet } from "@jsenv/utils/src/html_ast/html_attribute_src_set.js"
+} from "@jsenv/ast"
 
 export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
   const url = urlInfo.originalUrl
@@ -26,9 +28,12 @@ export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
       column,
       originalLine,
       originalColumn,
+      node,
+      attributeName,
       specifier,
-      attribute,
     }) => {
+      const { crossorigin, integrity } = readFetchMetas(node)
+
       const isRessourceHint = [
         "preconnect",
         "dns-prefetch",
@@ -45,9 +50,15 @@ export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
         specifierLine: line,
         specifierColumn: column,
         isRessourceHint,
+        crossorigin,
+        integrity,
       })
       actions.push(async () => {
-        attribute.value = await referenceUtils.readGeneratedSpecifier(reference)
+        setHtmlNodeAttributes(node, {
+          [attributeName]: await referenceUtils.readGeneratedSpecifier(
+            reference,
+          ),
+        })
       })
     },
   })
@@ -60,25 +71,39 @@ export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
   }
 }
 
+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, htmlAst, onUrl }) => {
   const addDependency = ({
     type,
     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 {
       line,
@@ -93,18 +118,61 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
       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,
@@ -120,15 +188,16 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
     },
     // 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",
       })
@@ -184,89 +253,5 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
         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
-}

package/src/plugins/url_analysis/js/js_urls.js

@@ -1,5 +1,5 @@
 import { createMagicSource } from "@jsenv/sourcemap"
-import { parseJsUrls } from "@jsenv/utils/src/js_ast/parse_js_urls.js"
+import { parseJsUrls } from "@jsenv/ast"
 
 import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
 

package/src/test/coverage/empty_coverage_factory.js

@@ -1,7 +1,7 @@
 import { readFile } from "@jsenv/filesystem"
 import { resolveUrl } from "@jsenv/urls"
 import { Abort } from "@jsenv/abort"
-import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/ast"
 
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 import { babelPluginInstrument } from "./babel_plugin_instrument.js"