@jsenv/ast 2.0.0 → 3.0.0

package/package.json

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

package/src/css/parse_css_urls.js

@@ -0,0 +1,33 @@
+import { applyPostCss } from "./apply_post_css.js"
+import { postCssPluginUrlVisitor } from "./postcss_plugin_url_visitor.js"
+
+export const parseCssUrls = async ({ css, url }) => {
+  const cssUrls = []
+  await applyPostCss({
+    content: css,
+    url,
+    sourcemaps: false,
+    plugins: [
+      postCssPluginUrlVisitor({
+        urlVisitor: ({
+          type,
+          specifier,
+          specifierStart,
+          specifierEnd,
+          specifierLine,
+          specifierColumn,
+        }) => {
+          cssUrls.push({
+            type: `css_${type}`,
+            specifier,
+            start: specifierStart,
+            end: specifierEnd,
+            line: specifierLine,
+            column: specifierColumn,
+          })
+        },
+      }),
+    ],
+  })
+  return cssUrls
+}

package/src/css/postcss_plugin_url_visitor.js

@@ -12,8 +12,9 @@ hence sourcemap cannot point the original source location
 */
 
 import { pathToFileURL } from "node:url"
+import { createRequire } from "node:module"
 
-import { require } from "../require.js"
+const require = createRequire(import.meta.url)
 
 export const postCssPluginUrlVisitor = ({ urlVisitor = () => null }) => {
   const parseCssValue = require("postcss-value-parser")
@@ -100,7 +101,7 @@ export const postCssPluginUrlVisitor = ({ urlVisitor = () => null }) => {
             )
             const specifierIndex = atRuleRaw.indexOf(atImportNode.params)
             const specifierStart = atRuleStart + specifierIndex
-            const specifierEnd = specifierStart + atImportNode.params.length
+            const specifierEnd = specifierStart + parsed.nodes[0].sourceEndIndex
             const specifierLine = atImportNode.source.start.line
             const specifierColumn =
               atImportNode.source.start.column + specifierIndex

package/src/html/html_node.js

@@ -104,11 +104,11 @@ const injectWithWhitespaces = (nodeToInsert, futureParentNode, futureIndex) => {
   const previousSiblings = childNodes.slice(0, futureIndex)
   const nextSiblings = childNodes.slice(futureIndex)
   const futureChildNodes = []
-  const previousSibling = previousSiblings[0]
+  const previousSibling = previousSiblings[previousSiblings.length - 1]
   if (previousSibling) {
     futureChildNodes.push(...previousSiblings)
   }
-  if (!previousSibling || previousSibling.nodeName !== "#text") {
+  if (!previousSibling || !isWhitespaceNode(previousSibling)) {
     futureChildNodes.push({
       nodeName: "#text",
       value: "\n    ",
@@ -117,7 +117,7 @@ const injectWithWhitespaces = (nodeToInsert, futureParentNode, futureIndex) => {
   }
   futureChildNodes.push(nodeToInsert)
   const nextSibling = nextSiblings[0]
-  if (!nextSibling || nextSibling.nodeName !== "#text") {
+  if (!nextSibling || !isWhitespaceNode(nextSibling)) {
     futureChildNodes.push({
       nodeName: "#text",
       value: "\n    ",
@@ -130,6 +130,12 @@ const injectWithWhitespaces = (nodeToInsert, futureParentNode, futureIndex) => {
   futureParentNode.childNodes = futureChildNodes
 }
 
+const isWhitespaceNode = (node) => {
+  if (node.nodeName !== "#text") return false
+  if (node.value.length === 0) return false
+  return /^\s+$/.test(node.value)
+}
+
 const findChild = ({ childNodes = [] }, predicate) => childNodes.find(predicate)
 
 const stringifyAttributes = (object) => {

package/src/js/js_static_analysis/import_export.js

@@ -7,10 +7,10 @@ export const analyzeImportDeclaration = (node, { onUrl }) => {
     type: "js_import",
     subtype: "import_static",
     specifier: specifierNode.value,
-    specifierStart: specifierNode.start,
-    specifierEnd: specifierNode.end,
-    specifierLine: specifierNode.loc.start.line,
-    specifierColumn: specifierNode.loc.start.column,
+    start: specifierNode.start,
+    end: specifierNode.end,
+    line: specifierNode.loc.start.line,
+    column: specifierNode.loc.start.column,
     expectedType: assertionInfo ? assertionInfo.assert.type : "js_module",
     ...assertionInfo,
   })
@@ -26,10 +26,10 @@ export const analyzeImportExpression = (node, { onUrl }) => {
     type: "js_import",
     subtype: "import_dynamic",
     specifier: specifierNode.value,
-    specifierStart: specifierNode.start,
-    specifierEnd: specifierNode.end,
-    specifierLine: specifierNode.loc.start.line,
-    specifierColumn: specifierNode.loc.start.column,
+    start: specifierNode.start,
+    end: specifierNode.end,
+    line: specifierNode.loc.start.line,
+    column: specifierNode.loc.start.column,
     expectedType: assertionInfo ? assertionInfo.assert.type : "js_module",
     ...assertionInfo,
   })
@@ -48,10 +48,10 @@ export const analyzeExportNamedDeclaration = (node, { onUrl }) => {
     type: "js_import",
     subtype: "export_named",
     specifier: specifierNode.value,
-    specifierStart: specifierNode.start,
-    specifierEnd: specifierNode.end,
-    specifierLine: specifierNode.loc.start.line,
-    specifierColumn: specifierNode.loc.start.column,
+    start: specifierNode.start,
+    end: specifierNode.end,
+    line: specifierNode.loc.start.line,
+    column: specifierNode.loc.start.column,
   })
 }
 export const analyzeExportAllDeclaration = (node, { onUrl }) => {
@@ -60,10 +60,10 @@ export const analyzeExportAllDeclaration = (node, { onUrl }) => {
     type: "js_import",
     subtype: "export_all",
     specifier: specifierNode.value,
-    specifierStart: specifierNode.start,
-    specifierEnd: specifierNode.end,
-    specifierLine: specifierNode.loc.start.line,
-    specifierColumn: specifierNode.loc.start.column,
+    start: specifierNode.start,
+    end: specifierNode.end,
+    line: specifierNode.loc.start.line,
+    column: specifierNode.loc.start.column,
   })
 }
 

package/src/js/js_static_analysis/import_meta_resolve.js

@@ -18,10 +18,10 @@ export const analyzeImportMetaResolveCall = (node, { onUrl }) => {
       type: "js_import",
       subtype: "import_meta_resolve",
       specifier: firstArg.value,
-      specifierStart: firstArg.start,
-      specifierEnd: firstArg.end,
-      specifierLine: firstArg.loc.start.line,
-      specifierColumn: firstArg.loc.start.column,
+      start: firstArg.start,
+      end: firstArg.end,
+      line: firstArg.loc.start.line,
+      column: firstArg.loc.start.column,
     })
   }
 }

package/src/js/js_static_analysis/new_url.js

@@ -17,10 +17,10 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
         type: "js_url",
         subtype: "new_url_first_arg",
         specifier: specifierNode.value,
-        specifierStart: specifierNode.start,
-        specifierEnd: specifierNode.end,
-        specifierLine: specifierNode.loc.start.line,
-        specifierColumn: specifierNode.loc.start.column,
+        start: specifierNode.start,
+        end: specifierNode.end,
+        line: specifierNode.loc.start.line,
+        column: specifierNode.loc.start.column,
       })
     }
     return
@@ -46,10 +46,10 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
           type: "js_url",
           subtype: "new_url_first_arg",
           specifier: specifierNode.value,
-          specifierStart: specifierNode.start,
-          specifierEnd: specifierNode.end,
-          specifierLine: specifierNode.loc.start.line,
-          specifierColumn: specifierNode.loc.start.column,
+          start: specifierNode.start,
+          end: specifierNode.end,
+          line: specifierNode.loc.start.line,
+          column: specifierNode.loc.start.column,
           baseUrlType,
           baseUrl:
             baseUrlType === "StringLiteral" ? secondArgNode.value : undefined,
@@ -61,10 +61,10 @@ export const analyzeNewUrlCall = (node, { isJsModule, onUrl }) => {
           type: "js_url",
           subtype: "new_url_second_arg",
           specifier: specifierNode.value,
-          specifierStart: specifierNode.start,
-          specifierEnd: specifierNode.end,
-          specifierLine: specifierNode.loc.start.line,
-          specifierColumn: specifierNode.loc.start.column,
+          start: specifierNode.start,
+          end: specifierNode.end,
+          line: specifierNode.loc.start.line,
+          column: specifierNode.loc.start.column,
         })
       }
     }

package/src/js/js_static_analysis/system.js

@@ -34,10 +34,10 @@ const analyzeSystemRegisterDeps = (node, { onUrl }) => {
         subtype: "system_register_arg",
         expectedType: "js_classic",
         specifier: specifierNode.value,
-        specifierStart: specifierNode.start,
-        specifierEnd: specifierNode.end,
-        specifierLine: specifierNode.loc.start.line,
-        specifierColumn: specifierNode.loc.start.column,
+        start: specifierNode.start,
+        end: specifierNode.end,
+        line: specifierNode.loc.start.line,
+        column: specifierNode.loc.start.column,
       })
     }
   })
@@ -65,10 +65,10 @@ export const analyzeSystemImportCall = (node, { onUrl }) => {
       subtype: "system_import_arg",
       expectedType: "js_classic",
       specifier: specifierNode.value,
-      specifierStart: specifierNode.start,
-      specifierEnd: specifierNode.end,
-      specifierLine: specifierNode.loc.start.line,
-      specifierColumn: specifierNode.loc.start.column,
+      start: specifierNode.start,
+      end: specifierNode.end,
+      line: specifierNode.loc.start.line,
+      column: specifierNode.loc.start.column,
     })
   }
 }
@@ -97,10 +97,10 @@ export const analyzeSystemResolveCall = (node, { onUrl }) => {
       type: "js_url",
       subtype: "system_resolve_arg",
       specifier: specifierNode.value,
-      specifierStart: specifierNode.start,
-      specifierEnd: specifierNode.end,
-      specifierLine: specifierNode.loc.start.line,
-      specifierColumn: specifierNode.loc.start.column,
+      start: specifierNode.start,
+      end: specifierNode.end,
+      line: specifierNode.loc.start.line,
+      column: specifierNode.loc.start.column,
     })
   }
 }

package/src/js/js_static_analysis/web_worker.js

@@ -22,10 +22,10 @@ export const analyzeImportScriptCalls = (node, { onUrl }) => {
         subtype: "self_import_scripts_arg",
         expectedType: "js_classic",
         specifier: specifierNode.value,
-        specifierStart: specifierNode.start,
-        specifierEnd: specifierNode.end,
-        specifierLine: specifierNode.loc.start.line,
-        specifierColumn: specifierNode.loc.start.column,
+        start: specifierNode.start,
+        end: specifierNode.end,
+        line: specifierNode.loc.start.line,
+        column: specifierNode.loc.start.column,
       })
     }
   })

package/src/js/js_static_analysis/web_worker_entry_point.js

@@ -124,10 +124,10 @@ const analyzeWorkerCallArguments = (
       expectedSubtype,
       typePropertyNode,
       specifier: specifierNode.value,
-      specifierStart: specifierNode.start,
-      specifierEnd: specifierNode.end,
-      specifierLine: specifierNode.loc.start.line,
-      specifierColumn: specifierNode.loc.start.column,
+      start: specifierNode.start,
+      end: specifierNode.end,
+      line: specifierNode.loc.start.line,
+      column: specifierNode.loc.start.column,
     })
     return
   }

package/src/main.js

@@ -35,8 +35,7 @@ export {
 } from "./html/html_node_position.js"
 
 // css
-export { applyPostCss } from "./css/apply_post_css.js"
-export { postCssPluginUrlVisitor } from "./css/postcss_plugin_url_visitor.js"
+export { parseCssUrls } from "./css/parse_css_urls.js"
 
 // js
 export { applyBabelPlugins } from "./js/apply_babel_plugins.js"