Merge pull request #14 from rtfpessoa/merge-npm

Merge npm package

.gitignore

@@ -14,3 +14,10 @@
 # Maven
 log/
 target/
+
+# Node
+node_modules/
+npm-debug.log
+
+# Bower
+bower_components/

README.md

@@ -22,7 +22,9 @@ Diff to Html generates pretty HTML diffs from git word diff output.
 
 * [Node Module](https://www.npmjs.org/package/diff2html)
 
-* Manually download and import `diff2html.js` into your page
+* [Bower Package](http://bower.io/search/?q=diff2html)
+
+* Manually download and import `dist/diff2html.min.js` into your page
 
 ## How to use
 

bin/diff2html

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require("../src/diff2html.js");

bower.json

@@ -2,15 +2,7 @@
   "name": "diff2html",
   "version": "0.2.5",
   "homepage": "https://github.com/rtfpessoa/diff2html",
-  "authors": [
-    "Rodrigo Fernandes <rtfrodrigo@gmail.com>"
-  ],
-  "repository": {
-  "type": "git",
-  "url": "git://github.com/rtfpessoa/diff2html.git"
-  },
   "description": "Fast Diff to colorized HTML",
-  "main": "./src/diff2html.js",
   "keywords": [
     "git",
     "diff",
@@ -28,12 +20,37 @@
     "difftohtml",
     "colorized"
   ],
+
+  "authors": [
+    "Rodrigo Fernandes <rtfrodrigo@gmail.com>"
+  ],
+
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/rtfpessoa/diff2html.git"
+  },
+
+  "main": "./src/diff2html.js",
+
   "license": "MIT",
+
+  "moduleType": [
+    "globals",
+    "node"
+  ],
+
+  "dependencies": {
+    "jsdiff": ">= 1.4.0"
+  },
+
   "ignore": [
     "**/.*",
     "node_modules",
     "bower_components",
     "test",
-    "tests"
+    "tests",
+    "bin",
+    "package.json",
+    "release.sh"
   ]
 }

dist/diff2html.js

@@ -17,13 +17,10 @@ function require() {
  * These methods are based on the implementation proposed in
  * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
  * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
- *
- * AUTHOR: https://github.com/kpdecker/jsdiff
  */
 (function (global, undefined) {
+  var objectPrototypeToString = Object.prototype.toString;
 
-  var JsDiff = (function() {
-    /*jshint maxparams: 5*/
   /*istanbul ignore next*/
   function map(arr, mapper, that) {
     if (Array.prototype.map) {
@@ -37,9 +34,11 @@ function require() {
     }
     return other;
   }
+
   function clonePath(path) {
     return {newPos: path.newPos, components: path.components.slice(0)};
   }
+
   function removeEmpty(array) {
     var ret = [];
     for (var i = 0; i < array.length; i++) {
@@ -49,6 +48,7 @@ function require() {
     }
     return ret;
   }
+
   function escapeHTML(s) {
     var n = s;
     n = n.replace(/&/g, '&amp;');
@@ -59,6 +59,53 @@ function require() {
     return n;
   }
 
+  // This function handles the presence of circular references by bailing out when encountering an
+  // object that is already on the "stack" of items being processed.
+  function canonicalize(obj, stack, replacementStack) {
+    stack = stack || [];
+    replacementStack = replacementStack || [];
+
+    var i;
+
+    for (i = 0; i < stack.length; i += 1) {
+      if (stack[i] === obj) {
+        return replacementStack[i];
+      }
+    }
+
+    var canonicalizedObj;
+
+    if ('[object Array]' === objectPrototypeToString.call(obj)) {
+      stack.push(obj);
+      canonicalizedObj = new Array(obj.length);
+      replacementStack.push(canonicalizedObj);
+      for (i = 0; i < obj.length; i += 1) {
+        canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack);
+      }
+      stack.pop();
+      replacementStack.pop();
+    } else if (typeof obj === 'object' && obj !== null) {
+      stack.push(obj);
+      canonicalizedObj = {};
+      replacementStack.push(canonicalizedObj);
+      var sortedKeys = [],
+        key;
+      for (key in obj) {
+        sortedKeys.push(key);
+      }
+      sortedKeys.sort();
+      for (i = 0; i < sortedKeys.length; i += 1) {
+        key = sortedKeys[i];
+        canonicalizedObj[key] = canonicalize(obj[key], stack, replacementStack);
+      }
+      stack.pop();
+      replacementStack.pop();
+    } else {
+      canonicalizedObj = obj;
+    }
+    return canonicalizedObj;
+  }
+
   function buildValues(components, newString, oldString, useLongestToken) {
     var componentPos = 0,
       componentLen = components.length,
@@ -88,22 +135,34 @@ function require() {
       } else {
         component.value = oldString.slice(oldPos, oldPos + component.count).join('');
         oldPos += component.count;
+
+        // Reverse add and remove so removes are output first to match common convention
+        // The diffing algorithm is tied to add then remove output and this is the simplest
+        // route to get the desired output with minimal overhead.
+        if (componentPos && components[componentPos - 1].added) {
+          var tmp = components[componentPos - 1];
+          components[componentPos - 1] = components[componentPos];
+          components[componentPos] = tmp;
+        }
       }
     }
 
     return components;
   }
 
-    var Diff = function(ignoreWhitespace) {
+  function Diff(ignoreWhitespace) {
     this.ignoreWhitespace = ignoreWhitespace;
-    };
+  }
+
   Diff.prototype = {
     diff: function (oldString, newString, callback) {
       var self = this;
 
       function done(value) {
         if (callback) {
-            setTimeout(function() { callback(undefined, value); }, 0);
+          setTimeout(function () {
+            callback(undefined, value);
+          }, 0);
           return true;
         } else {
           return value;
@@ -125,6 +184,7 @@ function require() {
       oldString = this.tokenize(oldString);
 
       var newLen = newString.length, oldLen = oldString.length;
+      var editLength = 1;
       var maxEditLength = newLen + oldLen;
       var bestPath = [{newPos: -1, components: []}];
 
@@ -140,15 +200,15 @@ function require() {
         for (var diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {
           var basePath;
           var addPath = bestPath[diagonalPath - 1],
-              removePath = bestPath[diagonalPath+1];
+            removePath = bestPath[diagonalPath + 1],
             oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
           if (addPath) {
             // No one else is going to attempt to use this value, clear it
             bestPath[diagonalPath - 1] = undefined;
           }
 
-            var canAdd = addPath && addPath.newPos+1 < newLen;
+          var canAdd = addPath && addPath.newPos + 1 < newLen,
-            var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
+            canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
           if (!canAdd && !canRemove) {
             // If this path is a terminal then prune
             bestPath[diagonalPath] = undefined;
@@ -167,7 +227,7 @@ function require() {
             self.pushComponent(basePath.components, true, undefined);
           }
 
-            var oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);
+          oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);
 
           // If we have hit the end of both strings, then we are done
           if (basePath.newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
@@ -184,7 +244,6 @@ function require() {
       // Performs the length of edit iteration. Is a bit fugly as this has to support the
       // sync and async mode which is never fun. Loops over execEditLength until a value
       // is produced.
-        var editLength = 1;
       if (callback) {
         (function exec() {
           setTimeout(function () {
@@ -198,7 +257,7 @@ function require() {
               exec();
             }
           }, 0);
-          })();
+        }());
       } else {
         while (editLength <= maxEditLength) {
           var ret = execEditLength();
@@ -273,12 +332,12 @@ function require() {
     for (var i = 0; i < lines.length; i++) {
       var line = lines[i],
         lastLine = lines[i - 1],
-          lastLineLastChar = lastLine ? lastLine[lastLine.length - 1] : '';
+        lastLineLastChar = lastLine && lastLine[lastLine.length - 1];
 
       // Merge lines that may contain windows new lines
       if (line === '\n' && lastLineLastChar === '\r') {
         retLines[retLines.length - 1] = retLines[retLines.length - 1].slice(0, -1) + '\r\n';
-        } else if (line) {
+      } else {
         if (this.ignoreTrim) {
           line = line.trim();
           // add a newline unless this is the last line.
@@ -293,6 +352,28 @@ function require() {
     return retLines;
   };
 
+  var PatchDiff = new Diff();
+  PatchDiff.tokenize = function (value) {
+    var ret = [],
+      linesAndNewlines = value.split(/(\n|\r\n)/);
+
+    // Ignore the final empty token that occurs if the string ends with a new line
+    if (!linesAndNewlines[linesAndNewlines.length - 1]) {
+      linesAndNewlines.pop();
+    }
+
+    // Merge the content and line separators into single tokens
+    for (var i = 0; i < linesAndNewlines.length; i++) {
+      var line = linesAndNewlines[i];
+
+      if (i % 2) {
+        ret[ret.length - 1] += line;
+      } else {
+        ret.push(line);
+      }
+    }
+    return ret;
+  };
 
   var SentenceDiff = new Diff();
   SentenceDiff.tokenize = function (value) {
@@ -308,66 +389,32 @@ function require() {
     return LineDiff.equals(left.replace(/,([\r\n])/g, '$1'), right.replace(/,([\r\n])/g, '$1'));
   };
 
-    var objectPrototypeToString = Object.prototype.toString;
+  var JsDiff = {
-
-    // This function handles the presence of circular references by bailing out when encountering an
-    // object that is already on the "stack" of items being processed.
-    function canonicalize(obj, stack, replacementStack) {
-      stack = stack || [];
-      replacementStack = replacementStack || [];
-
-      var i;
-
-      for (var i = 0 ; i < stack.length ; i += 1) {
-        if (stack[i] === obj) {
-          return replacementStack[i];
-        }
-      }
-
-      var canonicalizedObj;
-
-      if ('[object Array]' === objectPrototypeToString.call(obj)) {
-        stack.push(obj);
-        canonicalizedObj = new Array(obj.length);
-        replacementStack.push(canonicalizedObj);
-        for (i = 0 ; i < obj.length ; i += 1) {
-          canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack);
-        }
-        stack.pop();
-        replacementStack.pop();
-      } else if (typeof obj === 'object' && obj !== null) {
-        stack.push(obj);
-        canonicalizedObj = {};
-        replacementStack.push(canonicalizedObj);
-        var sortedKeys = [];
-        for (var key in obj) {
-          sortedKeys.push(key);
-        }
-        sortedKeys.sort();
-        for (i = 0 ; i < sortedKeys.length ; i += 1) {
-          var key = sortedKeys[i];
-          canonicalizedObj[key] = canonicalize(obj[key], stack, replacementStack);
-        }
-        stack.pop();
-        replacementStack.pop();
-      } else {
-        canonicalizedObj = obj;
-      }
-      return canonicalizedObj;
-    }
-
-    return {
     Diff: Diff,
 
-      diffChars: function(oldStr, newStr, callback) { return CharDiff.diff(oldStr, newStr, callback); },
+    diffChars: function (oldStr, newStr, callback) {
-      diffWords: function(oldStr, newStr, callback) { return WordDiff.diff(oldStr, newStr, callback); },
+      return CharDiff.diff(oldStr, newStr, callback);
-      diffWordsWithSpace: function(oldStr, newStr, callback) { return WordWithSpaceDiff.diff(oldStr, newStr, callback); },
+    },
-      diffLines: function(oldStr, newStr, callback) { return LineDiff.diff(oldStr, newStr, callback); },
+    diffWords: function (oldStr, newStr, callback) {
-      diffTrimmedLines: function(oldStr, newStr, callback) { return TrimmedLineDiff.diff(oldStr, newStr, callback); },
+      return WordDiff.diff(oldStr, newStr, callback);
+    },
+    diffWordsWithSpace: function (oldStr, newStr, callback) {
+      return WordWithSpaceDiff.diff(oldStr, newStr, callback);
+    },
+    diffLines: function (oldStr, newStr, callback) {
+      return LineDiff.diff(oldStr, newStr, callback);
+    },
+    diffTrimmedLines: function (oldStr, newStr, callback) {
+      return TrimmedLineDiff.diff(oldStr, newStr, callback);
+    },
 
-      diffSentences: function(oldStr, newStr, callback) { return SentenceDiff.diff(oldStr, newStr, callback); },
+    diffSentences: function (oldStr, newStr, callback) {
+      return SentenceDiff.diff(oldStr, newStr, callback);
+    },
 
-      diffCss: function(oldStr, newStr, callback) { return CssDiff.diff(oldStr, newStr, callback); },
+    diffCss: function (oldStr, newStr, callback) {
+      return CssDiff.diff(oldStr, newStr, callback);
+    },
     diffJson: function (oldObj, newObj, callback) {
       return JsonDiff.diff(
         typeof oldObj === 'string' ? oldObj : JSON.stringify(canonicalize(oldObj), undefined, '  '),
@@ -376,30 +423,34 @@ function require() {
       );
     },
 
-      createPatch: function(fileName, oldStr, newStr, oldHeader, newHeader) {
+    createTwoFilesPatch: function (oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader) {
       var ret = [];
 
-        ret.push('Index: ' + fileName);
+      if (oldFileName == newFileName) {
-        ret.push('===================================================================');
+        ret.push('Index: ' + oldFileName);
-        ret.push('--- ' + fileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
-        ret.push('+++ ' + fileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
-
-        var diff = LineDiff.diff(oldStr, newStr);
-        if (!diff[diff.length-1].value) {
-          diff.pop();   // Remove trailing newline add
       }
+      ret.push('===================================================================');
+      ret.push('--- ' + oldFileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
+      ret.push('+++ ' + newFileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
+
+      var diff = PatchDiff.diff(oldStr, newStr);
       diff.push({value: '', lines: []});   // Append an empty value to make cleanup easier
 
+      // Formats a given set of lines for printing as context lines in a patch
       function contextLines(lines) {
-          return map(lines, function(entry) { return ' ' + entry; });
+        return map(lines, function (entry) {
+          return ' ' + entry;
+        });
       }
+
+      // Outputs the no newline at end of file warning if needed
       function eofNL(curRange, i, current) {
         var last = diff[diff.length - 2],
           isLast = i === diff.length - 2,
-            isLastOfType = i === diff.length-3 && (current.added !== last.added || current.removed !== last.removed);
+          isLastOfType = i === diff.length - 3 && current.added !== last.added;
 
         // Figure out if this is the last line for the given file and missing NL
-          if (!/\n$/.test(current.value) && (isLast || isLastOfType)) {
+        if (!(/\n$/.test(current.value)) && (isLast || isLastOfType)) {
           curRange.push('\\ No newline at end of file');
         }
       }
@@ -412,6 +463,7 @@ function require() {
         current.lines = lines;
 
         if (current.added || current.removed) {
+          // If we have previous context, start with that
           if (!oldRangeStart) {
             var prev = diff[i - 1];
             oldRangeStart = oldLine;
@@ -423,15 +475,21 @@ function require() {
               newRangeStart -= curRange.length;
             }
           }
-            curRange.push.apply(curRange, map(lines, function(entry) { return (current.added?'+':'-') + entry; }));
+
+          // Output our changes
+          curRange.push.apply(curRange, map(lines, function (entry) {
+            return (current.added ? '+' : '-') + entry;
+          }));
           eofNL(curRange, i, current);
 
+          // 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 <= 8 && i < diff.length - 2) {
@@ -450,7 +508,9 @@ function require() {
                 eofNL(ret, i, current);
               }
 
-                oldRangeStart = 0;  newRangeStart = 0; curRange = [];
+              oldRangeStart = 0;
+              newRangeStart = 0;
+              curRange = [];
             }
           }
           oldLine += lines.length;
@@ -461,35 +521,40 @@ function require() {
       return ret.join('\n') + '\n';
     },
 
+    createPatch: function (fileName, oldStr, newStr, oldHeader, newHeader) {
+      return JsDiff.createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader);
+    },
+
     applyPatch: function (oldStr, uniDiff) {
-        var diffstr = uniDiff.split('\n');
+      var diffstr = uniDiff.split('\n'),
-        var diff = [];
+        hunks = [],
-        var i = 0,
+        i = 0,
         remEOFNL = false,
         addEOFNL = false;
 
-        // Skip to the first change chunk
+      // Skip to the first change hunk
-        while (i < diffstr.length && !/^@@/.test(diffstr[i])) {
+      while (i < diffstr.length && !(/^@@/.test(diffstr[i]))) {
         i++;
       }
 
+      // Parse the unified diff
       for (; i < diffstr.length; i++) {
         if (diffstr[i][0] === '@') {
-            var meh = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+          var chnukHeader = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
-            diff.unshift({
+          hunks.unshift({
-              start:meh[3],
+            start: chnukHeader[3],
-              oldlength:meh[2],
+            oldlength: +chnukHeader[2],
-              oldlines:[],
+            removed: [],
-              newlength:meh[4],
+            newlength: chnukHeader[4],
-              newlines:[]
+            added: []
           });
         } else if (diffstr[i][0] === '+') {
-            diff[0].newlines.push(diffstr[i].substr(1));
+          hunks[0].added.push(diffstr[i].substr(1));
         } else if (diffstr[i][0] === '-') {
-            diff[0].oldlines.push(diffstr[i].substr(1));
+          hunks[0].removed.push(diffstr[i].substr(1));
         } else if (diffstr[i][0] === ' ') {
-            diff[0].newlines.push(diffstr[i].substr(1));
+          hunks[0].added.push(diffstr[i].substr(1));
-            diff[0].oldlines.push(diffstr[i].substr(1));
+          hunks[0].removed.push(diffstr[i].substr(1));
         } else if (diffstr[i][0] === '\\') {
           if (diffstr[i - 1][0] === '+') {
             remEOFNL = true;
@@ -499,25 +564,28 @@ function require() {
         }
       }
 
-        var str = oldStr.split('\n');
+      // Apply the diff to the input
-        for (var i = diff.length - 1; i >= 0; i--) {
+      var lines = oldStr.split('\n');
-          var d = diff[i];
+      for (i = hunks.length - 1; i >= 0; i--) {
-          for (var j = 0; j < d.oldlength; j++) {
+        var hunk = hunks[i];
-            if (str[d.start-1+j] !== d.oldlines[j]) {
+        // Sanity check the input string. Bail if we don't match.
+        for (var j = 0; j < hunk.oldlength; j++) {
+          if (lines[hunk.start - 1 + j] !== hunk.removed[j]) {
             return false;
           }
         }
-          Array.prototype.splice.apply(str,[d.start-1,+d.oldlength].concat(d.newlines));
+        Array.prototype.splice.apply(lines, [hunk.start - 1, hunk.oldlength].concat(hunk.added));
       }
 
+      // Handle EOFNL insertion/removal
       if (remEOFNL) {
-          while (!str[str.length-1]) {
+        while (!lines[lines.length - 1]) {
-            str.pop();
+          lines.pop();
         }
       } else if (addEOFNL) {
-          str.push('');
+        lines.push('');
       }
-        return str.join('\n');
+      return lines.join('\n');
     },
 
     convertChangesToXML: function (changes) {
@@ -543,30 +611,41 @@ function require() {
 
     // See: http://code.google.com/p/google-diff-match-patch/wiki/API
     convertChangesToDMP: function (changes) {
-        var ret = [], change;
+      var ret = [],
+        change,
+        operation;
       for (var i = 0; i < changes.length; i++) {
         change = changes[i];
-          ret.push([(change.added ? 1 : change.removed ? -1 : 0), change.value]);
+        if (change.added) {
+          operation = 1;
+        } else if (change.removed) {
+          operation = -1;
+        } else {
+          operation = 0;
+        }
+
+        ret.push([operation, change.value]);
       }
       return ret;
     },
 
     canonicalize: canonicalize
   };
-  })();
 
   /*istanbul ignore next */
+  /*global module */
   if (typeof module !== 'undefined' && module.exports) {
     module.exports = JsDiff;
-  }
+  } else if (typeof define === 'function' && define.amd) {
-  else if (typeof define === 'function' && define.amd) {
     /*global define */
-    define([], function() { return JsDiff; });
+    define([], function () {
-  }
+      return JsDiff;
-  else if (typeof global.JsDiff === 'undefined') {
+    });
+  } else if (typeof global.JsDiff === 'undefined') {
     global.JsDiff = JsDiff;
   }
-})(this);/*
+}(this));
+/*
  *
  * Utils (utils.js)
  * Author: rtfpessoa
@@ -833,7 +912,9 @@ function require() {
 (function (global, undefined) {
 
   // dirty hack for browser compatibility
-  var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) || require("../lib/diff.js");
+  var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) ||
+    require("diff") ||
+    require("../lib/diff.js");
   var utils = require("./utils.js").Utils;
 
   function PrinterUtils() {

lib/diff.js

@@ -13,13 +13,10 @@
  * These methods are based on the implementation proposed in
  * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
  * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
- *
- * AUTHOR: https://github.com/kpdecker/jsdiff
  */
 (function (global, undefined) {
+  var objectPrototypeToString = Object.prototype.toString;
 
-  var JsDiff = (function() {
-    /*jshint maxparams: 5*/
   /*istanbul ignore next*/
   function map(arr, mapper, that) {
     if (Array.prototype.map) {
@@ -33,9 +30,11 @@
     }
     return other;
   }
+
   function clonePath(path) {
     return {newPos: path.newPos, components: path.components.slice(0)};
   }
+
   function removeEmpty(array) {
     var ret = [];
     for (var i = 0; i < array.length; i++) {
@@ -45,6 +44,7 @@
     }
     return ret;
   }
+
   function escapeHTML(s) {
     var n = s;
     n = n.replace(/&/g, '&amp;');
@@ -55,6 +55,53 @@
     return n;
   }
 
+  // This function handles the presence of circular references by bailing out when encountering an
+  // object that is already on the "stack" of items being processed.
+  function canonicalize(obj, stack, replacementStack) {
+    stack = stack || [];
+    replacementStack = replacementStack || [];
+
+    var i;
+
+    for (i = 0; i < stack.length; i += 1) {
+      if (stack[i] === obj) {
+        return replacementStack[i];
+      }
+    }
+
+    var canonicalizedObj;
+
+    if ('[object Array]' === objectPrototypeToString.call(obj)) {
+      stack.push(obj);
+      canonicalizedObj = new Array(obj.length);
+      replacementStack.push(canonicalizedObj);
+      for (i = 0; i < obj.length; i += 1) {
+        canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack);
+      }
+      stack.pop();
+      replacementStack.pop();
+    } else if (typeof obj === 'object' && obj !== null) {
+      stack.push(obj);
+      canonicalizedObj = {};
+      replacementStack.push(canonicalizedObj);
+      var sortedKeys = [],
+        key;
+      for (key in obj) {
+        sortedKeys.push(key);
+      }
+      sortedKeys.sort();
+      for (i = 0; i < sortedKeys.length; i += 1) {
+        key = sortedKeys[i];
+        canonicalizedObj[key] = canonicalize(obj[key], stack, replacementStack);
+      }
+      stack.pop();
+      replacementStack.pop();
+    } else {
+      canonicalizedObj = obj;
+    }
+    return canonicalizedObj;
+  }
+
   function buildValues(components, newString, oldString, useLongestToken) {
     var componentPos = 0,
       componentLen = components.length,
@@ -84,22 +131,34 @@
       } else {
         component.value = oldString.slice(oldPos, oldPos + component.count).join('');
         oldPos += component.count;
+
+        // Reverse add and remove so removes are output first to match common convention
+        // The diffing algorithm is tied to add then remove output and this is the simplest
+        // route to get the desired output with minimal overhead.
+        if (componentPos && components[componentPos - 1].added) {
+          var tmp = components[componentPos - 1];
+          components[componentPos - 1] = components[componentPos];
+          components[componentPos] = tmp;
+        }
       }
     }
 
     return components;
   }
 
-    var Diff = function(ignoreWhitespace) {
+  function Diff(ignoreWhitespace) {
     this.ignoreWhitespace = ignoreWhitespace;
-    };
+  }
+
   Diff.prototype = {
     diff: function (oldString, newString, callback) {
       var self = this;
 
       function done(value) {
         if (callback) {
-            setTimeout(function() { callback(undefined, value); }, 0);
+          setTimeout(function () {
+            callback(undefined, value);
+          }, 0);
           return true;
         } else {
           return value;
@@ -121,6 +180,7 @@
       oldString = this.tokenize(oldString);
 
       var newLen = newString.length, oldLen = oldString.length;
+      var editLength = 1;
       var maxEditLength = newLen + oldLen;
       var bestPath = [{newPos: -1, components: []}];
 
@@ -136,15 +196,15 @@
         for (var diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {
           var basePath;
           var addPath = bestPath[diagonalPath - 1],
-              removePath = bestPath[diagonalPath+1];
+            removePath = bestPath[diagonalPath + 1],
             oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
           if (addPath) {
             // No one else is going to attempt to use this value, clear it
             bestPath[diagonalPath - 1] = undefined;
           }
 
-            var canAdd = addPath && addPath.newPos+1 < newLen;
+          var canAdd = addPath && addPath.newPos + 1 < newLen,
-            var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
+            canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
           if (!canAdd && !canRemove) {
             // If this path is a terminal then prune
             bestPath[diagonalPath] = undefined;
@@ -163,7 +223,7 @@
             self.pushComponent(basePath.components, true, undefined);
           }
 
-            var oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);
+          oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);
 
           // If we have hit the end of both strings, then we are done
           if (basePath.newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
@@ -180,7 +240,6 @@
       // Performs the length of edit iteration. Is a bit fugly as this has to support the
       // sync and async mode which is never fun. Loops over execEditLength until a value
       // is produced.
-        var editLength = 1;
       if (callback) {
         (function exec() {
           setTimeout(function () {
@@ -194,7 +253,7 @@
               exec();
             }
           }, 0);
-          })();
+        }());
       } else {
         while (editLength <= maxEditLength) {
           var ret = execEditLength();
@@ -269,12 +328,12 @@
     for (var i = 0; i < lines.length; i++) {
       var line = lines[i],
         lastLine = lines[i - 1],
-          lastLineLastChar = lastLine ? lastLine[lastLine.length - 1] : '';
+        lastLineLastChar = lastLine && lastLine[lastLine.length - 1];
 
       // Merge lines that may contain windows new lines
       if (line === '\n' && lastLineLastChar === '\r') {
         retLines[retLines.length - 1] = retLines[retLines.length - 1].slice(0, -1) + '\r\n';
-        } else if (line) {
+      } else {
         if (this.ignoreTrim) {
           line = line.trim();
           // add a newline unless this is the last line.
@@ -289,6 +348,28 @@
     return retLines;
   };
 
+  var PatchDiff = new Diff();
+  PatchDiff.tokenize = function (value) {
+    var ret = [],
+      linesAndNewlines = value.split(/(\n|\r\n)/);
+
+    // Ignore the final empty token that occurs if the string ends with a new line
+    if (!linesAndNewlines[linesAndNewlines.length - 1]) {
+      linesAndNewlines.pop();
+    }
+
+    // Merge the content and line separators into single tokens
+    for (var i = 0; i < linesAndNewlines.length; i++) {
+      var line = linesAndNewlines[i];
+
+      if (i % 2) {
+        ret[ret.length - 1] += line;
+      } else {
+        ret.push(line);
+      }
+    }
+    return ret;
+  };
 
   var SentenceDiff = new Diff();
   SentenceDiff.tokenize = function (value) {
@@ -304,66 +385,32 @@
     return LineDiff.equals(left.replace(/,([\r\n])/g, '$1'), right.replace(/,([\r\n])/g, '$1'));
   };
 
-    var objectPrototypeToString = Object.prototype.toString;
+  var JsDiff = {
-
-    // This function handles the presence of circular references by bailing out when encountering an
-    // object that is already on the "stack" of items being processed.
-    function canonicalize(obj, stack, replacementStack) {
-      stack = stack || [];
-      replacementStack = replacementStack || [];
-
-      var i;
-
-      for (var i = 0 ; i < stack.length ; i += 1) {
-        if (stack[i] === obj) {
-          return replacementStack[i];
-        }
-      }
-
-      var canonicalizedObj;
-
-      if ('[object Array]' === objectPrototypeToString.call(obj)) {
-        stack.push(obj);
-        canonicalizedObj = new Array(obj.length);
-        replacementStack.push(canonicalizedObj);
-        for (i = 0 ; i < obj.length ; i += 1) {
-          canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack);
-        }
-        stack.pop();
-        replacementStack.pop();
-      } else if (typeof obj === 'object' && obj !== null) {
-        stack.push(obj);
-        canonicalizedObj = {};
-        replacementStack.push(canonicalizedObj);
-        var sortedKeys = [];
-        for (var key in obj) {
-          sortedKeys.push(key);
-        }
-        sortedKeys.sort();
-        for (i = 0 ; i < sortedKeys.length ; i += 1) {
-          var key = sortedKeys[i];
-          canonicalizedObj[key] = canonicalize(obj[key], stack, replacementStack);
-        }
-        stack.pop();
-        replacementStack.pop();
-      } else {
-        canonicalizedObj = obj;
-      }
-      return canonicalizedObj;
-    }
-
-    return {
     Diff: Diff,
 
-      diffChars: function(oldStr, newStr, callback) { return CharDiff.diff(oldStr, newStr, callback); },
+    diffChars: function (oldStr, newStr, callback) {
-      diffWords: function(oldStr, newStr, callback) { return WordDiff.diff(oldStr, newStr, callback); },
+      return CharDiff.diff(oldStr, newStr, callback);
-      diffWordsWithSpace: function(oldStr, newStr, callback) { return WordWithSpaceDiff.diff(oldStr, newStr, callback); },
+    },
-      diffLines: function(oldStr, newStr, callback) { return LineDiff.diff(oldStr, newStr, callback); },
+    diffWords: function (oldStr, newStr, callback) {
-      diffTrimmedLines: function(oldStr, newStr, callback) { return TrimmedLineDiff.diff(oldStr, newStr, callback); },
+      return WordDiff.diff(oldStr, newStr, callback);
+    },
+    diffWordsWithSpace: function (oldStr, newStr, callback) {
+      return WordWithSpaceDiff.diff(oldStr, newStr, callback);
+    },
+    diffLines: function (oldStr, newStr, callback) {
+      return LineDiff.diff(oldStr, newStr, callback);
+    },
+    diffTrimmedLines: function (oldStr, newStr, callback) {
+      return TrimmedLineDiff.diff(oldStr, newStr, callback);
+    },
 
-      diffSentences: function(oldStr, newStr, callback) { return SentenceDiff.diff(oldStr, newStr, callback); },
+    diffSentences: function (oldStr, newStr, callback) {
+      return SentenceDiff.diff(oldStr, newStr, callback);
+    },
 
-      diffCss: function(oldStr, newStr, callback) { return CssDiff.diff(oldStr, newStr, callback); },
+    diffCss: function (oldStr, newStr, callback) {
+      return CssDiff.diff(oldStr, newStr, callback);
+    },
     diffJson: function (oldObj, newObj, callback) {
       return JsonDiff.diff(
         typeof oldObj === 'string' ? oldObj : JSON.stringify(canonicalize(oldObj), undefined, '  '),
@@ -372,30 +419,34 @@
       );
     },
 
-      createPatch: function(fileName, oldStr, newStr, oldHeader, newHeader) {
+    createTwoFilesPatch: function (oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader) {
       var ret = [];
 
-        ret.push('Index: ' + fileName);
+      if (oldFileName == newFileName) {
-        ret.push('===================================================================');
+        ret.push('Index: ' + oldFileName);
-        ret.push('--- ' + fileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
-        ret.push('+++ ' + fileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
-
-        var diff = LineDiff.diff(oldStr, newStr);
-        if (!diff[diff.length-1].value) {
-          diff.pop();   // Remove trailing newline add
       }
+      ret.push('===================================================================');
+      ret.push('--- ' + oldFileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
+      ret.push('+++ ' + newFileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
+
+      var diff = PatchDiff.diff(oldStr, newStr);
       diff.push({value: '', lines: []});   // Append an empty value to make cleanup easier
 
+      // Formats a given set of lines for printing as context lines in a patch
       function contextLines(lines) {
-          return map(lines, function(entry) { return ' ' + entry; });
+        return map(lines, function (entry) {
+          return ' ' + entry;
+        });
       }
+
+      // Outputs the no newline at end of file warning if needed
       function eofNL(curRange, i, current) {
         var last = diff[diff.length - 2],
           isLast = i === diff.length - 2,
-            isLastOfType = i === diff.length-3 && (current.added !== last.added || current.removed !== last.removed);
+          isLastOfType = i === diff.length - 3 && current.added !== last.added;
 
         // Figure out if this is the last line for the given file and missing NL
-          if (!/\n$/.test(current.value) && (isLast || isLastOfType)) {
+        if (!(/\n$/.test(current.value)) && (isLast || isLastOfType)) {
           curRange.push('\\ No newline at end of file');
         }
       }
@@ -408,6 +459,7 @@
         current.lines = lines;
 
         if (current.added || current.removed) {
+          // If we have previous context, start with that
           if (!oldRangeStart) {
             var prev = diff[i - 1];
             oldRangeStart = oldLine;
@@ -419,15 +471,21 @@
               newRangeStart -= curRange.length;
             }
           }
-            curRange.push.apply(curRange, map(lines, function(entry) { return (current.added?'+':'-') + entry; }));
+
+          // Output our changes
+          curRange.push.apply(curRange, map(lines, function (entry) {
+            return (current.added ? '+' : '-') + entry;
+          }));
           eofNL(curRange, i, current);
 
+          // 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 <= 8 && i < diff.length - 2) {
@@ -446,7 +504,9 @@
                 eofNL(ret, i, current);
               }
 
-                oldRangeStart = 0;  newRangeStart = 0; curRange = [];
+              oldRangeStart = 0;
+              newRangeStart = 0;
+              curRange = [];
             }
           }
           oldLine += lines.length;
@@ -457,35 +517,40 @@
       return ret.join('\n') + '\n';
     },
 
+    createPatch: function (fileName, oldStr, newStr, oldHeader, newHeader) {
+      return JsDiff.createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader);
+    },
+
     applyPatch: function (oldStr, uniDiff) {
-        var diffstr = uniDiff.split('\n');
+      var diffstr = uniDiff.split('\n'),
-        var diff = [];
+        hunks = [],
-        var i = 0,
+        i = 0,
         remEOFNL = false,
         addEOFNL = false;
 
-        // Skip to the first change chunk
+      // Skip to the first change hunk
-        while (i < diffstr.length && !/^@@/.test(diffstr[i])) {
+      while (i < diffstr.length && !(/^@@/.test(diffstr[i]))) {
         i++;
       }
 
+      // Parse the unified diff
       for (; i < diffstr.length; i++) {
         if (diffstr[i][0] === '@') {
-            var meh = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+          var chnukHeader = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
-            diff.unshift({
+          hunks.unshift({
-              start:meh[3],
+            start: chnukHeader[3],
-              oldlength:meh[2],
+            oldlength: +chnukHeader[2],
-              oldlines:[],
+            removed: [],
-              newlength:meh[4],
+            newlength: chnukHeader[4],
-              newlines:[]
+            added: []
           });
         } else if (diffstr[i][0] === '+') {
-            diff[0].newlines.push(diffstr[i].substr(1));
+          hunks[0].added.push(diffstr[i].substr(1));
         } else if (diffstr[i][0] === '-') {
-            diff[0].oldlines.push(diffstr[i].substr(1));
+          hunks[0].removed.push(diffstr[i].substr(1));
         } else if (diffstr[i][0] === ' ') {
-            diff[0].newlines.push(diffstr[i].substr(1));
+          hunks[0].added.push(diffstr[i].substr(1));
-            diff[0].oldlines.push(diffstr[i].substr(1));
+          hunks[0].removed.push(diffstr[i].substr(1));
         } else if (diffstr[i][0] === '\\') {
           if (diffstr[i - 1][0] === '+') {
             remEOFNL = true;
@@ -495,25 +560,28 @@
         }
       }
 
-        var str = oldStr.split('\n');
+      // Apply the diff to the input
-        for (var i = diff.length - 1; i >= 0; i--) {
+      var lines = oldStr.split('\n');
-          var d = diff[i];
+      for (i = hunks.length - 1; i >= 0; i--) {
-          for (var j = 0; j < d.oldlength; j++) {
+        var hunk = hunks[i];
-            if (str[d.start-1+j] !== d.oldlines[j]) {
+        // Sanity check the input string. Bail if we don't match.
+        for (var j = 0; j < hunk.oldlength; j++) {
+          if (lines[hunk.start - 1 + j] !== hunk.removed[j]) {
             return false;
           }
         }
-          Array.prototype.splice.apply(str,[d.start-1,+d.oldlength].concat(d.newlines));
+        Array.prototype.splice.apply(lines, [hunk.start - 1, hunk.oldlength].concat(hunk.added));
       }
 
+      // Handle EOFNL insertion/removal
       if (remEOFNL) {
-          while (!str[str.length-1]) {
+        while (!lines[lines.length - 1]) {
-            str.pop();
+          lines.pop();
         }
       } else if (addEOFNL) {
-          str.push('');
+        lines.push('');
       }
-        return str.join('\n');
+      return lines.join('\n');
     },
 
     convertChangesToXML: function (changes) {
@@ -539,27 +607,37 @@
 
     // See: http://code.google.com/p/google-diff-match-patch/wiki/API
     convertChangesToDMP: function (changes) {
-        var ret = [], change;
+      var ret = [],
+        change,
+        operation;
       for (var i = 0; i < changes.length; i++) {
         change = changes[i];
-          ret.push([(change.added ? 1 : change.removed ? -1 : 0), change.value]);
+        if (change.added) {
+          operation = 1;
+        } else if (change.removed) {
+          operation = -1;
+        } else {
+          operation = 0;
+        }
+
+        ret.push([operation, change.value]);
       }
       return ret;
     },
 
     canonicalize: canonicalize
   };
-  })();
 
   /*istanbul ignore next */
+  /*global module */
   if (typeof module !== 'undefined' && module.exports) {
     module.exports = JsDiff;
-  }
+  } else if (typeof define === 'function' && define.amd) {
-  else if (typeof define === 'function' && define.amd) {
     /*global define */
-    define([], function() { return JsDiff; });
+    define([], function () {
-  }
+      return JsDiff;
-  else if (typeof global.JsDiff === 'undefined') {
+    });
+  } else if (typeof global.JsDiff === 'undefined') {
     global.JsDiff = JsDiff;
   }
-})(this);
+}(this));

package.json

@@ -0,0 +1,67 @@
+{
+  "name":     "diff2html",
+  "version":  "0.2.4",
+  "homepage": "https://www.github.com/rtfpessoa/diff2html",
+  "description": "Fast Diff to colorized HTML",
+  "keywords": [
+      "git",
+      "diff",
+      "pretty",
+      "side",
+      "line",
+      "side-by-side",
+      "line-by-line",
+      "character",
+      "highlight",
+      "pretty",
+      "color",
+      "html",
+      "diff2html",
+      "difftohtml",
+      "colorized"
+    ],
+
+  "author": {
+    "name":  "Rodrigo Fernandes",
+    "email": "rtfrodrigo@gmail.com"
+  },
+
+  "repository": {
+    "type": "git",
+    "url": "https://www.github.com/rtfpessoa/diff2html.git"
+  },
+
+  "bugs": {
+    "url": "https://www.github.com/rtfpessoa/diff2html/issues"
+  },
+
+  "engines": {
+      "node": ">=0.10"
+  },
+
+  "preferGlobal": "true",
+
+  "scripts": {
+    "test": ""
+  },
+
+  "bin": {
+    "diff2html-lib": "./bin/diff2html"
+  },
+
+  "main": "./src/diff2html.js",
+
+  "dependencies": {
+    "diff": "1.4.0"
+  },
+
+  "devDependencies": {},
+
+  "license": "MIT",
+
+  "files": [
+    "bin",
+    "lib",
+    "src"
+  ]
+}

src/printer-utils.js

@@ -8,7 +8,9 @@
 (function (global, undefined) {
 
   // dirty hack for browser compatibility
-  var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) || require("../lib/diff.js");
+  var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) ||
+    require("diff") ||
+    require("../lib/diff.js");
   var utils = require("./utils.js").Utils;
 
   function PrinterUtils() {