@jsenv/ast 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Parse and transform HTML,CSS and JS",
   "license": "MIT",
   "repository": {
@@ -33,8 +33,8 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@babel/parser": "7.19.0",
-    "@parcel/css": "1.13.1",
+    "@babel/parser": "7.19.1",
+    "@parcel/css": "1.14.0",
     "acorn": "8.8.0",
     "acorn-import-assertions": "1.8.0",
     "acorn-walk": "8.2.0",

package/src/html/html_node.js

@@ -29,23 +29,42 @@ export const injectScriptNodeAsEarlyAsPossible = (
   const isJsModule = analyzeScriptNode(scriptNode).type === "js_module"
   if (isJsModule) {
     const firstImportmapScript = findHtmlNode(htmlAst, (node) => {
-      if (node.nodeName !== "script") return false
-      return analyzeScriptNode(node).type === "importmap"
+      return (
+        node.nodeName === "script" &&
+        analyzeScriptNode(node).type === "importmap"
+      )
     })
+
     if (firstImportmapScript) {
-      return insertAfter(
-        scriptNode,
-        firstImportmapScript.parentNode,
-        firstImportmapScript,
+      const importmapParent = firstImportmapScript.parentNode
+      const importmapSiblings = importmapParent.childNodes
+      const nextSiblings = importmapSiblings.slice(
+        importmapSiblings.indexOf(firstImportmapScript) + 1,
       )
+      let after = firstImportmapScript
+      for (const nextSibling of nextSiblings) {
+        if (nextSibling.nodeName === "script") {
+          return insertBefore(scriptNode, importmapParent, nextSibling)
+        }
+        if (nextSibling.nodeName === "link") {
+          after = nextSibling
+        }
+      }
+      return insertAfter(scriptNode, importmapParent, after)
     }
   }
   const headNode = findChild(htmlAst, (node) => node.nodeName === "html")
     .childNodes[0]
-  const firstHeadScript = findChild(headNode, (node) => {
-    return node.nodeName === "script"
-  })
-  return insertBefore(scriptNode, headNode, firstHeadScript)
+  let after = headNode.childNodes[0]
+  for (const child of headNode.childNodes) {
+    if (child.nodeName === "script") {
+      return insertBefore(scriptNode, headNode, child)
+    }
+    if (child.nodeName === "link") {
+      after = child
+    }
+  }
+  return insertAfter(scriptNode, headNode, after)
 }
 
 const insertBefore = (nodeToInsert, futureParentNode, futureNextSibling) => {