154 lines
17 KiB
JavaScript
154 lines
17 KiB
JavaScript
|
/*istanbul ignore start*/'use strict';
|
||
|
|
|
||
|
|
exports.__esModule = true;
|
||
|
|
exports. /*istanbul ignore end*/structuredPatch = structuredPatch;
|
||
|
|
/*istanbul ignore start*/exports. /*istanbul ignore end*/createTwoFilesPatch = createTwoFilesPatch;
|
||
|
|
/*istanbul ignore start*/exports. /*istanbul ignore end*/createPatch = createPatch;
|
||
|
|
|
||
|
|
var /*istanbul ignore start*/_line = require('../diff/line') /*istanbul ignore end*/;
|
||
|
|
|
||
|
|
/*istanbul ignore start*/
|
||
|
|
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
|
||
|
|
|
||
|
|
/*istanbul ignore end*/function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
|
||
|
|
if (!options) {
|
||
|
|
options = { context: 4 };
|
||
|
|
}
|
||
|
|
|
||
|
|
var diff = /*istanbul ignore start*/(0, _line.diffLines) /*istanbul ignore end*/(oldStr, newStr);
|
||
|
|
diff.push({ value: '', lines: [] }); // Append an empty value to make cleanup easier
|
||
|
|
|
||
|
|
function contextLines(lines) {
|
||
|
|
return lines.map(function (entry) {
|
||
|
|
return ' ' + entry;
|
||
|
|
});
|
||
|
|
}
|
||
|
|
|
||
|
|
var hunks = [];
|
||
|
|
var oldRangeStart = 0,
|
||
|
|
newRangeStart = 0,
|
||
|
|
curRange = [],
|
||
|
|
oldLine = 1,
|
||
|
|
newLine = 1;
|
||
|
|
/*istanbul ignore start*/
|
||
|
|
var _loop = function _loop( /*istanbul ignore end*/i) {
|
||
|
|
var current = diff[i],
|
||
|
|
lines = current.lines || current.value.replace(/\n$/, '').split('\n');
|
||
|
|
current.lines = lines;
|
||
|
|
|
||
|
|
if (current.added || current.removed) {
|
||
|
|
/*istanbul ignore start*/
|
||
|
|
var _curRange;
|
||
|
|
|
||
|
|
/*istanbul ignore end*/
|
||
|
|
// If we have previous context, start with that
|
||
|
|
if (!oldRangeStart) {
|
||
|
|
var prev = diff[i - 1];
|
||
|
|
oldRangeStart = oldLine;
|
||
|
|
newRangeStart = newLine;
|
||
|
|
|
||
|
|
if (prev) {
|
||
|
|
curRange = options.context > 0 ? contextLines(prev.lines.slice(-options.context)) : [];
|
||
|
|
oldRangeStart -= curRange.length;
|
||
|
|
newRangeStart -= curRange.length;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
// Output our changes
|
||
|
|
/*istanbul ignore start*/(_curRange = /*istanbul ignore end*/curRange).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_curRange /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/lines.map(function (entry) {
|
||
|
|
return (current.added ? '+' : '-') + entry;
|
||
|
|
})));
|
||
|
|
|
||
|
|
// Track the updated file position
|
||
|
|
if (current.added) {
|
||
|
|
newLine += lines.length;
|
||
|
|
} else {
|
||
|
|
oldLine += lines.length;
|
||
|
|
}
|
||
|
|
} else {
|
||
|
|
// Identical context lines. Track line changes
|
||
|
|
if (oldRangeStart) {
|
||
|
|
// Close out any changes that have been output (or join overlapping)
|
||
|
|
if (lines.length <= options.context * 2 && i < diff.length - 2) {
|
||
|
|
/*istanbul ignore start*/
|
||
|
|
var _curRange2;
|
||
|
|
|
||
|
|
/*istanbul ignore end*/
|
||
|
|
// Overlapping
|
||
|
|
/*istanbul ignore start*/(_curRange2 = /*istanbul ignore end*/curRange).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_curRange2 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/contextLines(lines)));
|
||
|
|
} else {
|
||
|
|
/*istanbul ignore start*/
|
||
|
|
var _curRange3;
|
||
|
|
|
||
|
|
/*istanbul ignore end*/
|
||
|
|
// end the range and output
|
||
|
|
var contextSize = Math.min(lines.length, options.context);
|
||
|
|
/*istanbul ignore start*/(_curRange3 = /*istanbul ignore end*/curRange).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_curRange3 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/contextLines(lines.slice(0, contextSize))));
|
||
|
|
|
||
|
|
var hunk = {
|
||
|
|
oldStart: oldRangeStart,
|
||
|
|
oldLines: oldLine - oldRangeStart + contextSize,
|
||
|
|
newStart: newRangeStart,
|
||
|
|
newLines: newLine - newRangeStart + contextSize,
|
||
|
|
lines: curRange
|
||
|
|
};
|
||
|
|
if (i >= diff.length - 2 && lines.length <= options.context) {
|
||
|
|
// EOF is inside this hunk
|
||
|
|
var oldEOFNewline = /\n$/.test(oldStr);
|
||
|
|
var newEOFNewline = /\n$/.test(newStr);
|
||
|
|
if (lines.length == 0 && !oldEOFNewline) {
|
||
|
|
// special case: old has no eol and no trailing context; no-nl can end up before adds
|
||
|
|
curRange.splice(hunk.oldLines, 0, '\\ No newline at end of file');
|
||
|
|
} else if (!oldEOFNewline || !newEOFNewline) {
|
||
|
|
curRange.push('\\ No newline at end of file');
|
||
|
|
}
|
||
|
|
}
|
||
|
|
hunks.push(hunk);
|
||
|
|
|
||
|
|
oldRangeStart = 0;
|
||
|
|
newRangeStart = 0;
|
||
|
|
curRange = [];
|
||
|
|
}
|
||
|
|
}
|
||
|
|
oldLine += lines.length;
|
||
|
|
newLine += lines.length;
|
||
|
|
}
|
||
|
|
};
|
||
|
|
|
||
|
|
for (var i = 0; i < diff.length; i++) {
|
||
|
|
/*istanbul ignore start*/
|
||
|
|
_loop( /*istanbul ignore end*/i);
|
||
|
|
}
|
||
|
|
|
||
|
|
return {
|
||
|
|
oldFileName: oldFileName, newFileName: newFileName,
|
||
|
|
oldHeader: oldHeader, newHeader: newHeader,
|
||
|
|
hunks: hunks
|
||
|
|
};
|
||
|
|
}
|
||
|
|
|
||
|
|
function createTwoFilesPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
|
||
|
|
var diff = structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options);
|
||
|
|
|
||
|
|
var ret = [];
|
||
|
|
if (oldFileName == newFileName) {
|
||
|
|
ret.push('Index: ' + oldFileName);
|
||
|
|
}
|
||
|
|
ret.push('===================================================================');
|
||
|
|
ret.push('--- ' + diff.oldFileName + (typeof diff.oldHeader === 'undefined' ? '' : '\t' + diff.oldHeader));
|
||
|
|
ret.push('+++ ' + diff.newFileName + (typeof diff.newHeader === 'undefined' ? '' : '\t' + diff.newHeader));
|
||
|
|
|
||
|
|
for (var i = 0; i < diff.hunks.length; i++) {
|
||
|
|
var hunk = diff.hunks[i];
|
||
|
|
ret.push('@@ -' + hunk.oldStart + ',' + hunk.oldLines + ' +' + hunk.newStart + ',' + hunk.newLines + ' @@');
|
||
|
|
ret.push.apply(ret, hunk.lines);
|
||
|
|
}
|
||
|
|
|
||
|
|
return ret.join('\n') + '\n';
|
||
|
|
}
|
||
|
|
|
||
|
|
function createPatch(fileName, oldStr, newStr, oldHeader, newHeader, options) {
|
||
|
|
return createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader, options);
|
||
|
|
}
|
||
|
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXRjaC9jcmVhdGUuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O2dDQUVnQjt5REE4RkE7eURBd0JBOztBQXhIaEI7Ozs7O3VCQUVPLFNBQVMsZUFBVCxDQUF5QixXQUF6QixFQUFzQyxXQUF0QyxFQUFtRCxNQUFuRCxFQUEyRCxNQUEzRCxFQUFtRSxTQUFuRSxFQUE4RSxTQUE5RSxFQUF5RixPQUF6RixFQUFrRztBQUN2RyxNQUFJLENBQUMsT0FBRCxFQUFVO0FBQ1osY0FBVSxFQUFFLFNBQVMsQ0FBVCxFQUFaLENBRFk7R0FBZDs7QUFJQSxNQUFNLE9BQU8sc0VBQVUsTUFBVixFQUFrQixNQUFsQixDQUFQLENBTGlHO0FBTXZHLE9BQUssSUFBTCxDQUFVLEVBQUMsT0FBTyxFQUFQLEVBQVcsT0FBTyxFQUFQLEVBQXRCOztBQU51RyxXQVE5RixZQUFULENBQXNCLEtBQXRCLEVBQTZCO0FBQzNCLFdBQU8sTUFBTSxHQUFOLENBQVUsVUFBUyxLQUFULEVBQWdCO0FBQUUsYUFBTyxNQUFNLEtBQU4sQ0FBVDtLQUFoQixDQUFqQixDQUQyQjtHQUE3Qjs7QUFJQSxNQUFJLFFBQVEsRUFBUixDQVptRztBQWF2RyxNQUFJLGdCQUFnQixDQUFoQjtNQUFtQixnQkFBZ0IsQ0FBaEI7TUFBbUIsV0FBVyxFQUFYO01BQ3RDLFVBQVUsQ0FBVjtNQUFhLFVBQVUsQ0FBVixDQWRzRjs7cURBZTlGO0FBQ1AsUUFBTSxVQUFVLEtBQUssQ0FBTCxDQUFWO1FBQ0EsUUFBUSxRQUFRLEtBQVIsSUFBaUIsUUFBUSxLQUFSLENBQWMsT0FBZCxDQUFzQixLQUF0QixFQUE2QixFQUE3QixFQUFpQyxLQUFqQyxDQUF1QyxJQUF2QyxDQUFqQjtBQUNkLFlBQVEsS0FBUixHQUFnQixLQUFoQjs7QUFFQSxRQUFJLFFBQVEsS0FBUixJQUFpQixRQUFRLE9BQVIsRUFBaUI7Ozs7OztBQUVwQyxVQUFJLENBQUMsYUFBRCxFQUFnQjtBQUNsQixZQUFNLE9BQU8sS0FB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
|