parseman 0.58.0 → 0.58.2

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.2";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parseman",
-  "version": "0.58.0",
+  "version": "0.58.2",
   "packageManager": "pnpm@10.15.1",
   "engines": {
     "node": "^20.19.0 || >=22.13.0"
@@ -95,6 +95,7 @@
     "perf:guard": "node --import tsx/esm bench/perf-guard.ts",
     "perf:guard:grammars": "node --import tsx/esm bench/grammar-perf-guard.ts",
     "perf:xproc": "node --import tsx/esm bench/xproc-ab.ts",
+    "perf:xproc:gate": "node --import tsx/esm bench/xproc-gate.ts",
     "prepare": "git config core.hooksPath scripts/git-hooks || true; node scripts/build.mjs",
     "prepublishOnly": "node scripts/check-changelog.mjs --publish",
     "check:changelog": "node scripts/check-changelog.mjs",

package/src/cli/index.ts

@@ -44,7 +44,7 @@
 import { readFileSync, writeFileSync, readdirSync, statSync } from 'node:fs'
 import { resolve, relative, join, extname } from 'node:path'
 import { pathToFileURL } from 'node:url'
-import { register } from 'node:module'
+import * as nodeModule from 'node:module'
 import { diagnoseGrammar, examinedNothing, type GrammarDiagnosis } from '../analysis/diagnose.ts'
 import { renderDiagnosis } from '../analysis/diagnose-render.ts'
 import { DEFAULT_WIDTH } from '../analysis/terminal.ts'
@@ -147,6 +147,11 @@ async function registerTsIfNeeded(path: string): Promise<void> {
  *
  * Source is not rewritten: the attribute is removed from the load/resolve CONTEXT, so
  * nothing depends on parsing the importer's text.
+ *
+ * The hooks return whatever the next hook returns, without awaiting it, so the same
+ * module serves both hook APIs: `registerHooks()` runs it in-thread, where `next*`
+ * returns a result, and `register()` runs it on the hooks thread, where it returns a
+ * promise.
  */
 const MACRO_ATTR_HOOK = `
 const strip = (context) => {
@@ -156,18 +161,25 @@ const strip = (context) => {
   delete rest.type
   return { ...context, importAttributes: rest }
 }
-export async function resolve(specifier, context, nextResolve) {
+export function resolve(specifier, context, nextResolve) {
   return nextResolve(specifier, strip(context))
 }
-export async function load(url, context, nextLoad) {
+export function load(url, context, nextLoad) {
   return nextLoad(url, strip(context))
 }
 `
 let macroAttrRegistered = false
-function registerMacroAttributeHook(): void {
+async function registerMacroAttributeHook(): Promise<void> {
   if (macroAttrRegistered) return
   macroAttrRegistered = true
-  register(`data:text/javascript,${encodeURIComponent(MACRO_ATTR_HOOK)}`)
+  const url = `data:text/javascript,${encodeURIComponent(MACRO_ATTR_HOOK)}`
+  // `register()` is deprecated from Node 26 (DEP0205) and prints a warning into the
+  // CLI's stderr. `registerHooks()` replaces it but only exists from 22.15 / 23.5, so
+  // the 20.x and early-22.x lines in `engines` keep the old API.
+  if (typeof nodeModule.registerHooks === 'function') {
+    nodeModule.registerHooks(await import(url) as nodeModule.RegisterHooksOptions)
+  }
+  else nodeModule.register(url)
 }
 
 async function loadGrammar(path: string, exportName: string | undefined): Promise<unknown> {
@@ -176,7 +188,7 @@ async function loadGrammar(path: string, exportName: string | undefined): Promis
   catch { throw new CliError(`no such grammar module: ${path}`) }
   await registerTsIfNeeded(abs)
   // AFTER the TS loader, so this hook is outermost and `nextLoad` still runs it.
-  registerMacroAttributeHook()
+  await registerMacroAttributeHook()
   let mod: Record<string, unknown>
   try { mod = await import(pathToFileURL(abs).href) as Record<string, unknown> }
   catch (e) {

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.2'