parseman 0.19.0 → 0.21.0

package/dist/index.js

@@ -327,9 +327,9 @@ function asciiFoldEq(a, b) {
 }
 function literal(value, opts = {}) {
   const caseInsensitive = opts.caseInsensitive ?? false;
-  const firstSet = value.length > 0 ? fromChar(value.codePointAt(0)) : empty();
+  const firstSet2 = value.length > 0 ? fromChar(value.codePointAt(0)) : empty();
   const meta = {
-    firstSet,
+    firstSet: firstSet2,
     canMatchNewline: value.includes("\n"),
     isTrivia: false
   };
@@ -341,7 +341,7 @@ function literal(value, opts = {}) {
     meta.firstSet = firstLower !== void 0 && firstUpper !== void 0 ? firstLower === firstUpper ? { kind: "ranges", ranges: [{ lo: firstLower, hi: firstLower }] } : { kind: "ranges", ranges: [
       { lo: firstLower, hi: firstLower },
       { lo: firstUpper, hi: firstUpper }
-    ] } : firstSet;
+    ] } : firstSet2;
   }
   return {
     _tag: "literal",
@@ -364,68 +364,66 @@ function literal(value, opts = {}) {
   };
 }
 
-// src/combinators/regex.ts
-var firstSetAnalyzer = null;
-function registerRegexAnalyzer(analyzer) {
-  firstSetAnalyzer = analyzer;
-}
-var permissiveFirstSet = () => ({ firstSet: any(), canMatchNewline: true });
-var SCAN_BAIL_AT = 64;
+// src/regex/classes.ts
+var CLASS_ESCAPES = { t: 9, n: 10, r: 13, f: 12, v: 11, "0": 0 };
 var SPACE_RANGES = [
   [9, 13],
   [32, 32],
   [160, 160],
   [5760, 5760],
   [8192, 8202],
-  [8232, 8233],
+  [8232, 8232],
+  [8233, 8233],
   [8239, 8239],
   [8287, 8287],
   [12288, 12288],
   [65279, 65279]
 ];
-var CLASS_ESCAPES = { t: 9, n: 10, r: 13, f: 12, v: 11, "0": 0 };
 function shorthandRanges(ch) {
   if (ch === "d") return [[48, 57]];
   if (ch === "s") return SPACE_RANGES;
   return [[48, 57], [65, 90], [97, 122], [95, 95]];
 }
-function inRanges(cp, ranges) {
-  for (let i = 0; i < ranges.length; i++) {
-    const [lo, hi] = ranges[i];
-    if (cp >= lo && cp <= hi) return true;
-  }
-  return false;
+function readUnicodeEscape(body, i) {
+  if (body[i] !== "\\" || body[i + 1] !== "u") return null;
+  const hex = body.slice(i + 2, i + 6);
+  if (!/^[0-9a-fA-F]{4}$/.test(hex)) return null;
+  return { cp: Number.parseInt(hex, 16), next: i + 6 };
 }
-function readClassRanges(body) {
-  if (body.startsWith("^")) return null;
+function parseClassRanges(body) {
   const ranges = [];
   let i = 0;
   const readAtom = () => {
     const ch = body[i];
     if (ch === void 0) return null;
     if (ch === "\\") {
-      const esc = body[i + 1];
-      if (esc === void 0) return null;
+      const uni = readUnicodeEscape(body, i);
+      if (uni) {
+        i = uni.next;
+        return { cp: uni.cp };
+      }
+      const e = body[i + 1];
+      if (e === void 0) return null;
       i += 2;
-      if (esc === "d" || esc === "w" || esc === "s") return { ranges: shorthandRanges(esc) };
-      if (esc in CLASS_ESCAPES) return { cp: CLASS_ESCAPES[esc] };
-      if (esc >= "a" && esc <= "z" || esc >= "A" && esc <= "Z") return null;
-      return { cp: esc.charCodeAt(0) };
+      if (e in CLASS_ESCAPES) return { cp: CLASS_ESCAPES[e] };
+      if (e === "d" || e === "w" || e === "s") return { set: shorthandRanges(e) };
+      if (e >= "a" && e <= "z" || e >= "A" && e <= "Z") return null;
+      return { cp: e.codePointAt(0) };
     }
-    i++;
-    return { cp: ch.charCodeAt(0) };
+    i += ch.length;
+    return { cp: ch.codePointAt(0) };
   };
   while (i < body.length) {
     const lo = readAtom();
-    if (!lo) return null;
-    if ("ranges" in lo) {
-      ranges.push(...lo.ranges);
+    if (lo === null) return null;
+    if ("set" in lo) {
+      ranges.push(...lo.set);
       continue;
     }
     if (body[i] === "-" && body[i + 1] !== void 0 && body[i + 1] !== "]") {
-      i++;
+      i += 1;
       const hi = readAtom();
-      if (!hi || "ranges" in hi) return null;
+      if (hi === null || "set" in hi) return null;
       ranges.push([lo.cp, hi.cp]);
     } else {
       ranges.push([lo.cp, lo.cp]);
@@ -433,6 +431,25 @@ function readClassRanges(body) {
   }
   return ranges.length ? ranges : null;
 }
+
+// src/combinators/regex.ts
+var firstSetAnalyzer = null;
+function registerRegexAnalyzer(analyzer) {
+  firstSetAnalyzer = analyzer;
+}
+var permissiveFirstSet = () => ({ firstSet: any(), canMatchNewline: true });
+var SCAN_BAIL_AT = 64;
+function inRanges(cp, ranges) {
+  for (let i = 0; i < ranges.length; i++) {
+    const [lo, hi] = ranges[i];
+    if (cp >= lo && cp <= hi) return true;
+  }
+  return false;
+}
+function readClassRanges(body) {
+  if (body.startsWith("^")) return null;
+  return parseClassRanges(body);
+}
 function shortScanner(source, flags) {
   if (/[imsuvy]/.test(flags)) return null;
   let ranges = null;
@@ -466,8 +483,8 @@ function regex(pattern, flags = "") {
   const resolvedFlags = typeof pattern === "string" ? flags : pattern.flags;
   const anchored = new RegExp(source, "y" + resolvedFlags.replace(/[gy]/g, ""));
   const scan = shortScanner(source, resolvedFlags);
-  const { firstSet, canMatchNewline } = (firstSetAnalyzer ?? permissiveFirstSet)(source);
-  const meta = { firstSet, canMatchNewline, isTrivia: false };
+  const { firstSet: firstSet2, canMatchNewline } = (firstSetAnalyzer ?? permissiveFirstSet)(source);
+  const meta = { firstSet: firstSet2, canMatchNewline, isTrivia: false };
   return {
     _tag: "regex",
     _meta: meta,
@@ -495,111 +512,266 @@ function regex(pattern, flags = "") {
   };
 }
 
-// src/combinators/regex-analyze.ts
-import regexpTree from "regexp-tree";
-function firstSetFromRegex(pattern) {
-  try {
-    const ast = regexpTree.parse(`/${pattern}/`);
-    return extractFirstSet(ast.body);
-  } catch {
-    return { firstSet: any(), canMatchNewline: true };
-  }
+// src/regex/first-set.ts
+var ANY = { t: "any" };
+var EMPTY2 = { t: "empty" };
+function charNode(set, nl) {
+  return { t: "char", set, nl };
+}
+function rangesToSet(ranges) {
+  let fs = empty();
+  for (const [lo, hi] of ranges) fs = union(fs, fromRange(lo, hi));
+  return fs;
+}
+function rangesHaveNewline(ranges) {
+  return ranges.some(([lo, hi]) => lo <= 10 && 10 <= hi);
 }
-function canBeEmpty(node2) {
-  if (!node2) return true;
-  switch (node2.type) {
-    case "Repetition": {
-      const q = node2.quantifier;
-      return q.kind === "*" || q.kind === "?" || q.kind === "Range" && (q.from ?? 1) === 0;
+var BAIL = /* @__PURE__ */ Symbol("regex-bail");
+function parseRegex(src) {
+  let i = 0;
+  const parseAlt = () => {
+    const arms = [parseSeq()];
+    while (src[i] === "|") {
+      i++;
+      arms.push(parseSeq());
     }
-    case "Alternative": {
-      const exprs = node2.expressions;
-      return !exprs || exprs.length === 0 || exprs.every((e) => canBeEmpty(e));
+    return arms.length === 1 ? arms[0] : { t: "alt", arms };
+  };
+  const parseSeq = () => {
+    const parts = [];
+    while (i < src.length) {
+      const ch = src[i];
+      if (ch === "|" || ch === ")") break;
+      parts.push(parseQuantified());
+    }
+    if (parts.length === 0) return EMPTY2;
+    return parts.length === 1 ? parts[0] : { t: "seq", parts };
+  };
+  const parseQuantified = () => {
+    const atom = parseAtom();
+    const ch = src[i];
+    let min = null;
+    if (ch === "*") {
+      min = 0;
+      i++;
+    } else if (ch === "+") {
+      min = 1;
+      i++;
+    } else if (ch === "?") {
+      min = 0;
+      i++;
+    } else if (ch === "{") {
+      min = parseBraceQuantifier();
     }
-    case "Group":
-      return canBeEmpty(node2.expression);
-    case "Disjunction":
-      return canBeEmpty(node2.left) || canBeEmpty(node2.right);
-    default:
-      return false;
-  }
-}
-function extractFirstSet(node2) {
-  if (!node2) return { firstSet: empty(), canMatchNewline: false };
-  switch (node2.type) {
-    case "Disjunction": {
-      const left = extractFirstSet(node2.left);
-      const right = extractFirstSet(node2.right);
-      return {
-        firstSet: union(left.firstSet, right.firstSet),
-        canMatchNewline: left.canMatchNewline || right.canMatchNewline
-      };
+    if (min === null) return atom;
+    if (src[i] === "?") i++;
+    return { t: "rep", node: atom, min };
+  };
+  const parseBraceQuantifier = () => {
+    const close = src.indexOf("}", i);
+    if (close === -1) return null;
+    const m = /^(\d+)(?:,(\d*))?$/.exec(src.slice(i + 1, close));
+    if (!m) return null;
+    i = close + 1;
+    return Number.parseInt(m[1], 10);
+  };
+  const parseAtom = () => {
+    const ch = src[i];
+    switch (ch) {
+      case "(":
+        return parseGroup();
+      case "[":
+        return parseClass();
+      case ".":
+        i++;
+        return charNode(any(), false);
+      // `.` matches any char except line terminators
+      case "\\":
+        return parseEscape();
+      case "^":
+      case "$":
+        i++;
+        return EMPTY2;
+      // anchors are zero-width
+      case "{":
+        i++;
+        return charNode(fromRange(123, 123), false);
+      // a `{` with nothing to quantify is a literal brace
+      default:
+        i += ch.length;
+        return charNode(fromRange(ch.codePointAt(0), ch.codePointAt(0)), ch === "\n");
     }
-    case "Alternative": {
-      const exprs = node2.expressions;
-      if (!exprs || exprs.length === 0) return { firstSet: empty(), canMatchNewline: false };
-      let fs = empty();
-      let canNL = false;
-      for (const expr of exprs) {
-        const r = extractFirstSet(expr);
-        fs = union(fs, r.firstSet);
-        canNL = canNL || r.canMatchNewline;
-        if (!canBeEmpty(expr)) break;
-      }
-      return { firstSet: fs, canMatchNewline: canNL };
+  };
+  const parseGroup = () => {
+    i++;
+    let lookaround = false;
+    if (src[i] === "?") {
+      const c1 = src[i + 1];
+      if (c1 === ":") i += 2;
+      else if (c1 === "=" || c1 === "!") {
+        i += 2;
+        lookaround = true;
+      } else if (c1 === "<") {
+        const c2 = src[i + 2];
+        if (c2 === "=" || c2 === "!") {
+          i += 3;
+          lookaround = true;
+        } else {
+          const gt = src.indexOf(">", i);
+          if (gt === -1) throw BAIL;
+          i = gt + 1;
+        }
+      } else throw BAIL;
     }
-    case "Char": {
-      const kind = node2.kind;
-      if (kind === "simple") {
-        const code = node2.codePoint ?? node2.value.codePointAt(0) ?? 0;
-        return { firstSet: fromRange(code, code), canMatchNewline: code === 10 };
-      }
-      if (kind === "meta") {
-        const val = node2.value;
-        if (val === ".") return { firstSet: any(), canMatchNewline: false };
-        if (val === "d") return { firstSet: fromRange(48, 57), canMatchNewline: false };
-        if (val === "D") return { firstSet: any(), canMatchNewline: true };
-        if (val === "w") return {
-          firstSet: union(
-            union(fromRange(48, 57), fromRange(65, 90)),
-            union(fromRange(97, 122), fromRange(95, 95))
-          ),
-          canMatchNewline: false
-        };
-        if (val === "s") return { firstSet: fromRange(9, 13), canMatchNewline: true };
-        if (val === "n") return { firstSet: fromRange(10, 10), canMatchNewline: true };
+    const inner = parseAlt();
+    if (src[i] !== ")") throw BAIL;
+    i++;
+    return lookaround ? EMPTY2 : inner;
+  };
+  const parseClass = () => {
+    let k = i + 1;
+    const negated = src[k] === "^";
+    if (negated) k++;
+    let body = "";
+    while (k < src.length && src[k] !== "]") {
+      if (src[k] === "\\") {
+        body += src[k] + (src[k + 1] ?? "");
+        k += 2;
+      } else {
+        body += src[k];
+        k++;
       }
-      return { firstSet: any(), canMatchNewline: true };
     }
-    case "CharacterClass": {
-      const expressions = node2.expressions;
+    if (src[k] !== "]") throw BAIL;
+    i = k + 1;
+    if (negated) return charNode(any(), true);
+    const ranges = parseClassRanges(body);
+    if (!ranges) return charNode(any(), true);
+    return charNode(rangesToSet(ranges), rangesHaveNewline(ranges));
+  };
+  const parseEscape = () => {
+    const e = src[i + 1];
+    if (e === void 0) throw BAIL;
+    if (e === "u" && /^[0-9a-fA-F]{4}$/.test(src.slice(i + 2, i + 6))) {
+      const cp = Number.parseInt(src.slice(i + 2, i + 6), 16);
+      i += 6;
+      return charNode(fromRange(cp, cp), cp === 10);
+    }
+    if (e === "x" && /^[0-9a-fA-F]{2}$/.test(src.slice(i + 2, i + 4))) {
+      const cp = Number.parseInt(src.slice(i + 2, i + 4), 16);
+      i += 4;
+      return charNode(fromRange(cp, cp), cp === 10);
+    }
+    i += 2;
+    switch (e) {
+      case "d":
+        return charNode(rangesToSet(shorthandRanges("d")), false);
+      case "w":
+        return charNode(rangesToSet(shorthandRanges("w")), false);
+      case "s":
+        return charNode(rangesToSet(shorthandRanges("s")), true);
+      case "D":
+      case "W":
+      case "S":
+        return charNode(any(), true);
+      // negated shorthand → widen
+      case "b":
+      case "B":
+        return EMPTY2;
+      // word boundary: zero-width
+      case "n":
+        return charNode(fromRange(10, 10), true);
+      case "r":
+        return charNode(fromRange(13, 13), false);
+      case "t":
+        return charNode(fromRange(9, 9), false);
+      case "f":
+        return charNode(fromRange(12, 12), false);
+      case "v":
+        return charNode(fromRange(11, 11), false);
+      case "0":
+        return charNode(fromRange(0, 0), false);
+      default:
+        if (e >= "1" && e <= "9") return ANY;
+        return charNode(fromRange(e.codePointAt(0), e.codePointAt(0)), e === "\n");
+    }
+  };
+  const node2 = parseAlt();
+  if (i < src.length) throw BAIL;
+  return node2;
+}
+function nullable(n) {
+  switch (n.t) {
+    case "char":
+      return false;
+    case "any":
+      return true;
+    case "empty":
+      return true;
+    case "seq":
+      return n.parts.every(nullable);
+    case "alt":
+      return n.arms.some(nullable);
+    case "rep":
+      return n.min === 0 || nullable(n.node);
+  }
+}
+function firstSet(n) {
+  switch (n.t) {
+    case "char":
+      return n.set;
+    case "any":
+      return any();
+    case "empty":
+      return empty();
+    case "rep":
+      return firstSet(n.node);
+    case "alt": {
+      let fs = empty();
+      for (const arm of n.arms) fs = union(fs, firstSet(arm));
+      return fs;
+    }
+    case "seq": {
       let fs = empty();
-      let canNL = false;
-      for (const expr of expressions) {
-        if (expr.type === "ClassRange") {
-          const from = expr.from.codePoint;
-          const to = expr.to.codePoint;
-          fs = union(fs, fromRange(from, to));
-          if (from <= 10 && 10 <= to) canNL = true;
-        } else if (expr.type === "Char") {
-          const r = extractFirstSet(expr);
-          fs = union(fs, r.firstSet);
-          canNL = canNL || r.canMatchNewline;
-        }
+      for (const part of n.parts) {
+        fs = union(fs, firstSet(part));
+        if (!nullable(part)) break;
       }
-      if (node2.negative) return { firstSet: any(), canMatchNewline: true };
-      return { firstSet: fs, canMatchNewline: canNL };
-    }
-    case "Repetition": {
-      return extractFirstSet(node2.expression);
+      return fs;
     }
-    case "Group": {
-      return extractFirstSet(node2.expression);
+  }
+}
+function firstCanBeNewline(n) {
+  switch (n.t) {
+    case "char":
+      return n.nl;
+    case "any":
+      return true;
+    case "empty":
+      return false;
+    case "rep":
+      return firstCanBeNewline(n.node);
+    case "alt":
+      return n.arms.some(firstCanBeNewline);
+    case "seq": {
+      for (const part of n.parts) {
+        if (firstCanBeNewline(part)) return true;
+        if (!nullable(part)) break;
+      }
+      return false;
     }
-    default:
-      return { firstSet: any(), canMatchNewline: true };
   }
 }
+function firstSetFromRegex(source) {
+  let ast;
+  try {
+    ast = parseRegex(source);
+  } catch {
+    return { firstSet: any(), canMatchNewline: true };
+  }
+  if (nullable(ast)) return { firstSet: any(), canMatchNewline: true };
+  return { firstSet: firstSet(ast), canMatchNewline: firstCanBeNewline(ast) };
+}
 
 // src/combinators/keywords.ts
 function word(str, boundary = "_0-9A-Za-z") {
@@ -617,19 +789,19 @@ function keywords(words, opts = {}) {
   const boundary = opts.boundary ? `(?![${opts.boundary}])` : "";
   const flags = opts.caseInsensitive ? "iuy" : "uy";
   const re = new RegExp(`(?:${alt})${boundary}`, flags);
-  let firstSet = empty();
+  let firstSet2 = empty();
   for (const w of sorted) {
     if (w.length === 0) continue;
     const cp = w.codePointAt(0);
-    firstSet = union(firstSet, fromChar(cp));
+    firstSet2 = union(firstSet2, fromChar(cp));
     if (opts.caseInsensitive) {
       const u = String.fromCodePoint(cp).toUpperCase().codePointAt(0);
       const l = String.fromCodePoint(cp).toLowerCase().codePointAt(0);
-      if (u !== void 0) firstSet = union(firstSet, fromChar(u));
-      if (l !== void 0) firstSet = union(firstSet, fromChar(l));
+      if (u !== void 0) firstSet2 = union(firstSet2, fromChar(u));
+      if (l !== void 0) firstSet2 = union(firstSet2, fromChar(l));
     }
   }
-  const meta = { firstSet, canMatchNewline: false, isTrivia: false };
+  const meta = { firstSet: firstSet2, canMatchNewline: false, isTrivia: false };
   return {
     _tag: "keywords",
     _meta: meta,
@@ -1006,13 +1178,25 @@ function tryFastLabeledScan(input, cur, trivia2) {
 }
 function recordTriviaChunks(ctx, chunks) {
   const kinds = ctx.triviaKindLabels;
+  const mask = ctx._triviaCaptureMask;
   for (const ch of chunks) {
     pushTriviaLogEntry(ctx, ch.start, ch.end, kinds ? ch.kindIndex : void 0);
     if (ctx.captureTrivia && (ctx._cstBuf !== void 0 || ctx._cstTriviaLog !== void 0)) {
-      pushCstTriviaEntry(ctx, ch.start, ch.end, kinds ? ch.kindIndex : void 0);
+      if (mask === void 0 || kinds === void 0 || (mask & 1 << ch.kindIndex) !== 0) {
+        pushCstTriviaEntry(ctx, ch.start, ch.end, kinds ? ch.kindIndex : void 0);
+      }
     }
   }
 }
+function triviaKindMask(labels, keep) {
+  if (!labels) return void 0;
+  let mask = 0;
+  for (const name of keep) {
+    const idx = labels.indexOf(name);
+    if (idx >= 0) mask |= 1 << idx;
+  }
+  return mask;
+}
 
 // src/combinators/trivia-skip.ts
 var NOOP_COMMIT = () => {
@@ -1701,10 +1885,15 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
       const saved = beginCstNodeCapture(ctx);
       const savedFields = ctx._fields;
       ctx._fields = capturesFields ? [] : void 0;
+      const savedMask = ctx._triviaCaptureMask;
+      if (build === void 0 && ctx.build?._parsemanTriviaKinds !== void 0 && def.type !== void 0) {
+        ctx._triviaCaptureMask = ctx.build._parsemanTriviaKinds(def.type);
+      }
       if (!capturesTrivia) ctx.captureTrivia = false;
       const r = combinator.parse(input, pos, ctx);
       const fields = capturesFields ? buildFieldMap(ctx._fields) : void 0;
       ctx._fields = savedFields;
+      ctx._triviaCaptureMask = savedMask;
       const { children, rawChildren, triviaLog } = endCstNodeCapture(ctx, saved);
       if (!r.ok) return r;
       const st = clonesState && ctx.state !== void 0 ? Object.assign({}, ctx.state) : void 0;
@@ -1842,7 +2031,13 @@ function parser(opts, root) {
           trivia: opts.trivia,
           ...opts.trivia._meta.triviaKindLabels ? { triviaKindLabels: opts.trivia._meta.triviaKindLabels } : {}
         } : {},
-        ...opts.captureTrivia || _ctx?.captureTrivia ? { captureTrivia: true } : {}
+        ...opts.captureTrivia || _ctx?.captureTrivia ? { captureTrivia: true } : {},
+        // Kind-filter for per-node capture. Resolve against this scope's trivia
+        // labels — this parser's own trivia if it declares one, else the INHERITED
+        // labels (`_ctx.triviaKindLabels`), so captureTriviaKinds still applies when
+        // trivia is inherited rather than re-declared here. No labels → undefined
+        // (capture all).
+        ...opts.captureTriviaKinds && !clearTrivia ? { _triviaCaptureMask: triviaKindMask(opts.trivia?._meta.triviaKindLabels ?? _ctx?.triviaKindLabels, opts.captureTriviaKinds) } : {}
       };
       const result = root.parse(input, pos ?? 0, ctx);
       if (trackLines) {
@@ -1993,77 +2188,11 @@ function expect(combinator, label2) {
 
 // src/compiler/scannable-run.ts
 var BACKSLASH = 92;
-var CLASS_ESCAPES2 = { t: 9, n: 10, r: 13, f: 12, v: 11, "0": 0 };
 var META = new Set("()[]{}*+?|^$.".split(""));
-var SPACE_RANGES2 = [
-  [9, 13],
-  [32, 32],
-  [160, 160],
-  [5760, 5760],
-  [8192, 8202],
-  [8232, 8232],
-  [8233, 8233],
-  [8239, 8239],
-  [8287, 8287],
-  [12288, 12288],
-  [65279, 65279]
-];
-function shorthandRanges2(ch) {
-  if (ch === "d") return [[48, 57]];
-  if (ch === "s") return SPACE_RANGES2;
-  return [[48, 57], [65, 90], [97, 122], [95, 95]];
-}
-function readUnicodeEscape(body, i) {
-  if (body[i] !== "\\" || body[i + 1] !== "u") return null;
-  const hex = body.slice(i + 2, i + 6);
-  if (!/^[0-9a-fA-F]{4}$/.test(hex)) return null;
-  return { cp: Number.parseInt(hex, 16), next: i + 6 };
-}
-function parseClassRanges(body) {
-  const ranges = [];
-  let i = 0;
-  const readAtom = () => {
-    const ch = body[i];
-    if (ch === void 0) return null;
-    if (ch === "\\") {
-      const uni = readUnicodeEscape(body, i);
-      if (uni) {
-        i = uni.next;
-        return { cp: uni.cp };
-      }
-      const e = body[i + 1];
-      if (e === void 0) return null;
-      i += 2;
-      if (e in CLASS_ESCAPES2) return { cp: CLASS_ESCAPES2[e] };
-      if (e === "d" || e === "w" || e === "s") return { set: shorthandRanges2(e) };
-      if (e >= "a" && e <= "z" || e >= "A" && e <= "Z") return null;
-      return { cp: e.codePointAt(0) };
-    }
-    i += ch.length;
-    return { cp: ch.codePointAt(0) };
-  };
-  while (i < body.length) {
-    const lo = readAtom();
-    if (lo === null) return null;
-    if ("set" in lo) {
-      ranges.push(...lo.set);
-      continue;
-    }
-    if (body[i] === "-" && body[i + 1] !== void 0 && body[i + 1] !== "]") {
-      i += 1;
-      const hi = readAtom();
-      if (hi === null || "set" in hi) return null;
-      ranges.push([lo.cp, hi.cp]);
-    } else {
-      ranges.push([lo.cp, lo.cp]);
-    }
-  }
-  return ranges.length ? ranges : null;
-}
 function classToRanges(cls) {
-  if (cls === "\\d") return shorthandRanges2("d");
-  if (cls === "\\w") return shorthandRanges2("w");
-  if (cls === "\\s") return shorthandRanges2("s");
+  if (cls === "\\d") return shorthandRanges("d");
+  if (cls === "\\w") return shorthandRanges("w");
+  if (cls === "\\s") return shorthandRanges("s");
   const body = cls.slice(1, -1);
   if (body.startsWith("^")) return null;
   return parseClassRanges(body);
@@ -2081,7 +2210,7 @@ function literalCodePoints(frag) {
     if (ch === "\\") {
       const e = frag[i + 1];
       if (e === void 0) return null;
-      out.push(e in CLASS_ESCAPES2 ? CLASS_ESCAPES2[e] : e.codePointAt(0));
+      out.push(e in CLASS_ESCAPES ? CLASS_ESCAPES[e] : e.codePointAt(0));
       i += 2;
       continue;
     }
@@ -2174,7 +2303,7 @@ function parseSeqParts(source) {
       if (e === "d" || e === "w" || e === "s") {
         flush();
         i += 2;
-        i += runFrom(shorthandRanges2(e), false, source[i]);
+        i += runFrom(shorthandRanges(e), false, source[i]);
         continue;
       }
       const uni = readUnicodeEscape(source, i);
@@ -2183,8 +2312,8 @@ function parseSeqParts(source) {
         cp2 = uni.cp;
         i = uni.next;
       } else if (e === void 0) return null;
-      else if (e in CLASS_ESCAPES2) {
-        cp2 = CLASS_ESCAPES2[e];
+      else if (e in CLASS_ESCAPES) {
+        cp2 = CLASS_ESCAPES[e];
         i += 2;
       } else if (e >= "a" && e <= "z" || e >= "A" && e <= "Z") return null;
       else {
@@ -2291,7 +2420,7 @@ function rangesSubset(sub, sup) {
 }
 function parseClassOperand(body) {
   if (body === "\\d" || body === "\\w" || body === "\\s") {
-    return { ranges: shorthandRanges2(body[1]), negated: false };
+    return { ranges: shorthandRanges(body[1]), negated: false };
   }
   if (body.length >= 2 && body[0] === "[" && body[body.length - 1] === "]") {
     let inner = body.slice(1, -1);
@@ -2724,7 +2853,7 @@ function parseScanShapeCore(source) {
   }
   m = /^\\([dws])([+*])$/.exec(source);
   if (m) {
-    return { kind: "chars", ranges: shorthandRanges2(m[1]), minOne: m[2] === "+" };
+    return { kind: "chars", ranges: shorthandRanges(m[1]), minOne: m[2] === "+" };
   }
   m = /^(\[(?:\\.|[^\]])+\]|\\[dws])(\[(?:\\.|[^\]])+\]|\\[dws])\*$/.exec(source);
   if (m) {
@@ -3081,7 +3210,7 @@ function scanBranchLabeled(shape, kindIndex, mint) {
     `    if (${m.end} > _e) {`,
     `      if (_cap) {`,
     `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, ${m.end}, ${kindIndex})`,
-    `        if (_ctx._cstTriviaLog !== undefined) _ctx._cstTriviaLog.push(_e, ${m.end}, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${kindIndex})`,
+    `        if (_ctx._cstTriviaLog !== undefined && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << kindIndex}))) _ctx._cstTriviaLog.push(_e, ${m.end}, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${kindIndex})`,
     `      }`,
     `      _e = ${m.end}`,
     `      continue`,
@@ -3197,7 +3326,7 @@ function buildLabeledRegexTriviaFnDecl(fnName, spec, reNames) {
       `      const _ce = _e + _m${i}[0].length`,
       `      if (_cap) {`,
       `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, _ce, ${k})`,
-      `        if (_ctx._cstTriviaLog !== undefined) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
+      `        if (_ctx._cstTriviaLog !== undefined && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
       `      }`,
       `      _e = _ce`,
       `      _matched = true`,
@@ -3235,7 +3364,7 @@ function buildLabeledRuntimeTriviaFnDecl(fnName, spec, rpStartIndex) {
       `      const _ce = _r${i}.span.end`,
       `      if (_cap) {`,
       `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, _ce, ${k})`,
-      `        if (_ctx._cstTriviaLog !== undefined) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
+      `        if (_ctx._cstTriviaLog !== undefined && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
       `      }`,
       `      _e = _ce`,
       `      _matched = true`,
@@ -4625,6 +4754,7 @@ function emitNode(def, ctx, pos) {
   const tlV = capturesTrivia || structural ? v(ctx, "_tl") : "_EMPTY_TL";
   if (!capturesTrivia) ctx.needsEmptyTl = true;
   const sc = v(ctx, "_sc"), sl = v(ctx, "_sl"), sr = v(ctx, "_sr"), st = v(ctx, "_st"), stl = v(ctx, "_stl");
+  const smk = structural ? v(ctx, "_smk") : null;
   if (structural) ctx.needsHostReads = true;
   const hostTriviaGate = `_ctx.build !== undefined && (_ctx.build._parsemanCaptureTrivia !== undefined ? _ctx.build._parsemanCaptureTrivia(${JSON.stringify(def.type)}) : (_ctx._pmCapTL ??= _hostReads(_ctx.build, 5)))`;
   const allocStmt = structural ? `${i}const ${capTLv} = ${hostTriviaGate}, ${capSTv} = _ctx._pmCapST ??= (_ctx.build === undefined || _hostReads(_ctx.build, 6))${capFv ? `, ${capFv} = _ctx.build !== undefined && _hostReads(_ctx.build, 2)` : ""}
@@ -4636,15 +4766,15 @@ ${i}const ${chV} = [], ${rawV} = [], ${tlV} = ${capTLv} ? [] : _EMPTY_TL` : capt
   const fObj = hasFields ? v(ctx, "_fields") : "undefined";
   const stmts = [
     allocStmt,
-    `${i}const ${sc} = _ctx._cstChildren, ${sl} = _ctx._cstLeaves, ${sr} = _ctx._cstRawChildren, ${st} = _ctx.captureTrivia, ${stl} = _ctx._cstTriviaLog${sf ? `, ${sf} = _ctx._fields` : ""}`,
-    `${i}_ctx._cstChildren = ${chV}; _ctx._cstLeaves = ${chV}; _ctx._cstRawChildren = ${rawV}; _ctx.captureTrivia = true; _ctx._cstTriviaLog = ${innerTl}${sf ? `; _ctx._fields = ${fieldsOn} ? [] : undefined` : ""}`
+    `${i}const ${sc} = _ctx._cstChildren, ${sl} = _ctx._cstLeaves, ${sr} = _ctx._cstRawChildren, ${st} = _ctx.captureTrivia, ${stl} = _ctx._cstTriviaLog${smk ? `, ${smk} = _ctx._triviaCaptureMask` : ""}${sf ? `, ${sf} = _ctx._fields` : ""}`,
+    `${i}_ctx._cstChildren = ${chV}; _ctx._cstLeaves = ${chV}; _ctx._cstRawChildren = ${rawV}; _ctx.captureTrivia = true; _ctx._cstTriviaLog = ${innerTl}${smk ? `; _ctx._triviaCaptureMask = ${capTLv} && _ctx.build._parsemanTriviaKinds !== undefined ? _ctx.build._parsemanTriviaKinds(${JSON.stringify(def.type)}) : ${smk}` : ""}${sf ? `; _ctx._fields = ${fieldsOn} ? [] : undefined` : ""}`
   ];
   const { stmts: innerStmts, okVar, endVar } = emitFallible(def.parser, ctx, pos);
   stmts.push(...innerStmts);
   if (sf && fArr) {
     stmts.push(`${i}const ${fArr} = _ctx._fields`);
   }
-  stmts.push(`${i}_ctx._cstChildren = ${sc}; _ctx._cstLeaves = ${sl}; _ctx._cstRawChildren = ${sr}; _ctx.captureTrivia = ${st}; _ctx._cstTriviaLog = ${stl}${sf ? `; _ctx._fields = ${sf}` : ""}`);
+  stmts.push(`${i}_ctx._cstChildren = ${sc}; _ctx._cstLeaves = ${sl}; _ctx._cstRawChildren = ${sr}; _ctx.captureTrivia = ${st}; _ctx._cstTriviaLog = ${stl}${smk ? `; _ctx._triviaCaptureMask = ${smk}` : ""}${sf ? `; _ctx._fields = ${sf}` : ""}`);
   stmts.push(...emitIfFail(ctx, `!${okVar}`, propagateFailBody(ctx)));
   let stV = "undefined";
   if (structural) {
@@ -6078,7 +6208,8 @@ function run(entry, input, options = {}) {
     _triviaLog: triviaLog,
     _errors: errors,
     build: options.build,
-    state: options.state
+    state: options.state,
+    ...options.triviaCaptureMask !== void 0 ? { _triviaCaptureMask: options.triviaCaptureMask } : {}
   };
   const r = invoke(entry, input, 0, ctx);
   let unconsumedFrom = null;
@@ -6555,6 +6686,7 @@ export {
   transform,
   trivia,
   triviaEntries,
+  triviaKindMask,
   walk,
   withCtx,
   word