diff - npm Package Compare versions

Comparing version 2.1.3 to 2.2.0

lib/patch/apply.js

@@ -6,5 +6,12 @@ 'use strict';
 exports.applyPatches = applyPatches;
+// istanbul ignore next
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
 var _parse = require('./parse');
 
+var _utilDistanceIterator = require('../util/distance-iterator');
+
+var _utilDistanceIterator2 = _interopRequireDefault(_utilDistanceIterator);
+
 function applyPatch(source, uniDiff) {
@@ -33,10 +40,11 @@ var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
       fuzzFactor = options.fuzzFactor || 0,
+      minLine = 0,
+      offset = 0,
       removeEOFNL = undefined,
       addEOFNL = undefined;
 
-  for (var i = 0; i < hunks.length; i++) {
-    var hunk = hunks[i],
-        toPos = hunk.newStart - 1;
-
-    // Sanity check the input string. Bail if we don't match.
+  /**
+   * Checks if the hunk exactly fits on the provided location
+   */
+  function hunkFits(hunk, toPos) {
     for (var j = 0; j < hunk.lines.length; j++) {
@@ -46,2 +54,3 @@ var line = hunk.lines[j],
           content = line.substr(1);
+
       if (operation === ' ' || operation === '-') {
@@ -56,4 +65,44 @@ // Context sanity check
         }
+        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 = _utilDistanceIterator2['default'](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
+  for (var i = 0; i < hunks.length; i++) {
+    var hunk = hunks[i],
+        toPos = hunk.offset + hunk.newStart - 1;
+
+    for (var j = 0; j < hunk.lines.length; j++) {
+      var line = hunk.lines[j],
+          operation = line[0],
+          content = line.substr(1);
+
       if (operation === ' ') {
@@ -100,3 +149,3 @@ toPos++;
     if (!index) {
-      options.complete();
+      return options.complete();
     }
@@ -117,2 +166,2 @@
 }
-//# sourceMappingURL=data:application/json;base64,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dkMsZ0JBQVUsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDLENBQUM7S0FDN0IsQ0FBQyxDQUFDO0dBQ0o7QUFDRCxjQUFZLEVBQUUsQ0FBQztDQUNoQiIsImZpbGUiOiJhcHBseS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7cGFyc2VQYXRjaH0gZnJvbSAnLi9wYXJzZSc7XG5cbmV4cG9ydCBmdW5jdGlvbiBhcHBseVBhdGNoKHNvdXJjZSwgdW5pRGlmZiwgb3B0aW9ucyA9IHt9KSB7XG4gIGlmICh0eXBlb2YgdW5pRGlmZiA9PT0gJ3N0cmluZycpIHtcbiAgICB1bmlEaWZmID0gcGFyc2VQYXRjaCh1bmlEaWZmKTtcbiAgfVxuXG4gIGlmIChBcnJheS5pc0FycmF5KHVuaURpZmYpKSB7XG4gICAgaWYgKHVuaURpZmYubGVuZ3RoID4gMSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKCdhcHBseVBhdGNoIG9ubHkgd29ya3Mgd2l0aCBhIHNpbmdsZSBpbnB1dC4nKTtcbiAgICB9XG5cbiAgICB1bmlEaWZmID0gdW5pRGlmZlswXTtcbiAgfVxuXG4gIC8vIEFwcGx5IHRoZSBkaWZmIHRvIHRoZSBpbnB1dFxuICBsZXQgbGluZXMgPSBzb3VyY2Uuc3BsaXQoJ1xcbicpLFxuICAgICAgaHVua3MgPSB1bmlEaWZmLmh1bmtzLFxuXG4gICAgICBjb21wYXJlTGluZSA9IG9wdGlvbnMuY29tcGFyZUxpbmUgfHwgKChsaW5lTnVtYmVyLCBsaW5lLCBvcGVyYXRpb24sIHBhdGNoQ29udGVudCkgPT4gbGluZSA9PT0gcGF0Y2hDb250ZW50KSxcbiAgICAgIGVycm9yQ291bnQgPSAwLFxuICAgICAgZnV6ekZhY3RvciA9IG9wdGlvbnMuZnV6ekZhY3RvciB8fCAwLFxuXG4gICAgICByZW1vdmVFT0ZOTCxcbiAgICAgIGFkZEVPRk5MO1xuXG4gIGZvciAobGV0IGkgPSAwOyBpIDwgaHVua3MubGVuZ3RoOyBpKyspIHtcbiAgICBsZXQgaHVuayA9IGh1bmtzW2ldLFxuICAgICAgICB0b1BvcyA9IGh1bmsubmV3U3RhcnQgLSAxO1xuXG4gICAgLy8gU2FuaXR5IGNoZWNrIHRoZSBpbnB1dCBzdHJpbmcuIEJhaWwgaWYgd2UgZG9uJ3QgbWF0Y2guXG4gICAgZm9yIChsZXQgaiA9IDA7IGogPCBodW5rLmxpbmVzLmxlbmd0aDsgaisrKSB7XG4gICAgICBsZXQgbGluZSA9IGh1bmsubGluZXNbal0sXG4gICAgICAgICAgb3BlcmF0aW9uID0gbGluZVswXSxcbiAgICAgICAgICBjb250ZW50ID0gbGluZS5zdWJzdHIoMSk7XG4gICAgICBpZiAob3BlcmF0aW9uID09PSAnICcgfHwgb3BlcmF0aW9uID09PSAnLScpIHtcbiAgICAgICAgLy8gQ29udGV4dCBzYW5pdHkgY2hlY2tcbiAgICAgICAgaWYgKCFjb21wYXJlTGluZSh0b1BvcyArIDEsIGxpbmVzW3RvUG9zXSwgb3BlcmF0aW9uLCBjb250ZW50KSkge1xuICAgICAgICAgIGVycm9yQ291bnQrKztcblxuICAgICAgICAgIGlmIChlcnJvckNvdW50ID4gZnV6ekZhY3Rvcikge1xuICAgICAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgfVxuXG4gICAgICBpZiAob3BlcmF0aW9uID09PSAnICcpIHtcbiAgICAgICAgdG9Qb3MrKztcbiAgICAgIH0gZWxzZSBpZiAob3BlcmF0aW9uID09PSAnLScpIHtcbiAgICAgICAgbGluZXMuc3BsaWNlKHRvUG9zLCAxKTtcbiAgICAgIC8qIGlzdGFuYnVsIGlnbm9yZSBlbHNlICovXG4gICAgICB9IGVsc2UgaWYgKG9wZXJhdGlvbiA9PT0gJysnKSB7XG4gICAgICAgIGxpbmVzLnNwbGljZSh0b1BvcywgMCwgY29udGVudCk7XG4gICAgICAgIHRvUG9zKys7XG4gICAgICB9IGVsc2UgaWYgKG9wZXJhdGlvbiA9PT0gJ1xcXFwnKSB7XG4gICAgICAgIGxldCBwcmV2aW91c09wZXJhdGlvbiA9IGh1bmsubGluZXNbaiAtIDFdID8gaHVuay5saW5lc1tqIC0gMV1bMF0gOiBudWxsO1xuICAgICAgICBpZiAocHJldmlvdXNPcGVyYXRpb24gPT09ICcrJykge1xuICAgICAgICAgIHJlbW92ZUVPRk5MID0gdHJ1ZTtcbiAgICAgICAgfSBlbHNlIGlmIChwcmV2aW91c09wZXJhdGlvbiA9PT0gJy0nKSB7XG4gICAgICAgICAgYWRkRU9GTkwgPSB0cnVlO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgLy8gSGFuZGxlIEVPRk5MIGluc2VydGlvbi9yZW1vdmFsXG4gIGlmIChyZW1vdmVFT0ZOTCkge1xuICAgIHdoaWxlICghbGluZXNbbGluZXMubGVuZ3RoIC0gMV0pIHtcbiAgICAgIGxpbmVzLnBvcCgpO1xuICAgIH1cbiAgfSBlbHNlIGlmIChhZGRFT0ZOTCkge1xuICAgIGxpbmVzLnB1c2goJycpO1xuICB9XG4gIHJldHVybiBsaW5lcy5qb2luKCdcXG4nKTtcbn1cblxuLy8gV3JhcHBlciB0aGF0IHN1cHBvcnRzIG11bHRpcGxlIGZpbGUgcGF0Y2hlcyB2aWEgY2FsbGJhY2tzLlxuZXhwb3J0IGZ1bmN0aW9uIGFwcGx5UGF0Y2hlcyh1bmlEaWZmLCBvcHRpb25zKSB7XG4gIGlmICh0eXBlb2YgdW5pRGlmZiA9PT0gJ3N0cmluZycpIHtcbiAgICB1bmlEaWZmID0gcGFyc2VQYXRjaCh1bmlEaWZmKTtcbiAgfVxuXG4gIGxldCBjdXJyZW50SW5kZXggPSAwO1xuICBmdW5jdGlvbiBwcm9jZXNzSW5kZXgoKSB7XG4gICAgbGV0IGluZGV4ID0gdW5pRGlmZltjdXJyZW50SW5kZXgrK107XG4gICAgaWYgKCFpbmRleCkge1xuICAgICAgb3B0aW9ucy5jb21wbGV0ZSgpO1xuICAgIH1cblxuICAgIG9wdGlvbnMubG9hZEZpbGUoaW5kZXgsIGZ1bmN0aW9uKGVyciwgZGF0YSkge1xuICAgICAgaWYgKGVycikge1xuICAgICAgICByZXR1cm4gb3B0aW9ucy5jb21wbGV0ZShlcnIpO1xuICAgICAgfVxuXG4gICAgICBsZXQgdXBkYXRlZENvbnRlbnQgPSBhcHBseVBhdGNoKGRhdGEsIGluZGV4LCBvcHRpb25zKTtcbiAgICAgIG9wdGlvbnMucGF0Y2hlZChpbmRleCwgdXBkYXRlZENvbnRlbnQpO1xuXG4gICAgICBzZXRUaW1lb3V0KHByb2Nlc3NJbmRleCwgMCk7XG4gICAgfSk7XG4gIH1cbiAgcHJvY2Vzc0luZGV4KCk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/patch/apply.js"],"names":[],"mappings":"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","file":"apply.js","sourcesContent":["import {parsePatch} from './parse';\nimport distanceIterator from '../util/distance-iterator';\n\nexport function applyPatch(source, uniDiff, options = {}) {\n  if (typeof uniDiff === 'string') {\n    uniDiff = parsePatch(uniDiff);\n  }\n\n  if (Array.isArray(uniDiff)) {\n    if (uniDiff.length > 1) {\n      throw new Error('applyPatch only works with a single input.');\n    }\n\n    uniDiff = uniDiff[0];\n  }\n\n  // Apply the diff to the input\n  let lines = source.split('\\n'),\n      hunks = uniDiff.hunks,\n\n      compareLine = options.compareLine || ((lineNumber, line, operation, patchContent) => line === patchContent),\n      errorCount = 0,\n      fuzzFactor = options.fuzzFactor || 0,\n      minLine = 0,\n      offset = 0,\n\n      removeEOFNL,\n      addEOFNL;\n\n  /**\n   * Checks if the hunk exactly fits on the provided location\n   */\n  function hunkFits(hunk, toPos) {\n    for (let j = 0; j < hunk.lines.length; j++) {\n      let line = hunk.lines[j],\n          operation = line[0],\n          content = line.substr(1);\n\n      if (operation === ' ' || operation === '-') {\n        // Context sanity check\n        if (!compareLine(toPos + 1, lines[toPos], operation, content)) {\n          errorCount++;\n\n          if (errorCount > fuzzFactor) {\n            return false;\n          }\n        }\n        toPos++;\n      }\n    }\n\n    return true;\n  }\n\n  // Search best fit offsets for each hunk based on the previous ones\n  for (let i = 0; i < hunks.length; i++) {\n    let hunk = hunks[i],\n        maxLine = lines.length - hunk.oldLines,\n        localOffset = 0,\n        toPos = offset + hunk.oldStart - 1;\n\n    let iterator = distanceIterator(toPos, minLine, maxLine);\n\n    for (; localOffset !== undefined; localOffset = iterator()) {\n      if (hunkFits(hunk, toPos + localOffset)) {\n        hunk.offset = offset += localOffset;\n        break;\n      }\n    }\n\n    if (localOffset === undefined) {\n      return false;\n    }\n\n    // Set lower text limit to end of the current hunk, so next ones don't try\n    // to fit over already patched text\n    minLine = hunk.offset + hunk.oldStart + hunk.oldLines;\n  }\n\n  // Apply patch hunks\n  for (let i = 0; i < hunks.length; i++) {\n    let hunk = hunks[i],\n        toPos = hunk.offset + hunk.newStart - 1;\n\n    for (let j = 0; j < hunk.lines.length; j++) {\n      let line = hunk.lines[j],\n          operation = line[0],\n          content = line.substr(1);\n\n      if (operation === ' ') {\n        toPos++;\n      } else if (operation === '-') {\n        lines.splice(toPos, 1);\n      /* istanbul ignore else */\n      } else if (operation === '+') {\n        lines.splice(toPos, 0, content);\n        toPos++;\n      } else if (operation === '\\\\') {\n        let previousOperation = hunk.lines[j - 1] ? hunk.lines[j - 1][0] : null;\n        if (previousOperation === '+') {\n          removeEOFNL = true;\n        } else if (previousOperation === '-') {\n          addEOFNL = true;\n        }\n      }\n    }\n  }\n\n  // Handle EOFNL insertion/removal\n  if (removeEOFNL) {\n    while (!lines[lines.length - 1]) {\n      lines.pop();\n    }\n  } else if (addEOFNL) {\n    lines.push('');\n  }\n  return lines.join('\\n');\n}\n\n// Wrapper that supports multiple file patches via callbacks.\nexport function applyPatches(uniDiff, options) {\n  if (typeof uniDiff === 'string') {\n    uniDiff = parsePatch(uniDiff);\n  }\n\n  let currentIndex = 0;\n  function processIndex() {\n    let index = uniDiff[currentIndex++];\n    if (!index) {\n      return options.complete();\n    }\n\n    options.loadFile(index, function(err, data) {\n      if (err) {\n        return options.complete(err);\n      }\n\n      let updatedContent = applyPatch(data, index, options);\n      options.patched(index, updatedContent);\n\n      setTimeout(processIndex, 0);\n    });\n  }\n  processIndex();\n}\n"]}

lib/patch/parse.js

@@ -19,3 +19,3 @@ 'use strict';
     while (i < diffstr.length) {
-      if (/^Index:/.test(diffstr[i]) || /^@@/.test(diffstr[i])) {
+      if (/^(Index:|diff -r|@@)/.test(diffstr[i])) {
         break;
@@ -26,3 +26,3 @@ }
 
-    var header = /^Index: (.*)/.exec(diffstr[i]);
+    var header = /^(?:Index:|diff(?: -r \w+)+) (.*)/.exec(diffstr[i]);
     if (header) {
@@ -47,3 +47,3 @@ index.index = header[1];
     while (i < diffstr.length) {
-      if (/^Index:/.test(diffstr[i])) {
+      if (/^(Index:|diff -r)/.test(diffstr[i])) {
         break;
@@ -137,2 +137,2 @@ } else if (/^@@/.test(diffstr[i])) {
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/patch/parse.js"],"names":[],"mappings":"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","file":"parse.js","sourcesContent":["export function parsePatch(uniDiff, options = {}) {\n  let diffstr = uniDiff.split('\\n'),\n      list = [],\n      i = 0;\n\n  function parseIndex() {\n    let index = {};\n    list.push(index);\n\n    // Ignore any leading junk\n    while (i < diffstr.length) {\n      if ((/^Index:/.test(diffstr[i])) || (/^@@/.test(diffstr[i]))) {\n        break;\n      }\n      i++;\n    }\n\n    let header = (/^Index: (.*)/.exec(diffstr[i]));\n    if (header) {\n      index.index = header[1];\n      i++;\n\n      if (/^===/.test(diffstr[i])) {\n        i++;\n      }\n\n      parseFileHeader(index);\n      parseFileHeader(index);\n    } else {\n      // Ignore erant header components that might occur at the start of the file\n      parseFileHeader({});\n      parseFileHeader({});\n    }\n\n    index.hunks = [];\n\n    while (i < diffstr.length) {\n      if (/^Index:/.test(diffstr[i])) {\n        break;\n      } else if (/^@@/.test(diffstr[i])) {\n        index.hunks.push(parseHunk());\n      } else if (diffstr[i] && options.strict) {\n        // Ignore unexpected content unless in strict mode\n        throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(diffstr[i]));\n      } else {\n        i++;\n      }\n    }\n  }\n\n  // Parses the --- and +++ headers, if none are found, no lines\n  // are consumed.\n  function parseFileHeader(index) {\n    let fileHeader = (/^(\\-\\-\\-|\\+\\+\\+)\\s(\\S+)\\s?(.*)/.exec(diffstr[i]));\n    if (fileHeader) {\n      let keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';\n      index[keyPrefix + 'FileName'] = fileHeader[2];\n      index[keyPrefix + 'Header'] = fileHeader[3];\n\n      i++;\n    }\n  }\n\n  // Parses a hunk\n  // This assumes that we are at the start of a hunk.\n  function parseHunk() {\n    let chunkHeaderIndex = i,\n        chunkHeaderLine = diffstr[i++],\n        chunkHeader = chunkHeaderLine.split(/@@ -(\\d+)(?:,(\\d+))? \\+(\\d+)(?:,(\\d+))? @@/);\n\n    let hunk = {\n      oldStart: +chunkHeader[1],\n      oldLines: +chunkHeader[2] || 1,\n      newStart: +chunkHeader[3],\n      newLines: +chunkHeader[4] || 1,\n      lines: []\n    };\n\n    let addCount = 0,\n        removeCount = 0;\n    for (; i < diffstr.length; i++) {\n      let operation = diffstr[i][0];\n\n      if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\\\') {\n        hunk.lines.push(diffstr[i]);\n\n        if (operation === '+') {\n          addCount++;\n        } else if (operation === '-') {\n          removeCount++;\n        } else if (operation === ' ') {\n          addCount++;\n          removeCount++;\n        }\n      } else {\n        break;\n      }\n    }\n\n    // Handle the empty block count case\n    if (!addCount && hunk.newLines === 1) {\n      hunk.newLines = 0;\n    }\n    if (!removeCount && hunk.oldLines === 1) {\n      hunk.oldLines = 0;\n    }\n\n    // Perform optional sanity checking\n    if (options.strict) {\n      if (addCount !== hunk.newLines) {\n        throw new Error('Added line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n      }\n      if (removeCount !== hunk.oldLines) {\n        throw new Error('Removed line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n      }\n    }\n\n    return hunk;\n  }\n\n  while (i < diffstr.length) {\n    parseIndex();\n  }\n\n  return list;\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/patch/parse.js"],"names":[],"mappings":"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","file":"parse.js","sourcesContent":["export function parsePatch(uniDiff, options = {}) {\n  let diffstr = uniDiff.split('\\n'),\n      list = [],\n      i = 0;\n\n  function parseIndex() {\n    let index = {};\n    list.push(index);\n\n    // Ignore any leading junk\n    while (i < diffstr.length) {\n      if (/^(Index:|diff -r|@@)/.test(diffstr[i])) {\n        break;\n      }\n      i++;\n    }\n\n    let header = (/^(?:Index:|diff(?: -r \\w+)+) (.*)/.exec(diffstr[i]));\n    if (header) {\n      index.index = header[1];\n      i++;\n\n      if (/^===/.test(diffstr[i])) {\n        i++;\n      }\n\n      parseFileHeader(index);\n      parseFileHeader(index);\n    } else {\n      // Ignore erant header components that might occur at the start of the file\n      parseFileHeader({});\n      parseFileHeader({});\n    }\n\n    index.hunks = [];\n\n    while (i < diffstr.length) {\n      if (/^(Index:|diff -r)/.test(diffstr[i])) {\n        break;\n      } else if (/^@@/.test(diffstr[i])) {\n        index.hunks.push(parseHunk());\n      } else if (diffstr[i] && options.strict) {\n        // Ignore unexpected content unless in strict mode\n        throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(diffstr[i]));\n      } else {\n        i++;\n      }\n    }\n  }\n\n  // Parses the --- and +++ headers, if none are found, no lines\n  // are consumed.\n  function parseFileHeader(index) {\n    let fileHeader = (/^(\\-\\-\\-|\\+\\+\\+)\\s(\\S+)\\s?(.*)/.exec(diffstr[i]));\n    if (fileHeader) {\n      let keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';\n      index[keyPrefix + 'FileName'] = fileHeader[2];\n      index[keyPrefix + 'Header'] = fileHeader[3];\n\n      i++;\n    }\n  }\n\n  // Parses a hunk\n  // This assumes that we are at the start of a hunk.\n  function parseHunk() {\n    let chunkHeaderIndex = i,\n        chunkHeaderLine = diffstr[i++],\n        chunkHeader = chunkHeaderLine.split(/@@ -(\\d+)(?:,(\\d+))? \\+(\\d+)(?:,(\\d+))? @@/);\n\n    let hunk = {\n      oldStart: +chunkHeader[1],\n      oldLines: +chunkHeader[2] || 1,\n      newStart: +chunkHeader[3],\n      newLines: +chunkHeader[4] || 1,\n      lines: []\n    };\n\n    let addCount = 0,\n        removeCount = 0;\n    for (; i < diffstr.length; i++) {\n      let operation = diffstr[i][0];\n\n      if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\\\') {\n        hunk.lines.push(diffstr[i]);\n\n        if (operation === '+') {\n          addCount++;\n        } else if (operation === '-') {\n          removeCount++;\n        } else if (operation === ' ') {\n          addCount++;\n          removeCount++;\n        }\n      } else {\n        break;\n      }\n    }\n\n    // Handle the empty block count case\n    if (!addCount && hunk.newLines === 1) {\n      hunk.newLines = 0;\n    }\n    if (!removeCount && hunk.oldLines === 1) {\n      hunk.oldLines = 0;\n    }\n\n    // Perform optional sanity checking\n    if (options.strict) {\n      if (addCount !== hunk.newLines) {\n        throw new Error('Added line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n      }\n      if (removeCount !== hunk.oldLines) {\n        throw new Error('Removed line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n      }\n    }\n\n    return hunk;\n  }\n\n  while (i < diffstr.length) {\n    parseIndex();\n  }\n\n  return list;\n}\n"]}

package.json

 {
   "name": "diff",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "description": "A javascript text diff implementation.",
@@ -30,24 +30,24 @@ "keywords": [
   "devDependencies": {
-    "async": "^1.4.0",
-    "babel": "^5.8.20",
-    "babel-core": "^5.8.20",
+    "async": "^1.4.2",
+    "babel": "^5.8.23",
+    "babel-core": "^5.8.25",
     "babel-loader": "^5.3.2",
-    "chai": "^3.2.0",
-    "colors": "^1.1.0",
-    "eslint": "^1.0.0",
+    "chai": "^3.3.0",
+    "colors": "^1.1.2",
+    "eslint": "^1.6.0",
     "grunt": "^0.4.5",
-    "grunt-babel": "^5.0.1",
+    "grunt-babel": "^5.0.3",
     "grunt-clean": "^0.4.0",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-copy": "^0.8.0",
-    "grunt-contrib-uglify": "^0.9.1",
+    "grunt-contrib-copy": "^0.8.1",
+    "grunt-contrib-uglify": "^0.9.2",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-eslint": "^17.0.0",
-    "grunt-karma": "^0.12.0",
-    "grunt-mocha-istanbul": "^2.4.0",
+    "grunt-eslint": "^17.3.1",
+    "grunt-karma": "^0.12.1",
+    "grunt-mocha-istanbul": "^3.0.1",
     "grunt-mocha-test": "^0.12.7",
     "grunt-webpack": "^1.0.11",
-    "istanbul": "^0.3.2",
-    "karma": "^0.13.8",
+    "istanbul": "^0.3.22",
+    "karma": "^0.13.11",
     "karma-mocha": "^0.2.0",
@@ -57,11 +57,11 @@ "karma-mocha-reporter": "^1.1.1",
     "karma-sauce-launcher": "^0.2.14",
-    "karma-sourcemap-loader": "^0.3.5",
+    "karma-sourcemap-loader": "^0.3.6",
     "karma-webpack": "^1.7.0",
-    "mocha": "^2.2.4",
-    "phantomjs": "^1.9.17",
-    "semver": "^5.0.1",
-    "webpack": "^1.10.5",
-    "webpack-dev-server": "^1.10.1"
+    "mocha": "^2.3.3",
+    "phantomjs": "^1.9.18",
+    "semver": "^5.0.3",
+    "webpack": "^1.12.2",
+    "webpack-dev-server": "^1.12.0"
   },
   "optionalDependencies": {}
 }

README.md

@@ -110,3 +110,3 @@ # jsdiff
 
-    Return a JSON object representation of the a patch, suitable for use with the `applyPath` method. This parses to the same structure returned by `JsDiff.structuredPatch`.
+    Return a JSON object representation of the a patch, suitable for use with the `applyPatch` method. This parses to the same structure returned by `JsDiff.structuredPatch`.
 
@@ -113,0 +113,0 @@ * `convertChangesToXML(changes)` - converts a list of changes to a serialized XML format

release-notes.md

@@ -5,4 +5,14 @@ # Release Notes
 
-[Commits](https://github.com/kpdecker/jsdiff/compare/v2.1.3...master)
+[Commits](https://github.com/kpdecker/jsdiff/compare/v2.2.0...master)
 
+## v2.2.0 - October 29th, 2015
+- [#80](https://github.com/kpdecker/jsdiff/pull/80) - Fix a typo: applyPath ->  applyPatch ([@fluxxu](https://api.github.com/users/fluxxu))
+- [#83](https://github.com/kpdecker/jsdiff/pull/83) - Add basic fuzzy matching to applyPatch ([@piranna](https://github.com/piranna))
+[Commits](https://github.com/kpdecker/jsdiff/compare/v2.2.0...v2.2.0)
+
+## v2.2.0 - October 29th, 2015
+- [#80](https://github.com/kpdecker/jsdiff/pull/80) - Fix a typo: applyPath ->  applyPatch ([@fluxxu](https://api.github.com/users/fluxxu))
+- [#83](https://github.com/kpdecker/jsdiff/pull/83) - Add basic fuzzy matching to applyPatch ([@piranna](https://github.com/piranna))
+[Commits](https://github.com/kpdecker/jsdiff/compare/v2.1.3...v2.2.0)
+
 ## v2.1.3 - September 30th, 2015
@@ -9,0 +19,0 @@ - [#78](https://github.com/kpdecker/jsdiff/pull/78) - fix: error throwing when apply patch to empty string ([@21paradox](https://api.github.com/users/21paradox))

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

314261

increased by11.95%

Number of package files

28

increased by7.69%

Lines of code

3089

increased by9.69%

No dependency changes