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

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -7,17 +7,17 @@
 import {
   parseHtmlString,
   stringifyHtmlAst,
-  visitHtmlAst,
-  getHtmlNodeAttributeByName,
-  removeHtmlNodeAttributeByName,
-  parseScriptNode,
-  injectScriptAsEarlyAsPossible,
+  visitHtmlNodes,
+  getHtmlNodeAttribute,
+  setHtmlNodeAttributes,
+  analyzeScriptNode,
+  injectScriptNodeAsEarlyAsPossible,
   createHtmlNode,
-  htmlNodePosition,
-  getHtmlNodeTextNode,
+  getHtmlNodePosition,
+  getHtmlNodeText,
   removeHtmlNodeText,
-  setHtmlNodeGeneratedText,
-} from "@jsenv/utils/src/html_ast/html_ast.js"
+  setHtmlNodeText,
+} from "@jsenv/ast"
 import { generateInlineContentUrl } from "@jsenv/urls"
 
 export const jsenvPluginHtmlSupervisor = ({
@@ -45,10 +45,10 @@ export 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({
@@ -69,7 +69,7 @@ export const jsenvPluginHtmlSupervisor = ({
             specifierColumn: column,
             specifier: inlineScriptUrl,
             contentType: "text/javascript",
-            content: textNode.value,
+            content: htmlNodeText,
           })
           removeHtmlNodeText(node)
           scriptsToSupervise.push({
@@ -79,76 +79,61 @@ export const jsenvPluginHtmlSupervisor = ({
             src: inlineScriptReference.generatedSpecifier,
           })
         }
-        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,
             crossorigin,
           })
         }
-        visitHtmlAst(htmlAst, (node) => {
-          if (node.nodeName !== "script") {
-            return
-          }
-          const scriptCategory = parseScriptNode(node)
-          if (scriptCategory !== "classic" && scriptCategory !== "module") {
-            return
-          }
-          const injectedByAttribute = getHtmlNodeAttributeByName(
-            node,
-            "injected-by",
-          )
-          if (injectedByAttribute) {
-            return
-          }
-          const noHtmlSupervisor = getHtmlNodeAttributeByName(
-            node,
-            "no-html-supervisor",
-          )
-          if (noHtmlSupervisor) {
-            return
-          }
-          const textNode = getHtmlNodeTextNode(node)
-          if (textNode) {
-            handleInlineScript(node, textNode)
-            return
-          }
-          const srcAttribute = getHtmlNodeAttributeByName(node, "src")
-          if (srcAttribute) {
-            handleScriptWithSrc(node, srcAttribute)
-            return
-          }
+        visitHtmlNodes(htmlAst, {
+          script: (node) => {
+            const scriptCategory = analyzeScriptNode(node)
+            if (scriptCategory !== "classic" && scriptCategory !== "module") {
+              return
+            }
+            const injectedBy = getHtmlNodeAttribute(node, "injected-by")
+            if (injectedBy !== undefined) {
+              return
+            }
+            const noHtmlSupervisor = getHtmlNodeAttribute(
+              node,
+              "no-html-supervisor",
+            )
+            if (noHtmlSupervisor !== undefined) {
+              return
+            }
+            const htmlNodeText = getHtmlNodeText(node)
+            if (htmlNodeText) {
+              handleInlineScript(node, htmlNodeText)
+              return
+            }
+            const src = getHtmlNodeAttribute(node, "src")
+            if (src) {
+              handleScriptWithSrc(node, src)
+              return
+            }
+          },
         })
         const [htmlSupervisorInstallerFileReference] = referenceUtils.inject({
           type: "js_import_export",
           expectedType: "js_module",
           specifier: htmlSupervisorInstallerFileUrl,
         })
-        injectScriptAsEarlyAsPossible(
+        injectScriptNodeAsEarlyAsPossible(
           htmlAst,
           createHtmlNode({
             "tagName": "script",
@@ -173,7 +158,7 @@ export const jsenvPluginHtmlSupervisor = ({
           expectedType: "js_classic",
           specifier: htmlSupervisorSetupFileUrl,
         })
-        injectScriptAsEarlyAsPossible(
+        injectScriptNodeAsEarlyAsPossible(
           htmlAst,
           createHtmlNode({
             "tagName": "script",
@@ -192,8 +177,9 @@ export const jsenvPluginHtmlSupervisor = ({
             integrity,
             crossorigin,
           }) => {
-            setHtmlNodeGeneratedText(node, {
-              generatedText: generateCodeToSuperviseScript({
+            setHtmlNodeText(
+              node,
+              generateCodeToSuperviseScript({
                 type,
                 src,
                 isInline,
@@ -204,9 +190,11 @@ export const jsenvPluginHtmlSupervisor = ({
                 htmlSupervisorInstallerSpecifier:
                   htmlSupervisorInstallerFileReference.generatedSpecifier,
               }),
-              generatedBy: "jsenv:html_supervisor",
-              generatedFromSrc: src,
-              generatedFromInlineContent: isInline,
+            )
+            setHtmlNodeAttributes(node, {
+              "generated-by": "jsenv:html_supervisor",
+              ...(src ? { "generated-from-src": src } : {}),
+              ...(isInline ? { "generated-from-inline-content": "" } : {}),
             })
           },
         )

package/src/plugins/import_meta_hot/html_hot_dependencies.js

@@ -1,8 +1,4 @@
-import {
-  getHtmlNodeAttributeByName,
-  parseLinkNode,
-} from "@jsenv/utils/src/html_ast/html_ast.js"
-import { htmlAttributeSrcSet } from "@jsenv/utils/src/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,5 @@
 import { createMagicSource } from "@jsenv/sourcemap"
-import { parseHtmlString } from "@jsenv/utils/src/html_ast/html_ast.js"
-import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+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

@@ -10,7 +10,7 @@
  */
 
 import { createMagicSource } from "@jsenv/sourcemap"
-import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/ast"
 
 export const jsenvPluginImportMetaScenarios = () => {
   return {

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -26,14 +26,14 @@ import { generateInlineContentUrl } from "@jsenv/urls"
 import {
   parseHtmlString,
   stringifyHtmlAst,
-  findNode,
-  getHtmlNodeAttributeByName,
-  htmlNodePosition,
-  removeHtmlNodeAttributeByName,
-  setHtmlNodeGeneratedText,
-  getHtmlNodeTextNode,
+  findHtmlNode,
+  getHtmlNodeAttribute,
+  setHtmlNodeAttributes,
+  getHtmlNodePosition,
+  getHtmlNodeText,
+  setHtmlNodeText,
   removeHtmlNode,
-} from "@jsenv/utils/src/html_ast/html_ast.js"
+} from "@jsenv/ast"
 
 export const jsenvPluginImportmap = () => {
   let finalImportmap = null
@@ -92,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
@@ -108,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({
@@ -132,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),
@@ -159,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({
@@ -188,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/src/html_ast/html_ast.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_html_inline_content.js

@@ -2,13 +2,14 @@ import { generateInlineContentUrl } from "@jsenv/urls"
 import {
   parseHtmlString,
   stringifyHtmlAst,
-  visitHtmlAst,
-  getHtmlNodeTextNode,
-  htmlNodePosition,
-  parseScriptNode,
-  setHtmlNodeGeneratedText,
-  getHtmlNodeAttributeByName,
-} from "@jsenv/utils/src/html_ast/html_ast.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 }) => {
@@ -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 { 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"
-import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.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/src/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

@@ -14,9 +14,9 @@
 import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 import { readFileSync } from "@jsenv/filesystem"
 import { createMagicSource, composeTwoSourcemaps } from "@jsenv/sourcemap"
-import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
-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 { 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"