@jxsuite/parser 4.1.0 → 4.1.1

package/dist/content-loader.js

@@ -18643,16 +18643,43 @@ function color2(d) {
 }
 
 // ../../node_modules/unist-util-visit/node_modules/unist-util-visit-parents/lib/index.js
-function visitParents2(tree, test, visitor, reverse) {
+function visitParents2(tree, testOrEnterOrVisitors, enterOrVisitorsOrReverse, reverse) {
+  if (!tree || typeof tree !== "object") {
+    throw new Error("Unexpected value `" + tree + "` for `tree`, expected node");
+  }
+  let preorder = true;
   let check;
-  if (typeof test === "function" && typeof visitor !== "function") {
-    reverse = visitor;
-    visitor = test;
+  let visitors;
+  let enter;
+  let exit;
+  if (typeof enterOrVisitorsOrReverse === "function" || enterOrVisitorsOrReverse && typeof enterOrVisitorsOrReverse === "object") {
+    check = testOrEnterOrVisitors;
+    visitors = enterOrVisitorsOrReverse;
+    if (reverse)
+      preorder = false;
   } else {
-    check = test;
+    visitors = testOrEnterOrVisitors;
+    if (enterOrVisitorsOrReverse)
+      preorder = false;
+  }
+  if (typeof visitors === "function") {
+    enter = visitors;
+  } else if (visitors && typeof visitors === "object") {
+    if (visitors.enter === null || visitors.enter === undefined) {} else if (typeof visitors.enter === "function") {
+      enter = visitors.enter;
+    } else {
+      throw new Error("Unexpected value `" + visitors.enter + "` for `visitors.enter`, expected optional visitor");
+    }
+    if (typeof visitors.exit === "function") {
+      exit = visitors.exit;
+    } else {
+      throw new Error("Unexpected value `" + visitors.exit + "` for `visitors.exit`, expected visitor (pass a visitor directly if you only want an enter visitor)");
+    }
+  } else {
+    throw new Error("Unexpected value `" + visitors + "` for `enter` or `visitors`, expected visitor or object with visitors");
   }
   const is = convert(check);
-  const step = reverse ? -1 : 1;
+  const step = preorder ? 1 : -1;
   factory(tree, undefined, [])();
   function factory(node, index, parents) {
     const value = node && typeof node === "object" ? node : {};
@@ -18664,12 +18691,10 @@ function visitParents2(tree, test, visitor, reverse) {
     }
     return visit;
     function visit() {
+      const matches = !check || is(node, index, parents[parents.length - 1] || undefined);
       let result = empty2;
-      let subresult;
-      let offset;
-      let grandparents;
-      if (!test || is(node, index, parents[parents.length - 1] || undefined)) {
-        result = toResult2(visitor(node, parents));
+      if (enter && matches) {
+        result = toResult2(enter(node, parents, index));
         if (result[0] === EXIT2) {
           return result;
         }
@@ -18677,11 +18702,11 @@ function visitParents2(tree, test, visitor, reverse) {
       if ("children" in node && node.children) {
         const nodeAsParent = node;
         if (nodeAsParent.children && result[0] !== SKIP2) {
-          offset = (reverse ? nodeAsParent.children.length : -1) + step;
-          grandparents = parents.concat(nodeAsParent);
+          let offset = (preorder ? -1 : nodeAsParent.children.length) + step;
+          const grandparents = [...parents, nodeAsParent];
           while (offset > -1 && offset < nodeAsParent.children.length) {
             const child = nodeAsParent.children[offset];
-            subresult = factory(child, offset, grandparents)();
+            const subresult = factory(child, offset, grandparents)();
             if (subresult[0] === EXIT2) {
               return subresult;
             }
@@ -18689,6 +18714,15 @@ function visitParents2(tree, test, visitor, reverse) {
           }
         }
       }
+      if (exit && matches) {
+        const exitResult = toResult2(exit(node, parents, index));
+        if (exitResult[0] === SKIP2) {
+          throw new Error("Unexpected value `" + exitResult[0] + "` from `exit`, expected `CONTINUE`, `EXIT`, index, or nothing");
+        }
+        if (exitResult[0] === EXIT2 || typeof exitResult[1] === "number") {
+          return exitResult;
+        }
+      }
       return result;
     }
   }
@@ -18714,24 +18748,36 @@ var init_unist_util_visit_parents2 = __esm(() => {
 });
 
 // ../../node_modules/unist-util-visit/lib/index.js
-function visit(tree, testOrVisitor, visitorOrReverse, maybeReverse) {
+function visit(tree, testOrEnterOrVisitors, enterOrVisitorsOrReverse, maybeReverse) {
+  let check;
+  let visitors;
   let reverse;
-  let test;
-  let visitor;
-  if (typeof testOrVisitor === "function" && typeof visitorOrReverse !== "function") {
-    test = undefined;
-    visitor = testOrVisitor;
-    reverse = visitorOrReverse;
-  } else {
-    test = testOrVisitor;
-    visitor = visitorOrReverse;
+  if (typeof enterOrVisitorsOrReverse === "function" || enterOrVisitorsOrReverse && typeof enterOrVisitorsOrReverse === "object") {
+    check = testOrEnterOrVisitors;
+    visitors = enterOrVisitorsOrReverse;
     reverse = maybeReverse;
+  } else {
+    visitors = testOrEnterOrVisitors;
+    reverse = enterOrVisitorsOrReverse;
   }
-  visitParents2(tree, test, overload, reverse);
-  function overload(node, parents) {
-    const parent = parents[parents.length - 1];
-    const index = parent ? parent.children.indexOf(node) : undefined;
-    return visitor(node, index, parent);
+  if (typeof visitors === "function") {
+    visitParents2(tree, check, wrap2(visitors), reverse);
+  } else {
+    visitParents2(tree, check, wrapVisitors(visitors), reverse);
+  }
+}
+function wrapVisitors(visitors) {
+  if (!visitors || typeof visitors !== "object")
+    return visitors;
+  return {
+    enter: typeof visitors.enter === "function" ? wrap2(visitors.enter) : visitors.enter,
+    exit: typeof visitors.exit === "function" ? wrap2(visitors.exit) : visitors.exit
+  };
+}
+function wrap2(visitor) {
+  return overload;
+  function overload(node, parents, index) {
+    return visitor(node, index, parents[parents.length - 1]);
   }
 }
 var init_lib16 = __esm(() => {

package/dist/markdown.js

@@ -18500,16 +18500,43 @@ function color2(d) {
 }
 
 // ../../node_modules/unist-util-visit/node_modules/unist-util-visit-parents/lib/index.js
-function visitParents2(tree, test, visitor, reverse) {
+function visitParents2(tree, testOrEnterOrVisitors, enterOrVisitorsOrReverse, reverse) {
+  if (!tree || typeof tree !== "object") {
+    throw new Error("Unexpected value `" + tree + "` for `tree`, expected node");
+  }
+  let preorder = true;
   let check;
-  if (typeof test === "function" && typeof visitor !== "function") {
-    reverse = visitor;
-    visitor = test;
+  let visitors;
+  let enter;
+  let exit;
+  if (typeof enterOrVisitorsOrReverse === "function" || enterOrVisitorsOrReverse && typeof enterOrVisitorsOrReverse === "object") {
+    check = testOrEnterOrVisitors;
+    visitors = enterOrVisitorsOrReverse;
+    if (reverse)
+      preorder = false;
   } else {
-    check = test;
+    visitors = testOrEnterOrVisitors;
+    if (enterOrVisitorsOrReverse)
+      preorder = false;
+  }
+  if (typeof visitors === "function") {
+    enter = visitors;
+  } else if (visitors && typeof visitors === "object") {
+    if (visitors.enter === null || visitors.enter === undefined) {} else if (typeof visitors.enter === "function") {
+      enter = visitors.enter;
+    } else {
+      throw new Error("Unexpected value `" + visitors.enter + "` for `visitors.enter`, expected optional visitor");
+    }
+    if (typeof visitors.exit === "function") {
+      exit = visitors.exit;
+    } else {
+      throw new Error("Unexpected value `" + visitors.exit + "` for `visitors.exit`, expected visitor (pass a visitor directly if you only want an enter visitor)");
+    }
+  } else {
+    throw new Error("Unexpected value `" + visitors + "` for `enter` or `visitors`, expected visitor or object with visitors");
   }
   const is = convert(check);
-  const step = reverse ? -1 : 1;
+  const step = preorder ? 1 : -1;
   factory(tree, undefined, [])();
   function factory(node, index, parents) {
     const value = node && typeof node === "object" ? node : {};
@@ -18521,12 +18548,10 @@ function visitParents2(tree, test, visitor, reverse) {
     }
     return visit;
     function visit() {
+      const matches = !check || is(node, index, parents[parents.length - 1] || undefined);
       let result = empty2;
-      let subresult;
-      let offset;
-      let grandparents;
-      if (!test || is(node, index, parents[parents.length - 1] || undefined)) {
-        result = toResult2(visitor(node, parents));
+      if (enter && matches) {
+        result = toResult2(enter(node, parents, index));
         if (result[0] === EXIT2) {
           return result;
         }
@@ -18534,11 +18559,11 @@ function visitParents2(tree, test, visitor, reverse) {
       if ("children" in node && node.children) {
         const nodeAsParent = node;
         if (nodeAsParent.children && result[0] !== SKIP2) {
-          offset = (reverse ? nodeAsParent.children.length : -1) + step;
-          grandparents = parents.concat(nodeAsParent);
+          let offset = (preorder ? -1 : nodeAsParent.children.length) + step;
+          const grandparents = [...parents, nodeAsParent];
           while (offset > -1 && offset < nodeAsParent.children.length) {
             const child = nodeAsParent.children[offset];
-            subresult = factory(child, offset, grandparents)();
+            const subresult = factory(child, offset, grandparents)();
             if (subresult[0] === EXIT2) {
               return subresult;
             }
@@ -18546,6 +18571,15 @@ function visitParents2(tree, test, visitor, reverse) {
           }
         }
       }
+      if (exit && matches) {
+        const exitResult = toResult2(exit(node, parents, index));
+        if (exitResult[0] === SKIP2) {
+          throw new Error("Unexpected value `" + exitResult[0] + "` from `exit`, expected `CONTINUE`, `EXIT`, index, or nothing");
+        }
+        if (exitResult[0] === EXIT2 || typeof exitResult[1] === "number") {
+          return exitResult;
+        }
+      }
       return result;
     }
   }
@@ -18571,24 +18605,36 @@ var init_unist_util_visit_parents2 = __esm(() => {
 });
 
 // ../../node_modules/unist-util-visit/lib/index.js
-function visit(tree, testOrVisitor, visitorOrReverse, maybeReverse) {
+function visit(tree, testOrEnterOrVisitors, enterOrVisitorsOrReverse, maybeReverse) {
+  let check;
+  let visitors;
   let reverse;
-  let test;
-  let visitor;
-  if (typeof testOrVisitor === "function" && typeof visitorOrReverse !== "function") {
-    test = undefined;
-    visitor = testOrVisitor;
-    reverse = visitorOrReverse;
-  } else {
-    test = testOrVisitor;
-    visitor = visitorOrReverse;
+  if (typeof enterOrVisitorsOrReverse === "function" || enterOrVisitorsOrReverse && typeof enterOrVisitorsOrReverse === "object") {
+    check = testOrEnterOrVisitors;
+    visitors = enterOrVisitorsOrReverse;
     reverse = maybeReverse;
+  } else {
+    visitors = testOrEnterOrVisitors;
+    reverse = enterOrVisitorsOrReverse;
   }
-  visitParents2(tree, test, overload, reverse);
-  function overload(node, parents) {
-    const parent = parents[parents.length - 1];
-    const index = parent ? parent.children.indexOf(node) : undefined;
-    return visitor(node, index, parent);
+  if (typeof visitors === "function") {
+    visitParents2(tree, check, wrap2(visitors), reverse);
+  } else {
+    visitParents2(tree, check, wrapVisitors(visitors), reverse);
+  }
+}
+function wrapVisitors(visitors) {
+  if (!visitors || typeof visitors !== "object")
+    return visitors;
+  return {
+    enter: typeof visitors.enter === "function" ? wrap2(visitors.enter) : visitors.enter,
+    exit: typeof visitors.exit === "function" ? wrap2(visitors.exit) : visitors.exit
+  };
+}
+function wrap2(visitor) {
+  return overload;
+  function overload(node, parents, index) {
+    return visitor(node, index, parents[parents.length - 1]);
   }
 }
 var init_lib16 = __esm(() => {

package/dist/serialize.js

@@ -9716,16 +9716,43 @@ function color(d) {
 }
 
 // ../../node_modules/unist-util-visit/node_modules/unist-util-visit-parents/lib/index.js
-function visitParents(tree, test, visitor, reverse) {
+function visitParents(tree, testOrEnterOrVisitors, enterOrVisitorsOrReverse, reverse) {
+  if (!tree || typeof tree !== "object") {
+    throw new Error("Unexpected value `" + tree + "` for `tree`, expected node");
+  }
+  let preorder = true;
   let check;
-  if (typeof test === "function" && typeof visitor !== "function") {
-    reverse = visitor;
-    visitor = test;
+  let visitors;
+  let enter;
+  let exit;
+  if (typeof enterOrVisitorsOrReverse === "function" || enterOrVisitorsOrReverse && typeof enterOrVisitorsOrReverse === "object") {
+    check = testOrEnterOrVisitors;
+    visitors = enterOrVisitorsOrReverse;
+    if (reverse)
+      preorder = false;
   } else {
-    check = test;
+    visitors = testOrEnterOrVisitors;
+    if (enterOrVisitorsOrReverse)
+      preorder = false;
+  }
+  if (typeof visitors === "function") {
+    enter = visitors;
+  } else if (visitors && typeof visitors === "object") {
+    if (visitors.enter === null || visitors.enter === undefined) {} else if (typeof visitors.enter === "function") {
+      enter = visitors.enter;
+    } else {
+      throw new Error("Unexpected value `" + visitors.enter + "` for `visitors.enter`, expected optional visitor");
+    }
+    if (typeof visitors.exit === "function") {
+      exit = visitors.exit;
+    } else {
+      throw new Error("Unexpected value `" + visitors.exit + "` for `visitors.exit`, expected visitor (pass a visitor directly if you only want an enter visitor)");
+    }
+  } else {
+    throw new Error("Unexpected value `" + visitors + "` for `enter` or `visitors`, expected visitor or object with visitors");
   }
   const is = convert(check);
-  const step = reverse ? -1 : 1;
+  const step = preorder ? 1 : -1;
   factory(tree, undefined, [])();
   function factory(node, index, parents) {
     const value = node && typeof node === "object" ? node : {};
@@ -9737,12 +9764,10 @@ function visitParents(tree, test, visitor, reverse) {
     }
     return visit;
     function visit() {
+      const matches = !check || is(node, index, parents[parents.length - 1] || undefined);
       let result = empty;
-      let subresult;
-      let offset;
-      let grandparents;
-      if (!test || is(node, index, parents[parents.length - 1] || undefined)) {
-        result = toResult(visitor(node, parents));
+      if (enter && matches) {
+        result = toResult(enter(node, parents, index));
         if (result[0] === EXIT) {
           return result;
         }
@@ -9750,11 +9775,11 @@ function visitParents(tree, test, visitor, reverse) {
       if ("children" in node && node.children) {
         const nodeAsParent = node;
         if (nodeAsParent.children && result[0] !== SKIP) {
-          offset = (reverse ? nodeAsParent.children.length : -1) + step;
-          grandparents = parents.concat(nodeAsParent);
+          let offset = (preorder ? -1 : nodeAsParent.children.length) + step;
+          const grandparents = [...parents, nodeAsParent];
           while (offset > -1 && offset < nodeAsParent.children.length) {
             const child = nodeAsParent.children[offset];
-            subresult = factory(child, offset, grandparents)();
+            const subresult = factory(child, offset, grandparents)();
             if (subresult[0] === EXIT) {
               return subresult;
             }
@@ -9762,6 +9787,15 @@ function visitParents(tree, test, visitor, reverse) {
           }
         }
       }
+      if (exit && matches) {
+        const exitResult = toResult(exit(node, parents, index));
+        if (exitResult[0] === SKIP) {
+          throw new Error("Unexpected value `" + exitResult[0] + "` from `exit`, expected `CONTINUE`, `EXIT`, index, or nothing");
+        }
+        if (exitResult[0] === EXIT || typeof exitResult[1] === "number") {
+          return exitResult;
+        }
+      }
       return result;
     }
   }
@@ -9787,24 +9821,36 @@ var init_unist_util_visit_parents = __esm(() => {
 });
 
 // ../../node_modules/unist-util-visit/lib/index.js
-function visit(tree, testOrVisitor, visitorOrReverse, maybeReverse) {
+function visit(tree, testOrEnterOrVisitors, enterOrVisitorsOrReverse, maybeReverse) {
+  let check;
+  let visitors;
   let reverse;
-  let test;
-  let visitor;
-  if (typeof testOrVisitor === "function" && typeof visitorOrReverse !== "function") {
-    test = undefined;
-    visitor = testOrVisitor;
-    reverse = visitorOrReverse;
-  } else {
-    test = testOrVisitor;
-    visitor = visitorOrReverse;
+  if (typeof enterOrVisitorsOrReverse === "function" || enterOrVisitorsOrReverse && typeof enterOrVisitorsOrReverse === "object") {
+    check = testOrEnterOrVisitors;
+    visitors = enterOrVisitorsOrReverse;
     reverse = maybeReverse;
+  } else {
+    visitors = testOrEnterOrVisitors;
+    reverse = enterOrVisitorsOrReverse;
   }
-  visitParents(tree, test, overload, reverse);
-  function overload(node, parents) {
-    const parent = parents[parents.length - 1];
-    const index = parent ? parent.children.indexOf(node) : undefined;
-    return visitor(node, index, parent);
+  if (typeof visitors === "function") {
+    visitParents(tree, check, wrap2(visitors), reverse);
+  } else {
+    visitParents(tree, check, wrapVisitors(visitors), reverse);
+  }
+}
+function wrapVisitors(visitors) {
+  if (!visitors || typeof visitors !== "object")
+    return visitors;
+  return {
+    enter: typeof visitors.enter === "function" ? wrap2(visitors.enter) : visitors.enter,
+    exit: typeof visitors.exit === "function" ? wrap2(visitors.exit) : visitors.exit
+  };
+}
+function wrap2(visitor) {
+  return overload;
+  function overload(node, parents, index) {
+    return visitor(node, index, parents[parents.length - 1]);
   }
 }
 var init_lib9 = __esm(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/parser",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Jx markdown parser and external class integration",
   "license": "MIT",
   "repository": {
@@ -48,8 +48,8 @@
     "upgrade": "bun update --latest && bun install"
   },
   "dependencies": {
-    "@jxsuite/markup": "^1.0.0",
-    "@jxsuite/schema": "^4.0.0",
+    "@jxsuite/markup": "^1.0.1",
+    "@jxsuite/schema": "^4.1.0",
     "@shikijs/langs": "^4.5.0",
     "@shikijs/themes": "^4.5.0",
     "glob": "^13.0.6",
@@ -62,12 +62,12 @@
     "remark-stringify": "^11.0.0",
     "shiki": "^4.5.0",
     "unified": "^11.0.5",
-    "unist-util-visit": "^5.1.0",
+    "unist-util-visit": "^5.2.0",
     "yaml": "^2.9.1"
   },
   "devDependencies": {
     "@happy-dom/global-registrator": "^21.0.4",
-    "@jxsuite/runtime": "^5.2.0",
+    "@jxsuite/runtime": "^6.0.0",
     "@jxsuite/test-support": "^0.0.0",
     "@types/mdast": "^4.0.4",
     "ajv": "^8.20.0"