@jsenv/ast 1.4.10 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "1.4.10",
+  "version": "2.0.1",
   "description": "Parse and transform HTML,CSS and JS",
   "license": "MIT",
   "repository": {
@@ -34,7 +34,6 @@
   },
   "dependencies": {
     "@babel/parser": "7.20.7",
-    "@parcel/css": "1.14.0",
     "acorn": "8.8.1",
     "acorn-import-assertions": "1.8.0",
     "acorn-walk": "8.2.0",

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/main.js

@@ -36,7 +36,6 @@ export {
 
 // css
 export { applyPostCss } from "./css/apply_post_css.js"
-export { transpileWithParcel, minifyWithParcel } from "./css/parcel_css.js"
 export { postCssPluginUrlVisitor } from "./css/postcss_plugin_url_visitor.js"
 
 // js

package/src/css/parcel_css.js

@@ -1,58 +0,0 @@
-import { createRequire } from "node:module"
-import { fileURLToPath } from "node:url"
-
-const require = createRequire(import.meta.url)
-
-export const transpileWithParcel = (urlInfo, context) => {
-  const css = require("@parcel/css")
-  const targets = runtimeCompatToTargets(context.runtimeCompat)
-  const { code, map } = css.transform({
-    filename: fileURLToPath(urlInfo.originalUrl),
-    code: Buffer.from(urlInfo.content),
-    targets,
-    minify: false,
-  })
-  return { code, map }
-}
-
-export const minifyWithParcel = (urlInfo, context) => {
-  const css = require("@parcel/css")
-  const targets = runtimeCompatToTargets(context.runtimeCompat)
-  const { code, map } = css.transform({
-    filename: fileURLToPath(urlInfo.originalUrl),
-    code: Buffer.from(urlInfo.content),
-    targets,
-    minify: true,
-  })
-  return { code, map }
-}
-
-export const bundleWithParcel = (urlInfo, context) => {
-  const targets = runtimeCompatToTargets(context.runtimeCompat)
-  const css = require("@parcel/css")
-  const { code, map } = css.bundle({
-    filename: fileURLToPath(urlInfo.originalUrl),
-    targets,
-    minify: false,
-  })
-  return { code, map }
-}
-
-const runtimeCompatToTargets = (runtimeCompat) => {
-  const targets = {}
-  ;["chrome", "firefox", "ie", "opera", "safari"].forEach((runtimeName) => {
-    const version = runtimeCompat[runtimeName]
-    if (version) {
-      targets[runtimeName] = versionToBits(version)
-    }
-  })
-  return targets
-}
-
-const versionToBits = (version) => {
-  const [major, minor = 0, patch = 0] = version
-    .split("-")[0]
-    .split(".")
-    .map((v) => parseInt(v, 10))
-  return (major << 16) | (minor << 8) | patch
-}