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

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"

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 = []