@jsonstudio/llms 0.6.938 → 0.6.1164

package/dist/tools/apply-patch/validation/shared.js

@@ -0,0 +1,6 @@
+export const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+export const asString = (value) => {
+    if (typeof value === 'string' && value.trim().length > 0)
+        return value;
+    return null;
+};

package/dist/tools/apply-patch/validator.d.ts

@@ -1,5 +1,5 @@
-export declare const looksLikePatch: (text?: string) => boolean;
-export declare const normalizeApplyPatchText: (raw: string) => string;
+import { normalizeApplyPatchText, looksLikePatch } from './patch-text/normalize.js';
+export { looksLikePatch, normalizeApplyPatchText };
 export type ApplyPatchValidationResult = {
     ok: boolean;
     reason?: string;

package/dist/tools/apply-patch/validator.js

@@ -1,559 +1,9 @@
-import { buildStructuredPatch, isStructuredApplyPatchPayload, StructuredApplyPatchError } from './structured.js';
-const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
-const asString = (value) => {
-    if (typeof value === 'string' && value.trim().length > 0)
-        return value;
-    return null;
-};
-const stripCodeFences = (text) => {
-    const trimmed = text.trim();
-    // Only treat the entire payload as fenced when it *starts* with a code fence.
-    // Patch bodies (especially added Markdown files) may legitimately contain ``` blocks;
-    // we must not strip those.
-    if (!trimmed.startsWith('```'))
-        return text;
-    const fenceRe = /^```(?:diff|patch|apply_patch|text|json)?[ \t]*\n([\s\S]*?)\n```/gmi;
-    const candidates = [];
-    let match = null;
-    while ((match = fenceRe.exec(trimmed))) {
-        if (match[1])
-            candidates.push(match[1].trim());
-    }
-    if (!candidates.length)
-        return text;
-    for (const candidate of candidates) {
-        if (candidate.includes('*** Begin Patch') ||
-            candidate.includes('*** Update File:') ||
-            candidate.includes('diff --git')) {
-            return candidate;
-        }
-    }
-    return candidates[0] ?? text;
-};
-export const looksLikePatch = (text) => {
-    if (!text)
-        return false;
-    const t = text.trim();
-    if (!t)
-        return false;
-    return (t.includes('*** Begin Patch') ||
-        t.includes('*** Update File:') ||
-        t.includes('*** Add File:') ||
-        t.includes('*** Delete File:') ||
-        t.includes('diff --git') ||
-        /^(?:@@|\+\+\+\s|---\s)/m.test(t));
-};
-const decodeEscapedNewlinesIfNeeded = (value) => {
-    try {
-        if (!value)
-            return value;
-        if (value.includes('\n'))
-            return value;
-        if (!value.includes('\\n'))
-            return value;
-        return value.replace(/\\n/g, '\n');
-    }
-    catch {
-        return value;
-    }
-};
-const stripConflictMarkers = (text) => {
-    try {
-        const lines = text.replace(/\r\n/g, '\n').split('\n');
-        const out = [];
-        for (const line of lines) {
-            if (line.startsWith('<<<<<<<') || line.startsWith('=======') || line.startsWith('>>>>>>>')) {
-                continue;
-            }
-            out.push(line);
-        }
-        return out.join('\n');
-    }
-    catch {
-        return text;
-    }
-};
-const convertGitDiffToApplyPatch = (text) => {
-    const lines = text.replace(/\r\n/g, '\n').split('\n');
-    const files = [];
-    let current = null;
-    let sawDiff = false;
-    const flush = () => {
-        if (!current)
-            return;
-        if (current.path && current.kind === 'delete') {
-            files.push(current);
-            current = null;
-            return;
-        }
-        // Include rename-only diffs (no hunks) when we have a move target.
-        if (current.path && (current.lines.length || current.moveTo)) {
-            files.push(current);
-        }
-        current = null;
-    };
-    const extractPath = (value) => {
-        const v = String(value || '').trim();
-        if (!v)
-            return '';
-        const head = v.split('\t')[0] ?? v;
-        const m = String(head).trim().match(/^(?:a\/|b\/)?(.+)$/);
-        return (m && m[1] ? m[1] : String(head)).trim();
-    };
-    for (const line of lines) {
-        const diffMatch = line.match(/^diff --git\s+a\/(.+?)\s+b\/(.+)$/);
-        if (diffMatch) {
-            sawDiff = true;
-            flush();
-            current = {
-                path: extractPath(diffMatch[2]),
-                kind: 'update',
-                lines: [],
-                oldPath: extractPath(diffMatch[1]),
-                newPath: extractPath(diffMatch[2]),
-            };
-            continue;
-        }
-        if (!current)
-            continue;
-        if (line.startsWith('GIT binary patch') || line.startsWith('Binary files ')) {
-            current.binary = true;
-            continue;
-        }
-        const delMatch = line.match(/^deleted file mode\s+/);
-        const newMatch = line.match(/^new file mode\s+/);
-        if (delMatch) {
-            current.kind = 'delete';
-            continue;
-        }
-        if (newMatch) {
-            current.kind = 'add';
-            continue;
-        }
-        if (line.startsWith('rename from ')) {
-            const p = extractPath(line.slice('rename from '.length));
-            if (p)
-                current.oldPath = p;
-            continue;
-        }
-        if (line.startsWith('rename to ')) {
-            const p = extractPath(line.slice('rename to '.length));
-            if (p) {
-                current.newPath = p;
-                current.moveTo = p;
-            }
-            continue;
-        }
-        if (line.startsWith('--- ')) {
-            const p = extractPath(line.slice(4));
-            if (p) {
-                current.oldPath = p;
-                if (p === '/dev/null')
-                    current.kind = 'add';
-            }
-            continue;
-        }
-        if (line.startsWith('+++ ')) {
-            const p = extractPath(line.slice(4));
-            if (p) {
-                current.newPath = p;
-                if (p === '/dev/null')
-                    current.kind = 'delete';
-            }
-            continue;
-        }
-        if (line.startsWith('index ') || line.startsWith('similarity index ') || line.startsWith('dissimilarity index ')) {
-            continue;
-        }
-        if (line.startsWith('@@')) {
-            current.lines.push(line);
-            continue;
-        }
-        if (line.startsWith('+') || line.startsWith('-') || line.startsWith(' ')) {
-            current.lines.push(line);
-            continue;
-        }
-    }
-    flush();
-    if (!sawDiff || files.length === 0)
-        return null;
-    if (files.some((f) => f.binary))
-        return null;
-    const out = ['*** Begin Patch'];
-    for (const file of files) {
-        const oldPath = typeof file.oldPath === 'string' ? file.oldPath : '';
-        const newPath = typeof file.newPath === 'string' ? file.newPath : '';
-        const resolvedPath = file.kind === 'add'
-            ? (newPath && newPath !== '/dev/null' ? newPath : file.path)
-            : file.kind === 'delete'
-                ? (oldPath && oldPath !== '/dev/null' ? oldPath : file.path)
-                : (file.moveTo && oldPath && oldPath !== '/dev/null'
-                    ? oldPath
-                    : (newPath && newPath !== '/dev/null' ? newPath : file.path));
-        if (file.kind === 'delete') {
-            out.push(`*** Delete File: ${resolvedPath}`);
-            continue;
-        }
-        if (file.kind === 'add') {
-            out.push(`*** Add File: ${resolvedPath}`);
-            for (const l of file.lines) {
-                if (l.startsWith('+'))
-                    out.push(l);
-            }
-            continue;
-        }
-        out.push(`*** Update File: ${resolvedPath}`);
-        if (file.moveTo && file.moveTo !== resolvedPath) {
-            out.push(`*** Move to: ${file.moveTo}`);
-        }
-        out.push(...file.lines);
-    }
-    out.push('*** End Patch');
-    return out.join('\n');
-};
-export const normalizeApplyPatchText = (raw) => {
-    if (!raw)
-        return raw;
-    let text = raw.replace(/\r\n/g, '\n');
-    text = decodeEscapedNewlinesIfNeeded(text);
-    text = stripCodeFences(text);
-    text = text.trim();
-    if (!text)
-        return raw;
-    text = stripConflictMarkers(text);
-    if (!text.includes('*** Begin Patch') && text.includes('diff --git')) {
-        const converted = convertGitDiffToApplyPatch(text);
-        if (converted)
-            text = converted;
-    }
-    else if (!text.includes('*** Begin Patch') && !text.includes('diff --git')) {
-        const minusMatch = text.match(/^---\s+(.*)$/m);
-        const plusMatch = text.match(/^\+\+\+\s+(.*)$/m);
-        if (minusMatch && plusMatch) {
-            const rawMinus = (minusMatch[1] || '').split('\t')[0] || '';
-            const rawPlus = (plusMatch[1] || '').split('\t')[0] || '';
-            const normalizeHeaderPath = (value) => {
-                const v = String(value || '').trim();
-                if (!v)
-                    return '';
-                const m = v.match(/^(?:a\/|b\/)?(.+)$/);
-                return (m && m[1] ? m[1] : v).trim();
-            };
-            const minusPath = normalizeHeaderPath(rawMinus);
-            const plusPath = normalizeHeaderPath(rawPlus);
-            const filePath = plusPath === '/dev/null' ? minusPath : plusPath;
-            if (filePath) {
-                const synthetic = `diff --git a/${filePath} b/${filePath}\n${text}`;
-                const converted = convertGitDiffToApplyPatch(synthetic);
-                if (converted)
-                    text = converted;
-            }
-        }
-    }
-    if (text.includes('*** Add File:')) {
-        text = text.replace(/\*\*\* Create File:/g, '*** Add File:');
-    }
-    let hasBegin = text.includes('*** Begin Patch');
-    const hasEnd = text.includes('*** End Patch');
-    if (hasBegin && !hasEnd) {
-        text = `${text}\n*** End Patch`;
-    }
-    if (!hasBegin && /^\*\*\* (Add|Update|Delete) File:/m.test(text)) {
-        text = `*** Begin Patch\n${text}\n*** End Patch`;
-        hasBegin = true;
-    }
-    if (!text.includes('*** Begin Patch')) {
-        return text;
-    }
-    const beginIndex = text.indexOf('*** Begin Patch');
-    if (beginIndex > 0) {
-        text = text.slice(beginIndex);
-    }
-    const endMarker = '*** End Patch';
-    const firstEndIndex = text.indexOf(endMarker);
-    const concatSignatures = [
-        `${endMarker}","input":"*** Begin Patch`,
-        `${endMarker}","patch":"*** Begin Patch`,
-        `${endMarker}\\",\\"input\\":\\"*** Begin Patch`,
-        `${endMarker}\\",\\"patch\\":\\"*** Begin Patch`
-    ];
-    const hasConcatenationSignal = concatSignatures.some((sig) => text.includes(sig));
-    if (hasConcatenationSignal && firstEndIndex >= 0) {
-        text = text.slice(0, firstEndIndex + endMarker.length);
-    }
-    else {
-        const lastEndIndex = text.lastIndexOf(endMarker);
-        if (lastEndIndex >= 0) {
-            const afterEnd = text.slice(lastEndIndex + endMarker.length);
-            if (afterEnd.trim().length > 0) {
-                text = text.slice(0, lastEndIndex + endMarker.length);
-            }
-        }
-    }
-    // Fix missing prefix lines in Update File sections: treat as context (" ").
-    const lines = text.split('\n');
-    const output = [];
-    let inUpdateSection = false;
-    let afterUpdateHeader = false;
-    for (const line of lines) {
-        if (line.startsWith('*** Begin Patch')) {
-            output.push(line);
-            inUpdateSection = false;
-            afterUpdateHeader = false;
-            continue;
-        }
-        if (line.startsWith('*** End Patch')) {
-            output.push(line);
-            inUpdateSection = false;
-            afterUpdateHeader = false;
-            continue;
-        }
-        if (line.startsWith('*** Update File:')) {
-            output.push(line);
-            inUpdateSection = true;
-            afterUpdateHeader = true;
-            continue;
-        }
-        if (line.startsWith('*** Add File:') || line.startsWith('*** Delete File:')) {
-            output.push(line);
-            inUpdateSection = false;
-            afterUpdateHeader = false;
-            continue;
-        }
-        if (inUpdateSection) {
-            if (afterUpdateHeader && line.trim() === '') {
-                continue;
-            }
-            afterUpdateHeader = false;
-            if (line.startsWith('@@') || line.startsWith('+') || line.startsWith('-') || line.startsWith(' ')) {
-                output.push(line);
-            }
-            else {
-                output.push(` ${line}`);
-            }
-            continue;
-        }
-        output.push(line);
-    }
-    return output.join('\n');
-};
-const buildSingleChangePayload = (record) => {
-    const kindRaw = asString(record.kind);
-    if (!kindRaw)
-        return undefined;
-    const change = {
-        kind: kindRaw.toLowerCase(),
-        lines: record.lines ?? record.text ?? record.body,
-        target: asString(record.target) ?? undefined,
-        anchor: asString(record.anchor) ?? undefined
-    };
-    if (typeof record.use_anchor_indent === 'boolean') {
-        change.use_anchor_indent = record.use_anchor_indent;
-    }
-    const changeFile = asString(record.file);
-    if (changeFile) {
-        change.file = changeFile;
-    }
-    return { file: changeFile, changes: [change] };
-};
-const tryParseJson = (value) => {
-    if (typeof value !== 'string')
-        return undefined;
-    const trimmed = value.trim();
-    if (!trimmed)
-        return undefined;
-    if (!(trimmed.startsWith('{') || trimmed.startsWith('[')))
-        return undefined;
-    try {
-        return JSON.parse(trimmed);
-    }
-    catch {
-        return undefined;
-    }
-};
-const escapeUnescapedQuotesInJsonStrings = (input) => {
-    // Best-effort: when JSON is almost valid but contains unescaped `"` inside string values
-    // (e.g. JSX snippets like className="..."), escape quotes that are not followed by a
-    // valid JSON token delimiter. Deterministic; does not attempt to fix structural issues.
-    let out = '';
-    let inString = false;
-    let escaped = false;
-    for (let i = 0; i < input.length; i += 1) {
-        const ch = input[i] ?? '';
-        if (!inString) {
-            if (ch === '"') {
-                inString = true;
-                escaped = false;
-            }
-            out += ch;
-            continue;
-        }
-        if (escaped) {
-            out += ch;
-            escaped = false;
-            continue;
-        }
-        if (ch === '\\') {
-            out += ch;
-            escaped = true;
-            continue;
-        }
-        if (ch === '"') {
-            let j = i + 1;
-            while (j < input.length && /\s/.test(input[j] ?? ''))
-                j += 1;
-            const next = j < input.length ? input[j] : '';
-            if (next === '' || next === ':' || next === ',' || next === '}' || next === ']') {
-                inString = false;
-                out += ch;
-            }
-            else {
-                out += '\\"';
-            }
-            continue;
-        }
-        out += ch;
-    }
-    return out;
-};
-const balanceJsonContainers = (input) => {
-    // Best-effort bracket/brace balancing for JSON-like strings.
-    // Only operates outside string literals. When encountering a closing token that doesn't
-    // match the current stack top, inserts the missing closer(s) to recover.
-    let out = '';
-    let inString = false;
-    let escaped = false;
-    const stack = [];
-    const closeFor = (open) => (open === '{' ? '}' : ']');
-    for (let i = 0; i < input.length; i += 1) {
-        const ch = input[i] ?? '';
-        if (inString) {
-            out += ch;
-            if (escaped) {
-                escaped = false;
-                continue;
-            }
-            if (ch === '\\') {
-                escaped = true;
-                continue;
-            }
-            if (ch === '"') {
-                inString = false;
-            }
-            continue;
-        }
-        if (ch === '"') {
-            inString = true;
-            out += ch;
-            continue;
-        }
-        if (ch === '{' || ch === '[') {
-            stack.push(ch);
-            out += ch;
-            continue;
-        }
-        if (ch === '}' || ch === ']') {
-            const expectedOpen = ch === '}' ? '{' : '[';
-            while (stack.length && stack[stack.length - 1] !== expectedOpen) {
-                const open = stack.pop();
-                out += closeFor(open);
-            }
-            if (stack.length && stack[stack.length - 1] === expectedOpen) {
-                stack.pop();
-            }
-            out += ch;
-            continue;
-        }
-        out += ch;
-    }
-    while (stack.length) {
-        const open = stack.pop();
-        out += closeFor(open);
-    }
-    return out;
-};
-const tryParseJsonLoose = (value) => {
-    const parsed = tryParseJson(value);
-    if (parsed !== undefined)
-        return parsed;
-    if (typeof value !== 'string')
-        return undefined;
-    const trimmed = value.trim();
-    if (!trimmed)
-        return undefined;
-    if (!(trimmed.startsWith('{') || trimmed.startsWith('[')))
-        return undefined;
-    let repaired = escapeUnescapedQuotesInJsonStrings(trimmed);
-    repaired = balanceJsonContainers(repaired);
-    if (!repaired || repaired === trimmed)
-        return undefined;
-    try {
-        return JSON.parse(repaired);
-    }
-    catch {
-        return undefined;
-    }
-};
-const coerceChangesArray = (value) => {
-    const parsed = tryParseJson(value);
-    if (!parsed)
-        return undefined;
-    if (Array.isArray(parsed)) {
-        const items = parsed.filter((entry) => entry && typeof entry === 'object');
-        if (!items.length)
-            return undefined;
-        // Ensure at least one entry looks like a structured change.
-        if (!items.some((c) => typeof c.kind === 'string' && String(c.kind).trim()))
-            return undefined;
-        return items;
-    }
-    if (parsed && typeof parsed === 'object' && Array.isArray(parsed.changes)) {
-        const items = parsed.changes.filter((entry) => entry && typeof entry === 'object');
-        if (!items.length)
-            return undefined;
-        if (!items.some((c) => typeof c.kind === 'string' && String(c.kind).trim()))
-            return undefined;
-        return items;
-    }
-    return undefined;
-};
-const coerceStructuredPayload = (record) => {
-    if (isStructuredApplyPatchPayload(record)) {
-        return record;
-    }
-    if (Array.isArray(record.changes) && record.changes.length === 0) {
-        return undefined;
-    }
-    // Common shape error: { file, instructions: "[{...},{...}]" } where instructions contains JSON changes.
-    if (!Array.isArray(record.changes)) {
-        const changesFromInstructions = coerceChangesArray(record.instructions);
-        if (changesFromInstructions) {
-            return {
-                ...(typeof record.file === 'string' ? { file: record.file } : {}),
-                changes: changesFromInstructions
-            };
-        }
-        // Another common shape: changes is a JSON string.
-        const changesFromString = coerceChangesArray(record.changes);
-        if (changesFromString) {
-            return {
-                ...(typeof record.file === 'string' ? { file: record.file } : {}),
-                changes: changesFromString
-            };
-        }
-        const editsFromString = coerceChangesArray(record.edits ?? record.operations ?? record.ops);
-        if (editsFromString) {
-            return {
-                ...(typeof record.file === 'string' ? { file: record.file } : {}),
-                changes: editsFromString
-            };
-        }
-    }
-    const single = buildSingleChangePayload(record);
-    if (single)
-        return single;
-    return undefined;
-};
+import { buildStructuredPatch, StructuredApplyPatchError } from './structured.js';
+import { coerceStructuredPayload } from './structured/coercion.js';
+import { tryParseJsonLoose } from './json/parse-loose.js';
+import { normalizeApplyPatchText, looksLikePatch } from './patch-text/normalize.js';
+import { asString, isRecord } from './validation/shared.js';
+export { looksLikePatch, normalizeApplyPatchText };
 const toJson = (value) => {
     try {
         return JSON.stringify(value ?? {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.938",
+  "version": "0.6.1164",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",