-
Notifications
You must be signed in to change notification settings - Fork 883
Expand file tree
/
Copy pathapplyDiff.ts
More file actions
358 lines (311 loc) · 8.96 KB
/
Copy pathapplyDiff.ts
File metadata and controls
358 lines (311 loc) · 8.96 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
/**
* Applies a headerless V4A diff to the provided file content.
* - mode "default": patch an existing file using V4A sections ("@@" + +/-/space lines).
* - mode "create": create-file syntax that requires every line to start with "+".
*
* The function preserves trailing newlines from the original file and throws when
* the diff cannot be applied cleanly.
*/
export function applyDiff(
input: string,
diff: string,
mode: 'default' | 'create' = 'default',
): string {
const diffLines = normalizeDiffLines(diff);
if (mode === 'create') {
return parseCreateDiff(diffLines);
}
const { chunks } = parseUpdateDiff(diffLines, input);
return applyChunks(input, chunks);
}
type Chunk = { origIndex: number; delLines: string[]; insLines: string[] };
type ParserState = { lines: string[]; index: number; fuzz: number };
const END_PATCH = '*** End Patch';
const END_FILE = '*** End of File';
const END_SECTION_MARKERS = [
END_PATCH,
'*** Update File:',
'*** Delete File:',
'*** Add File:',
END_FILE,
];
const SECTION_TERMINATORS = [
END_PATCH,
'*** Update File:',
'*** Delete File:',
'*** Add File:',
];
function normalizeDiffLines(diff: string): string[] {
return diff
.split(/\r?\n/)
.map((line) => line.replace(/\r$/, ''))
.filter((line, idx, arr) => !(idx === arr.length - 1 && line === ''));
}
function isDone(state: ParserState, prefixes: string[]): boolean {
if (state.index >= state.lines.length) return true;
if (prefixes.some((p) => state.lines[state.index]?.startsWith(p)))
return true;
return false;
}
function readStr(state: ParserState, prefix: string): string {
const current = state.lines[state.index];
if (typeof current === 'string' && current.startsWith(prefix)) {
state.index += 1;
return current.slice(prefix.length);
}
return '';
}
function parseCreateDiff(lines: string[]): string {
const parser: ParserState = {
lines: [...lines, END_PATCH],
index: 0,
fuzz: 0,
};
const output: string[] = [];
while (!isDone(parser, SECTION_TERMINATORS)) {
const line = parser.lines[parser.index];
parser.index += 1;
if (!line.startsWith('+')) {
throw new Error(`Invalid Add File Line: ${line}`);
}
output.push(line.slice(1));
}
return output.join('\n');
}
function parseUpdateDiff(
lines: string[],
input: string,
): { chunks: Chunk[]; fuzz: number } {
const parser: ParserState = {
lines: [...lines, END_PATCH],
index: 0,
fuzz: 0,
};
const inputLines = input.split('\n');
const chunks: Chunk[] = [];
let cursor = 0;
while (!isDone(parser, END_SECTION_MARKERS)) {
const anchor = readStr(parser, '@@ ');
const hasBareAnchor = !anchor && parser.lines[parser.index] === '@@';
if (hasBareAnchor) parser.index += 1;
if (!(anchor || hasBareAnchor || cursor === 0)) {
throw new Error(`Invalid Line:\n${parser.lines[parser.index]}`);
}
if (anchor.trim()) {
cursor = advanceCursorToAnchor(anchor, inputLines, cursor, parser);
}
const { nextContext, sectionChunks, endIndex, eof } = readSection(
parser.lines,
parser.index,
);
const nextContextText = nextContext.join('\n');
const { newIndex, fuzz } = findContext(
inputLines,
nextContext,
cursor,
eof,
);
if (newIndex === -1) {
if (eof) {
throw new Error(`Invalid EOF Context ${cursor}:\n${nextContextText}`);
}
throw new Error(`Invalid Context ${cursor}:\n${nextContextText}`);
}
parser.fuzz += fuzz;
for (const ch of sectionChunks) {
chunks.push({ ...ch, origIndex: ch.origIndex + newIndex });
}
cursor = newIndex + nextContext.length;
parser.index = endIndex;
}
return { chunks, fuzz: parser.fuzz };
}
function advanceCursorToAnchor(
anchor: string,
inputLines: string[],
cursor: number,
parser: ParserState,
): number {
let found = false;
if (!inputLines.slice(0, cursor).some((s) => s === anchor)) {
for (let i = cursor; i < inputLines.length; i += 1) {
if (inputLines[i] === anchor) {
cursor = i + 1;
found = true;
break;
}
}
}
if (
!found &&
!inputLines.slice(0, cursor).some((s) => s.trim() === anchor.trim())
) {
for (let i = cursor; i < inputLines.length; i += 1) {
if (inputLines[i].trim() === anchor.trim()) {
cursor = i + 1;
parser.fuzz += 1;
found = true;
break;
}
}
}
return cursor;
}
function readSection(
lines: string[],
startIndex: number,
): {
nextContext: string[];
sectionChunks: Chunk[];
endIndex: number;
eof: boolean;
} {
const context: string[] = [];
let delLines: string[] = [];
let insLines: string[] = [];
const sectionChunks: Chunk[] = [];
let mode: 'keep' | 'add' | 'delete' = 'keep';
let index = startIndex;
const origIndex = index;
while (index < lines.length) {
const raw = lines[index];
if (
raw.startsWith('@@') ||
raw.startsWith(END_PATCH) ||
raw.startsWith('*** Update File:') ||
raw.startsWith('*** Delete File:') ||
raw.startsWith('*** Add File:') ||
raw.startsWith(END_FILE)
) {
break;
}
if (raw === '***') break;
if (raw.startsWith('***')) {
throw new Error(`Invalid Line: ${raw}`);
}
index += 1;
const lastMode: 'keep' | 'add' | 'delete' = mode;
let line = raw;
if (line === '') line = ' ';
if (line[0] === '+') {
mode = 'add';
} else if (line[0] === '-') {
mode = 'delete';
} else if (line[0] === ' ') {
mode = 'keep';
} else {
throw new Error(`Invalid Line: ${line}`);
}
line = line.slice(1);
const switchingToContext = mode === 'keep' && lastMode !== mode;
if (switchingToContext && (insLines.length || delLines.length)) {
sectionChunks.push({
origIndex: context.length - delLines.length,
delLines,
insLines,
});
delLines = [];
insLines = [];
}
if (mode === 'delete') {
delLines.push(line);
context.push(line);
} else if (mode === 'add') {
insLines.push(line);
} else {
context.push(line);
}
}
if (insLines.length || delLines.length) {
sectionChunks.push({
origIndex: context.length - delLines.length,
delLines,
insLines,
});
delLines = [];
insLines = [];
}
if (index < lines.length && lines[index] === END_FILE) {
index += 1;
return { nextContext: context, sectionChunks, endIndex: index, eof: true };
}
if (index === origIndex) {
throw new Error(`Nothing in this section - index=${index} ${lines[index]}`);
}
return { nextContext: context, sectionChunks, endIndex: index, eof: false };
}
function findContext(
lines: string[],
context: string[],
start: number,
eof: boolean,
): { newIndex: number; fuzz: number } {
if (eof) {
const endStart = Math.max(0, lines.length - context.length);
const endMatch = findContextCore(lines, context, endStart);
if (endMatch.newIndex !== -1) return endMatch;
const fallback = findContextCore(lines, context, start);
return { newIndex: fallback.newIndex, fuzz: fallback.fuzz + 10000 };
}
return findContextCore(lines, context, start);
}
function findContextCore(
lines: string[],
context: string[],
start: number,
): { newIndex: number; fuzz: number } {
if (!context.length) {
return { newIndex: start, fuzz: 0 };
}
for (let i = start; i < lines.length; i += 1) {
if (equalsSlice(lines, context, i, (s) => s))
return { newIndex: i, fuzz: 0 };
}
for (let i = start; i < lines.length; i += 1) {
if (equalsSlice(lines, context, i, (s) => s.trimEnd()))
return { newIndex: i, fuzz: 1 };
}
for (let i = start; i < lines.length; i += 1) {
if (equalsSlice(lines, context, i, (s) => s.trim()))
return { newIndex: i, fuzz: 100 };
}
return { newIndex: -1, fuzz: 0 };
}
function equalsSlice(
source: string[],
target: string[],
start: number,
mapFn: (value: string) => string,
): boolean {
if (start + target.length > source.length) return false;
for (let i = 0; i < target.length; i += 1) {
if (mapFn(source[start + i]) !== mapFn(target[i])) return false;
}
return true;
}
function applyChunks(input: string, chunks: Chunk[]): string {
const origLines = input.split('\n');
const destLines: string[] = [];
let origIndex = 0;
for (const chunk of chunks) {
if (chunk.origIndex > origLines.length) {
throw new Error(
`applyDiff: chunk.origIndex ${chunk.origIndex} > input length ${origLines.length}`,
);
}
if (origIndex > chunk.origIndex) {
throw new Error(
`applyDiff: overlapping chunk at ${chunk.origIndex} (cursor ${origIndex})`,
);
}
destLines.push(...origLines.slice(origIndex, chunk.origIndex));
origIndex = chunk.origIndex;
if (chunk.insLines.length) {
destLines.push(...chunk.insLines);
}
origIndex += chunk.delLines.length;
}
destLines.push(...origLines.slice(origIndex));
const result = destLines.join('\n');
return result;
}