@jsenv/ast 6.3.4 → 6.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "6.3.4",
+  "version": "6.3.6",
   "description": "Parse and transform HTML, CSS and JS",
   "license": "MIT",
   "repository": {
@@ -31,7 +31,7 @@
   "dependencies": {
     "@babel/parser": "7.26.2",
     "@jsenv/humanize": "1.2.8",
-    "@jsenv/urls": "2.5.2",
+    "@jsenv/urls": "2.5.3",
     "acorn": "8.14.0",
     "acorn-import-attributes": "1.9.5",
     "acorn-walk": "8.3.4",

package/src/css/apply_post_css.js

@@ -1,4 +1,4 @@
-import { fileURLToPath } from "node:url";
+import { urlToFileSystemPath } from "@jsenv/urls";
 import { createParseError } from "../parse_error.js";
 
 export const applyPostCss = async ({
@@ -16,8 +16,8 @@ export const applyPostCss = async ({
     const cssFileUrl = urlToFileUrl(url);
     const result = await postcss(plugins).process(content, {
       collectUrls: true,
-      from: fileURLToPath(cssFileUrl),
-      to: fileURLToPath(cssFileUrl),
+      from: urlToFileSystemPath(cssFileUrl),
+      to: urlToFileSystemPath(cssFileUrl),
       map: {
         annotation: sourcemaps === "file",
         inline: sourcemaps === "inline",

package/src/html/html_node.js

@@ -130,9 +130,38 @@ const getJsenvScriptsNode = (htmlAst) => {
   jsenvScripts = createHtmlNode({
     tagName: "jsenv-scripts",
   });
-  getAsFirstJsModuleInjector(htmlAst, {
-    anyScript: true,
-  })(jsenvScripts);
+  const headNode = findChild(htmlAst, (node) => node.nodeName === "html")
+    .childNodes[0];
+  let after = headNode.childNodes[0];
+  for (const child of headNode.childNodes) {
+    if (child.nodeName === "link") {
+      after = child;
+      continue;
+    }
+    if (child.nodeName === "script") {
+      const { type } = analyzeScriptNode(child);
+      if (type === "js_classic") {
+        insertHtmlNodeBefore(jsenvScripts, child);
+        return jsenvScripts;
+      }
+      if (type === "importmap") {
+        insertHtmlNodeAfter(jsenvScripts, child);
+        return jsenvScripts;
+      }
+      if (type === "js_module") {
+        insertHtmlNodeBefore(jsenvScripts, child);
+        return jsenvScripts;
+      }
+    }
+    if (child.nodeName === "meta") {
+      after = child;
+    }
+  }
+  if (after) {
+    insertHtmlNodeAfter(jsenvScripts, after);
+    return jsenvScripts;
+  }
+  injectHtmlNode(htmlAst, jsenvScripts);
   return jsenvScripts;
 };
 const stringifyParams = (params, prefix = "") => {

package/src/js/apply_babel_plugins.js

@@ -3,7 +3,8 @@
  * - https://astexplorer.net/
  * - https://bvaughn.github.io/babel-repl
  */
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { urlToFileSystemPath } from "@jsenv/urls";
+import { pathToFileURL } from "node:url";
 import { createParseError } from "../parse_error.js";
 
 export const applyBabelPlugins = async ({
@@ -20,7 +21,7 @@ export const applyBabelPlugins = async ({
   }
   const { transformAsync, transformFromAstAsync } = await import("@babel/core");
   const sourceFileName = inputUrl.startsWith("file:")
-    ? fileURLToPath(inputUrl)
+    ? urlToFileSystemPath(inputUrl)
     : undefined;
   options = {
     ast: false,
@@ -29,7 +30,7 @@ export const applyBabelPlugins = async ({
     sourceFileName,
     filename: outputUrl
       ? outputUrl.startsWith("file:")
-        ? fileURLToPath(inputUrl)
+        ? urlToFileSystemPath(inputUrl)
         : undefined
       : sourceFileName,
     configFile: false,