@poe-platform/safe-bash 0.1.799 → 0.1.801

package/dist/safe-bash-search-engine/matcher.js

@@ -1,9 +1,9 @@
 import {
   prepareErgonomicRegex
-} from "../safe-bash/command-chunks/chunk-OLQG7ZCN.js";
+} from "../safe-bash/command-chunks/chunk-PEF7K3UQ.js";
 import {
   SearchError
-} from "../safe-bash/command-chunks/chunk-J4PEQWSF.js";
+} from "../safe-bash/command-chunks/chunk-VGG2DL5Q.js";
 import "../safe-bash/command-chunks/chunk-AVX5VLX5.js";
 import {
   init_buffer
@@ -67,10 +67,12 @@ var Matcher = class {
   session;
   descriptor;
   vm;
+  captureVm;
   crossLine;
   literalAsciiBytes;
   resetForRun(patterns, args, session, ergonomic = true, useSharedLiteralBuf = false) {
     this.session = session;
+    this.captureVm = void 0;
     if (patterns.length === 0) {
       this.literalAsciiBytes = void 0;
       this.vm = void 0;
@@ -104,7 +106,8 @@ var Matcher = class {
       this.descriptor = useSharedLiteralBuf ? DUMMY_LITERAL_DESCRIPTOR : { kind: "rg", patterns, fixed: true, case: "sensitive", whole: false, word: false, nullData: false };
       return;
     }
-    const prepared = ergonomic ? prepareErgonomicRegex(patterns, {
+    const captures = args.replacement?.includes("$") ?? false;
+    const prepared = ergonomic || captures ? prepareErgonomicRegex(patterns, {
       kind: "rg",
       fixed: args.fixed,
       caseMode: args.case,
@@ -112,18 +115,37 @@ var Matcher = class {
       word: args.word,
       nullData: args.nullData,
       multiline: args.multiline,
-      multilineDotall: args.multilineDotall
+      multilineDotall: args.multilineDotall,
+      captures
     }) : void 0;
-    if (prepared?.mode === "vm") {
+    if (prepared?.mode === "vm" && ergonomic) {
       this.vm = prepared.vm;
       this.crossLine = prepared.crossLine;
       this.descriptor = { kind: "rg", patterns: [], fixed: args.fixed, case: args.case, whole: args.whole, word: args.word, nullData: args.nullData };
     } else {
       this.vm = void 0;
+      this.captureVm = prepared?.mode === "vm" ? prepared.vm : void 0;
       this.crossLine = false;
-      this.descriptor = { kind: "rg", patterns: prepared ? [...prepared.patterns] : [...patterns], fixed: args.fixed, case: args.case, whole: args.whole, word: args.word, nullData: args.nullData };
+      this.descriptor = { kind: "rg", patterns: prepared?.mode === "delegated" && ergonomic ? [...prepared.patterns] : [...patterns], fixed: args.fixed, case: args.case, whole: args.whole, word: args.word, nullData: args.nullData };
     }
   }
+  attachCaptures(results, rows) {
+    if (!this.captureVm) return results;
+    return results.map((matches, index) => {
+      if (matches.length === 0) return matches;
+      const row = rows[index];
+      const captured = this.captureVm.matchBytes(row.bytes, row.all);
+      let cursor = 0;
+      return matches.map((match) => {
+        while (cursor < captured.length && captured[cursor].start < match.start) cursor++;
+        const candidate = captured[cursor];
+        if (candidate?.start !== match.start || candidate.end !== match.end) {
+          throw new SearchError("regex provider match cannot be expanded with the supported capture syntax");
+        }
+        return candidate;
+      });
+    });
+  }
   matchBuffer(bytes, all = true) {
     if (this.vm) return this.vm.matchBytes(bytes, all);
     return [];
@@ -133,8 +155,8 @@ var Matcher = class {
     trustedInputRows.add(rows);
     try {
       const res = this.session.runSync(this.descriptor, rows);
-      if (!(res instanceof Promise)) return res;
-      return res.catch((error) => {
+      if (!(res instanceof Promise)) return this.attachCaptures(res, rows);
+      return res.then((result) => this.attachCaptures(result, rows)).catch((error) => {
         if (error instanceof RegexExecutionError && error.code === "MATCH") throw new SearchError(error.message);
         throw error;
       });

package/dist/safe-bash-search-engine/options.js

@@ -3,7 +3,7 @@ import {
   SearchError,
   count,
   parse
-} from "../safe-bash/command-chunks/chunk-J4PEQWSF.js";
+} from "../safe-bash/command-chunks/chunk-VGG2DL5Q.js";
 import "../safe-bash/command-chunks/chunk-AVX5VLX5.js";
 import "../safe-bash/command-chunks/chunk-HX3SHTCE.js";
 export {

package/dist/safe-bash-search-engine/output.d.ts

@@ -1,5 +1,5 @@
 import type { Match } from "./matcher.js";
-import { type Arguments } from "./options.js";
+import type { Arguments } from "./options.js";
 import { Limits, type Line } from "./shared.js";
 export declare const elapsed: Readonly<{
     secs: 0;
@@ -27,6 +27,7 @@ export declare class Printer {
     private lastFile;
     private lastLine;
     private headings;
+    private replacement;
     constructor(args: Arguments, limits: Limits);
     resetForRun(args: Arguments, limits: Limits): void;
     event(type: string, value: unknown): Promise<void>;
@@ -37,5 +38,5 @@ export declare class Printer {
     countPartsSyncOrAsync(dirLabel: string, entryName: string, amount: number, filename: boolean): Promise<void> | undefined;
     count(label: string, amount: number, filename: boolean): Promise<void>;
     binary(label: string, offset: number, filename: boolean): Promise<void>;
-    record(label: string, line: Line, matches: readonly Match[], selected: boolean, filename: boolean): Promise<void>;
+    record(label: string, line: Line, matches: readonly Match[], selected: boolean, filename: boolean, multiline?: boolean, sourceLines?: number): Promise<void>;
 }

package/dist/safe-bash-search-engine/output.js

@@ -1,6 +1,6 @@
 import {
   SearchError
-} from "../safe-bash/command-chunks/chunk-J4PEQWSF.js";
+} from "../safe-bash/command-chunks/chunk-VGG2DL5Q.js";
 import "../safe-bash/command-chunks/chunk-AVX5VLX5.js";
 import {
   init_buffer
@@ -9,32 +9,105 @@ import {
 // packages/safe-bash-search-engine/src/output.ts
 init_buffer();
 import { base64Text } from "../safe-bash-byte-engine/index.js";
+import { bytesFrom as bytesFrom2, concatBytes as concatBytes2 } from "../safe-bash-byte-engine/index.js";
+
+// packages/safe-bash-search-engine/src/replacement.ts
+init_buffer();
 import { bytesFrom, concatBytes } from "../safe-bash-byte-engine/index.js";
+var Replacement = class {
+  parts = [];
+  constructor(source) {
+    let literal = "";
+    const flush = () => {
+      if (literal) this.parts.push(bytesFrom(literal));
+      literal = "";
+    };
+    for (let offset = 0; offset < source.length; ) {
+      if (source[offset] !== "$") {
+        literal += source[offset++];
+        continue;
+      }
+      if (source[offset + 1] === "$") {
+        literal += "$";
+        offset += 2;
+        continue;
+      }
+      const braced = source[offset + 1] === "{";
+      const start = offset + (braced ? 2 : 1);
+      let end = start;
+      let numeric = true;
+      while (end < source.length) {
+        const c = source.charCodeAt(end);
+        const digit = c >= 48 && c <= 57;
+        if (!digit && c !== 95 && !(c >= 65 && c <= 90) && !(c >= 97 && c <= 122)) break;
+        numeric &&= digit;
+        end++;
+      }
+      if (end === start || braced && source[end] !== "}") {
+        literal += "$";
+        offset++;
+        continue;
+      }
+      flush();
+      const key = source.slice(start, end);
+      this.parts.push(numeric ? Number(key) : key);
+      offset = end + (braced ? 1 : 0);
+    }
+    flush();
+  }
+  expand(bytes, matches, onlyMatching, maxBytes) {
+    const parts = [];
+    let size = 0, cursor = 0;
+    const append = (part) => {
+      if (part.length > maxBytes - size) throw new SearchError("replacement output byte limit exceeded");
+      size += part.length;
+      if (part.length) parts.push(part);
+    };
+    for (const match of matches) {
+      if (!onlyMatching) append(bytes.subarray(cursor, match.start));
+      for (const part of this.parts) {
+        if (part instanceof Uint8Array) append(part);
+        else {
+          const span = part === 0 ? match : match.captures?.get(part);
+          if (span) append(bytes.subarray(span.start, span.end));
+        }
+      }
+      cursor = match.end;
+    }
+    if (!onlyMatching) append(bytes.subarray(cursor));
+    return concatBytes(parts, size);
+  }
+};
+
+// packages/safe-bash-search-engine/src/output.ts
 var elapsed = Object.freeze({ secs: 0, nanos: 0, human: "0.000000s" });
 var stats = () => ({ elapsed, searches: 0, searches_with_match: 0, bytes_searched: 0, bytes_printed: 0, matched_lines: 0, matches: 0 });
 function data(bytes) {
   try {
     return { text: new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(bytes) };
   } catch {
-    return { bytes: base64Text(bytesFrom(bytes)) };
+    return { bytes: base64Text(bytesFrom2(bytes)) };
   }
 }
 var Printer = class {
   constructor(args, limits) {
     this.args = args;
     this.limits = limits;
+    this.replacement = args.replacement === void 0 ? void 0 : new Replacement(args.replacement);
   }
   args;
   limits;
   lastFile;
   lastLine = 0;
   headings;
+  replacement;
   resetForRun(args, limits) {
     this.args = args;
     this.limits = limits;
     this.lastFile = void 0;
     this.lastLine = 0;
     this.headings = void 0;
+    this.replacement = args.replacement === void 0 ? void 0 : new Replacement(args.replacement);
   }
   async event(type, value) {
     const ordered = (input) => input && typeof input === "object" && !Array.isArray(input) ? Object.fromEntries(Object.entries(input).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).map(([key, item]) => [key, ordered(item)])) : input;
@@ -63,10 +136,10 @@ var Printer = class {
     await this.limits.output(`${filename ? label + ": " : ""}binary file matches (found "\\0" byte around offset ${offset})
 `);
   }
-  async record(label, line, matches, selected, filename) {
+  async record(label, line, matches, selected, filename, multiline = false, sourceLines = 1) {
     if (this.args.mode === "json") {
       await this.event(selected ? "match" : "context", {
-        path: data(bytesFrom(label)),
+        path: data(bytesFrom2(label)),
         lines: data(line.rawBytes),
         line_number: line.number,
         absolute_offset: line.offset,
@@ -83,40 +156,48 @@ var Printer = class {
       await this.limits.output(this.args.separator + "\n");
     }
     const pieces = this.args.onlyMatching && selected && !this.args.invert ? matches : [void 0];
+    let expandedCursor = 0, expandedOffset = 0, expandedLine = line.number;
     for (const match of pieces) {
       const separator = selected ? ":" : "-";
-      let prefix = filename && !this.args.heading ? label + (this.args.nullPath ? "\0" : separator) : "";
-      if (this.args.lineNumber) prefix += line.number + separator;
-      if (this.args.column && matches.length) prefix += (match ?? matches[0]).start + 1 + separator;
-      if (this.args.byteOffset) prefix += line.offset + (match?.start ?? 0) + separator;
-      let content = match ? line.content.subarray(match.start, match.end) : line.content;
-      if (this.args.replacement !== void 0 && selected && !this.args.invert) {
-        const replacement = bytesFrom(this.args.replacement);
-        if (match) content = replacement;
-        else {
-          const parts = [];
-          let cursor = 0;
-          let size = line.content.length;
-          for (const span of matches) {
-            size += replacement.length - (span.end - span.start);
-            if (size > this.limits.maxOutputBytes) throw new SearchError("replacement output byte limit exceeded");
-            parts.push(line.content.subarray(cursor, span.start), replacement);
-            cursor = span.end;
-          }
-          parts.push(line.content.subarray(cursor));
-          content = concatBytes(parts);
+      if (multiline && match) {
+        for (let index = expandedCursor; index < match.start; index++) {
+          if (line.content[index] === (this.args.nullData ? 0 : 10)) expandedLine++;
         }
+        expandedOffset += match.start - expandedCursor;
       }
-      if (this.args.trim) {
-        let start = 0;
-        while (start < content.length && (content[start] === 32 || content[start] >= 9 && content[start] <= 13)) start++;
-        content = content.subarray(start);
+      let content = match ? line.content.subarray(match.start, match.end) : line.content;
+      if (this.replacement && selected && !this.args.invert) {
+        content = this.replacement.expand(line.content, match ? [match] : matches, match !== void 0, this.limits.maxOutputBytes - this.limits.outputBytes);
       }
       const terminator = this.args.nullData ? "\0" : match && this.args.crlf ? "\r\n" : "\n";
-      await this.limits.output(concatBytes([bytesFrom(prefix), content, bytesFrom(terminator)]));
+      let start = 0, number = multiline && match ? expandedLine : line.number;
+      do {
+        const delimiter = multiline ? content.indexOf(this.args.nullData ? 0 : 10, start) : -1;
+        let chunk = content.subarray(start, delimiter < 0 ? content.length : delimiter);
+        let prefix = filename && !this.args.heading ? label + (this.args.nullPath ? "\0" : separator) : "";
+        if (this.args.lineNumber) prefix += number + separator;
+        if (this.args.column && matches.length) prefix += (multiline && match ? expandedOffset : (match ?? matches[0]).start) + 1 + separator;
+        if (this.args.byteOffset) prefix += line.offset + (multiline && match ? expandedOffset : match?.start ?? start) + separator;
+        if (this.args.trim) {
+          let trim = 0;
+          while (trim < chunk.length && (chunk[trim] === 32 || chunk[trim] >= 9 && chunk[trim] <= 13)) trim++;
+          chunk = chunk.subarray(trim);
+        }
+        if (!multiline || !match || chunk.length > 0) {
+          await this.limits.output(concatBytes2([bytesFrom2(prefix), chunk, bytesFrom2(terminator)]));
+        }
+        if (delimiter < 0) break;
+        start = delimiter + 1;
+        number++;
+      } while (start < content.length);
+      if (multiline && match) {
+        expandedCursor = match.end;
+        expandedOffset += content.length;
+        expandedLine = number;
+      }
     }
     this.lastFile = label;
-    this.lastLine = line.number;
+    this.lastLine = line.number + sourceLines - 1;
   }
 };
 export {

package/dist/safe-bash-search-engine/shared.d.ts

@@ -35,6 +35,8 @@ export declare class Limits {
     private ensureOutBuf;
     private releaseOutBuf;
     tick(): Promise<void> | undefined;
+    tick(syncOnly: true): true | undefined;
+    tick(syncOnly: boolean): Promise<void> | true | undefined;
     private write;
     flush(): Promise<void>;
     flushCachedSharedSync(len: number): boolean;

package/dist/safe-bash-search-engine/shared.js

@@ -7,8 +7,8 @@ import {
   pathFor,
   sharedOutBufGeneration,
   trySyncLineBatches
-} from "../safe-bash/command-chunks/chunk-3VGGYEDH.js";
-import "../safe-bash/command-chunks/chunk-J4PEQWSF.js";
+} from "../safe-bash/command-chunks/chunk-ORYGZYKW.js";
+import "../safe-bash/command-chunks/chunk-VGG2DL5Q.js";
 import "../safe-bash/command-chunks/chunk-AVX5VLX5.js";
 import "../safe-bash/command-chunks/chunk-HX3SHTCE.js";
 export {

package/dist/safe-bash-search-engine/walk.js

@@ -1,14 +1,14 @@
+import {
+  pathFor
+} from "../safe-bash/command-chunks/chunk-ORYGZYKW.js";
 import {
   Glob,
   ignoreRules,
   matchGlobs
-} from "../safe-bash/command-chunks/chunk-AVSPNLWV.js";
-import {
-  pathFor
-} from "../safe-bash/command-chunks/chunk-3VGGYEDH.js";
+} from "../safe-bash/command-chunks/chunk-I237SNW5.js";
 import {
   SearchError
-} from "../safe-bash/command-chunks/chunk-J4PEQWSF.js";
+} from "../safe-bash/command-chunks/chunk-VGG2DL5Q.js";
 import {
   defaultFileTypes
 } from "../safe-bash/command-chunks/chunk-AVX5VLX5.js";
@@ -716,7 +716,7 @@ var Walker = class {
       for (let entryIdx = 0; entryIdx < len; entryIdx++) {
         const entryName = keys[entryIdx];
         const entryObj = vals[entryIdx];
-        if (this.limits.tick()) return null;
+        if (this.limits.tick(true)) return null;
         if (++this.limits.files > this.limits.maxFilesSmi && this.limits.files > this.limits.maxFiles) throw new SearchError("filesystem entry limit exceeded");
         if (!this.args.hidden && entryName.startsWith(".")) continue;
         const entryType = entryObj.type;
@@ -773,18 +773,17 @@ var Walker = class {
       for (let bufIdx = baseOffset, entryIdx = 0; bufIdx < endOffset; bufIdx += 2, entryIdx++) {
         const entryName = syncWalkBuffer[bufIdx];
         const entryObj = syncWalkBuffer[bufIdx + 1];
-        const tickPending = this.limits.tick();
+        if (syncOnly && this.limits.tick(true)) return null;
+        const tickPending = syncOnly ? void 0 : this.limits.tick();
         if (++this.limits.files > this.limits.maxFilesSmi && this.limits.files > this.limits.maxFiles) throw new SearchError("filesystem entry limit exceeded");
         if (!this.args.hidden && entryName.startsWith(".")) {
           if (tickPending) {
-            if (syncOnly) return null;
             return this.finishWalkEntriesAsync(backing, cleanPath, cleanLabel, depth, rules, repository, onTarget, memDirEntries, entryIdx + 1, tickPending.then(() => true));
           }
           continue;
         }
         const entryType = entryObj.type;
         if (tickPending) {
-          if (syncOnly) return null;
           const child = `${cleanPath}/${entryName}`;
           const display = samePrefix ? child : cleanLabel ? `${cleanLabel}/${entryName}` : entryName;
           return this.finishWalkEntryAfterTickAsync(backing, cleanPath, cleanLabel, child, display, entryType, depth, rules, repository, onTarget, memDirEntries, entryIdx + 1, tickPending);
@@ -840,7 +839,8 @@ var Walker = class {
           const rootEntries = path.indexOf("/", 1) === -1 ? tryGetMemoryDirectoryEntryNamesSync(fastMem, "/") : void 0;
           if (rootEntries !== void 0 && !rootEntries.has(".git") && (!this.args.ignore || !rootEntries.has(".gitignore") && !rootEntries.has(".ignore") && !rootEntries.has(".rgignore"))) {
             this.context.signal.throwIfAborted();
-            const tickPending = this.limits.tick();
+            if (syncOnly && this.limits.tick(true)) return null;
+            const tickPending = syncOnly ? void 0 : this.limits.tick();
             if (!tickPending) {
               if (++this.limits.files > this.limits.maxFilesSmi && this.limits.files > this.limits.maxFiles) throw new SearchError("filesystem entry limit exceeded");
               this.uniformDirAdmitted = true;
@@ -852,6 +852,7 @@ var Walker = class {
               if (syncWalk === null) return null;
               return syncWalk instanceof Promise ? toVoidPromise(syncWalk) : void 0;
             }
+            return tickPending.then(() => this.walkTargets(paths, implicit, onTarget));
           }
         }
       }

package/dist/safe-bash-table-text-engine/table-text/internal.d.ts

@@ -19,7 +19,7 @@ export declare const empty: Uint8Array<ArrayBuffer>;
 export declare const encode: (value: string) => Uint8Array;
 export declare function settings(options: TableTextCommandsOptions): TableTextLimits;
 export declare function fail(message: string): never;
-export declare function command(name: string, handler: CommandHandler): CommandDefinition;
+export declare function command(name: string, limits: TableTextLimits, handler: (context: CommandContext, budget: Budget) => ReturnType<CommandHandler>): CommandDefinition;
 export declare function compare(left: Uint8Array, right: Uint8Array, fold?: boolean): number;
 export declare class Budget {
     readonly context: CommandContext;
@@ -27,8 +27,6 @@ export declare class Budget {
     private inputBytes;
     private outputBytes;
     steps: number;
-    private signalAborted;
-    private readonly pollBaseSignal;
     constructor(context: CommandContext, limits: TableTextLimits, outputChunkBytes?: number);
     check(value: number | bigint, maximum: number, label: string): void;
     step(): void | Promise<void>;
@@ -73,10 +71,14 @@ export type OrderMode = "default" | "check" | "none";
 export declare class OrderCheck {
     readonly mode: OrderMode;
     readonly context: CommandContext;
-    unpaired: boolean;
+    readonly budget: Budget;
+    private unpaired;
     failed: boolean;
     private warned;
-    constructor(mode: OrderMode, context: CommandContext);
+    private pending;
+    constructor(mode: OrderMode, context: CommandContext, budget: Budget);
+    markUnpaired(): Promise<void>;
     check(previous: Uint8Array | undefined, next: Uint8Array | undefined, file: number, fold?: boolean): void | Promise<void>;
+    private report;
     finish(): Promise<void>;
 }

package/dist/safe-bash-table-text-engine/table-text/internal.js

@@ -34,18 +34,23 @@ function settings(options) {
 function fail(message) {
   throw new FsError("EINVAL", { message });
 }
-function command(name, handler) {
+function command(name, limits, handler) {
   return { name, async execute(context) {
     context.signal.throwIfAborted();
+    let budget;
     try {
       const infoPromise = gnuInformation(name, context);
       if (infoPromise) {
         const info = await infoPromise;
         if (info) return info;
       }
-      return await handler(context);
+      budget = new Budget(context, limits);
+      const result = await handler(context, budget);
+      await budget.flushOutput();
+      return result;
     } catch (error) {
       context.signal.throwIfAborted();
+      if (budget?.hasPendingOutput()) await budget.flushOutput();
       await diagnostic(context, error);
       return { exitCode: 1 };
     }
@@ -65,13 +70,6 @@ var Budget = class {
     this.context = context;
     this.limits = limits;
     this.outBuf = new Uint8Array(outputChunkBytes);
-    this.signalAborted = context.signal.aborted;
-    this.pollBaseSignal = Object.prototype.hasOwnProperty.call(context.signal, "aborted");
-    if (!this.signalAborted && !this.pollBaseSignal) {
-      context.signal.addEventListener("abort", () => {
-        this.signalAborted = true;
-      }, { once: true });
-    }
     this.check(context.args.reduce((size, value) => size + utf8ByteLength(value), 0), limits.maxArgumentBytes, "argument");
   }
   context;
@@ -79,13 +77,11 @@ var Budget = class {
   inputBytes = 0;
   outputBytes = 0;
   steps = 0;
-  signalAborted;
-  pollBaseSignal;
   check(value, maximum, label) {
     if (value > maximum) throw new FsError("EFBIG", { message: `table-text ${label} limit exceeded` });
   }
   step() {
-    if (this.pollBaseSignal ? this.context.signal.aborted : this.signalAborted) this.context.signal.throwIfAborted();
+    this.context.signal.throwIfAborted();
     this.check(++this.steps, this.limits.maxSteps, "step");
     if (this.steps % 1024 !== 0) return;
     return yieldTurn(this.context.signal).then(() => {
@@ -95,6 +91,7 @@ var Budget = class {
   input(size) {
     this.check(size, this.limits.maxChunkBytes, "chunk");
     this.inputBytes += size;
+    this.context.inputBudget?.check(this.inputBytes);
     this.check(this.inputBytes, this.limits.maxInputBytes, "input");
   }
   admitOutput(size) {
@@ -314,27 +311,48 @@ function argument(args, index, attached, option) {
   return [value, index + 1];
 }
 var OrderCheck = class {
-  constructor(mode, context) {
+  constructor(mode, context, budget) {
     this.mode = mode;
     this.context = context;
+    this.budget = budget;
   }
   mode;
   context;
+  budget;
   unpaired = false;
   failed = false;
   warned = /* @__PURE__ */ new Set();
+  // Only the transition into each current row matters when default checking starts.
+  pending = /* @__PURE__ */ new Set();
+  async markUnpaired() {
+    if (this.unpaired) return;
+    this.unpaired = true;
+    for (const file of this.pending) await this.report(file);
+    this.pending.clear();
+  }
   check(previous, next, file, fold = false) {
-    if (this.mode === "none" || this.mode === "default" && !this.unpaired || this.warned.has(file)) return;
-    if (previous && next && compare(previous, next, fold) > 0) {
-      const message = `file ${file} is not in sorted order`;
-      if (this.mode === "check") fail(message);
-      this.warned.add(file);
-      this.failed = true;
-      return diagnostic(this.context, new PublicDiagnostic(message));
+    if (this.mode === "none" || this.warned.has(file)) return;
+    const disordered = previous !== void 0 && next !== void 0 && compare(previous, next, fold) > 0;
+    if (this.mode === "default" && !this.unpaired) {
+      if (disordered) this.pending.add(file);
+      else this.pending.delete(file);
+      return;
     }
+    if (disordered) return this.report(file);
+  }
+  async report(file) {
+    const message = `file ${file} is not in sorted order`;
+    if (this.mode === "check") fail(message);
+    this.warned.add(file);
+    this.failed = true;
+    if (this.budget.hasPendingOutput()) await this.budget.flushOutput();
+    await diagnostic(this.context, new PublicDiagnostic(message));
   }
   async finish() {
-    if (this.failed) await diagnostic(this.context, new PublicDiagnostic("input is not in sorted order"));
+    if (this.failed) {
+      if (this.budget.hasPendingOutput()) await this.budget.flushOutput();
+      await diagnostic(this.context, new PublicDiagnostic("input is not in sorted order"));
+    }
   }
 };
 export {

package/dist/safe-bash-xml-engine/document.d.ts

@@ -1,4 +1,4 @@
 import type { XmlElement } from "@poe-platform/safe-fs/core";
 import { XmlBudget } from "./limits.js";
-export type DocumentMode = "format" | "c14n";
+export type DocumentMode = "format" | "c14n" | "exc-c14n";
 export declare function serializeDocument(root: XmlElement, mode: DocumentMode, budget: XmlBudget, format?: boolean): AsyncGenerator<string>;

package/dist/safe-bash-xml-engine/document.js

@@ -1,8 +1,8 @@
 import {
   serializeDocument
-} from "../safe-bash/command-chunks/chunk-ZS3QPNUL.js";
-import "../safe-bash/command-chunks/chunk-XS3PGJU2.js";
-import "../safe-bash/command-chunks/chunk-KVFCSLKK.js";
+} from "../safe-bash/command-chunks/chunk-IR2BY7EL.js";
+import "../safe-bash/command-chunks/chunk-XJXU3VVH.js";
+import "../safe-bash/command-chunks/chunk-NXEQ3ESQ.js";
 import "../safe-bash/command-chunks/chunk-HX3SHTCE.js";
 export {
   serializeDocument

package/dist/safe-bash-xml-engine/evaluate.d.ts

@@ -20,6 +20,7 @@ interface ContentNode {
     value: Exclude<XmlContent, XmlElement>;
 }
 export type Node = Container | AttributeNode | ContentNode;
+export declare function evaluateScalar(query: Query, root: XmlElement, budget: XmlBudget): Promise<string>;
 export declare function evaluate(query: Query, root: XmlElement, budget: XmlBudget): Promise<Node[]>;
 export declare function stringValue(node: Node | undefined, budget: XmlBudget): AsyncGenerator<string>;
 export declare function serializeSimpleSync(node: Node, budget: XmlBudget): string | undefined;

package/dist/safe-bash-xml-engine/evaluate.js

@@ -1,14 +1,17 @@
 import {
   escape,
   evaluate,
+  evaluateScalar,
   serialize,
   serializeSimpleSync,
   stringValue
-} from "../safe-bash/command-chunks/chunk-XS3PGJU2.js";
+} from "../safe-bash/command-chunks/chunk-XJXU3VVH.js";
+import "../safe-bash/command-chunks/chunk-NXEQ3ESQ.js";
 import "../safe-bash/command-chunks/chunk-HX3SHTCE.js";
 export {
   escape,
   evaluate,
+  evaluateScalar,
   serialize,
   serializeSimpleSync,
   stringValue

package/dist/safe-bash-xml-engine/index.js

@@ -1,23 +1,24 @@
 import {
   serializeDocument
-} from "../safe-bash/command-chunks/chunk-ZS3QPNUL.js";
+} from "../safe-bash/command-chunks/chunk-IR2BY7EL.js";
+import {
+  parseQuery
+} from "../safe-bash/command-chunks/chunk-JNZ3CVAE.js";
 import {
   escape,
   evaluate,
+  evaluateScalar,
   serialize,
   serializeSimpleSync,
   stringValue
-} from "../safe-bash/command-chunks/chunk-XS3PGJU2.js";
-import {
-  parseQuery
-} from "../safe-bash/command-chunks/chunk-5MPOQ6V3.js";
+} from "../safe-bash/command-chunks/chunk-XJXU3VVH.js";
 import {
   XmlBudget,
   XmlQueryError,
   XmlQueryLimitError,
   defaultXmlQueryLimits,
   resolveXmlQueryLimits
-} from "../safe-bash/command-chunks/chunk-KVFCSLKK.js";
+} from "../safe-bash/command-chunks/chunk-NXEQ3ESQ.js";
 import {
   init_buffer
 } from "../safe-bash/command-chunks/chunk-HX3SHTCE.js";
@@ -31,6 +32,7 @@ export {
   defaultXmlQueryLimits,
   escape,
   evaluate,
+  evaluateScalar,
   parseQuery,
   resolveXmlQueryLimits,
   serialize,

package/dist/safe-bash-xml-engine/io.js

@@ -1,7 +1,7 @@
 import {
   XmlQueryError,
   XmlQueryLimitError
-} from "../safe-bash/command-chunks/chunk-KVFCSLKK.js";
+} from "../safe-bash/command-chunks/chunk-NXEQ3ESQ.js";
 import {
   init_buffer
 } from "../safe-bash/command-chunks/chunk-HX3SHTCE.js";