@poe-platform/safe-bash 0.1.799 → 0.1.800

package/dist/safe-bash/commands/diff-patch/index.js

@@ -1,9 +1,9 @@
-import { encoder, registerDefaultExecutors, syncCommandEvaluators } from "../internal.js";
-import { gnuInformationSync } from "../gnu-information.js";
-import { flags } from "./diff-options.js";
-import { expandTabs } from "./diff-output.js";
-import { diffCommand } from "./diff.js";
-import { patchCommand } from "./patch.js";
+import { syncCommandEvaluators } from "../internal.js";
+import { evalSyncPatch } from "../../../safe-bash-command-patch/index.js";
+syncCommandEvaluators.evalSyncPatch = evalSyncPatch;
+import { registerDefaultExecutors } from "../internal.js";
+import { diffCommand } from "../../../safe-bash-command-diff/index.js";
+import { patchCommand } from "../../../safe-bash-command-patch/index.js";
 export function createDiffPatchCommands(options = {}) {
     return registerDefaultExecutors([diffCommand(options), patchCommand(options)], options);
 }
@@ -22,331 +22,6 @@ export function diffPatchCommands(options = {}) {
         },
     };
 }
-const syncDiffDecoder = new TextDecoder("utf-8", { fatal: false });
-function normalizeSyncDiffLines(text, opts) {
-    const rawLines = [];
-    let start = 0;
-    for (let i = 0; i < text.length; i++) {
-        if (text.charCodeAt(i) === 10) {
-            rawLines.push(text.slice(start, i + 1));
-            start = i + 1;
-        }
-    }
-    if (start < text.length)
-        rawLines.push(text.slice(start));
-    const out = [];
-    for (let i = 0; i < rawLines.length; i++) {
-        let line = rawLines[i];
-        if (opts.stripTrailingCr && line.endsWith("\r\n")) {
-            line = line.slice(0, -2) + "\n";
-        }
-        else if (opts.stripTrailingCr && line.endsWith("\r")) {
-            line = line.slice(0, -1);
-        }
-        let body = line.endsWith("\n") ? line.slice(0, -1) : line;
-        if (opts.ignoreTabs)
-            body = expandTabs(body);
-        if (opts.whitespace !== "exact") {
-            body = body.replace(/[ \t\v\f\r]+/gu, opts.whitespace === "all" ? "" : " ");
-        }
-        if (opts.ignoreTrailing || opts.whitespace !== "exact") {
-            body = body.replace(/[ \t\v\f\r]+$/u, "");
-        }
-        if (opts.ignoreCase) {
-            body = body.replace(/[A-Z]/gu, letter => letter.toLowerCase());
-        }
-        if (opts.ignoreBlank && body === "")
-            continue;
-        const suffix = (opts.whitespace !== "exact" || opts.ignoreTrailing || opts.ignoreTabs) ? "" : (line.endsWith("\n") ? "\n" : "");
-        out.push(body + suffix);
-    }
-    return out;
-}
-export function evalSyncDiff(stdinBytes, args, readFile) {
-    let opts;
-    try {
-        opts = flags(args);
-    }
-    catch {
-        return undefined;
-    }
-    const pairFiles = opts.fromFile !== undefined && opts.toFile === undefined && opts.files.length === 1
-        ? [opts.fromFile, opts.files[0]]
-        : opts.toFile !== undefined && opts.fromFile === undefined && opts.files.length === 1
-            ? [opts.files[0], opts.toFile]
-            : opts.fromFile === undefined && opts.toFile === undefined && opts.files.length === 2
-                ? [opts.files[0], opts.files[1]]
-                : undefined;
-    if (!pairFiles ||
-        opts.recursive ||
-        opts.paginate ||
-        (opts.format === "side" && !opts.suppressCommon) ||
-        opts.format === "ifdef") {
-        return undefined;
-    }
-    const left = pairFiles[0];
-    const right = pairFiles[1];
-    if (left === "-" && right === "-")
-        return opts.reportSame ? `Files ${opts.labels[0] ?? left} and ${opts.labels[1] ?? right} are identical\n` : "";
-    const resolveOperand = (op) => {
-        if (op === "-" || op === "/dev/stdin" || op === "/dev/fd/0")
-            return stdinBytes;
-        if (!readFile)
-            return undefined;
-        return readFile(op);
-    };
-    const b1 = resolveOperand(left);
-    const b2 = resolveOperand(right);
-    if (!b1 || !b2)
-        return undefined;
-    let same = false;
-    if (b1.byteLength === b2.byteLength) {
-        same = true;
-        for (let i = 0; i < b1.byteLength; i++) {
-            if (b1[i] !== b2[i]) {
-                same = false;
-                break;
-            }
-        }
-    }
-    if (!same) {
-        // Ignore patterns apply to change groups through the command's bounded BRE
-        // matcher. Filtering entire inputs here can hide differences between them.
-        if (opts.ignorePatterns.length > 0)
-            return undefined;
-        if (!opts.ignoreCase && !opts.ignoreTrailing && !opts.ignoreBlank && !opts.ignoreTabs && !opts.stripTrailingCr && opts.whitespace === "exact") {
-            return undefined;
-        }
-        for (let i = 0; i < b1.byteLength; i++)
-            if (b1[i] === 0)
-                return undefined;
-        for (let i = 0; i < b2.byteLength; i++)
-            if (b2[i] === 0)
-                return undefined;
-        const t1 = syncDiffDecoder.decode(b1);
-        const t2 = syncDiffDecoder.decode(b2);
-        const l1 = normalizeSyncDiffLines(t1, opts);
-        const l2 = normalizeSyncDiffLines(t2, opts);
-        if (l1.length !== l2.length)
-            return undefined;
-        for (let i = 0; i < l1.length; i++) {
-            if (l1[i] !== l2[i])
-                return undefined;
-        }
-        same = true;
-    }
-    return opts.reportSame ? `Files ${opts.labels[0] ?? left} and ${opts.labels[1] ?? right} are identical\n` : "";
-}
-export function evalSyncPatch(inBytes, opArgs, readFileSync, writeFileSync) {
-    const gnuInfo = gnuInformationSync("patch", opArgs);
-    if (gnuInfo !== undefined)
-        return gnuInfo;
-    if (!readFileSync || !writeFileSync)
-        return undefined;
-    let strip;
-    let quiet = false;
-    let reverse = false;
-    let dryRun = false;
-    let outputPath;
-    let inputPath;
-    let ended = false;
-    const operands = [];
-    for (let i = 0; i < opArgs.length; i++) {
-        const a = opArgs[i];
-        if (ended || !a.startsWith("-") || a === "-") {
-            operands.push(a);
-            continue;
-        }
-        if (a === "--") {
-            ended = true;
-            continue;
-        }
-        if (a === "-s" || a === "--quiet" || a === "--silent") {
-            quiet = true;
-            continue;
-        }
-        if (a === "-R" || a === "--reverse") {
-            reverse = true;
-            continue;
-        }
-        if (a === "--dry-run") {
-            dryRun = true;
-            continue;
-        }
-        if (a === "-N" || a === "--forward" || a === "-f" || a === "--force" || a === "-t" || a === "--batch" || a === "-u" || a === "--unified") {
-            continue;
-        }
-        if (a === "-o" || a === "--output") {
-            outputPath = opArgs[++i];
-            if (!outputPath)
-                return undefined;
-            continue;
-        }
-        if (a.startsWith("-o") && a.length > 2) {
-            outputPath = a.slice(2);
-            continue;
-        }
-        if (a.startsWith("--output=")) {
-            outputPath = a.slice(9);
-            if (!outputPath)
-                return undefined;
-            continue;
-        }
-        if (a === "-p" || a === "--strip") {
-            const v = opArgs[++i];
-            if (!v || !/^\d+$/.test(v))
-                return undefined;
-            strip = Number(v);
-            continue;
-        }
-        if (a.startsWith("-p") && /^\d+$/.test(a.slice(2))) {
-            strip = Number(a.slice(2));
-            continue;
-        }
-        if (a.startsWith("--strip=") && /^\d+$/.test(a.slice(8))) {
-            strip = Number(a.slice(8));
-            continue;
-        }
-        if (a === "-i" || a === "--input") {
-            inputPath = opArgs[++i];
-            if (!inputPath)
-                return undefined;
-            continue;
-        }
-        if (a.startsWith("--input=")) {
-            inputPath = a.slice(8);
-            continue;
-        }
-        return undefined;
-    }
-    if (operands.length > 2)
-        return undefined;
-    const targetArg = operands[0];
-    const patchFileArg = inputPath ?? operands[1];
-    const patchBytes = patchFileArg && patchFileArg !== "-" ? readFileSync(patchFileArg) : inBytes;
-    if (!patchBytes || patchBytes.includes(0))
-        return undefined;
-    const patchText = syncDiffDecoder.decode(patchBytes);
-    const lines = patchText.split("\n");
-    let headerOld;
-    let headerNew;
-    let idx = 0;
-    while (idx < lines.length && !lines[idx].startsWith("@@ ")) {
-        if (lines[idx].startsWith("--- ")) {
-            headerOld = lines[idx].slice(4).split("\t")[0].trim();
-        }
-        else if (lines[idx].startsWith("+++ ")) {
-            headerNew = lines[idx].slice(4).split("\t")[0].trim();
-        }
-        idx++;
-    }
-    if (idx >= lines.length)
-        return undefined;
-    let resolvedTarget = targetArg;
-    if (!resolvedTarget) {
-        const hdr = headerNew && headerNew !== "/dev/null" ? headerNew : headerOld;
-        if (!hdr || hdr === "/dev/null")
-            return undefined;
-        if (strip !== undefined) {
-            const parts = hdr.split("/");
-            if (parts.length <= strip)
-                return undefined;
-            resolvedTarget = parts.slice(strip).join("/");
-        }
-        else {
-            resolvedTarget = hdr.split("/").pop() || hdr;
-        }
-    }
-    if (!resolvedTarget)
-        return undefined;
-    const origBytes = readFileSync(resolvedTarget);
-    if (origBytes && origBytes.includes(0))
-        return undefined;
-    const isNewFile = !origBytes && (reverse ? headerNew === "/dev/null" : headerOld === "/dev/null");
-    if (!origBytes && !isNewFile)
-        return undefined;
-    const origText = origBytes ? syncDiffDecoder.decode(origBytes) : "";
-    let hasTrailingNewline = origText === "" ? true : origText.endsWith("\n");
-    const origLines = origText === "" ? [] : (origText.endsWith("\n") ? origText.slice(0, -1).split("\n") : origText.split("\n"));
-    const outLines = [];
-    let origPos = 0;
-    let lastHunkOp = " ";
-    while (idx < lines.length) {
-        const line = lines[idx];
-        if (!line.startsWith("@@ ")) {
-            if (line === "") {
-                idx++;
-                continue;
-            }
-            return undefined;
-        }
-        const m = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/.exec(line);
-        if (!m)
-            return undefined;
-        const startLineNum = Number(reverse ? m[3] : m[1]);
-        const oldStart = startLineNum === 0 ? 0 : startLineNum - 1;
-        if (oldStart < origPos || oldStart > origLines.length)
-            return undefined;
-        while (origPos < oldStart)
-            outLines.push(origLines[origPos++]);
-        idx++;
-        while (idx < lines.length && !lines[idx].startsWith("@@ ")) {
-            const hl = lines[idx];
-            if (hl === "" && idx === lines.length - 1) {
-                idx++;
-                break;
-            }
-            const rawPrefix = hl[0];
-            const prefix = reverse ? (rawPrefix === "+" ? "-" : rawPrefix === "-" ? "+" : rawPrefix) : rawPrefix;
-            const body = hl.slice(1);
-            if (prefix === " ") {
-                if (origLines[origPos] !== body)
-                    return undefined;
-                outLines.push(body);
-                origPos++;
-                lastHunkOp = " ";
-            }
-            else if (prefix === "-") {
-                if (origLines[origPos] !== body)
-                    return undefined;
-                origPos++;
-                if (origPos === origLines.length)
-                    hasTrailingNewline = true;
-                lastHunkOp = "-";
-            }
-            else if (prefix === "+") {
-                outLines.push(body);
-                if (origPos === origLines.length)
-                    hasTrailingNewline = true;
-                lastHunkOp = "+";
-            }
-            else if (hl.startsWith("\\ No newline")) {
-                if (lastHunkOp === "+" || (lastHunkOp === " " && origPos === origLines.length)) {
-                    hasTrailingNewline = false;
-                }
-            }
-            else {
-                return undefined;
-            }
-            idx++;
-        }
-    }
-    while (origPos < origLines.length)
-        outLines.push(origLines[origPos++]);
-    const resultText = outLines.length === 0 ? "" : outLines.join("\n") + (hasTrailingNewline ? "\n" : "");
-    if (outputPath === "-") {
-        return resultText;
-    }
-    const destPath = outputPath ?? resolvedTarget;
-    if (!dryRun && outputPath !== "/dev/null") {
-        if (!writeFileSync(destPath, encoder.encode(resultText), false))
-            return undefined;
-    }
-    if (quiet)
-        return "";
-    const verb = dryRun ? "checking" : "patching";
-    const label = outputPath !== undefined ? `${outputPath} (read from ${resolvedTarget})` : resolvedTarget;
-    return `${verb} file ${label}\n`;
-}
-syncCommandEvaluators.evalSyncPatch = evalSyncPatch;
+export * from "../../../safe-bash-command-diff/index.js";
+export * from "../../../safe-bash-command-patch/index.js";
 //# sourceMappingURL=index.js.map

package/dist/safe-bash/commands/diff-patch/patch-envelope.d.ts

@@ -1,3 +1,2 @@
-import { Budget } from "./shared.js";
-export declare function unwrapPatch(text: string, budget: Budget): Promise<string>;
+export * from "../../../safe-bash-command-patch/patch-envelope.js";
 //# sourceMappingURL=patch-envelope.d.ts.map

package/dist/safe-bash/commands/diff-patch/patch-envelope.js

@@ -1,64 +1,2 @@
-import { Budget, ToolError } from "./shared.js";
-async function normalizeTransport(text, budget) {
-    const lines = [];
-    let position = 0;
-    while (position < text.length) {
-        const end = text.indexOf("\n", position);
-        budget.step(1 + end - position);
-        {
-            const c = budget.checkpoint();
-            if (c)
-                await c;
-        }
-        if (end <= position || text[end - 1] !== "\r")
-            return text;
-        lines.push(text.slice(position, end - 1), "\n");
-        if (lines.length / 2 > budget.limits.maxLines)
-            throw new ToolError("transport line limit exceeded");
-        position = end + 1;
-    }
-    return lines.join("");
-}
-export async function unwrapPatch(text, budget) {
-    if (text && !text.endsWith("\n"))
-        throw new ToolError("patch is truncated: missing final LF");
-    text = await normalizeTransport(text, budget);
-    let position = 0;
-    let lines = 0;
-    const mail = /^(?:From [0-9a-f]{40,64} |(?:From|Date|Subject|To|Cc|MIME-Version|Content-Type):)/u.test(text);
-    if (mail) {
-        while (position < text.length) {
-            budget.step();
-            {
-                const c = budget.checkpoint();
-                if (c)
-                    await c;
-            }
-            const end = text.indexOf("\n", position);
-            const line = text.slice(position, end);
-            if (/^(?:--- |\*\*\* |diff |\d+(?:,\d+)?[acd]\d)/u.test(line))
-                break;
-            if (/^(?:old mode |new mode |new file mode |deleted file mode |rename |copy |similarity index |dissimilarity index |GIT binary patch|Binary files |index |@@|[+\\])/u.test(line))
-                throw new ToolError("unsupported or malformed mail patch metadata");
-            position = end + 1;
-            if (++lines > budget.limits.maxLines)
-                throw new ToolError("mail preamble limit exceeded");
-        }
-        if (position === text.length)
-            throw new ToolError("mail preamble without patch");
-    }
-    const body = text.slice(position);
-    const signature = body.indexOf("\n-- \n");
-    if (signature < 0)
-        return body;
-    const trailer = body.slice(signature + 5);
-    if (trailer.split("\n").length > budget.limits.maxLines)
-        throw new ToolError("mail signature limit exceeded");
-    for (const line of trailer.split("\n")) {
-        budget.step();
-        if (/^(?:diff |---|\+\+\+|\*\*\*|@@|index |old mode |new mode |new file mode |deleted file mode |rename |copy |similarity index |dissimilarity index |GIT binary patch|Binary files |[+\\]|\d+(?:,\d+)?[acd]\d)/u.test(line))
-            throw new ToolError("patch data after mail signature");
-    }
-    return body.slice(0, signature + 1);
-}
+export * from "../../../safe-bash-command-patch/patch-envelope.js";
 //# sourceMappingURL=patch-envelope.js.map

package/dist/safe-bash/commands/diff-patch/patch-formats.d.ts

@@ -1,8 +1,2 @@
-import { Budget } from "./shared.js";
-import { type FilePatch } from "./unified.js";
-export type PatchFormat = "unified" | "normal" | "context";
-export interface ParseProgress {
-    error?: unknown;
-}
-export declare function parsePatch(text: string, budget: Budget, format: PatchFormat | undefined, target: string | undefined, progress?: ParseProgress): Promise<FilePatch[]>;
+export * from "../../../safe-bash-command-patch/patch-formats.js";
 //# sourceMappingURL=patch-formats.d.ts.map