parseman 0.42.1 → 0.43.0

package/dist/language-service/index.cjs

@@ -476,15 +476,16 @@ function normalizeCstCollapse(collapse) {
   }
   return typeof collapse === "function" ? collapse : void 0;
 }
-function buildCstNode(type, children, _fields, span, _rawChildren, _triviaLog, state) {
-  return { _tag: "node", type, span: { ...span }, state: state ?? null, children: [...children] };
+function buildCstNode(type, children, _fields, span, _rawChildren, _triviaLog, state, tags) {
+  return tags !== void 0 && tags.length > 0 ? { _tag: "node", type, tags, span: { ...span }, state: state ?? null, children: [...children] } : { _tag: "node", type, span: { ...span }, state: state ?? null, children: [...children] };
 }
-function cstBuildHost(typeOrOptions, children, _fields, span, rawChildren, triviaLog, state) {
+function cstBuildHost(typeOrOptions, children, _fields, span, rawChildren, triviaLog, state, _tags) {
   if (typeof typeOrOptions === "string") {
     return buildCstNode(typeOrOptions, children ?? [], _fields, span ?? { start: 0, end: 0 }, rawChildren, triviaLog, state);
   }
   const collapse = normalizeCstCollapse(typeOrOptions?.collapse);
-  const host = (type, children2, fields, span2, rawChildren2, triviaLog2, state2) => buildCstNode(type, children2 ?? [], fields, span2, rawChildren2, triviaLog2, state2);
+  const materializeTags = typeOrOptions?.tags === true;
+  const host = (type, children2, fields, span2, rawChildren2, triviaLog2, state2, tags) => buildCstNode(type, children2 ?? [], fields, span2, rawChildren2, triviaLog2, state2, materializeTags ? tags : void 0);
   host._parsemanCstOutput = true;
   if (collapse) host._parsemanCstCollapse = collapse;
   return host;
@@ -498,19 +499,6 @@ function fusedHostElidedOf(registry) {
   return registry[FUSED_HOST_ELIDED] === true;
 }
 
-// src/cst/walk.ts
-function walk(root, visitor, ctx = void 0) {
-  const go = (node2, parent) => {
-    const descend = visitor.enter ? visitor.enter(node2, parent, ctx) : void 0;
-    const children = node2.children;
-    if (descend !== false && Array.isArray(children)) {
-      for (const child of children) go(child, node2);
-    }
-    visitor.leave?.(node2, parent, ctx);
-  };
-  go(root, null);
-}
-
 // src/cst/relative-spans.ts
 function relativizeCST(node2, parentBase = 0) {
   const span = { start: node2.span.start - parentBase, end: node2.span.end - parentBase };
@@ -953,6 +941,14 @@ function parseDoc(registry, rootRule, input, opts = {}) {
 
 // src/language-service/index.ts
 var errorMessage = (expected) => expected.length ? `Unexpected input; expected ${expected.join(" or ")}` : "Unexpected input";
+function visitTree(root, enter) {
+  const go = (node2) => {
+    enter(node2);
+    const children = node2.children;
+    if (Array.isArray(children)) for (const child of children) go(child);
+  };
+  go(root);
+}
 function mergeDiagnostics(tree, flat, unconsumedFrom, inputLength, config) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -972,17 +968,15 @@ function mergeDiagnostics(tree, flat, unconsumedFrom, inputLength, config) {
 function diagnoseTree(root, config) {
   const out = [];
   const rules2 = config.diagnostics;
-  walk(root, {
-    enter(node2) {
-      if (node2._tag === "parseError") {
-        out.push({ severity: "error", message: errorMessage(node2.expected ?? []), span: node2.span });
-        return;
-      }
-      const h = rules2 && node2.type !== void 0 ? rules2[node2.type] : void 0;
-      if (h) {
-        const d = h(node2);
-        if (d) out.push(...Array.isArray(d) ? d : [d]);
-      }
+  visitTree(root, (node2) => {
+    if (node2._tag === "parseError") {
+      out.push({ severity: "error", message: errorMessage(node2.expected ?? []), span: node2.span });
+      return;
+    }
+    const h = rules2 && node2.type !== void 0 ? rules2[node2.type] : void 0;
+    if (h) {
+      const d = h(node2);
+      if (d) out.push(...Array.isArray(d) ? d : [d]);
     }
   });
   return out;
@@ -1040,11 +1034,9 @@ function languageService(grammar, config = {}) {
 function ruleAtCursor(root, offset) {
   if (!root || typeof root !== "object") return null;
   let best = null;
-  walk(root, {
-    enter(node2) {
-      const s = node2.span;
-      if (s && s.start <= offset && offset <= s.end && node2.type !== void 0) best = node2.type;
-    }
+  visitTree(root, (node2) => {
+    const s = node2.span;
+    if (s && s.start <= offset && offset <= s.end && node2.type !== void 0) best = node2.type;
   });
   return best;
 }