blob: b6458430d7906867edb90211cb29e962f799dcb3 [file] [log] [blame]
Peter Marshall0b95ea12020-07-02 18:50:04 +02001function Diff() {}
2Diff.prototype = {
3 diff: function diff(oldString, newString) {
4 var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
5 var callback = options.callback;
6
7 if (typeof options === 'function') {
8 callback = options;
9 options = {};
10 }
11
12 this.options = options;
13 var self = this;
14
15 function done(value) {
16 if (callback) {
17 setTimeout(function () {
18 callback(undefined, value);
19 }, 0);
20 return true;
21 } else {
22 return value;
23 }
24 } // Allow subclasses to massage the input prior to running
25
26
27 oldString = this.castInput(oldString);
28 newString = this.castInput(newString);
29 oldString = this.removeEmpty(this.tokenize(oldString));
30 newString = this.removeEmpty(this.tokenize(newString));
31 var newLen = newString.length,
32 oldLen = oldString.length;
33 var editLength = 1;
34 var maxEditLength = newLen + oldLen;
35 var bestPath = [{
36 newPos: -1,
37 components: []
38 }]; // Seed editLength = 0, i.e. the content starts with the same values
39
40 var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
41
42 if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
43 // Identity per the equality and tokenizer
44 return done([{
45 value: this.join(newString),
46 count: newString.length
47 }]);
48 } // Main worker method. checks all permutations of a given edit length for acceptance.
49
50
51 function execEditLength() {
52 for (var diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {
53 var basePath = void 0;
54
55 var addPath = bestPath[diagonalPath - 1],
56 removePath = bestPath[diagonalPath + 1],
57 _oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
58
59 if (addPath) {
60 // No one else is going to attempt to use this value, clear it
61 bestPath[diagonalPath - 1] = undefined;
62 }
63
64 var canAdd = addPath && addPath.newPos + 1 < newLen,
65 canRemove = removePath && 0 <= _oldPos && _oldPos < oldLen;
66
67 if (!canAdd && !canRemove) {
68 // If this path is a terminal then prune
69 bestPath[diagonalPath] = undefined;
70 continue;
71 } // Select the diagonal that we want to branch from. We select the prior
72 // path whose position in the new string is the farthest from the origin
73 // and does not pass the bounds of the diff graph
74
75
76 if (!canAdd || canRemove && addPath.newPos < removePath.newPos) {
77 basePath = clonePath(removePath);
78 self.pushComponent(basePath.components, undefined, true);
79 } else {
80 basePath = addPath; // No need to clone, we've pulled it from the list
81
82 basePath.newPos++;
83 self.pushComponent(basePath.components, true, undefined);
84 }
85
86 _oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath); // If we have hit the end of both strings, then we are done
87
88 if (basePath.newPos + 1 >= newLen && _oldPos + 1 >= oldLen) {
89 return done(buildValues(self, basePath.components, newString, oldString, self.useLongestToken));
90 } else {
91 // Otherwise track this path as a potential candidate and continue.
92 bestPath[diagonalPath] = basePath;
93 }
94 }
95
96 editLength++;
97 } // Performs the length of edit iteration. Is a bit fugly as this has to support the
98 // sync and async mode which is never fun. Loops over execEditLength until a value
99 // is produced.
100
101
102 if (callback) {
103 (function exec() {
104 setTimeout(function () {
105 // This should not happen, but we want to be safe.
106
107 /* istanbul ignore next */
108 if (editLength > maxEditLength) {
109 return callback();
110 }
111
112 if (!execEditLength()) {
113 exec();
114 }
115 }, 0);
116 })();
117 } else {
118 while (editLength <= maxEditLength) {
119 var ret = execEditLength();
120
121 if (ret) {
122 return ret;
123 }
124 }
125 }
126 },
127 pushComponent: function pushComponent(components, added, removed) {
128 var last = components[components.length - 1];
129
130 if (last && last.added === added && last.removed === removed) {
131 // We need to clone here as the component clone operation is just
132 // as shallow array clone
133 components[components.length - 1] = {
134 count: last.count + 1,
135 added: added,
136 removed: removed
137 };
138 } else {
139 components.push({
140 count: 1,
141 added: added,
142 removed: removed
143 });
144 }
145 },
146 extractCommon: function extractCommon(basePath, newString, oldString, diagonalPath) {
147 var newLen = newString.length,
148 oldLen = oldString.length,
149 newPos = basePath.newPos,
150 oldPos = newPos - diagonalPath,
151 commonCount = 0;
152
153 while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(newString[newPos + 1], oldString[oldPos + 1])) {
154 newPos++;
155 oldPos++;
156 commonCount++;
157 }
158
159 if (commonCount) {
160 basePath.components.push({
161 count: commonCount
162 });
163 }
164
165 basePath.newPos = newPos;
166 return oldPos;
167 },
168 equals: function equals(left, right) {
169 if (this.options.comparator) {
170 return this.options.comparator(left, right);
171 } else {
172 return left === right || this.options.ignoreCase && left.toLowerCase() === right.toLowerCase();
173 }
174 },
175 removeEmpty: function removeEmpty(array) {
176 var ret = [];
177
178 for (var i = 0; i < array.length; i++) {
179 if (array[i]) {
180 ret.push(array[i]);
181 }
182 }
183
184 return ret;
185 },
186 castInput: function castInput(value) {
187 return value;
188 },
189 tokenize: function tokenize(value) {
190 return value.split('');
191 },
192 join: function join(chars) {
193 return chars.join('');
194 }
195};
196
197function buildValues(diff, components, newString, oldString, useLongestToken) {
198 var componentPos = 0,
199 componentLen = components.length,
200 newPos = 0,
201 oldPos = 0;
202
203 for (; componentPos < componentLen; componentPos++) {
204 var component = components[componentPos];
205
206 if (!component.removed) {
207 if (!component.added && useLongestToken) {
208 var value = newString.slice(newPos, newPos + component.count);
209 value = value.map(function (value, i) {
210 var oldValue = oldString[oldPos + i];
211 return oldValue.length > value.length ? oldValue : value;
212 });
213 component.value = diff.join(value);
214 } else {
215 component.value = diff.join(newString.slice(newPos, newPos + component.count));
216 }
217
218 newPos += component.count; // Common case
219
220 if (!component.added) {
221 oldPos += component.count;
222 }
223 } else {
224 component.value = diff.join(oldString.slice(oldPos, oldPos + component.count));
225 oldPos += component.count; // Reverse add and remove so removes are output first to match common convention
226 // The diffing algorithm is tied to add then remove output and this is the simplest
227 // route to get the desired output with minimal overhead.
228
229 if (componentPos && components[componentPos - 1].added) {
230 var tmp = components[componentPos - 1];
231 components[componentPos - 1] = components[componentPos];
232 components[componentPos] = tmp;
233 }
234 }
235 } // Special case handle for when one terminal is ignored (i.e. whitespace).
236 // For this case we merge the terminal into the prior string and drop the change.
237 // This is only available for string mode.
238
239
240 var lastComponent = components[componentLen - 1];
241
242 if (componentLen > 1 && typeof lastComponent.value === 'string' && (lastComponent.added || lastComponent.removed) && diff.equals('', lastComponent.value)) {
243 components[componentLen - 2].value += lastComponent.value;
244 components.pop();
245 }
246
247 return components;
248}
249
250function clonePath(path) {
251 return {
252 newPos: path.newPos,
253 components: path.components.slice(0)
254 };
255}
256
257var characterDiff = new Diff();
258function diffChars(oldStr, newStr, options) {
259 return characterDiff.diff(oldStr, newStr, options);
260}
261
262function generateOptions(options, defaults) {
263 if (typeof options === 'function') {
264 defaults.callback = options;
265 } else if (options) {
266 for (var name in options) {
267 /* istanbul ignore else */
268 if (options.hasOwnProperty(name)) {
269 defaults[name] = options[name];
270 }
271 }
272 }
273
274 return defaults;
275}
276
277//
278// Ranges and exceptions:
279// Latin-1 Supplement, 0080–00FF
280// - U+00D7 × Multiplication sign
281// - U+00F7 ÷ Division sign
282// Latin Extended-A, 0100–017F
283// Latin Extended-B, 0180–024F
284// IPA Extensions, 0250–02AF
285// Spacing Modifier Letters, 02B0–02FF
286// - U+02C7 ˇ &#711; Caron
287// - U+02D8 ˘ &#728; Breve
288// - U+02D9 ˙ &#729; Dot Above
289// - U+02DA ˚ &#730; Ring Above
290// - U+02DB ˛ &#731; Ogonek
291// - U+02DC ˜ &#732; Small Tilde
292// - U+02DD ˝ &#733; Double Acute Accent
293// Latin Extended Additional, 1E00–1EFF
294
295var extendedWordChars = /^[A-Za-z\xC0-\u02C6\u02C8-\u02D7\u02DE-\u02FF\u1E00-\u1EFF]+$/;
296var reWhitespace = /\S/;
297var wordDiff = new Diff();
298
299wordDiff.equals = function (left, right) {
300 if (this.options.ignoreCase) {
301 left = left.toLowerCase();
302 right = right.toLowerCase();
303 }
304
305 return left === right || this.options.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right);
306};
307
308wordDiff.tokenize = function (value) {
309 var tokens = value.split(/(\s+|[()[\]{}'"]|\b)/); // Join the boundary splits that we do not consider to be boundaries. This is primarily the extended Latin character set.
310
311 for (var i = 0; i < tokens.length - 1; i++) {
312 // If we have an empty string in the next field and we have only word chars before and after, merge
313 if (!tokens[i + 1] && tokens[i + 2] && extendedWordChars.test(tokens[i]) && extendedWordChars.test(tokens[i + 2])) {
314 tokens[i] += tokens[i + 2];
315 tokens.splice(i + 1, 2);
316 i--;
317 }
318 }
319
320 return tokens;
321};
322
323function diffWords(oldStr, newStr, options) {
324 options = generateOptions(options, {
325 ignoreWhitespace: true
326 });
327 return wordDiff.diff(oldStr, newStr, options);
328}
329function diffWordsWithSpace(oldStr, newStr, options) {
330 return wordDiff.diff(oldStr, newStr, options);
331}
332
333var lineDiff = new Diff();
334
335lineDiff.tokenize = function (value) {
336 var retLines = [],
337 linesAndNewlines = value.split(/(\n|\r\n)/); // Ignore the final empty token that occurs if the string ends with a new line
338
339 if (!linesAndNewlines[linesAndNewlines.length - 1]) {
340 linesAndNewlines.pop();
341 } // Merge the content and line separators into single tokens
342
343
344 for (var i = 0; i < linesAndNewlines.length; i++) {
345 var line = linesAndNewlines[i];
346
347 if (i % 2 && !this.options.newlineIsToken) {
348 retLines[retLines.length - 1] += line;
349 } else {
350 if (this.options.ignoreWhitespace) {
351 line = line.trim();
352 }
353
354 retLines.push(line);
355 }
356 }
357
358 return retLines;
359};
360
361function diffLines(oldStr, newStr, callback) {
362 return lineDiff.diff(oldStr, newStr, callback);
363}
364function diffTrimmedLines(oldStr, newStr, callback) {
365 var options = generateOptions(callback, {
366 ignoreWhitespace: true
367 });
368 return lineDiff.diff(oldStr, newStr, options);
369}
370
371var sentenceDiff = new Diff();
372
373sentenceDiff.tokenize = function (value) {
374 return value.split(/(\S.+?[.!?])(?=\s+|$)/);
375};
376
377function diffSentences(oldStr, newStr, callback) {
378 return sentenceDiff.diff(oldStr, newStr, callback);
379}
380
381var cssDiff = new Diff();
382
383cssDiff.tokenize = function (value) {
384 return value.split(/([{}:;,]|\s+)/);
385};
386
387function diffCss(oldStr, newStr, callback) {
388 return cssDiff.diff(oldStr, newStr, callback);
389}
390
391function _typeof(obj) {
392 if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
393 _typeof = function (obj) {
394 return typeof obj;
395 };
396 } else {
397 _typeof = function (obj) {
398 return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
399 };
400 }
401
402 return _typeof(obj);
403}
404
405function _toConsumableArray(arr) {
406 return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread();
407}
408
409function _arrayWithoutHoles(arr) {
410 if (Array.isArray(arr)) {
411 for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
412
413 return arr2;
414 }
415}
416
417function _iterableToArray(iter) {
418 if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
419}
420
421function _nonIterableSpread() {
422 throw new TypeError("Invalid attempt to spread non-iterable instance");
423}
424
425var objectPrototypeToString = Object.prototype.toString;
426var jsonDiff = new Diff(); // Discriminate between two lines of pretty-printed, serialized JSON where one of them has a
427// dangling comma and the other doesn't. Turns out including the dangling comma yields the nicest output:
428
429jsonDiff.useLongestToken = true;
430jsonDiff.tokenize = lineDiff.tokenize;
431
432jsonDiff.castInput = function (value) {
433 var _this$options = this.options,
434 undefinedReplacement = _this$options.undefinedReplacement,
435 _this$options$stringi = _this$options.stringifyReplacer,
436 stringifyReplacer = _this$options$stringi === void 0 ? function (k, v) {
437 return typeof v === 'undefined' ? undefinedReplacement : v;
438 } : _this$options$stringi;
439 return typeof value === 'string' ? value : JSON.stringify(canonicalize(value, null, null, stringifyReplacer), stringifyReplacer, ' ');
440};
441
442jsonDiff.equals = function (left, right) {
443 return Diff.prototype.equals.call(jsonDiff, left.replace(/,([\r\n])/g, '$1'), right.replace(/,([\r\n])/g, '$1'));
444};
445
446function diffJson(oldObj, newObj, options) {
447 return jsonDiff.diff(oldObj, newObj, options);
448} // This function handles the presence of circular references by bailing out when encountering an
449// object that is already on the "stack" of items being processed. Accepts an optional replacer
450
451function canonicalize(obj, stack, replacementStack, replacer, key) {
452 stack = stack || [];
453 replacementStack = replacementStack || [];
454
455 if (replacer) {
456 obj = replacer(key, obj);
457 }
458
459 var i;
460
461 for (i = 0; i < stack.length; i += 1) {
462 if (stack[i] === obj) {
463 return replacementStack[i];
464 }
465 }
466
467 var canonicalizedObj;
468
469 if ('[object Array]' === objectPrototypeToString.call(obj)) {
470 stack.push(obj);
471 canonicalizedObj = new Array(obj.length);
472 replacementStack.push(canonicalizedObj);
473
474 for (i = 0; i < obj.length; i += 1) {
475 canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack, replacer, key);
476 }
477
478 stack.pop();
479 replacementStack.pop();
480 return canonicalizedObj;
481 }
482
483 if (obj && obj.toJSON) {
484 obj = obj.toJSON();
485 }
486
487 if (_typeof(obj) === 'object' && obj !== null) {
488 stack.push(obj);
489 canonicalizedObj = {};
490 replacementStack.push(canonicalizedObj);
491
492 var sortedKeys = [],
493 _key;
494
495 for (_key in obj) {
496 /* istanbul ignore else */
497 if (obj.hasOwnProperty(_key)) {
498 sortedKeys.push(_key);
499 }
500 }
501
502 sortedKeys.sort();
503
504 for (i = 0; i < sortedKeys.length; i += 1) {
505 _key = sortedKeys[i];
506 canonicalizedObj[_key] = canonicalize(obj[_key], stack, replacementStack, replacer, _key);
507 }
508
509 stack.pop();
510 replacementStack.pop();
511 } else {
512 canonicalizedObj = obj;
513 }
514
515 return canonicalizedObj;
516}
517
518var arrayDiff = new Diff();
519
520arrayDiff.tokenize = function (value) {
521 return value.slice();
522};
523
524arrayDiff.join = arrayDiff.removeEmpty = function (value) {
525 return value;
526};
527
528function diffArrays(oldArr, newArr, callback) {
529 return arrayDiff.diff(oldArr, newArr, callback);
530}
531
532function parsePatch(uniDiff) {
533 var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
534 var diffstr = uniDiff.split(/\r\n|[\n\v\f\r\x85]/),
535 delimiters = uniDiff.match(/\r\n|[\n\v\f\r\x85]/g) || [],
536 list = [],
537 i = 0;
538
539 function parseIndex() {
540 var index = {};
541 list.push(index); // Parse diff metadata
542
543 while (i < diffstr.length) {
544 var line = diffstr[i]; // File header found, end parsing diff metadata
545
546 if (/^(\-\-\-|\+\+\+|@@)\s/.test(line)) {
547 break;
548 } // Diff index
549
550
551 var header = /^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/.exec(line);
552
553 if (header) {
554 index.index = header[1];
555 }
556
557 i++;
558 } // Parse file headers if they are defined. Unified diff requires them, but
559 // there's no technical issues to have an isolated hunk without file header
560
561
562 parseFileHeader(index);
563 parseFileHeader(index); // Parse hunks
564
565 index.hunks = [];
566
567 while (i < diffstr.length) {
568 var _line = diffstr[i];
569
570 if (/^(Index:|diff|\-\-\-|\+\+\+)\s/.test(_line)) {
571 break;
572 } else if (/^@@/.test(_line)) {
573 index.hunks.push(parseHunk());
574 } else if (_line && options.strict) {
575 // Ignore unexpected content unless in strict mode
576 throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(_line));
577 } else {
578 i++;
579 }
580 }
581 } // Parses the --- and +++ headers, if none are found, no lines
582 // are consumed.
583
584
585 function parseFileHeader(index) {
586 var fileHeader = /^(---|\+\+\+)\s+(.*)$/.exec(diffstr[i]);
587
588 if (fileHeader) {
589 var keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';
590 var data = fileHeader[2].split('\t', 2);
591 var fileName = data[0].replace(/\\\\/g, '\\');
592
593 if (/^".*"$/.test(fileName)) {
594 fileName = fileName.substr(1, fileName.length - 2);
595 }
596
597 index[keyPrefix + 'FileName'] = fileName;
598 index[keyPrefix + 'Header'] = (data[1] || '').trim();
599 i++;
600 }
601 } // Parses a hunk
602 // This assumes that we are at the start of a hunk.
603
604
605 function parseHunk() {
606 var chunkHeaderIndex = i,
607 chunkHeaderLine = diffstr[i++],
608 chunkHeader = chunkHeaderLine.split(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
609 var hunk = {
610 oldStart: +chunkHeader[1],
611 oldLines: +chunkHeader[2] || 1,
612 newStart: +chunkHeader[3],
613 newLines: +chunkHeader[4] || 1,
614 lines: [],
615 linedelimiters: []
616 };
617 var addCount = 0,
618 removeCount = 0;
619
620 for (; i < diffstr.length; i++) {
621 // Lines starting with '---' could be mistaken for the "remove line" operation
622 // But they could be the header for the next file. Therefore prune such cases out.
623 if (diffstr[i].indexOf('--- ') === 0 && i + 2 < diffstr.length && diffstr[i + 1].indexOf('+++ ') === 0 && diffstr[i + 2].indexOf('@@') === 0) {
624 break;
625 }
626
627 var operation = diffstr[i].length == 0 && i != diffstr.length - 1 ? ' ' : diffstr[i][0];
628
629 if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\') {
630 hunk.lines.push(diffstr[i]);
631 hunk.linedelimiters.push(delimiters[i] || '\n');
632
633 if (operation === '+') {
634 addCount++;
635 } else if (operation === '-') {
636 removeCount++;
637 } else if (operation === ' ') {
638 addCount++;
639 removeCount++;
640 }
641 } else {
642 break;
643 }
644 } // Handle the empty block count case
645
646
647 if (!addCount && hunk.newLines === 1) {
648 hunk.newLines = 0;
649 }
650
651 if (!removeCount && hunk.oldLines === 1) {
652 hunk.oldLines = 0;
653 } // Perform optional sanity checking
654
655
656 if (options.strict) {
657 if (addCount !== hunk.newLines) {
658 throw new Error('Added line count did not match for hunk at line ' + (chunkHeaderIndex + 1));
659 }
660
661 if (removeCount !== hunk.oldLines) {
662 throw new Error('Removed line count did not match for hunk at line ' + (chunkHeaderIndex + 1));
663 }
664 }
665
666 return hunk;
667 }
668
669 while (i < diffstr.length) {
670 parseIndex();
671 }
672
673 return list;
674}
675
676// Iterator that traverses in the range of [min, max], stepping
677// by distance from a given start position. I.e. for [0, 4], with
678// start of 2, this will iterate 2, 3, 1, 4, 0.
679function distanceIterator (start, minLine, maxLine) {
680 var wantForward = true,
681 backwardExhausted = false,
682 forwardExhausted = false,
683 localOffset = 1;
684 return function iterator() {
685 if (wantForward && !forwardExhausted) {
686 if (backwardExhausted) {
687 localOffset++;
688 } else {
689 wantForward = false;
690 } // Check if trying to fit beyond text length, and if not, check it fits
691 // after offset location (or desired location on first iteration)
692
693
694 if (start + localOffset <= maxLine) {
695 return localOffset;
696 }
697
698 forwardExhausted = true;
699 }
700
701 if (!backwardExhausted) {
702 if (!forwardExhausted) {
703 wantForward = true;
704 } // Check if trying to fit before text beginning, and if not, check it fits
705 // before offset location
706
707
708 if (minLine <= start - localOffset) {
709 return -localOffset++;
710 }
711
712 backwardExhausted = true;
713 return iterator();
714 } // We tried to fit hunk before text beginning and beyond text length, then
715 // hunk can't fit on the text. Return undefined
716
717 };
718}
719
720function applyPatch(source, uniDiff) {
721 var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
722
723 if (typeof uniDiff === 'string') {
724 uniDiff = parsePatch(uniDiff);
725 }
726
727 if (Array.isArray(uniDiff)) {
728 if (uniDiff.length > 1) {
729 throw new Error('applyPatch only works with a single input.');
730 }
731
732 uniDiff = uniDiff[0];
733 } // Apply the diff to the input
734
735
736 var lines = source.split(/\r\n|[\n\v\f\r\x85]/),
737 delimiters = source.match(/\r\n|[\n\v\f\r\x85]/g) || [],
738 hunks = uniDiff.hunks,
739 compareLine = options.compareLine || function (lineNumber, line, operation, patchContent) {
740 return line === patchContent;
741 },
742 errorCount = 0,
743 fuzzFactor = options.fuzzFactor || 0,
744 minLine = 0,
745 offset = 0,
746 removeEOFNL,
747 addEOFNL;
748 /**
749 * Checks if the hunk exactly fits on the provided location
750 */
751
752
753 function hunkFits(hunk, toPos) {
754 for (var j = 0; j < hunk.lines.length; j++) {
755 var line = hunk.lines[j],
756 operation = line.length > 0 ? line[0] : ' ',
757 content = line.length > 0 ? line.substr(1) : line;
758
759 if (operation === ' ' || operation === '-') {
760 // Context sanity check
761 if (!compareLine(toPos + 1, lines[toPos], operation, content)) {
762 errorCount++;
763
764 if (errorCount > fuzzFactor) {
765 return false;
766 }
767 }
768
769 toPos++;
770 }
771 }
772
773 return true;
774 } // Search best fit offsets for each hunk based on the previous ones
775
776
777 for (var i = 0; i < hunks.length; i++) {
778 var hunk = hunks[i],
779 maxLine = lines.length - hunk.oldLines,
780 localOffset = 0,
781 toPos = offset + hunk.oldStart - 1;
782 var iterator = distanceIterator(toPos, minLine, maxLine);
783
784 for (; localOffset !== undefined; localOffset = iterator()) {
785 if (hunkFits(hunk, toPos + localOffset)) {
786 hunk.offset = offset += localOffset;
787 break;
788 }
789 }
790
791 if (localOffset === undefined) {
792 return false;
793 } // Set lower text limit to end of the current hunk, so next ones don't try
794 // to fit over already patched text
795
796
797 minLine = hunk.offset + hunk.oldStart + hunk.oldLines;
798 } // Apply patch hunks
799
800
801 var diffOffset = 0;
802
803 for (var _i = 0; _i < hunks.length; _i++) {
804 var _hunk = hunks[_i],
805 _toPos = _hunk.oldStart + _hunk.offset + diffOffset - 1;
806
807 diffOffset += _hunk.newLines - _hunk.oldLines;
808
809 if (_toPos < 0) {
810 // Creating a new file
811 _toPos = 0;
812 }
813
814 for (var j = 0; j < _hunk.lines.length; j++) {
815 var line = _hunk.lines[j],
816 operation = line.length > 0 ? line[0] : ' ',
817 content = line.length > 0 ? line.substr(1) : line,
818 delimiter = _hunk.linedelimiters[j];
819
820 if (operation === ' ') {
821 _toPos++;
822 } else if (operation === '-') {
823 lines.splice(_toPos, 1);
824 delimiters.splice(_toPos, 1);
825 /* istanbul ignore else */
826 } else if (operation === '+') {
827 lines.splice(_toPos, 0, content);
828 delimiters.splice(_toPos, 0, delimiter);
829 _toPos++;
830 } else if (operation === '\\') {
831 var previousOperation = _hunk.lines[j - 1] ? _hunk.lines[j - 1][0] : null;
832
833 if (previousOperation === '+') {
834 removeEOFNL = true;
835 } else if (previousOperation === '-') {
836 addEOFNL = true;
837 }
838 }
839 }
840 } // Handle EOFNL insertion/removal
841
842
843 if (removeEOFNL) {
844 while (!lines[lines.length - 1]) {
845 lines.pop();
846 delimiters.pop();
847 }
848 } else if (addEOFNL) {
849 lines.push('');
850 delimiters.push('\n');
851 }
852
853 for (var _k = 0; _k < lines.length - 1; _k++) {
854 lines[_k] = lines[_k] + delimiters[_k];
855 }
856
857 return lines.join('');
858} // Wrapper that supports multiple file patches via callbacks.
859
860function applyPatches(uniDiff, options) {
861 if (typeof uniDiff === 'string') {
862 uniDiff = parsePatch(uniDiff);
863 }
864
865 var currentIndex = 0;
866
867 function processIndex() {
868 var index = uniDiff[currentIndex++];
869
870 if (!index) {
871 return options.complete();
872 }
873
874 options.loadFile(index, function (err, data) {
875 if (err) {
876 return options.complete(err);
877 }
878
879 var updatedContent = applyPatch(data, index, options);
880 options.patched(index, updatedContent, function (err) {
881 if (err) {
882 return options.complete(err);
883 }
884
885 processIndex();
886 });
887 });
888 }
889
890 processIndex();
891}
892
893function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
894 if (!options) {
895 options = {};
896 }
897
898 if (typeof options.context === 'undefined') {
899 options.context = 4;
900 }
901
902 var diff = diffLines(oldStr, newStr, options);
903 diff.push({
904 value: '',
905 lines: []
906 }); // Append an empty value to make cleanup easier
907
908 function contextLines(lines) {
909 return lines.map(function (entry) {
910 return ' ' + entry;
911 });
912 }
913
914 var hunks = [];
915 var oldRangeStart = 0,
916 newRangeStart = 0,
917 curRange = [],
918 oldLine = 1,
919 newLine = 1;
920
921 var _loop = function _loop(i) {
922 var current = diff[i],
923 lines = current.lines || current.value.replace(/\n$/, '').split('\n');
924 current.lines = lines;
925
926 if (current.added || current.removed) {
927 var _curRange;
928
929 // If we have previous context, start with that
930 if (!oldRangeStart) {
931 var prev = diff[i - 1];
932 oldRangeStart = oldLine;
933 newRangeStart = newLine;
934
935 if (prev) {
936 curRange = options.context > 0 ? contextLines(prev.lines.slice(-options.context)) : [];
937 oldRangeStart -= curRange.length;
938 newRangeStart -= curRange.length;
939 }
940 } // Output our changes
941
942
943 (_curRange = curRange).push.apply(_curRange, _toConsumableArray(lines.map(function (entry) {
944 return (current.added ? '+' : '-') + entry;
945 }))); // Track the updated file position
946
947
948 if (current.added) {
949 newLine += lines.length;
950 } else {
951 oldLine += lines.length;
952 }
953 } else {
954 // Identical context lines. Track line changes
955 if (oldRangeStart) {
956 // Close out any changes that have been output (or join overlapping)
957 if (lines.length <= options.context * 2 && i < diff.length - 2) {
958 var _curRange2;
959
960 // Overlapping
961 (_curRange2 = curRange).push.apply(_curRange2, _toConsumableArray(contextLines(lines)));
962 } else {
963 var _curRange3;
964
965 // end the range and output
966 var contextSize = Math.min(lines.length, options.context);
967
968 (_curRange3 = curRange).push.apply(_curRange3, _toConsumableArray(contextLines(lines.slice(0, contextSize))));
969
970 var hunk = {
971 oldStart: oldRangeStart,
972 oldLines: oldLine - oldRangeStart + contextSize,
973 newStart: newRangeStart,
974 newLines: newLine - newRangeStart + contextSize,
975 lines: curRange
976 };
977
978 if (i >= diff.length - 2 && lines.length <= options.context) {
979 // EOF is inside this hunk
980 var oldEOFNewline = /\n$/.test(oldStr);
981 var newEOFNewline = /\n$/.test(newStr);
982 var noNlBeforeAdds = lines.length == 0 && curRange.length > hunk.oldLines;
983
984 if (!oldEOFNewline && noNlBeforeAdds) {
985 // special case: old has no eol and no trailing context; no-nl can end up before adds
986 curRange.splice(hunk.oldLines, 0, '\\ No newline at end of file');
987 }
988
989 if (!oldEOFNewline && !noNlBeforeAdds || !newEOFNewline) {
990 curRange.push('\\ No newline at end of file');
991 }
992 }
993
994 hunks.push(hunk);
995 oldRangeStart = 0;
996 newRangeStart = 0;
997 curRange = [];
998 }
999 }
1000
1001 oldLine += lines.length;
1002 newLine += lines.length;
1003 }
1004 };
1005
1006 for (var i = 0; i < diff.length; i++) {
1007 _loop(i);
1008 }
1009
1010 return {
1011 oldFileName: oldFileName,
1012 newFileName: newFileName,
1013 oldHeader: oldHeader,
1014 newHeader: newHeader,
1015 hunks: hunks
1016 };
1017}
1018function createTwoFilesPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
1019 var diff = structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options);
1020 var ret = [];
1021
1022 if (oldFileName == newFileName) {
1023 ret.push('Index: ' + oldFileName);
1024 }
1025
1026 ret.push('===================================================================');
1027 ret.push('--- ' + diff.oldFileName + (typeof diff.oldHeader === 'undefined' ? '' : '\t' + diff.oldHeader));
1028 ret.push('+++ ' + diff.newFileName + (typeof diff.newHeader === 'undefined' ? '' : '\t' + diff.newHeader));
1029
1030 for (var i = 0; i < diff.hunks.length; i++) {
1031 var hunk = diff.hunks[i];
1032 ret.push('@@ -' + hunk.oldStart + ',' + hunk.oldLines + ' +' + hunk.newStart + ',' + hunk.newLines + ' @@');
1033 ret.push.apply(ret, hunk.lines);
1034 }
1035
1036 return ret.join('\n') + '\n';
1037}
1038function createPatch(fileName, oldStr, newStr, oldHeader, newHeader, options) {
1039 return createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader, options);
1040}
1041
1042function arrayEqual(a, b) {
1043 if (a.length !== b.length) {
1044 return false;
1045 }
1046
1047 return arrayStartsWith(a, b);
1048}
1049function arrayStartsWith(array, start) {
1050 if (start.length > array.length) {
1051 return false;
1052 }
1053
1054 for (var i = 0; i < start.length; i++) {
1055 if (start[i] !== array[i]) {
1056 return false;
1057 }
1058 }
1059
1060 return true;
1061}
1062
1063function calcLineCount(hunk) {
1064 var _calcOldNewLineCount = calcOldNewLineCount(hunk.lines),
1065 oldLines = _calcOldNewLineCount.oldLines,
1066 newLines = _calcOldNewLineCount.newLines;
1067
1068 if (oldLines !== undefined) {
1069 hunk.oldLines = oldLines;
1070 } else {
1071 delete hunk.oldLines;
1072 }
1073
1074 if (newLines !== undefined) {
1075 hunk.newLines = newLines;
1076 } else {
1077 delete hunk.newLines;
1078 }
1079}
1080function merge(mine, theirs, base) {
1081 mine = loadPatch(mine, base);
1082 theirs = loadPatch(theirs, base);
1083 var ret = {}; // For index we just let it pass through as it doesn't have any necessary meaning.
1084 // Leaving sanity checks on this to the API consumer that may know more about the
1085 // meaning in their own context.
1086
1087 if (mine.index || theirs.index) {
1088 ret.index = mine.index || theirs.index;
1089 }
1090
1091 if (mine.newFileName || theirs.newFileName) {
1092 if (!fileNameChanged(mine)) {
1093 // No header or no change in ours, use theirs (and ours if theirs does not exist)
1094 ret.oldFileName = theirs.oldFileName || mine.oldFileName;
1095 ret.newFileName = theirs.newFileName || mine.newFileName;
1096 ret.oldHeader = theirs.oldHeader || mine.oldHeader;
1097 ret.newHeader = theirs.newHeader || mine.newHeader;
1098 } else if (!fileNameChanged(theirs)) {
1099 // No header or no change in theirs, use ours
1100 ret.oldFileName = mine.oldFileName;
1101 ret.newFileName = mine.newFileName;
1102 ret.oldHeader = mine.oldHeader;
1103 ret.newHeader = mine.newHeader;
1104 } else {
1105 // Both changed... figure it out
1106 ret.oldFileName = selectField(ret, mine.oldFileName, theirs.oldFileName);
1107 ret.newFileName = selectField(ret, mine.newFileName, theirs.newFileName);
1108 ret.oldHeader = selectField(ret, mine.oldHeader, theirs.oldHeader);
1109 ret.newHeader = selectField(ret, mine.newHeader, theirs.newHeader);
1110 }
1111 }
1112
1113 ret.hunks = [];
1114 var mineIndex = 0,
1115 theirsIndex = 0,
1116 mineOffset = 0,
1117 theirsOffset = 0;
1118
1119 while (mineIndex < mine.hunks.length || theirsIndex < theirs.hunks.length) {
1120 var mineCurrent = mine.hunks[mineIndex] || {
1121 oldStart: Infinity
1122 },
1123 theirsCurrent = theirs.hunks[theirsIndex] || {
1124 oldStart: Infinity
1125 };
1126
1127 if (hunkBefore(mineCurrent, theirsCurrent)) {
1128 // This patch does not overlap with any of the others, yay.
1129 ret.hunks.push(cloneHunk(mineCurrent, mineOffset));
1130 mineIndex++;
1131 theirsOffset += mineCurrent.newLines - mineCurrent.oldLines;
1132 } else if (hunkBefore(theirsCurrent, mineCurrent)) {
1133 // This patch does not overlap with any of the others, yay.
1134 ret.hunks.push(cloneHunk(theirsCurrent, theirsOffset));
1135 theirsIndex++;
1136 mineOffset += theirsCurrent.newLines - theirsCurrent.oldLines;
1137 } else {
1138 // Overlap, merge as best we can
1139 var mergedHunk = {
1140 oldStart: Math.min(mineCurrent.oldStart, theirsCurrent.oldStart),
1141 oldLines: 0,
1142 newStart: Math.min(mineCurrent.newStart + mineOffset, theirsCurrent.oldStart + theirsOffset),
1143 newLines: 0,
1144 lines: []
1145 };
1146 mergeLines(mergedHunk, mineCurrent.oldStart, mineCurrent.lines, theirsCurrent.oldStart, theirsCurrent.lines);
1147 theirsIndex++;
1148 mineIndex++;
1149 ret.hunks.push(mergedHunk);
1150 }
1151 }
1152
1153 return ret;
1154}
1155
1156function loadPatch(param, base) {
1157 if (typeof param === 'string') {
1158 if (/^@@/m.test(param) || /^Index:/m.test(param)) {
1159 return parsePatch(param)[0];
1160 }
1161
1162 if (!base) {
1163 throw new Error('Must provide a base reference or pass in a patch');
1164 }
1165
1166 return structuredPatch(undefined, undefined, base, param);
1167 }
1168
1169 return param;
1170}
1171
1172function fileNameChanged(patch) {
1173 return patch.newFileName && patch.newFileName !== patch.oldFileName;
1174}
1175
1176function selectField(index, mine, theirs) {
1177 if (mine === theirs) {
1178 return mine;
1179 } else {
1180 index.conflict = true;
1181 return {
1182 mine: mine,
1183 theirs: theirs
1184 };
1185 }
1186}
1187
1188function hunkBefore(test, check) {
1189 return test.oldStart < check.oldStart && test.oldStart + test.oldLines < check.oldStart;
1190}
1191
1192function cloneHunk(hunk, offset) {
1193 return {
1194 oldStart: hunk.oldStart,
1195 oldLines: hunk.oldLines,
1196 newStart: hunk.newStart + offset,
1197 newLines: hunk.newLines,
1198 lines: hunk.lines
1199 };
1200}
1201
1202function mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) {
1203 // This will generally result in a conflicted hunk, but there are cases where the context
1204 // is the only overlap where we can successfully merge the content here.
1205 var mine = {
1206 offset: mineOffset,
1207 lines: mineLines,
1208 index: 0
1209 },
1210 their = {
1211 offset: theirOffset,
1212 lines: theirLines,
1213 index: 0
1214 }; // Handle any leading content
1215
1216 insertLeading(hunk, mine, their);
1217 insertLeading(hunk, their, mine); // Now in the overlap content. Scan through and select the best changes from each.
1218
1219 while (mine.index < mine.lines.length && their.index < their.lines.length) {
1220 var mineCurrent = mine.lines[mine.index],
1221 theirCurrent = their.lines[their.index];
1222
1223 if ((mineCurrent[0] === '-' || mineCurrent[0] === '+') && (theirCurrent[0] === '-' || theirCurrent[0] === '+')) {
1224 // Both modified ...
1225 mutualChange(hunk, mine, their);
1226 } else if (mineCurrent[0] === '+' && theirCurrent[0] === ' ') {
1227 var _hunk$lines;
1228
1229 // Mine inserted
1230 (_hunk$lines = hunk.lines).push.apply(_hunk$lines, _toConsumableArray(collectChange(mine)));
1231 } else if (theirCurrent[0] === '+' && mineCurrent[0] === ' ') {
1232 var _hunk$lines2;
1233
1234 // Theirs inserted
1235 (_hunk$lines2 = hunk.lines).push.apply(_hunk$lines2, _toConsumableArray(collectChange(their)));
1236 } else if (mineCurrent[0] === '-' && theirCurrent[0] === ' ') {
1237 // Mine removed or edited
1238 removal(hunk, mine, their);
1239 } else if (theirCurrent[0] === '-' && mineCurrent[0] === ' ') {
1240 // Their removed or edited
1241 removal(hunk, their, mine, true);
1242 } else if (mineCurrent === theirCurrent) {
1243 // Context identity
1244 hunk.lines.push(mineCurrent);
1245 mine.index++;
1246 their.index++;
1247 } else {
1248 // Context mismatch
1249 conflict(hunk, collectChange(mine), collectChange(their));
1250 }
1251 } // Now push anything that may be remaining
1252
1253
1254 insertTrailing(hunk, mine);
1255 insertTrailing(hunk, their);
1256 calcLineCount(hunk);
1257}
1258
1259function mutualChange(hunk, mine, their) {
1260 var myChanges = collectChange(mine),
1261 theirChanges = collectChange(their);
1262
1263 if (allRemoves(myChanges) && allRemoves(theirChanges)) {
1264 // Special case for remove changes that are supersets of one another
1265 if (arrayStartsWith(myChanges, theirChanges) && skipRemoveSuperset(their, myChanges, myChanges.length - theirChanges.length)) {
1266 var _hunk$lines3;
1267
1268 (_hunk$lines3 = hunk.lines).push.apply(_hunk$lines3, _toConsumableArray(myChanges));
1269
1270 return;
1271 } else if (arrayStartsWith(theirChanges, myChanges) && skipRemoveSuperset(mine, theirChanges, theirChanges.length - myChanges.length)) {
1272 var _hunk$lines4;
1273
1274 (_hunk$lines4 = hunk.lines).push.apply(_hunk$lines4, _toConsumableArray(theirChanges));
1275
1276 return;
1277 }
1278 } else if (arrayEqual(myChanges, theirChanges)) {
1279 var _hunk$lines5;
1280
1281 (_hunk$lines5 = hunk.lines).push.apply(_hunk$lines5, _toConsumableArray(myChanges));
1282
1283 return;
1284 }
1285
1286 conflict(hunk, myChanges, theirChanges);
1287}
1288
1289function removal(hunk, mine, their, swap) {
1290 var myChanges = collectChange(mine),
1291 theirChanges = collectContext(their, myChanges);
1292
1293 if (theirChanges.merged) {
1294 var _hunk$lines6;
1295
1296 (_hunk$lines6 = hunk.lines).push.apply(_hunk$lines6, _toConsumableArray(theirChanges.merged));
1297 } else {
1298 conflict(hunk, swap ? theirChanges : myChanges, swap ? myChanges : theirChanges);
1299 }
1300}
1301
1302function conflict(hunk, mine, their) {
1303 hunk.conflict = true;
1304 hunk.lines.push({
1305 conflict: true,
1306 mine: mine,
1307 theirs: their
1308 });
1309}
1310
1311function insertLeading(hunk, insert, their) {
1312 while (insert.offset < their.offset && insert.index < insert.lines.length) {
1313 var line = insert.lines[insert.index++];
1314 hunk.lines.push(line);
1315 insert.offset++;
1316 }
1317}
1318
1319function insertTrailing(hunk, insert) {
1320 while (insert.index < insert.lines.length) {
1321 var line = insert.lines[insert.index++];
1322 hunk.lines.push(line);
1323 }
1324}
1325
1326function collectChange(state) {
1327 var ret = [],
1328 operation = state.lines[state.index][0];
1329
1330 while (state.index < state.lines.length) {
1331 var line = state.lines[state.index]; // Group additions that are immediately after subtractions and treat them as one "atomic" modify change.
1332
1333 if (operation === '-' && line[0] === '+') {
1334 operation = '+';
1335 }
1336
1337 if (operation === line[0]) {
1338 ret.push(line);
1339 state.index++;
1340 } else {
1341 break;
1342 }
1343 }
1344
1345 return ret;
1346}
1347
1348function collectContext(state, matchChanges) {
1349 var changes = [],
1350 merged = [],
1351 matchIndex = 0,
1352 contextChanges = false,
1353 conflicted = false;
1354
1355 while (matchIndex < matchChanges.length && state.index < state.lines.length) {
1356 var change = state.lines[state.index],
1357 match = matchChanges[matchIndex]; // Once we've hit our add, then we are done
1358
1359 if (match[0] === '+') {
1360 break;
1361 }
1362
1363 contextChanges = contextChanges || change[0] !== ' ';
1364 merged.push(match);
1365 matchIndex++; // Consume any additions in the other block as a conflict to attempt
1366 // to pull in the remaining context after this
1367
1368 if (change[0] === '+') {
1369 conflicted = true;
1370
1371 while (change[0] === '+') {
1372 changes.push(change);
1373 change = state.lines[++state.index];
1374 }
1375 }
1376
1377 if (match.substr(1) === change.substr(1)) {
1378 changes.push(change);
1379 state.index++;
1380 } else {
1381 conflicted = true;
1382 }
1383 }
1384
1385 if ((matchChanges[matchIndex] || '')[0] === '+' && contextChanges) {
1386 conflicted = true;
1387 }
1388
1389 if (conflicted) {
1390 return changes;
1391 }
1392
1393 while (matchIndex < matchChanges.length) {
1394 merged.push(matchChanges[matchIndex++]);
1395 }
1396
1397 return {
1398 merged: merged,
1399 changes: changes
1400 };
1401}
1402
1403function allRemoves(changes) {
1404 return changes.reduce(function (prev, change) {
1405 return prev && change[0] === '-';
1406 }, true);
1407}
1408
1409function skipRemoveSuperset(state, removeChanges, delta) {
1410 for (var i = 0; i < delta; i++) {
1411 var changeContent = removeChanges[removeChanges.length - delta + i].substr(1);
1412
1413 if (state.lines[state.index + i] !== ' ' + changeContent) {
1414 return false;
1415 }
1416 }
1417
1418 state.index += delta;
1419 return true;
1420}
1421
1422function calcOldNewLineCount(lines) {
1423 var oldLines = 0;
1424 var newLines = 0;
1425 lines.forEach(function (line) {
1426 if (typeof line !== 'string') {
1427 var myCount = calcOldNewLineCount(line.mine);
1428 var theirCount = calcOldNewLineCount(line.theirs);
1429
1430 if (oldLines !== undefined) {
1431 if (myCount.oldLines === theirCount.oldLines) {
1432 oldLines += myCount.oldLines;
1433 } else {
1434 oldLines = undefined;
1435 }
1436 }
1437
1438 if (newLines !== undefined) {
1439 if (myCount.newLines === theirCount.newLines) {
1440 newLines += myCount.newLines;
1441 } else {
1442 newLines = undefined;
1443 }
1444 }
1445 } else {
1446 if (newLines !== undefined && (line[0] === '+' || line[0] === ' ')) {
1447 newLines++;
1448 }
1449
1450 if (oldLines !== undefined && (line[0] === '-' || line[0] === ' ')) {
1451 oldLines++;
1452 }
1453 }
1454 });
1455 return {
1456 oldLines: oldLines,
1457 newLines: newLines
1458 };
1459}
1460
1461// See: http://code.google.com/p/google-diff-match-patch/wiki/API
1462function convertChangesToDMP(changes) {
1463 var ret = [],
1464 change,
1465 operation;
1466
1467 for (var i = 0; i < changes.length; i++) {
1468 change = changes[i];
1469
1470 if (change.added) {
1471 operation = 1;
1472 } else if (change.removed) {
1473 operation = -1;
1474 } else {
1475 operation = 0;
1476 }
1477
1478 ret.push([operation, change.value]);
1479 }
1480
1481 return ret;
1482}
1483
1484function convertChangesToXML(changes) {
1485 var ret = [];
1486
1487 for (var i = 0; i < changes.length; i++) {
1488 var change = changes[i];
1489
1490 if (change.added) {
1491 ret.push('<ins>');
1492 } else if (change.removed) {
1493 ret.push('<del>');
1494 }
1495
1496 ret.push(escapeHTML(change.value));
1497
1498 if (change.added) {
1499 ret.push('</ins>');
1500 } else if (change.removed) {
1501 ret.push('</del>');
1502 }
1503 }
1504
1505 return ret.join('');
1506}
1507
1508function escapeHTML(s) {
1509 var n = s;
1510 n = n.replace(/&/g, '&amp;');
1511 n = n.replace(/</g, '&lt;');
1512 n = n.replace(/>/g, '&gt;');
1513 n = n.replace(/"/g, '&quot;');
1514 return n;
1515}
1516
1517/* See LICENSE file for terms of use */
1518
1519export { Diff, diffChars, diffWords, diffWordsWithSpace, diffLines, diffTrimmedLines, diffSentences, diffCss, diffJson, diffArrays, structuredPatch, createTwoFilesPatch, createPatch, applyPatch, applyPatches, parsePatch, merge, convertChangesToDMP, convertChangesToXML, canonicalize };