@jsenv/ast 1.1.0 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "Parse and transform HTML,CSS and JS",
   "license": "MIT",
   "repository": {
@@ -9,8 +9,7 @@
     "directory": "packages/ast"
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
+    "access": "public"
   },
   "author": {
     "name": "dmail",
@@ -34,8 +33,8 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@babel/parser": "7.18.5",
-    "@parcel/css": "1.10.1",
+    "@babel/parser": "7.18.8",
+    "@parcel/css": "1.11.2",
     "acorn": "8.7.1",
     "acorn-import-assertions": "1.8.0",
     "acorn-walk": "8.2.0",
@@ -43,4 +42,4 @@
     "postcss": "8.4.14",
     "postcss-value-parser": "4.2.0"
   }
-}
+}

package/src/html/html_analysis.js

@@ -1,17 +1,80 @@
 import { getHtmlNodeAttribute } from "./html_node_attributes.js"
 
 export const analyzeScriptNode = (scriptNode) => {
-  const type = getHtmlNodeAttribute(scriptNode, "type")
-  if (type === undefined || type === "text/javascript") {
-    return "classic"
+  const typeAttribute = getHtmlNodeAttribute(scriptNode, "type")
+  if (typeAttribute === undefined || typeAttribute === "text/javascript") {
+    return {
+      type: "js_classic",
+      contentType: "text/javascript",
+    }
+  }
+  if (typeAttribute === "module") {
+    return {
+      type: "js_module",
+      contentType: "text/javascript",
+    }
+  }
+  if (typeAttribute === "importmap") {
+    return {
+      type: "importmap",
+      contentType: "application/importmap+json",
+    }
+  }
+  // jsx
+  if (typeAttribute === "text/jsx") {
+    return {
+      type: "js_classic",
+      contentType: "text/javascript",
+      extension: ".jsx",
+    }
+  }
+  if (typeAttribute === "module/jsx") {
+    return {
+      type: "js_module",
+      contentType: "text/javascript",
+      extension: ".jsx",
+    }
   }
-  if (type === "module") {
-    return "module"
+  // typescript
+  if (typeAttribute === "text/ts") {
+    return {
+      type: "js_classic",
+      contentType: "text/javascript",
+      extension: ".ts",
+    }
   }
-  if (type === "importmap") {
-    return "importmap"
+  if (typeAttribute === "module/ts") {
+    return {
+      type: "js_module",
+      contentType: "text/javascript",
+      extension: ".ts",
+    }
+  }
+  // typescript and jsx
+  if (typeAttribute === "text/tsx") {
+    return {
+      type: "js_classic",
+      contentType: "text/javascript",
+      extension: ".tsx",
+    }
+  }
+  if (typeAttribute === "module/tsx") {
+    return {
+      type: "js_module",
+      contentType: "text/javascript",
+      extension: ".tsx",
+    }
+  }
+  // from MDN about [type] attribute:
+  // "Any other value: The embedded content is treated as a data block
+  // which won't be processed by the browser. Developers must use a valid MIME type
+  // that is not a JavaScript MIME type to denote data blocks.
+  // The src attribute will be ignored."
+  // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attr-type
+  return {
+    type: "text",
+    contentType: "text/plain",
   }
-  return type
 }
 
 export const analyzeLinkNode = (linkNode) => {

package/src/html/html_node.js

@@ -27,11 +27,11 @@ export const injectScriptNodeAsEarlyAsPossible = (htmlAst, scriptNode) => {
       "injected-by": "jsenv",
     })
   }
-  const isModule = analyzeScriptNode(scriptNode) === "module"
-  if (isModule) {
+  const isJsModule = analyzeScriptNode(scriptNode).type === "js_module"
+  if (isJsModule) {
     const firstImportmapScript = findHtmlNode(htmlAst, (node) => {
       if (node.nodeName !== "script") return false
-      return analyzeScriptNode(node) === "importmap"
+      return analyzeScriptNode(node).type === "importmap"
     })
     if (firstImportmapScript) {
       return insertAfter(

package/src/js/js_static_analysis/new_url.js

@@ -31,6 +31,13 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
     const baseUrlType = analyzeUrlNodeType(secondArgNode, { isJsModule })
     if (baseUrlType) {
       // we can understand the second argument
+      if (
+        baseUrlType === "StringLiteral" &&
+        secondArgNode.value === "file:///"
+      ) {
+        // ignore new URL(specifier, "file:///")
+        return
+      }
       const urlType = analyzeUrlNodeType(firstArgNode, { isJsModule })
       if (urlType === "StringLiteral") {
         // we can understand the first argument