parseman 0.50.3 → 0.50.4

package/dist/spec/index.js

@@ -1,8 +1,18 @@
 // src/combinators/first-set.ts
-function resolveNamedRef(p, resolve) {
+function winnerForRef(p, resolve) {
   if (resolve === void 0) return void 0;
   const name = p._ruleName;
-  return name === void 0 ? void 0 : resolve(name);
+  const w = name === void 0 ? void 0 : resolve(name);
+  if (w === void 0 || w === p) return void 0;
+  let cur = w;
+  for (const seen = /* @__PURE__ */ new Set(); !seen.has(cur); ) {
+    if (cur === p) return void 0;
+    seen.add(cur);
+    const cd = cur._def;
+    if (cd.tag !== "grammar" && cd.tag !== "trivia") return w;
+    cur = cd.parser;
+  }
+  return w;
 }
 function union(a, b) {
   if (a.kind === "any" || b.kind === "any") return { kind: "any" };
@@ -100,13 +110,15 @@ function matchesEmptyBody(p, seen, resolve) {
     case "grammar":
     case "recover":
       return me(d.parser);
-    case "lazy":
+    case "lazy": {
+      const w = winnerForRef(p, resolve);
+      if (w !== void 0) return me(w);
       try {
         return me(d.thunk());
       } catch {
-        const t = resolveNamedRef(p, resolve);
-        return t ? me(t) : true;
+        return true;
       }
+    }
     default:
       return true;
   }
@@ -170,13 +182,15 @@ function firstSetBody(p, seen, resolve) {
     // terminals: no refs, cached set is exact
     case "dispatch":
       return fs(d.selector);
-    case "lazy":
+    case "lazy": {
+      const w = winnerForRef(p, resolve);
+      if (w !== void 0) return fs(w);
       try {
         return fs(d.thunk());
       } catch {
-        const t = resolveNamedRef(p, resolve);
-        return t ? fs(t) : any();
+        return any();
       }
+    }
     case "choice": {
       let out = empty();
       for (const arm of d.parsers) out = union(out, fs(arm));