@jsenv/ast 1.4.3 → 1.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Parse and transform HTML,CSS and JS",
   "license": "MIT",
   "repository": {

package/src/html/html_node.js

@@ -19,12 +19,11 @@ export const createHtmlNode = ({ tagName, textContent = "", ...rest }) => {
 
 export const injectHtmlNode = (htmlAst, node, jsenvPluginName = "jsenv") => {
   setHtmlNodeAttributes(node, {
-    "jsenv-plugin-owner": jsenvPluginName,
-    "jsenv-plugin-action": "injected",
+    "jsenv-injected-by": jsenvPluginName,
   })
   const htmlHtmlNode = findChild(htmlAst, (node) => node.nodeName === "html")
   const bodyNode = findChild(htmlHtmlNode, (node) => node.nodeName === "body")
-  return insertAfter(node, bodyNode)
+  return insertHtmlNodeAfter(node, bodyNode)
 }
 
 export const injectScriptNodeAsEarlyAsPossible = (
@@ -33,8 +32,7 @@ export const injectScriptNodeAsEarlyAsPossible = (
   jsenvPluginName = "jsenv",
 ) => {
   setHtmlNodeAttributes(scriptNode, {
-    "jsenv-plugin-owner": jsenvPluginName,
-    "jsenv-plugin-action": "injected",
+    "jsenv-injected-by": jsenvPluginName,
   })
   const isJsModule = analyzeScriptNode(scriptNode).type === "js_module"
   if (isJsModule) {
@@ -54,13 +52,13 @@ export const injectScriptNodeAsEarlyAsPossible = (
       let after = firstImportmapScript
       for (const nextSibling of nextSiblings) {
         if (nextSibling.nodeName === "script") {
-          return insertBefore(scriptNode, importmapParent, nextSibling)
+          return insertHtmlNodeBefore(scriptNode, importmapParent, nextSibling)
         }
         if (nextSibling.nodeName === "link") {
           after = nextSibling
         }
       }
-      return insertAfter(scriptNode, importmapParent, after)
+      return insertHtmlNodeAfter(scriptNode, importmapParent, after)
     }
   }
   const headNode = findChild(htmlAst, (node) => node.nodeName === "html")
@@ -68,16 +66,20 @@ export const injectScriptNodeAsEarlyAsPossible = (
   let after = headNode.childNodes[0]
   for (const child of headNode.childNodes) {
     if (child.nodeName === "script") {
-      return insertBefore(scriptNode, headNode, child)
+      return insertHtmlNodeBefore(scriptNode, headNode, child)
     }
     if (child.nodeName === "link") {
       after = child
     }
   }
-  return insertAfter(scriptNode, headNode, after)
+  return insertHtmlNodeAfter(scriptNode, headNode, after)
 }
 
-const insertBefore = (nodeToInsert, futureParentNode, futureNextSibling) => {
+export const insertHtmlNodeBefore = (
+  nodeToInsert,
+  futureParentNode,
+  futureNextSibling,
+) => {
   const { childNodes = [] } = futureParentNode
   const futureIndex = futureNextSibling
     ? childNodes.indexOf(futureNextSibling)
@@ -85,7 +87,11 @@ const insertBefore = (nodeToInsert, futureParentNode, futureNextSibling) => {
   injectWithWhitespaces(nodeToInsert, futureParentNode, futureIndex)
 }
 
-const insertAfter = (nodeToInsert, futureParentNode, futurePrevSibling) => {
+export const insertHtmlNodeAfter = (
+  nodeToInsert,
+  futureParentNode,
+  futurePrevSibling,
+) => {
   const { childNodes = [] } = futureParentNode
   const futureIndex = futurePrevSibling
     ? childNodes.indexOf(futurePrevSibling) + 1
@@ -127,9 +133,14 @@ const injectWithWhitespaces = (nodeToInsert, futureParentNode, futureIndex) => {
 const findChild = ({ childNodes = [] }, predicate) => childNodes.find(predicate)
 
 const stringifyAttributes = (object) => {
-  return Object.keys(object)
-    .map((key) => `${key}=${valueToHtmlAttributeValue(object[key])}`)
-    .join(" ")
+  let string = ""
+  Object.keys(object).forEach((key) => {
+    const value = object[key]
+    if (value === undefined) return
+    if (string !== "") string += " "
+    string += `${key}=${valueToHtmlAttributeValue(value)}`
+  })
+  return string
 }
 
 const valueToHtmlAttributeValue = (value) => {

package/src/html/html_parse.js

@@ -68,8 +68,9 @@ export const stringifyHtmlAst = (
             "original-href-position": undefined,
             "inlined-from-src": undefined,
             "inlined-from-href": undefined,
-            "jsenv-plugin-owner": undefined,
-            "jsenv-plugin-action": undefined,
+            "jsenv-cooked-by": undefined,
+            "jsenv-inlined-by": undefined,
+            "jsenv-injected-by": undefined,
             "jsenv-debug": undefined,
           })
         },

package/src/js/js_static_analysis/new_url.js

@@ -87,8 +87,18 @@ const analyzeUrlNodeType = (secondArgNode, { isJsModule }) => {
   if (!isJsModule && isContextMetaUrlFromSystemJs(secondArgNode)) {
     return "context.meta.url"
   }
-  if (!isJsModule && isDocumentCurrentScriptSrc(secondArgNode)) {
-    return "document.currentScript.src"
+  if (!isJsModule) {
+    if (isDocumentCurrentScriptSrc(secondArgNode)) {
+      return "document.currentScript.src"
+    }
+    // new URL('specifier', document.currentScript.src)
+    // becomes
+    // var _currentUrl = document.currentScript.src
+    // new URL('specifier', currentUrl)
+    // (search for scope.generateUidIdentifier("currentUrl")
+    if (secondArgNode.type === "Identifier") {
+      return "document.currentScript.src"
+    }
   }
   return null
 }

package/src/main.js

@@ -22,6 +22,7 @@ export {
   createHtmlNode,
   injectHtmlNode,
   injectScriptNodeAsEarlyAsPossible,
+  insertHtmlNodeAfter,
 } from "./html/html_node.js"
 export {
   inlineScriptNode,