parseman 0.58.0 → 0.58.2

package/dist/cli/index.js

@@ -4,7 +4,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";
 
 // src/combinators/first-set.ts
 function classifyFinalChoice(arms, resolve2, activeTrivia) {
@@ -7850,12 +7850,13 @@ var Encoder = class {
     const rr = this.refResolver();
     const { next, boundary } = follow;
     if (matchesEmpty(next, /* @__PURE__ */ new Set(), rr) || mayCommitFailure(next, rr, this.commitFailureMemo)) return void 0;
-    const nextTag = next._def.tag;
-    if (nextTag !== "literal" && nextTag !== "regex" && nextTag !== "keywords" && nextTag !== "label") return void 0;
+    const nextDef = next._def;
+    if (nextDef.tag !== "literal" && nextDef.tag !== "regex" && nextDef.tag !== "keywords" && nextDef.tag !== "label") return void 0;
     const first = firstSetOf(next, /* @__PURE__ */ new Set(), rr, boundary);
     const cls = this.charClass(boundary === void 0 ? first : union(first, firstSetOf(boundary, /* @__PURE__ */ new Set(), rr)));
     if (cls < 0) return void 0;
-    return { cls, fx: this.expected(deriveExpected(next)) };
+    const miss = nextDef.tag === "label" ? deriveExpected(next) : directTerminalFailureExpected(nextDef);
+    return { cls, fx: this.expected(miss) };
   }
   node(p) {
     const lazyRef = p._def.tag === "lazy";
@@ -20193,18 +20194,21 @@ 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))
 }
 `;
 var macroAttrRegistered = false;
-function registerMacroAttributeHook() {
+async function registerMacroAttributeHook() {
   if (macroAttrRegistered) return;
   macroAttrRegistered = true;
-  register(`data:text/javascript,${encodeURIComponent(MACRO_ATTR_HOOK)}`);
+  const url = `data:text/javascript,${encodeURIComponent(MACRO_ATTR_HOOK)}`;
+  if (typeof nodeModule.registerHooks === "function") {
+    nodeModule.registerHooks(await import(url));
+  } else nodeModule.register(url);
 }
 async function loadGrammar(path, exportName) {
   const abs = resolve(path);
@@ -20214,7 +20218,7 @@ async function loadGrammar(path, exportName) {
     throw new CliError(`no such grammar module: ${path}`);
   }
   await registerTsIfNeeded(abs);
-  registerMacroAttributeHook();
+  await registerMacroAttributeHook();
   let mod;
   try {
     mod = await import(pathToFileURL(abs).href);