@jsenv/ast 6.2.15 → 6.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/ast",
-  "version": "6.2.15",
+  "version": "6.2.17",
   "description": "Parse and transform HTML, CSS and JS",
   "license": "MIT",
   "repository": {
@@ -39,7 +39,7 @@
     "acorn-import-attributes": "1.9.5",
     "acorn-walk": "8.3.3",
     "parse5": "7.1.2",
-    "postcss": "8.4.40",
+    "postcss": "8.4.41",
     "postcss-value-parser": "4.2.0"
   }
 }

package/src/css/apply_post_css.js

@@ -1,6 +1,5 @@
 import { fileURLToPath } from "node:url";
-
-import { createCssParseError } from "./css_parse_error.js";
+import { createParseError } from "../parse_error.js";
 
 export const applyPostCss = async ({
   sourcemaps = "comment",
@@ -34,8 +33,7 @@ export const applyPostCss = async ({
     };
   } catch (error) {
     if (error.name === "CssSyntaxError") {
-      throw createCssParseError({
-        message: error.message,
+      throw createParseError(error.message, {
         reasonCode: error.reason,
         url,
         line: error.line,

package/src/html/html_parse.js

@@ -1,6 +1,6 @@
 import { generateContentFrame } from "@jsenv/humanize";
 import { parse, parseFragment, serialize } from "parse5";
-
+import { createParseError } from "../parse_error.js";
 import { insertHtmlNodeAfter, insertHtmlNodeBefore } from "./html_node.js";
 import {
   getHtmlNodeAttribute,
@@ -27,19 +27,20 @@ export const parseHtml = ({ html, url, storeOriginalPositions = true }) => {
       ) {
         return;
       }
-      const htmlParseError = new Error(
+      const htmlParseError = createParseError(
         `Unable to parse HTML; ${parse5Error.code}`,
+        {
+          reasonCode: parse5Error.code,
+          url,
+          line: parse5Error.startLine,
+          column: parse5Error.startCol,
+          contentFrame: generateContentFrame({
+            content: html,
+            line: parse5Error.startLine,
+            column: parse5Error.startCol,
+          }),
+        },
       );
-      htmlParseError.reasonCode = parse5Error.code;
-      htmlParseError.code = "PARSE_ERROR";
-      htmlParseError.url = url;
-      htmlParseError.line = parse5Error.startLine;
-      htmlParseError.column = parse5Error.startCol;
-      htmlParseError.contentFrame = generateContentFrame({
-        content: html,
-        line: parse5Error.startLine,
-        column: parse5Error.startCol,
-      });
       throw htmlParseError;
     },
   });
@@ -142,6 +143,9 @@ const ensureLineBreaksBetweenHtmlNodes = (rootNode) => {
   const ensureChildrenSurroundedByLinebreaks = (headOrBody) => {
     const { childNodes } = headOrBody;
     const firstChild = childNodes[0];
+    if (!firstChild) {
+      return;
+    }
     if (firstChild.nodeName !== "#text") {
       mutationCallbackSet.add(() => {
         insertHtmlNodeBefore(

package/src/js/apply_babel_plugins.js

@@ -4,8 +4,7 @@
  * - https://bvaughn.github.io/babel-repl
  */
 import { fileURLToPath, pathToFileURL } from "node:url";
-
-import { createJsParseError } from "./js_parse_error.js";
+import { createParseError } from "../parse_error.js";
 
 export const applyBabelPlugins = async ({
   babelPlugins,
@@ -70,8 +69,7 @@ export const applyBabelPlugins = async ({
     return normalizeResult(result);
   } catch (error) {
     if (error && error.code === "BABEL_PARSE_ERROR") {
-      throw createJsParseError({
-        message: error.message,
+      throw createParseError(error.message, {
         reasonCode: error.reasonCode,
         content: input,
         url: inputUrl,

package/src/js/parse_js_with_acorn.js

@@ -1,7 +1,6 @@
 import { Parser, getLineInfo } from "acorn";
 import { importAttributes } from "acorn-import-attributes";
-
-import { createJsParseError } from "./js_parse_error.js";
+import { createParseError } from "../parse_error.js";
 
 export const parseJsWithAcorn = ({ js, url, isJsModule }) => {
   const AcornParser = Parser.extend(importAttributes);
@@ -28,8 +27,7 @@ export const parseJsWithAcorn = ({ js, url, isJsModule }) => {
   } catch (e) {
     if (e && e.name === "SyntaxError") {
       const { line, column } = getLineInfo(js, e.raisedAt);
-      throw createJsParseError({
-        message: e.message,
+      throw createParseError(e.message, {
         reasonCode: e.message,
         content: js,
         url,

package/src/parse_error.js

@@ -0,0 +1,18 @@
+export const createParseError = (message, props) => {
+  const parseError = new Error(message);
+  defineNonEnumerableProperties(parseError, {
+    code: "PARSE_ERROR",
+    ...props,
+  });
+  return parseError;
+};
+
+const defineNonEnumerableProperties = (error, properties) => {
+  for (const key of Object.keys(properties)) {
+    Object.defineProperty(error, key, {
+      configurable: true,
+      writable: true,
+      value: properties[key],
+    });
+  }
+};

package/src/css/css_parse_error.js

@@ -1,15 +0,0 @@
-export const createCssParseError = ({
-  message,
-  reasonCode,
-  url,
-  line,
-  column,
-}) => {
-  const parseError = new Error(message);
-  parseError.reasonCode = reasonCode;
-  parseError.code = "PARSE_ERROR";
-  parseError.url = url;
-  parseError.line = line;
-  parseError.column = column;
-  return parseError;
-};

package/src/js/js_parse_error.js

@@ -1,15 +0,0 @@
-export const createJsParseError = ({
-  message,
-  reasonCode,
-  url,
-  line,
-  column,
-}) => {
-  const parseError = new Error(message);
-  parseError.reasonCode = reasonCode;
-  parseError.code = "PARSE_ERROR";
-  parseError.url = url;
-  parseError.line = line;
-  parseError.column = column;
-  return parseError;
-};