diff2html/diff2html.js

447 lines
17 KiB
JavaScript
Raw Normal View History

2014-08-29 21:23:24 +00:00
/*
*
2014-08-30 02:54:52 +00:00
* Diff to HTML (diff2html.js)
2014-08-29 21:23:24 +00:00
* Author: rtfpessoa
* Date: Friday 29 August 2014
2015-01-25 00:03:09 +00:00
* Last Update: Sunday 25 January 2015
2014-08-29 21:23:24 +00:00
*
2014-08-30 22:16:38 +00:00
* Diff command:
2014-09-27 00:29:32 +00:00
* git diff
2014-08-29 21:23:24 +00:00
*/
2014-08-30 22:16:38 +00:00
(function (window) {
var ClassVariable;
2014-08-30 02:54:52 +00:00
2014-08-30 22:16:38 +00:00
ClassVariable = (function () {
2014-08-30 02:54:52 +00:00
2014-09-06 16:27:18 +00:00
var LINE_TYPE = {
INSERTS: "d2h-ins",
DELETES: "d2h-del",
CONTEXT: "d2h-cntx",
INFO: "d2h-info"
};
2014-08-30 02:54:52 +00:00
2014-08-30 22:16:38 +00:00
function Diff2Html() {
2014-08-30 02:54:52 +00:00
}
2014-08-30 22:16:38 +00:00
/*
* Generates pretty html from string diff input
*/
Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
var diffJson = generateDiffJson(diffInput);
2014-09-14 19:50:17 +00:00
return generateJsonHtml(diffJson);
2014-08-30 22:16:38 +00:00
};
/*
* Generates json object from string diff input
*/
Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
return generateDiffJson(diffInput);
};
/*
* Generates pretty html from a json object
*/
Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
2014-09-14 19:50:17 +00:00
return generateJsonHtml(diffJson);
};
/*
* Generates pretty side by side html from string diff input
*/
Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput) {
var diffJson = generateDiffJson(diffInput);
return generateSideBySideJsonHtml(diffJson);
};
/*
* Generates pretty side by side html from a json object
*/
Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
return generateSideBySideJsonHtml(diffJson);
2014-08-30 22:16:38 +00:00
};
var generateDiffJson = function (diffInput) {
var files = [],
currentFile = null,
currentBlock = null,
oldLine = null,
newLine = null;
var saveBlock = function () {
/* add previous block(if exists) before start a new file */
if (currentBlock) {
currentFile.blocks.push(currentBlock);
currentBlock = null;
}
};
var saveFile = function () {
/*
* add previous file(if exists) before start a new one
* if it has name (to avoid binary files errors)
*/
if (currentFile && currentFile.newName) {
2014-08-30 22:16:38 +00:00
files.push(currentFile);
currentFile = null;
}
};
var startFile = function () {
2014-08-30 22:16:38 +00:00
saveBlock();
saveFile();
/* create file structure */
currentFile = {};
currentFile.blocks = [];
currentFile.deletedLines = 0;
currentFile.addedLines = 0;
};
var startBlock = function (line) {
saveBlock();
var values = /^@@ -(\d+),\d+ \+(\d+),\d+ @@.*/.exec(line) ||
/^@@@ -(\d+),\d+ -\d+,\d+ \+(\d+),\d+ @@@.*/.exec(line) ||
[0, 0, 0];
oldLine = values[1];
newLine = values[2];
2014-08-30 22:16:38 +00:00
/* create block metadata */
currentBlock = {};
currentBlock.lines = [];
2014-09-08 17:15:51 +00:00
currentBlock.oldStartLine = oldLine;
currentBlock.newStartLine = newLine;
2014-09-06 16:27:18 +00:00
currentBlock.header = line;
2014-08-30 22:16:38 +00:00
};
var createLine = function (line) {
var currentLine = {};
2014-09-06 16:27:18 +00:00
currentLine.content = line;
/* fill the line data */
if (startsWith(line, "+") || startsWith(line, " +")) {
2014-09-06 16:27:18 +00:00
currentFile.addedLines++;
2014-08-30 22:16:38 +00:00
2014-09-27 00:29:32 +00:00
currentLine.type = LINE_TYPE.INSERTS;
2014-09-06 16:27:18 +00:00
currentLine.oldNumber = null;
currentLine.newNumber = newLine++;
2014-08-30 22:16:38 +00:00
2014-09-06 16:27:18 +00:00
currentBlock.lines.push(currentLine);
2014-08-30 22:16:38 +00:00
} else if (startsWith(line, "-") || startsWith(line, " -")) {
2014-09-06 16:27:18 +00:00
currentFile.deletedLines++;
2014-08-30 22:16:38 +00:00
2014-09-27 00:29:32 +00:00
currentLine.type = LINE_TYPE.DELETES;
2014-09-06 16:27:18 +00:00
currentLine.oldNumber = oldLine++;
currentLine.newNumber = null;
2014-08-30 22:16:38 +00:00
2014-09-06 16:27:18 +00:00
currentBlock.lines.push(currentLine);
2014-08-30 22:16:38 +00:00
2014-09-27 00:29:32 +00:00
} else {
currentLine.type = LINE_TYPE.CONTEXT;
2014-09-06 16:27:18 +00:00
currentLine.oldNumber = oldLine++;
currentLine.newNumber = newLine++;
currentBlock.lines.push(currentLine);
2014-08-30 22:16:38 +00:00
}
};
var diffLines = diffInput.split("\n");
diffLines.forEach(function (line) {
// Unmerged paths, and possibly other non-diffable files
// https://github.com/scottgonzalez/pretty-diff/issues/11
// Also, remove some useless lines
if (!line || startsWith(line, "*") ||
startsWith(line, "new") || startsWith(line, "index")) {
2014-08-30 22:16:38 +00:00
return;
}
var values = [];
2014-08-30 22:16:38 +00:00
if (startsWith(line, "diff")) {
startFile();
} else if (currentFile && !currentFile.oldName && (values = /^--- a\/(\S+).*$/.exec(line))) {
currentFile.oldName = values[1];
} else if (currentFile && !currentFile.newName && (values = /^\+\+\+ b\/(\S+).*$/.exec(line))) {
currentFile.newName = values[1];
2014-08-30 22:16:38 +00:00
} else if (currentFile && startsWith(line, "@@")) {
startBlock(line);
} else if (currentBlock) {
createLine(line);
}
});
saveBlock();
saveFile();
return files;
};
2014-09-06 16:27:18 +00:00
/*
* Line By Line HTML
*/
2014-09-14 19:50:17 +00:00
var generateJsonHtml = function (diffFiles) {
2014-09-08 17:15:51 +00:00
return "<div class=\"d2h-wrapper\">\n" +
2014-08-30 22:16:38 +00:00
diffFiles.map(function (file) {
return "<div class=\"d2h-file-wrapper\">\n" +
" <div class=\"d2h-file-header\">\n" +
" <div class=\"d2h-file-stats\">\n" +
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
2014-08-30 22:16:38 +00:00
" </div>\n" +
" <div class=\"d2h-file-name\">" + getDiffName(file.oldName, file.newName) + "</div>\n" +
2014-08-30 22:16:38 +00:00
" </div>\n" +
" <div class=\"d2h-file-diff\">\n" +
" <div class=\"d2h-code-wrapper\">\n" +
" <table class=\"d2h-diff-table\">\n" +
" <tbody class=\"d2h-diff-tbody\">\n" +
2014-09-14 19:50:17 +00:00
" " + generateFileHtml(file) +
2014-08-30 22:16:38 +00:00
" </tbody>\n" +
" </table>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n";
}).join("\n") +
"</div>\n";
};
var generateFileHtml = function (file) {
return file.blocks.map(function (block) {
2014-09-27 00:29:32 +00:00
var lines = "<tr>\n" +
2015-01-24 22:47:15 +00:00
" <td class=\"d2h-code-linenumber " + LINE_TYPE.INFO + "\"></td>\n" +
2014-09-06 16:27:18 +00:00
" <td class=\"" + LINE_TYPE.INFO + "\">" +
" <div class=\"d2h-code-line " + LINE_TYPE.INFO + "\">" + escape(block.header) + "</div>" +
" </td>\n" +
2014-09-27 00:29:32 +00:00
"</tr>\n";
2014-09-06 16:27:18 +00:00
2014-09-27 00:29:32 +00:00
for (var i = 0; i < block.lines.length; i++) {
var prevLine = block.lines[i - 1];
2014-09-27 00:29:32 +00:00
var line = block.lines[i];
var newLine = block.lines[i + 1];
var nextNewLine = block.lines[i + 2];
2014-09-06 16:27:18 +00:00
var isOppositeTypeTwoLineBlock =
line.type == LINE_TYPE.DELETES &&
newLine && newLine.type == LINE_TYPE.INSERTS &&
(!nextNewLine || nextNewLine && nextNewLine.type != LINE_TYPE.INSERTS) &&
(!prevLine || prevLine && prevLine.type != LINE_TYPE.DELETES);
2014-09-06 16:27:18 +00:00
2014-09-27 14:47:10 +00:00
var escapedLine = escape(line.content);
if (isOppositeTypeTwoLineBlock) {
2014-09-27 00:29:32 +00:00
var nextEscapedLine = escape(newLine.content);
var diff = diffHighlight(escapedLine, nextEscapedLine);
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, diff.o) +
generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, diff.n);
2014-09-27 00:29:32 +00:00
i++;
2014-09-27 00:29:32 +00:00
} else {
2014-09-27 14:47:10 +00:00
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
2014-09-27 00:29:32 +00:00
}
}
2014-09-06 16:27:18 +00:00
2014-09-27 00:29:32 +00:00
return lines;
2014-09-06 16:27:18 +00:00
}).join("\n");
};
2014-09-27 00:29:32 +00:00
var generateLineHtml = function (type, oldNumber, newNumber, content) {
2014-09-06 16:27:18 +00:00
return "<tr>\n" +
2014-09-27 00:29:32 +00:00
" <td class=\"d2h-code-linenumber " + type + "\">" +
" <div class=\"line-num1\">" + valueOrEmpty(oldNumber) + "</div>" +
" <div class=\"line-num2\">" + valueOrEmpty(newNumber) + "</div>" +
2014-09-08 17:15:51 +00:00
" </td>\n" +
2014-09-27 00:29:32 +00:00
" <td class=\"" + type + "\">" +
" <div class=\"d2h-code-line " + type + "\">" + content + "</div>" +
2014-09-06 16:27:18 +00:00
" </td>\n" +
"</tr>\n";
};
2014-08-30 22:16:38 +00:00
2014-09-14 19:50:17 +00:00
/*
* Side By Side HTML (work in progress)
*/
var generateSideBySideJsonHtml = function (diffFiles) {
return "<div class=\"d2h-wrapper\">\n" +
diffFiles.map(function (file) {
2014-09-27 00:29:32 +00:00
var diffs = generateSideBySideFileHtml(file);
2014-09-14 19:50:17 +00:00
return "<div class=\"d2h-file-wrapper\">\n" +
" <div class=\"d2h-file-header\">\n" +
" <div class=\"d2h-file-stats\">\n" +
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
" </div>\n" +
" <div class=\"d2h-file-name\">" + getDiffName(file.oldName, file.newName) + "</div>\n" +
" </div>\n" +
" <div class=\"d2h-files-diff\">\n" +
" <div class=\"d2h-file-side-diff\">\n" +
" <div class=\"d2h-code-wrapper\">\n" +
" <table class=\"d2h-diff-table\">\n" +
" <tbody class=\"d2h-diff-tbody\">\n" +
2014-09-27 00:29:32 +00:00
" " + diffs.left +
2014-09-14 19:50:17 +00:00
" </tbody>\n" +
" </table>\n" +
" </div>\n" +
" </div>\n" +
" <div class=\"d2h-file-side-diff\">\n" +
" <div class=\"d2h-code-wrapper\">\n" +
" <table class=\"d2h-diff-table\">\n" +
" <tbody class=\"d2h-diff-tbody\">\n" +
2014-09-27 00:29:32 +00:00
" " + diffs.right +
2014-09-14 19:50:17 +00:00
" </tbody>\n" +
" </table>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n";
}).join("\n") +
"</div>\n";
};
2014-09-27 00:29:32 +00:00
var generateSideBySideFileHtml = function (file) {
var fileHtml = {};
fileHtml.left = "";
fileHtml.right = "";
file.blocks.forEach(function (block) {
2014-09-14 19:50:17 +00:00
2014-09-27 00:29:32 +00:00
fileHtml.left += "<tr>\n" +
" <td class=\"d2h-code-side-linenumber " + LINE_TYPE.INFO + "\"></td>\n" +
2015-01-24 22:47:15 +00:00
" <td class=\"" + LINE_TYPE.INFO + "\">" +
" <div class=\"d2h-code-side-line " + LINE_TYPE.INFO + "\">" + escape(block.header) + "</div>" +
" </td>\n" +
"</tr>\n";
2014-09-14 19:50:17 +00:00
2014-09-27 00:29:32 +00:00
fileHtml.right += "<tr>\n" +
" <td class=\"d2h-code-side-linenumber " + LINE_TYPE.INFO + "\"></td>\n" +
2015-01-24 22:47:15 +00:00
" <td class=\"" + LINE_TYPE.INFO + "\">" +
" <div class=\"d2h-code-side-line " + LINE_TYPE.INFO + "\"></div>" +
" </td>\n" +
"</tr>\n";
2014-09-14 19:50:17 +00:00
2014-09-27 00:29:32 +00:00
for (var i = 0; i < block.lines.length; i++) {
var prevLine = block.lines[i - 1];
2014-09-27 00:29:32 +00:00
var line = block.lines[i];
var newLine = block.lines[i + 1];
var nextNewLine = block.lines[i + 2];
2014-09-27 00:29:32 +00:00
var isOpositeTypeTwoLineBlock = line.type == LINE_TYPE.DELETES && newLine && newLine.type == LINE_TYPE.INSERTS &&
(!nextNewLine || nextNewLine && nextNewLine.type != LINE_TYPE.INSERTS) &&
(!prevLine || prevLine && prevLine.type != LINE_TYPE.DELETES);
2014-09-14 19:50:17 +00:00
2014-09-27 14:47:10 +00:00
var escapedLine = escape(line.content);
if (isOpositeTypeTwoLineBlock) {
2014-09-27 00:29:32 +00:00
var nextEscapedLine = escape(newLine.content);
var diff = diffHighlight(escapedLine, nextEscapedLine);
fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, diff.o);
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.n);
2014-09-27 00:29:32 +00:00
i++;
2014-09-27 00:29:32 +00:00
} else if (line.type == LINE_TYPE.DELETES) {
2014-09-27 14:47:10 +00:00
fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
2014-09-27 00:29:32 +00:00
fileHtml.right += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", "");
} else if (line.type == LINE_TYPE.INSERTS) {
fileHtml.left += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", "");
2014-09-27 14:47:10 +00:00
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
2014-09-27 00:29:32 +00:00
} else {
2014-09-27 14:47:10 +00:00
fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
2014-09-27 00:29:32 +00:00
}
}
2014-09-14 19:50:17 +00:00
2014-09-27 00:29:32 +00:00
});
return fileHtml;
2014-09-14 19:50:17 +00:00
};
2014-09-27 00:29:32 +00:00
var generateSingleLineHtml = function (type, number, content) {
return "<tr>\n" +
" <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
" <td class=\"" + type + "\">" +
" <div class=\"d2h-code-side-line " + type + "\">" + content + "</div>" +
" </td>\n" +
" </tr>\n";
2014-09-14 19:50:17 +00:00
};
2014-09-06 16:27:18 +00:00
/*
* HTML Helpers
*/
2014-08-30 22:16:38 +00:00
2014-09-06 16:27:18 +00:00
var getDiffName = function (oldFilename, newFilename) {
if (oldFilename && newFilename && oldFilename !== newFilename) {
return oldFilename + " -> " + newFilename;
} else if (newFilename) {
return newFilename;
} else if (oldFilename) {
return oldFilename;
} else {
return "Unknown filename";
}
2014-08-30 22:16:38 +00:00
};
2014-09-27 00:29:32 +00:00
var removeIns = function (line) {
return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
2014-09-06 16:27:18 +00:00
};
2014-09-27 00:29:32 +00:00
var removeDel = function (line) {
return line.replace(/(<del>((.|\n)*?)<\/del>)/g, "");
2014-09-06 16:27:18 +00:00
};
2014-08-30 22:16:38 +00:00
/*
* Utils
*/
function escape(str) {
2014-09-06 16:27:18 +00:00
return str.slice(0)
2014-08-30 22:16:38 +00:00
.replace(/&/g, "&amp;")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/\t/g, " ");
2014-08-30 02:54:52 +00:00
}
2014-08-30 22:16:38 +00:00
function startsWith(str, start) {
return str.indexOf(start) === 0;
}
2014-08-30 02:54:52 +00:00
2014-08-30 22:16:38 +00:00
function valueOrEmpty(value) {
return value ? value : "";
}
2014-08-30 02:54:52 +00:00
function diffHighlight(diffLine1, diffLine2) {
/* remove the initial -/+ to avoid always having diff in the first char */
var highlightedLine = diffString(diffLine1.substr(1), diffLine2.substr(1));
return {
o: diffLine1.charAt(0) + removeIns(highlightedLine),
n: diffLine2.charAt(0) + removeDel(highlightedLine)
}
}
2014-08-30 22:16:38 +00:00
/* singleton pattern */
var instance;
return {
getInstance: function () {
if (instance === undefined) {
instance = new Diff2Html();
/* Hide the constructor so the returned objected can't be new'd */
instance.constructor = null;
}
return instance;
}
};
})();
window.Diff2Html = ClassVariable.getInstance();
return window.Diff2Html;
})(window);