Initial commit of working RSS Aggregator build
This commit is contained in:
jmadmin committed
1 parent
ea3a2ca53e
commit
7ac2f6e384
4962 files changed
+1032666
No files matched your search
+243
@@ -0,0 +1,243 @@
|
||||
/*istanbul ignore start*/
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.applyPatch = applyPatch;
|
||||
exports.applyPatches = applyPatches;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
var
|
||||
/*istanbul ignore start*/
|
||||
_parse = require("./parse")
|
||||
/*istanbul ignore end*/
|
||||
;
|
||||
|
||||
var
|
||||
/*istanbul ignore start*/
|
||||
_distanceIterator = _interopRequireDefault(require("../util/distance-iterator"))
|
||||
/*istanbul ignore end*/
|
||||
;
|
||||
|
||||
/*istanbul ignore start*/ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
||||
|
||||
/*istanbul ignore end*/
|
||||
function applyPatch(source, uniDiff) {
|
||||
/*istanbul ignore start*/
|
||||
var
|
||||
/*istanbul ignore end*/
|
||||
options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
||||
|
||||
if (typeof uniDiff === 'string') {
|
||||
uniDiff =
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_parse
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
parsePatch)
|
||||
/*istanbul ignore end*/
|
||||
(uniDiff);
|
||||
}
|
||||
|
||||
if (Array.isArray(uniDiff)) {
|
||||
if (uniDiff.length > 1) {
|
||||
throw new Error('applyPatch only works with a single input.');
|
||||
}
|
||||
|
||||
uniDiff = uniDiff[0];
|
||||
} // Apply the diff to the input
|
||||
|
||||
|
||||
var lines = source.split(/\r\n|[\n\v\f\r\x85]/),
|
||||
delimiters = source.match(/\r\n|[\n\v\f\r\x85]/g) || [],
|
||||
hunks = uniDiff.hunks,
|
||||
compareLine = options.compareLine || function (lineNumber, line, operation, patchContent)
|
||||
/*istanbul ignore start*/
|
||||
{
|
||||
return (
|
||||
/*istanbul ignore end*/
|
||||
line === patchContent
|
||||
);
|
||||
},
|
||||
errorCount = 0,
|
||||
fuzzFactor = options.fuzzFactor || 0,
|
||||
minLine = 0,
|
||||
offset = 0,
|
||||
removeEOFNL,
|
||||
addEOFNL;
|
||||
/**
|
||||
* Checks if the hunk exactly fits on the provided location
|
||||
*/
|
||||
|
||||
|
||||
function hunkFits(hunk, toPos) {
|
||||
for (var j = 0; j < hunk.lines.length; j++) {
|
||||
var line = hunk.lines[j],
|
||||
operation = line.length > 0 ? line[0] : ' ',
|
||||
content = line.length > 0 ? line.substr(1) : line;
|
||||
|
||||
if (operation === ' ' || operation === '-') {
|
||||
// Context sanity check
|
||||
if (!compareLine(toPos + 1, lines[toPos], operation, content)) {
|
||||
errorCount++;
|
||||
|
||||
if (errorCount > fuzzFactor) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
toPos++;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
} // Search best fit offsets for each hunk based on the previous ones
|
||||
|
||||
|
||||
for (var i = 0; i < hunks.length; i++) {
|
||||
var hunk = hunks[i],
|
||||
maxLine = lines.length - hunk.oldLines,
|
||||
localOffset = 0,
|
||||
toPos = offset + hunk.oldStart - 1;
|
||||
var iterator =
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_distanceIterator
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
default)
|
||||
/*istanbul ignore end*/
|
||||
(toPos, minLine, maxLine);
|
||||
|
||||
for (; localOffset !== undefined; localOffset = iterator()) {
|
||||
if (hunkFits(hunk, toPos + localOffset)) {
|
||||
hunk.offset = offset += localOffset;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (localOffset === undefined) {
|
||||
return false;
|
||||
} // Set lower text limit to end of the current hunk, so next ones don't try
|
||||
// to fit over already patched text
|
||||
|
||||
|
||||
minLine = hunk.offset + hunk.oldStart + hunk.oldLines;
|
||||
} // Apply patch hunks
|
||||
|
||||
|
||||
var diffOffset = 0;
|
||||
|
||||
for (var _i = 0; _i < hunks.length; _i++) {
|
||||
var _hunk = hunks[_i],
|
||||
_toPos = _hunk.oldStart + _hunk.offset + diffOffset - 1;
|
||||
|
||||
diffOffset += _hunk.newLines - _hunk.oldLines;
|
||||
|
||||
if (_toPos < 0) {
|
||||
// Creating a new file
|
||||
_toPos = 0;
|
||||
}
|
||||
|
||||
for (var j = 0; j < _hunk.lines.length; j++) {
|
||||
var line = _hunk.lines[j],
|
||||
operation = line.length > 0 ? line[0] : ' ',
|
||||
content = line.length > 0 ? line.substr(1) : line,
|
||||
delimiter = _hunk.linedelimiters[j];
|
||||
|
||||
if (operation === ' ') {
|
||||
_toPos++;
|
||||
} else if (operation === '-') {
|
||||
lines.splice(_toPos, 1);
|
||||
delimiters.splice(_toPos, 1);
|
||||
/* istanbul ignore else */
|
||||
} else if (operation === '+') {
|
||||
lines.splice(_toPos, 0, content);
|
||||
delimiters.splice(_toPos, 0, delimiter);
|
||||
_toPos++;
|
||||
} else if (operation === '\\') {
|
||||
var previousOperation = _hunk.lines[j - 1] ? _hunk.lines[j - 1][0] : null;
|
||||
|
||||
if (previousOperation === '+') {
|
||||
removeEOFNL = true;
|
||||
} else if (previousOperation === '-') {
|
||||
addEOFNL = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
} // Handle EOFNL insertion/removal
|
||||
|
||||
|
||||
if (removeEOFNL) {
|
||||
while (!lines[lines.length - 1]) {
|
||||
lines.pop();
|
||||
delimiters.pop();
|
||||
}
|
||||
} else if (addEOFNL) {
|
||||
lines.push('');
|
||||
delimiters.push('\n');
|
||||
}
|
||||
|
||||
for (var _k = 0; _k < lines.length - 1; _k++) {
|
||||
lines[_k] = lines[_k] + delimiters[_k];
|
||||
}
|
||||
|
||||
return lines.join('');
|
||||
} // Wrapper that supports multiple file patches via callbacks.
|
||||
|
||||
|
||||
function applyPatches(uniDiff, options) {
|
||||
if (typeof uniDiff === 'string') {
|
||||
uniDiff =
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_parse
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
parsePatch)
|
||||
/*istanbul ignore end*/
|
||||
(uniDiff);
|
||||
}
|
||||
|
||||
var currentIndex = 0;
|
||||
|
||||
function processIndex() {
|
||||
var index = uniDiff[currentIndex++];
|
||||
|
||||
if (!index) {
|
||||
return options.complete();
|
||||
}
|
||||
|
||||
options.loadFile(index, function (err, data) {
|
||||
if (err) {
|
||||
return options.complete(err);
|
||||
}
|
||||
|
||||
var updatedContent = applyPatch(data, index, options);
|
||||
options.patched(index, updatedContent, function (err) {
|
||||
if (err) {
|
||||
return options.complete(err);
|
||||
}
|
||||
|
||||
processIndex();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
processIndex();
|
||||
}
|
||||
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXRjaC9hcHBseS5qcyJdLCJuYW1lcyI6WyJhcHBseVBhdGNoIiwic291cmNlIiwidW5pRGlmZiIsIm9wdGlvbnMiLCJwYXJzZVBhdGNoIiwiQXJyYXkiLCJpc0FycmF5IiwibGVuZ3RoIiwiRXJyb3IiLCJsaW5lcyIsInNwbGl0IiwiZGVsaW1pdGVycyIsIm1hdGNoIiwiaHVua3MiLCJjb21wYXJlTGluZSIsImxpbmVOdW1iZXIiLCJsaW5lIiwib3BlcmF0aW9uIiwicGF0Y2hDb250ZW50IiwiZXJyb3JDb3VudCIsImZ1enpGYWN0b3IiLCJtaW5MaW5lIiwib2Zmc2V0IiwicmVtb3ZlRU9GTkwiLCJhZGRFT0ZOTCIsImh1bmtGaXRzIiwiaHVuayIsInRvUG9zIiwiaiIsImNvbnRlbnQiLCJzdWJzdHIiLCJpIiwibWF4TGluZSIsIm9sZExpbmVzIiwibG9jYWxPZmZzZXQiLCJvbGRTdGFydCIsIml0ZXJhdG9yIiwiZGlzdGFuY2VJdGVyYXRvciIsInVuZGVmaW5lZCIsImRpZmZPZmZzZXQiLCJuZXdMaW5lcyIsImRlbGltaXRlciIsImxpbmVkZWxpbWl0ZXJzIiwic3BsaWNlIiwicHJldmlvdXNPcGVyYXRpb24iLCJwb3AiLCJwdXNoIiwiX2siLCJqb2luIiwiYXBwbHlQYXRjaGVzIiwiY3VycmVudEluZGV4IiwicHJvY2Vzc0luZGV4IiwiaW5kZXgiLCJjb21wbGV0ZSIsImxvYWRGaWxlIiwiZXJyIiwiZGF0YSIsInVwZGF0ZWRDb250ZW50IiwicGF0Y2hlZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBQ0E7QUFBQTtBQUFBO0FBQUE7QUFBQTs7Ozs7QUFFTyxTQUFTQSxVQUFULENBQW9CQyxNQUFwQixFQUE0QkMsT0FBNUIsRUFBbUQ7QUFBQTtBQUFBO0FBQUE7QUFBZEMsRUFBQUEsT0FBYyx1RUFBSixFQUFJOztBQUN4RCxNQUFJLE9BQU9ELE9BQVAsS0FBbUIsUUFBdkIsRUFBaUM7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
Line truncated
|
||||
+247
@@ -0,0 +1,247 @@
|
||||
/*istanbul ignore start*/
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.structuredPatch = structuredPatch;
|
||||
exports.createTwoFilesPatch = createTwoFilesPatch;
|
||||
exports.createPatch = createPatch;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
var
|
||||
/*istanbul ignore start*/
|
||||
_line = require("../diff/line")
|
||||
/*istanbul ignore end*/
|
||||
;
|
||||
|
||||
/*istanbul ignore start*/ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
|
||||
|
||||
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
|
||||
|
||||
function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
|
||||
|
||||
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
|
||||
|
||||
/*istanbul ignore end*/
|
||||
function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
|
||||
if (!options) {
|
||||
options = {};
|
||||
}
|
||||
|
||||
if (typeof options.context === 'undefined') {
|
||||
options.context = 4;
|
||||
}
|
||||
|
||||
var diff =
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_line
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
diffLines)
|
||||
/*istanbul ignore end*/
|
||||
(oldStr, newStr, options);
|
||||
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);
|
||||
var noNlBeforeAdds = lines.length == 0 && curRange.length > hunk.oldLines;
|
||||
|
||||
if (!oldEOFNewline && noNlBeforeAdds) {
|
||||
// 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');
|
||||
}
|
||||
|
||||
if (!oldEOFNewline && !noNlBeforeAdds || !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;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXRjaC9jcmVhdGUuanMiXSwibmFtZXMiOlsic3RydWN0dXJlZFBhdGNoIiwib2xkRmlsZU5hbWUiLCJuZXdGaWxlTmFtZSIsIm9sZFN0ciIsIm5ld1N0ciIsIm9sZEhlYWRlciIsIm5ld0hlYWRlciIsIm9wdGlvbnMiLCJjb250ZXh0IiwiZGlmZiIsImRpZmZMaW5lcyIsInB1c2giLCJ2YWx1ZSIsImxpbmVzIiwiY29udGV4dExpbmVzIiwibWFwIiwiZW50cnkiLCJodW5rcyIsIm9sZFJhbmdlU3RhcnQiLCJuZXdSYW5nZVN0YXJ0IiwiY3VyUmFuZ2UiLCJvbGRMaW5lIiwibmV3TGluZSIsImkiLCJjdXJyZW50IiwicmVwbGFjZSIsInNwbGl0IiwiYWRkZWQiLCJyZW1vdmVkIiwicHJldiIsInNsaWNlIiwibGVuZ3RoIiwiY29udGV4dFNpemUiLCJNYXRoIiwibWluIiwiaHVuayIsIm9sZFN0YXJ0Iiwib2xkTGluZXMiLCJuZXdTdGFydCIsIm5ld0xpbmVzIiwib2xkRU9GTmV3bGluZSIsInRlc3QiLCJuZXdFT0ZOZXdsaW5lIiwibm9ObEJlZm9yZUFkZHMiLCJzcGxpY2UiLCJjcmVhdGVUd29GaWxlc1BhdGNoIiwicmV0IiwiYXBwbHkiLCJqb2luIiwiY3JlYXRlUGF0Y2giLCJmaWxlTmFtZSJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBOzs7Ozs7Ozs7OztBQUVPLFNBQVNBLGVBQVQsQ0FBeUJDLFdBQXpCLEVBQXNDQyxXQUF0QyxFQUFtREMsTUFBbkQsRUFBMkRDLE1BQTNELEVBQW1FQyxTQUFuRSxFQUE4RUMsU0FBOUUsRUFBeUZDLE9BQXpGLEVBQWtHO0FBQ3ZHLE1BQUksQ0FBQ0EsT0FBTCxFQUFjO0FBQ1pBLElBQUFBLE9BQU8sR0FBRyxFQUFWO0FBQ0Q7O0FBQ0QsTUFBSSxPQUFPQSxPQUFPLENBQUNDLE9BQWYsS0FBMkIsV0FBL0IsRUFBNEM7QUFDMUNELElBQUFBLE9BQU8sQ0FB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
Line truncated
|
||||
+609
@@ -0,0 +1,609 @@
|
||||
/*istanbul ignore start*/
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.calcLineCount = calcLineCount;
|
||||
exports.merge = merge;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
var
|
||||
/*istanbul ignore start*/
|
||||
_create = require("./create")
|
||||
/*istanbul ignore end*/
|
||||
;
|
||||
|
||||
var
|
||||
/*istanbul ignore start*/
|
||||
_parse = require("./parse")
|
||||
/*istanbul ignore end*/
|
||||
;
|
||||
|
||||
var
|
||||
/*istanbul ignore start*/
|
||||
_array = require("../util/array")
|
||||
/*istanbul ignore end*/
|
||||
;
|
||||
|
||||
/*istanbul ignore start*/ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
|
||||
|
||||
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
|
||||
|
||||
function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
|
||||
|
||||
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
|
||||
|
||||
/*istanbul ignore end*/
|
||||
function calcLineCount(hunk) {
|
||||
/*istanbul ignore start*/
|
||||
var _calcOldNewLineCount =
|
||||
/*istanbul ignore end*/
|
||||
calcOldNewLineCount(hunk.lines),
|
||||
oldLines = _calcOldNewLineCount.oldLines,
|
||||
newLines = _calcOldNewLineCount.newLines;
|
||||
|
||||
if (oldLines !== undefined) {
|
||||
hunk.oldLines = oldLines;
|
||||
} else {
|
||||
delete hunk.oldLines;
|
||||
}
|
||||
|
||||
if (newLines !== undefined) {
|
||||
hunk.newLines = newLines;
|
||||
} else {
|
||||
delete hunk.newLines;
|
||||
}
|
||||
}
|
||||
|
||||
function merge(mine, theirs, base) {
|
||||
mine = loadPatch(mine, base);
|
||||
theirs = loadPatch(theirs, base);
|
||||
var ret = {}; // For index we just let it pass through as it doesn't have any necessary meaning.
|
||||
// Leaving sanity checks on this to the API consumer that may know more about the
|
||||
// meaning in their own context.
|
||||
|
||||
if (mine.index || theirs.index) {
|
||||
ret.index = mine.index || theirs.index;
|
||||
}
|
||||
|
||||
if (mine.newFileName || theirs.newFileName) {
|
||||
if (!fileNameChanged(mine)) {
|
||||
// No header or no change in ours, use theirs (and ours if theirs does not exist)
|
||||
ret.oldFileName = theirs.oldFileName || mine.oldFileName;
|
||||
ret.newFileName = theirs.newFileName || mine.newFileName;
|
||||
ret.oldHeader = theirs.oldHeader || mine.oldHeader;
|
||||
ret.newHeader = theirs.newHeader || mine.newHeader;
|
||||
} else if (!fileNameChanged(theirs)) {
|
||||
// No header or no change in theirs, use ours
|
||||
ret.oldFileName = mine.oldFileName;
|
||||
ret.newFileName = mine.newFileName;
|
||||
ret.oldHeader = mine.oldHeader;
|
||||
ret.newHeader = mine.newHeader;
|
||||
} else {
|
||||
// Both changed... figure it out
|
||||
ret.oldFileName = selectField(ret, mine.oldFileName, theirs.oldFileName);
|
||||
ret.newFileName = selectField(ret, mine.newFileName, theirs.newFileName);
|
||||
ret.oldHeader = selectField(ret, mine.oldHeader, theirs.oldHeader);
|
||||
ret.newHeader = selectField(ret, mine.newHeader, theirs.newHeader);
|
||||
}
|
||||
}
|
||||
|
||||
ret.hunks = [];
|
||||
var mineIndex = 0,
|
||||
theirsIndex = 0,
|
||||
mineOffset = 0,
|
||||
theirsOffset = 0;
|
||||
|
||||
while (mineIndex < mine.hunks.length || theirsIndex < theirs.hunks.length) {
|
||||
var mineCurrent = mine.hunks[mineIndex] || {
|
||||
oldStart: Infinity
|
||||
},
|
||||
theirsCurrent = theirs.hunks[theirsIndex] || {
|
||||
oldStart: Infinity
|
||||
};
|
||||
|
||||
if (hunkBefore(mineCurrent, theirsCurrent)) {
|
||||
// This patch does not overlap with any of the others, yay.
|
||||
ret.hunks.push(cloneHunk(mineCurrent, mineOffset));
|
||||
mineIndex++;
|
||||
theirsOffset += mineCurrent.newLines - mineCurrent.oldLines;
|
||||
} else if (hunkBefore(theirsCurrent, mineCurrent)) {
|
||||
// This patch does not overlap with any of the others, yay.
|
||||
ret.hunks.push(cloneHunk(theirsCurrent, theirsOffset));
|
||||
theirsIndex++;
|
||||
mineOffset += theirsCurrent.newLines - theirsCurrent.oldLines;
|
||||
} else {
|
||||
// Overlap, merge as best we can
|
||||
var mergedHunk = {
|
||||
oldStart: Math.min(mineCurrent.oldStart, theirsCurrent.oldStart),
|
||||
oldLines: 0,
|
||||
newStart: Math.min(mineCurrent.newStart + mineOffset, theirsCurrent.oldStart + theirsOffset),
|
||||
newLines: 0,
|
||||
lines: []
|
||||
};
|
||||
mergeLines(mergedHunk, mineCurrent.oldStart, mineCurrent.lines, theirsCurrent.oldStart, theirsCurrent.lines);
|
||||
theirsIndex++;
|
||||
mineIndex++;
|
||||
ret.hunks.push(mergedHunk);
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
function loadPatch(param, base) {
|
||||
if (typeof param === 'string') {
|
||||
if (/^@@/m.test(param) || /^Index:/m.test(param)) {
|
||||
return (
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_parse
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
parsePatch)
|
||||
/*istanbul ignore end*/
|
||||
(param)[0]
|
||||
);
|
||||
}
|
||||
|
||||
if (!base) {
|
||||
throw new Error('Must provide a base reference or pass in a patch');
|
||||
}
|
||||
|
||||
return (
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_create
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
structuredPatch)
|
||||
/*istanbul ignore end*/
|
||||
(undefined, undefined, base, param)
|
||||
);
|
||||
}
|
||||
|
||||
return param;
|
||||
}
|
||||
|
||||
function fileNameChanged(patch) {
|
||||
return patch.newFileName && patch.newFileName !== patch.oldFileName;
|
||||
}
|
||||
|
||||
function selectField(index, mine, theirs) {
|
||||
if (mine === theirs) {
|
||||
return mine;
|
||||
} else {
|
||||
index.conflict = true;
|
||||
return {
|
||||
mine: mine,
|
||||
theirs: theirs
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function hunkBefore(test, check) {
|
||||
return test.oldStart < check.oldStart && test.oldStart + test.oldLines < check.oldStart;
|
||||
}
|
||||
|
||||
function cloneHunk(hunk, offset) {
|
||||
return {
|
||||
oldStart: hunk.oldStart,
|
||||
oldLines: hunk.oldLines,
|
||||
newStart: hunk.newStart + offset,
|
||||
newLines: hunk.newLines,
|
||||
lines: hunk.lines
|
||||
};
|
||||
}
|
||||
|
||||
function mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) {
|
||||
// This will generally result in a conflicted hunk, but there are cases where the context
|
||||
// is the only overlap where we can successfully merge the content here.
|
||||
var mine = {
|
||||
offset: mineOffset,
|
||||
lines: mineLines,
|
||||
index: 0
|
||||
},
|
||||
their = {
|
||||
offset: theirOffset,
|
||||
lines: theirLines,
|
||||
index: 0
|
||||
}; // Handle any leading content
|
||||
|
||||
insertLeading(hunk, mine, their);
|
||||
insertLeading(hunk, their, mine); // Now in the overlap content. Scan through and select the best changes from each.
|
||||
|
||||
while (mine.index < mine.lines.length && their.index < their.lines.length) {
|
||||
var mineCurrent = mine.lines[mine.index],
|
||||
theirCurrent = their.lines[their.index];
|
||||
|
||||
if ((mineCurrent[0] === '-' || mineCurrent[0] === '+') && (theirCurrent[0] === '-' || theirCurrent[0] === '+')) {
|
||||
// Both modified ...
|
||||
mutualChange(hunk, mine, their);
|
||||
} else if (mineCurrent[0] === '+' && theirCurrent[0] === ' ') {
|
||||
/*istanbul ignore start*/
|
||||
var _hunk$lines;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
// Mine inserted
|
||||
|
||||
/*istanbul ignore start*/
|
||||
(_hunk$lines =
|
||||
/*istanbul ignore end*/
|
||||
hunk.lines).push.
|
||||
/*istanbul ignore start*/
|
||||
apply
|
||||
/*istanbul ignore end*/
|
||||
(
|
||||
/*istanbul ignore start*/
|
||||
_hunk$lines
|
||||
/*istanbul ignore end*/
|
||||
,
|
||||
/*istanbul ignore start*/
|
||||
_toConsumableArray(
|
||||
/*istanbul ignore end*/
|
||||
collectChange(mine)));
|
||||
} else if (theirCurrent[0] === '+' && mineCurrent[0] === ' ') {
|
||||
/*istanbul ignore start*/
|
||||
var _hunk$lines2;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
// Theirs inserted
|
||||
|
||||
/*istanbul ignore start*/
|
||||
(_hunk$lines2 =
|
||||
/*istanbul ignore end*/
|
||||
hunk.lines).push.
|
||||
/*istanbul ignore start*/
|
||||
apply
|
||||
/*istanbul ignore end*/
|
||||
(
|
||||
/*istanbul ignore start*/
|
||||
_hunk$lines2
|
||||
/*istanbul ignore end*/
|
||||
,
|
||||
/*istanbul ignore start*/
|
||||
_toConsumableArray(
|
||||
/*istanbul ignore end*/
|
||||
collectChange(their)));
|
||||
} else if (mineCurrent[0] === '-' && theirCurrent[0] === ' ') {
|
||||
// Mine removed or edited
|
||||
removal(hunk, mine, their);
|
||||
} else if (theirCurrent[0] === '-' && mineCurrent[0] === ' ') {
|
||||
// Their removed or edited
|
||||
removal(hunk, their, mine, true);
|
||||
} else if (mineCurrent === theirCurrent) {
|
||||
// Context identity
|
||||
hunk.lines.push(mineCurrent);
|
||||
mine.index++;
|
||||
their.index++;
|
||||
} else {
|
||||
// Context mismatch
|
||||
conflict(hunk, collectChange(mine), collectChange(their));
|
||||
}
|
||||
} // Now push anything that may be remaining
|
||||
|
||||
|
||||
insertTrailing(hunk, mine);
|
||||
insertTrailing(hunk, their);
|
||||
calcLineCount(hunk);
|
||||
}
|
||||
|
||||
function mutualChange(hunk, mine, their) {
|
||||
var myChanges = collectChange(mine),
|
||||
theirChanges = collectChange(their);
|
||||
|
||||
if (allRemoves(myChanges) && allRemoves(theirChanges)) {
|
||||
// Special case for remove changes that are supersets of one another
|
||||
if (
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_array
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
arrayStartsWith)
|
||||
/*istanbul ignore end*/
|
||||
(myChanges, theirChanges) && skipRemoveSuperset(their, myChanges, myChanges.length - theirChanges.length)) {
|
||||
/*istanbul ignore start*/
|
||||
var _hunk$lines3;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
(_hunk$lines3 =
|
||||
/*istanbul ignore end*/
|
||||
hunk.lines).push.
|
||||
/*istanbul ignore start*/
|
||||
apply
|
||||
/*istanbul ignore end*/
|
||||
(
|
||||
/*istanbul ignore start*/
|
||||
_hunk$lines3
|
||||
/*istanbul ignore end*/
|
||||
,
|
||||
/*istanbul ignore start*/
|
||||
_toConsumableArray(
|
||||
/*istanbul ignore end*/
|
||||
myChanges));
|
||||
|
||||
return;
|
||||
} else if (
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_array
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
arrayStartsWith)
|
||||
/*istanbul ignore end*/
|
||||
(theirChanges, myChanges) && skipRemoveSuperset(mine, theirChanges, theirChanges.length - myChanges.length)) {
|
||||
/*istanbul ignore start*/
|
||||
var _hunk$lines4;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
(_hunk$lines4 =
|
||||
/*istanbul ignore end*/
|
||||
hunk.lines).push.
|
||||
/*istanbul ignore start*/
|
||||
apply
|
||||
/*istanbul ignore end*/
|
||||
(
|
||||
/*istanbul ignore start*/
|
||||
_hunk$lines4
|
||||
/*istanbul ignore end*/
|
||||
,
|
||||
/*istanbul ignore start*/
|
||||
_toConsumableArray(
|
||||
/*istanbul ignore end*/
|
||||
theirChanges));
|
||||
|
||||
return;
|
||||
}
|
||||
} else if (
|
||||
/*istanbul ignore start*/
|
||||
(0,
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
_array
|
||||
/*istanbul ignore end*/
|
||||
.
|
||||
/*istanbul ignore start*/
|
||||
arrayEqual)
|
||||
/*istanbul ignore end*/
|
||||
(myChanges, theirChanges)) {
|
||||
/*istanbul ignore start*/
|
||||
var _hunk$lines5;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
(_hunk$lines5 =
|
||||
/*istanbul ignore end*/
|
||||
hunk.lines).push.
|
||||
/*istanbul ignore start*/
|
||||
apply
|
||||
/*istanbul ignore end*/
|
||||
(
|
||||
/*istanbul ignore start*/
|
||||
_hunk$lines5
|
||||
/*istanbul ignore end*/
|
||||
,
|
||||
/*istanbul ignore start*/
|
||||
_toConsumableArray(
|
||||
/*istanbul ignore end*/
|
||||
myChanges));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
conflict(hunk, myChanges, theirChanges);
|
||||
}
|
||||
|
||||
function removal(hunk, mine, their, swap) {
|
||||
var myChanges = collectChange(mine),
|
||||
theirChanges = collectContext(their, myChanges);
|
||||
|
||||
if (theirChanges.merged) {
|
||||
/*istanbul ignore start*/
|
||||
var _hunk$lines6;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
|
||||
/*istanbul ignore start*/
|
||||
(_hunk$lines6 =
|
||||
/*istanbul ignore end*/
|
||||
hunk.lines).push.
|
||||
/*istanbul ignore start*/
|
||||
apply
|
||||
/*istanbul ignore end*/
|
||||
(
|
||||
/*istanbul ignore start*/
|
||||
_hunk$lines6
|
||||
/*istanbul ignore end*/
|
||||
,
|
||||
/*istanbul ignore start*/
|
||||
_toConsumableArray(
|
||||
/*istanbul ignore end*/
|
||||
theirChanges.merged));
|
||||
} else {
|
||||
conflict(hunk, swap ? theirChanges : myChanges, swap ? myChanges : theirChanges);
|
||||
}
|
||||
}
|
||||
|
||||
function conflict(hunk, mine, their) {
|
||||
hunk.conflict = true;
|
||||
hunk.lines.push({
|
||||
conflict: true,
|
||||
mine: mine,
|
||||
theirs: their
|
||||
});
|
||||
}
|
||||
|
||||
function insertLeading(hunk, insert, their) {
|
||||
while (insert.offset < their.offset && insert.index < insert.lines.length) {
|
||||
var line = insert.lines[insert.index++];
|
||||
hunk.lines.push(line);
|
||||
insert.offset++;
|
||||
}
|
||||
}
|
||||
|
||||
function insertTrailing(hunk, insert) {
|
||||
while (insert.index < insert.lines.length) {
|
||||
var line = insert.lines[insert.index++];
|
||||
hunk.lines.push(line);
|
||||
}
|
||||
}
|
||||
|
||||
function collectChange(state) {
|
||||
var ret = [],
|
||||
operation = state.lines[state.index][0];
|
||||
|
||||
while (state.index < state.lines.length) {
|
||||
var line = state.lines[state.index]; // Group additions that are immediately after subtractions and treat them as one "atomic" modify change.
|
||||
|
||||
if (operation === '-' && line[0] === '+') {
|
||||
operation = '+';
|
||||
}
|
||||
|
||||
if (operation === line[0]) {
|
||||
ret.push(line);
|
||||
state.index++;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
function collectContext(state, matchChanges) {
|
||||
var changes = [],
|
||||
merged = [],
|
||||
matchIndex = 0,
|
||||
contextChanges = false,
|
||||
conflicted = false;
|
||||
|
||||
while (matchIndex < matchChanges.length && state.index < state.lines.length) {
|
||||
var change = state.lines[state.index],
|
||||
match = matchChanges[matchIndex]; // Once we've hit our add, then we are done
|
||||
|
||||
if (match[0] === '+') {
|
||||
break;
|
||||
}
|
||||
|
||||
contextChanges = contextChanges || change[0] !== ' ';
|
||||
merged.push(match);
|
||||
matchIndex++; // Consume any additions in the other block as a conflict to attempt
|
||||
// to pull in the remaining context after this
|
||||
|
||||
if (change[0] === '+') {
|
||||
conflicted = true;
|
||||
|
||||
while (change[0] === '+') {
|
||||
changes.push(change);
|
||||
change = state.lines[++state.index];
|
||||
}
|
||||
}
|
||||
|
||||
if (match.substr(1) === change.substr(1)) {
|
||||
changes.push(change);
|
||||
state.index++;
|
||||
} else {
|
||||
conflicted = true;
|
||||
}
|
||||
}
|
||||
|
||||
if ((matchChanges[matchIndex] || '')[0] === '+' && contextChanges) {
|
||||
conflicted = true;
|
||||
}
|
||||
|
||||
if (conflicted) {
|
||||
return changes;
|
||||
}
|
||||
|
||||
while (matchIndex < matchChanges.length) {
|
||||
merged.push(matchChanges[matchIndex++]);
|
||||
}
|
||||
|
||||
return {
|
||||
merged: merged,
|
||||
changes: changes
|
||||
};
|
||||
}
|
||||
|
||||
function allRemoves(changes) {
|
||||
return changes.reduce(function (prev, change) {
|
||||
return prev && change[0] === '-';
|
||||
}, true);
|
||||
}
|
||||
|
||||
function skipRemoveSuperset(state, removeChanges, delta) {
|
||||
for (var i = 0; i < delta; i++) {
|
||||
var changeContent = removeChanges[removeChanges.length - delta + i].substr(1);
|
||||
|
||||
if (state.lines[state.index + i] !== ' ' + changeContent) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
state.index += delta;
|
||||
return true;
|
||||
}
|
||||
|
||||
function calcOldNewLineCount(lines) {
|
||||
var oldLines = 0;
|
||||
var newLines = 0;
|
||||
lines.forEach(function (line) {
|
||||
if (typeof line !== 'string') {
|
||||
var myCount = calcOldNewLineCount(line.mine);
|
||||
var theirCount = calcOldNewLineCount(line.theirs);
|
||||
|
||||
if (oldLines !== undefined) {
|
||||
if (myCount.oldLines === theirCount.oldLines) {
|
||||
oldLines += myCount.oldLines;
|
||||
} else {
|
||||
oldLines = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
if (newLines !== undefined) {
|
||||
if (myCount.newLines === theirCount.newLines) {
|
||||
newLines += myCount.newLines;
|
||||
} else {
|
||||
newLines = undefined;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (newLines !== undefined && (line[0] === '+' || line[0] === ' ')) {
|
||||
newLines++;
|
||||
}
|
||||
|
||||
if (oldLines !== undefined && (line[0] === '-' || line[0] === ' ')) {
|
||||
oldLines++;
|
||||
}
|
||||
}
|
||||
});
|
||||
return {
|
||||
oldLines: oldLines,
|
||||
newLines: newLines
|
||||
};
|
||||
}
|
||||
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXRjaC9tZXJnZS5qcyJdLCJuYW1lcyI6WyJjYWxjTGluZUNvdW50IiwiaHVuayIsImNhbGNPbGROZXdMaW5lQ291bnQiLCJsaW5lcyIsIm9sZExpbmVzIiwibmV3TGluZXMiLCJ1bmRlZmluZWQiLCJtZXJnZSIsIm1pbmUiLCJ0aGVpcnMiLCJiYXNlIiwibG9hZFBhdGNoIiwicmV0IiwiaW5kZXgiLCJuZXdGaWxlTmFtZSIsImZpbGVOYW1lQ2hhbmdlZCIsIm9sZEZpbGVOYW1lIiwib2xkSGVhZGVyIiwibmV3SGVhZGVyIiwic2VsZWN0RmllbGQiLCJodW5rcyIsIm1pbmVJbmRleCIsInRoZWlyc0luZGV4IiwibWluZU9mZnNldCIsInRoZWlyc09mZnNldCIsImxlbmd0aCIsIm1pbmVDdXJyZW50Iiwib2xkU3RhcnQiLCJJbmZpbml0eSIsInRoZWlyc0N1cnJlbnQiLCJodW5rQmVmb3JlIiwicHVzaCIsImNsb25lSHVuayIsIm1lcmdlZEh1bmsiLCJNYXRoIiwibWluIiwibmV3U3RhcnQiLCJtZXJnZUxpbmVzIiwicGFyYW0iLCJ0ZXN0IiwicGFyc2VQYXRjaCIsIkVycm9yIiwic3RydWN0dXJlZFBhdGNoIiwicGF0Y2giLCJjb25mbGljdCIsImNoZWNrIiwib2Zmc2V0IiwibWluZUxpbmVzIiwidGhlaXJPZmZzZXQiLCJ0aGVpckxpbmVzIiwidGhlaXIiLCJpbnNlcnRMZWFkaW5nIiwidGhlaXJDdXJyZW50IiwibXV0dWFsQ2hhbmdlIiwiY29sbGVjdENoYW5nZSIsInJlbW92YWwiLCJpbnNlcnRUcmFpbGluZyIsIm15Q2hhbmdlcyIsInRoZWlyQ2hhbmdlcyIsImFsbFJlbW92ZXMiLCJhcnJheVN0YXJ0c1dpdGgiLCJza2lwUmVtb3ZlU3VwZXJzZXQiLCJhcnJheUVxdWFsIiwic3dhcCIsImNvbGxlY3RDb250ZXh0IiwibWVyZ2VkIiwiaW5zZXJ0IiwibGluZSIsInN0YXRlIiwib3BlcmF0aW9uIiwibWF0Y2hDaGFuZ2VzIiwiY2hhbmdlcyIsIm1hdGNoSW5kZXgiLCJjb250ZXh0Q2hhbmdlcyIsImNvbmZsaWN0ZWQiLCJjaGFuZ2UiLCJtYXRjaCIsInN1YnN0ciIsInJlZHVjZSIsInByZXYiLCJyZW1vdmVDaGFuZ2VzIiwiZGVsdGEiLCJpIiwiY2hhbmdlQ29udGVudCIsImZvckVhY2giLCJteUNvdW50IiwidGhlaXJDb3VudCJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBQ0E7QUFBQTtBQUFBO0FBQUE7QUFBQTs7QUFFQTtBQUFBO0FBQUE7QUFBQTtBQUFBOzs7Ozs7Ozs7OztBQUVPLFNBQVNBLGFBQVQsQ0FBdUJDLElBQXZCLEVBQTZCO0FBQUE7QUFBQTtBQUFBO0FBQ0xDLEVBQUFBLG1CQUFtQixDQUFDRCxJQUFJLENBQUNFLEtBQU4sQ0FEZDtBQUFBLE1BQzNCQyxRQUQyQix3QkFDM0JBLFFBRDJCO0FBQUEsTUFDakJDLFFBRGlCLHdCQUNqQkEsUUFEaUI7O0FBR2xDLE1BQUlELFFBQVEsS0FBS0UsU0FBakIsRUFBNEI7QUFDMUJMLElBQUFBLElBQUksQ0FBQ0csUUFBTCxHQUFnQkEsUUFBaEI7QUFDRCxHQUZELE1BRU87QUFDTCxXQUFPSCxJQUFJLENBQUNHLFFBQVo7QUFDRDs7QUFFRCxNQUFJQyxRQUFRLEtBQUtDLFNBQWpCLEVBQTRCO0FBQzFCTCxJQUFBQSxJQUFJLENBQUNJLFFBQUwsR0FBZ0JBLFFBQWhCO0FBQ0QsR0FGRCxNQUVPO0FBQ0wsV0FBT0osSUFBSSxDQUFDSSxRQUFaO0FBQ0Q7QUFDRjs7QUFFTSxTQUFTRSxLQUFULENBQWVDLElBQWYsRUFBcUJDLE1BQXJCLEVBQTZCQyxJQUE3QixFQUFtQztBQUN4Q0YsRUFBQUEsSUFBSSxHQUFHRyxTQUFTLENBQUNILElBQUQsRUFBT0UsSUFBUCxDQUFoQjtBQUNBRCxFQUFBQSxNQUFNLEdBQUdFLFNBQVMsQ0FBQ0YsTUFBRCxFQUFTQyxJQUFULENBQWxCO0FBRUEsTUFBSUUsR0FBRyxHQUFHLEVBQVYsQ0FKd0MsQ0FN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
Line truncated
|
||||
+156
@@ -0,0 +1,156 @@
|
||||
/*istanbul ignore start*/
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.parsePatch = parsePatch;
|
||||
|
||||
/*istanbul ignore end*/
|
||||
function parsePatch(uniDiff) {
|
||||
/*istanbul ignore start*/
|
||||
var
|
||||
/*istanbul ignore end*/
|
||||
options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
||||
var diffstr = uniDiff.split(/\r\n|[\n\v\f\r\x85]/),
|
||||
delimiters = uniDiff.match(/\r\n|[\n\v\f\r\x85]/g) || [],
|
||||
list = [],
|
||||
i = 0;
|
||||
|
||||
function parseIndex() {
|
||||
var index = {};
|
||||
list.push(index); // Parse diff metadata
|
||||
|
||||
while (i < diffstr.length) {
|
||||
var line = diffstr[i]; // File header found, end parsing diff metadata
|
||||
|
||||
if (/^(\-\-\-|\+\+\+|@@)\s/.test(line)) {
|
||||
break;
|
||||
} // Diff index
|
||||
|
||||
|
||||
var headerMatch = /^(?:Index:|diff(?: -r \w+)+)\s+/.exec(line);
|
||||
|
||||
if (headerMatch) {
|
||||
index.index = line.substring(headerMatch[0].length).trim();
|
||||
}
|
||||
|
||||
i++;
|
||||
} // Parse file headers if they are defined. Unified diff requires them, but
|
||||
// there's no technical issues to have an isolated hunk without file header
|
||||
|
||||
|
||||
parseFileHeader(index);
|
||||
parseFileHeader(index); // Parse hunks
|
||||
|
||||
index.hunks = [];
|
||||
|
||||
while (i < diffstr.length) {
|
||||
var _line = diffstr[i];
|
||||
|
||||
if (/^(Index:|diff|\-\-\-|\+\+\+)\s/.test(_line)) {
|
||||
break;
|
||||
} else if (/^@@/.test(_line)) {
|
||||
index.hunks.push(parseHunk());
|
||||
} else if (_line && options.strict) {
|
||||
// Ignore unexpected content unless in strict mode
|
||||
throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(_line));
|
||||
} else {
|
||||
i++;
|
||||
}
|
||||
}
|
||||
} // Parses the --- and +++ headers, if none are found, no lines
|
||||
// are consumed.
|
||||
|
||||
|
||||
function parseFileHeader(index) {
|
||||
var fileHeaderMatch = /^(---|\+\+\+)\s+/.exec(diffstr[i]);
|
||||
|
||||
if (fileHeaderMatch) {
|
||||
var keyPrefix = fileHeaderMatch[1] === '---' ? 'old' : 'new';
|
||||
var data = diffstr[i].substring(3).trim().split('\t', 2);
|
||||
var fileName = data[0].replace(/\\\\/g, '\\');
|
||||
|
||||
if (fileName.startsWith('"') && fileName.endsWith('"')) {
|
||||
fileName = fileName.substr(1, fileName.length - 2);
|
||||
}
|
||||
|
||||
index[keyPrefix + 'FileName'] = fileName;
|
||||
index[keyPrefix + 'Header'] = (data[1] || '').trim();
|
||||
i++;
|
||||
}
|
||||
} // Parses a hunk
|
||||
// This assumes that we are at the start of a hunk.
|
||||
|
||||
|
||||
function parseHunk() {
|
||||
var chunkHeaderIndex = i,
|
||||
chunkHeaderLine = diffstr[i++],
|
||||
chunkHeader = chunkHeaderLine.split(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
|
||||
var hunk = {
|
||||
oldStart: +chunkHeader[1],
|
||||
oldLines: +chunkHeader[2] || 1,
|
||||
newStart: +chunkHeader[3],
|
||||
newLines: +chunkHeader[4] || 1,
|
||||
lines: [],
|
||||
linedelimiters: []
|
||||
};
|
||||
var addCount = 0,
|
||||
removeCount = 0;
|
||||
|
||||
for (; i < diffstr.length; i++) {
|
||||
// Lines starting with '---' could be mistaken for the "remove line" operation
|
||||
// But they could be the header for the next file. Therefore prune such cases out.
|
||||
if (diffstr[i].indexOf('--- ') === 0 && i + 2 < diffstr.length && diffstr[i + 1].indexOf('+++ ') === 0 && diffstr[i + 2].indexOf('@@') === 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
var operation = diffstr[i].length == 0 && i != diffstr.length - 1 ? ' ' : diffstr[i][0];
|
||||
|
||||
if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\') {
|
||||
hunk.lines.push(diffstr[i]);
|
||||
hunk.linedelimiters.push(delimiters[i] || '\n');
|
||||
|
||||
if (operation === '+') {
|
||||
addCount++;
|
||||
} else if (operation === '-') {
|
||||
removeCount++;
|
||||
} else if (operation === ' ') {
|
||||
addCount++;
|
||||
removeCount++;
|
||||
}
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
} // Handle the empty block count case
|
||||
|
||||
|
||||
if (!addCount && hunk.newLines === 1) {
|
||||
hunk.newLines = 0;
|
||||
}
|
||||
|
||||
if (!removeCount && hunk.oldLines === 1) {
|
||||
hunk.oldLines = 0;
|
||||
} // Perform optional sanity checking
|
||||
|
||||
|
||||
if (options.strict) {
|
||||
if (addCount !== hunk.newLines) {
|
||||
throw new Error('Added line count did not match for hunk at line ' + (chunkHeaderIndex + 1));
|
||||
}
|
||||
|
||||
if (removeCount !== hunk.oldLines) {
|
||||
throw new Error('Removed line count did not match for hunk at line ' + (chunkHeaderIndex + 1));
|
||||
}
|
||||
}
|
||||
|
||||
return hunk;
|
||||
}
|
||||
|
||||
while (i < diffstr.length) {
|
||||
parseIndex();
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXRjaC9wYXJzZS5qcyJdLCJuYW1lcyI6WyJwYXJzZVBhdGNoIiwidW5pRGlmZiIsIm9wdGlvbnMiLCJkaWZmc3RyIiwic3BsaXQiLCJkZWxpbWl0ZXJzIiwibWF0Y2giLCJsaXN0IiwiaSIsInBhcnNlSW5kZXgiLCJpbmRleCIsInB1c2giLCJsZW5ndGgiLCJsaW5lIiwidGVzdCIsImhlYWRlck1hdGNoIiwiZXhlYyIsInN1YnN0cmluZyIsInRyaW0iLCJwYXJzZUZpbGVIZWFkZXIiLCJodW5rcyIsInBhcnNlSHVuayIsInN0cmljdCIsIkVycm9yIiwiSlNPTiIsInN0cmluZ2lmeSIsImZpbGVIZWFkZXJNYXRjaCIsImtleVByZWZpeCIsImRhdGEiLCJmaWxlTmFtZSIsInJlcGxhY2UiLCJzdGFydHNXaXRoIiwiZW5kc1dpdGgiLCJzdWJzdHIiLCJjaHVua0hlYWRlckluZGV4IiwiY2h1bmtIZWFkZXJMaW5lIiwiY2h1bmtIZWFkZXIiLCJodW5rIiwib2xkU3RhcnQiLCJvbGRMaW5lcyIsIm5ld1N0YXJ0IiwibmV3TGluZXMiLCJsaW5lcyIsImxpbmVkZWxpbWl0ZXJzIiwiYWRkQ291bnQiLCJyZW1vdmVDb3VudCIsImluZGV4T2YiLCJvcGVyYXRpb24iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFPLFNBQVNBLFVBQVQsQ0FBb0JDLE9BQXBCLEVBQTJDO0FBQUE7QUFBQTtBQUFBO0FBQWRDLEVBQUFBLE9BQWMsdUVBQUosRUFBSTtBQUNoRCxNQUFJQyxPQUFPLEdBQUdGLE9BQU8sQ0FBQ0csS0FBUixDQUFjLHFCQUFkLENBQWQ7QUFBQSxNQUNJQyxVQUFVLEdBQUdKLE9BQU8sQ0FBQ0ssS0FBUixDQUFjLHNCQUFkLEtBQXlDLEVBRDFEO0FBQUEsTUFFSUMsSUFBSSxHQUFHLEVBRlg7QUFBQSxNQUdJQyxDQUFDLEdBQUcsQ0FIUjs7QUFLQSxXQUFTQyxVQUFULEdBQXNCO0FBQ3BCLFFBQUlDLEtBQUssR0FBRyxFQUFaO0FBQ0FILElB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
Line truncated
|
||||
Reference in new issue
Block a user