@jsenv/ast 1.1.3 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "description": "Parse and transform HTML,CSS and JS",
   "license": "MIT",
   "repository": {
@@ -33,13 +33,13 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@babel/parser": "7.18.8",
-    "@parcel/css": "1.11.2",
-    "acorn": "8.7.1",
+    "@babel/parser": "7.19.0",
+    "@parcel/css": "1.13.1",
+    "acorn": "8.8.0",
     "acorn-import-assertions": "1.8.0",
     "acorn-walk": "8.2.0",
-    "parse5": "7.0.0",
-    "postcss": "8.4.14",
+    "parse5": "7.1.1",
+    "postcss": "8.4.16",
     "postcss-value-parser": "4.2.0"
   }
 }

package/src/html/html_analysis.js

@@ -84,7 +84,7 @@ export const analyzeLinkNode = (linkNode) => {
       isStylesheet: true,
     }
   }
-  const isRessourceHint = [
+  const isResourceHint = [
     "preconnect",
     "dns-prefetch",
     "prefetch",
@@ -92,7 +92,7 @@ export const analyzeLinkNode = (linkNode) => {
     "modulepreload",
   ].includes(rel)
   return {
-    isRessourceHint,
+    isResourceHint,
     rel,
   }
 }

package/src/html/html_inlining.js

@@ -7,7 +7,7 @@ import { setHtmlNodeText } from "./html_node_text.js"
 export const inlineScriptNode = (script, textContent) => {
   const src = getHtmlNodeAttribute(script, "src")
   setHtmlNodeAttributes(script, {
-    "generated-from-src": src,
+    "inlined-from-src": src,
     "src": undefined,
     "crossorigin": undefined,
     "integrity": undefined,
@@ -18,7 +18,7 @@ export const inlineScriptNode = (script, textContent) => {
 export const inlineLinkStylesheetNode = (link, textContent) => {
   const href = getHtmlNodeAttribute(link, "href")
   setHtmlNodeAttributes(link, {
-    "generated-from-href": href,
+    "inlined-from-href": href,
     "href": undefined,
     "rel": undefined,
     "type": undefined,
@@ -34,7 +34,7 @@ export const inlineLinkStylesheetNode = (link, textContent) => {
 export const inlineImgNode = (img, contentAsBase64) => {
   const src = getHtmlNodeAttribute(img, "src")
   setHtmlNodeAttributes(img, {
-    "generated-from-src": src,
+    "inlined-from-src": src,
     "src": contentAsBase64,
   })
 }

package/src/html/html_node.js

@@ -1,9 +1,6 @@
 import { parseFragment } from "parse5"
 
-import {
-  getHtmlNodeAttribute,
-  setHtmlNodeAttributes,
-} from "./html_node_attributes.js"
+import { setHtmlNodeAttributes } from "./html_node_attributes.js"
 import { findHtmlNode } from "./html_search.js"
 import { analyzeScriptNode } from "./html_analysis.js"
 
@@ -20,13 +17,15 @@ export const createHtmlNode = ({ tagName, textContent = "", ...rest }) => {
   return fragment.childNodes[0]
 }
 
-export const injectScriptNodeAsEarlyAsPossible = (htmlAst, scriptNode) => {
-  const injectedBy = getHtmlNodeAttribute(scriptNode, "injected-by")
-  if (injectedBy === undefined) {
-    setHtmlNodeAttributes(scriptNode, {
-      "injected-by": "jsenv",
-    })
-  }
+export const injectScriptNodeAsEarlyAsPossible = (
+  htmlAst,
+  scriptNode,
+  jsenvPluginName = "jsenv",
+) => {
+  setHtmlNodeAttributes(scriptNode, {
+    "jsenv-plugin-owner": jsenvPluginName,
+    "jsenv-plugin-action": "injected",
+  })
   const isJsModule = analyzeScriptNode(scriptNode).type === "js_module"
   if (isJsModule) {
     const firstImportmapScript = findHtmlNode(htmlAst, (node) => {

package/src/html/html_node_position.js

@@ -97,9 +97,9 @@ export const getHtmlNodeAttributePosition = (node, attributeName) => {
     }
   }
   const originalPositionAttributeName =
-    attributeName === "generated-from-src"
+    attributeName === "inlined-from-src"
       ? "original-src-position"
-      : attributeName === "generated-from-href"
+      : attributeName === "inlined-from-href"
       ? "original-href-position"
       : `original-${attributeName}-position`
   const originalPosition = getHtmlNodeAttribute(

package/src/html/html_parse.js

@@ -45,9 +45,9 @@ export const parseHtmlString = (
 
 export const stringifyHtmlAst = (
   htmlAst,
-  { removeOriginalPositionAttributes = false } = {},
+  { cleanupJsenvAttributes = false } = {},
 ) => {
-  if (removeOriginalPositionAttributes) {
+  if (cleanupJsenvAttributes) {
     const htmlNode = findHtmlChildNode(
       htmlAst,
       (node) => node.nodeName === "html",
@@ -66,17 +66,17 @@ export const stringifyHtmlAst = (
             "original-position": undefined,
             "original-src-position": undefined,
             "original-href-position": undefined,
-            "injected-by": undefined,
-            "generated-by": undefined,
-            "generated-from-src": undefined,
-            "generated-from-href": undefined,
+            "inlined-from-src": undefined,
+            "inlined-from-href": undefined,
+            "jsenv-plugin-owner": undefined,
+            "jsenv-plugin-action": undefined,
+            "jsenv-debug": undefined,
           })
         },
       })
     }
   }
   const htmlString = serialize(htmlAst)
-
   return htmlString
 }