parseman 0.58.0 → 0.58.1

package/dist/version.d.ts

@@ -13,5 +13,5 @@
  * Kept in sync with `package.json` by `test/unit/version-sync.test.ts`, which fails
  * the build if this constant drifts from the published version.
  */
-export declare const PARSEMAN_VERSION = "0.58.0";
+export declare const PARSEMAN_VERSION = "0.58.1";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parseman",
-  "version": "0.58.0",
+  "version": "0.58.1",
   "packageManager": "pnpm@10.15.1",
   "engines": {
     "node": "^20.19.0 || >=22.13.0"

package/src/run/index.ts

@@ -25,6 +25,11 @@
  *   const result = run(myGrammar, source, { trivia })
  */
 export { buildRootTriviaIndex } from '../cst/trivia-entries.ts'
+// Line/column lookup for the spans and errors `run()` returns. `line-index.ts` is
+// already in the driver's closure (recovery annotates errors with it), so exposing
+// it here costs no module — a caller reporting positions need not import the main entry.
+export { buildLineIndex, offsetToLineCol } from '../line-index.ts'
+export type { LineIndex } from '../line-index.ts'
 export { run } from '../functional/run.ts'
 export type { RootTriviaCapture, Runnable, RunOptions, RunResult } from '../functional/run.ts'
 export type { RootTriviaGap, RootTriviaIndex, TriviaEntriesView } from '../cst/trivia-entries.ts'

package/src/table/encode.ts

@@ -983,17 +983,20 @@ class Encoder {
     const rr = this.refResolver()
     const { next, boundary } = follow
     if (matchesEmpty(next, new Set(), rr) || mayCommitFailure(next, rr, this.commitFailureMemo)) return undefined
-    // A miss reports `deriveExpected(next)`, a static set. Only a terminal or a
-    // label fails with exactly that set: a sequence over an `optional` prefix
-    // reports the prefix's labels statically but not when it runs, and a choice
-    // whose arms share an opener reports that opener once statically, once per
-    // arm when it runs.
-    const nextTag = (next._def as ParserDef).tag
-    if (nextTag !== 'literal' && nextTag !== 'regex' && nextTag !== 'keywords' && nextTag !== 'label') return undefined
+    // A miss reports the set `next` fails with at its start, so only a row with
+    // one such set is gated: a terminal, which fails with its own spelling
+    // (`directTerminalFailureExpected` — `keywords()` and `word()` say `keyword`,
+    // not each word as `deriveExpected` lists them), or a label, which fails with
+    // its name. A sequence over an `optional` prefix reports the prefix's labels
+    // statically but not when it runs, and a choice whose arms share an opener
+    // reports that opener once statically, once per arm when it runs.
+    const nextDef = next._def as ParserDef
+    if (nextDef.tag !== 'literal' && nextDef.tag !== 'regex' && nextDef.tag !== 'keywords' && nextDef.tag !== 'label') return undefined
     const first = firstSetOf(next, new Set(), rr, boundary)
     const cls = this.charClass(boundary === undefined ? first : union(first, firstSetOf(boundary, new Set(), rr)))
     if (cls < 0) return undefined
-    return { cls, fx: this.expected(deriveExpected(next)) }
+    const miss = nextDef.tag === 'label' ? deriveExpected(next) : directTerminalFailureExpected(nextDef)
+    return { cls, fx: this.expected(miss) }
   }
 
   node(p: Combinator<unknown>): Emitted {

package/src/version.ts

@@ -13,4 +13,4 @@
  * Kept in sync with `package.json` by `test/unit/version-sync.test.ts`, which fails
  * the build if this constant drifts from the published version.
  */
-export const PARSEMAN_VERSION = '0.58.0'
+export const PARSEMAN_VERSION = '0.58.1'