# diff2html [![Codacy Quality Badge](https://api.codacy.com/project/badge/Grade/06412dc3f5a14f568778d0db8a1f7dc8)](https://www.codacy.com/app/rtfpessoa/diff2html?utm_source=github.com&utm_medium=referral&utm_content=rtfpessoa/diff2html&utm_campaign=Badge_Grade) [![Codacy Coverage Badge](https://api.codacy.com/project/badge/Coverage/06412dc3f5a14f568778d0db8a1f7dc8)](https://www.codacy.com/app/rtfpessoa/diff2html?utm_source=github.com&utm_medium=referral&utm_content=rtfpessoa/diff2html&utm_campaign=Badge_Coverage) [![Circle CI](https://circleci.com/gh/rtfpessoa/diff2html.svg?style=svg)](https://circleci.com/gh/rtfpessoa/diff2html) [![npm](https://img.shields.io/npm/v/diff2html.svg)](https://www.npmjs.com/package/diff2html) [![Dependency Status](https://david-dm.org/rtfpessoa/diff2html.svg)](https://david-dm.org/rtfpessoa/diff2html) [![devDependency Status](https://david-dm.org/rtfpessoa/diff2html/dev-status.svg)](https://david-dm.org/rtfpessoa/diff2html#info=devDependencies) [![cdnjs](https://img.shields.io/cdnjs/v/diff2html)](https://cdnjs.com/libraries/diff2html) [![node](https://img.shields.io/node/v/diff2html.svg)]() [![npm](https://img.shields.io/npm/l/diff2html.svg)]() [![npm](https://img.shields.io/npm/dm/diff2html.svg)](https://www.npmjs.com/package/diff2html) [![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-) [![Gitter](https://badges.gitter.im/rtfpessoa/diff2html.svg)](https://gitter.im/rtfpessoa/diff2html?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) diff2html generates pretty HTML diffs from git or unified diff output. [![NPM](https://nodei.co/npm/diff2html.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/diff2html/) ## Features - Supports git and unified diffs - Line by line and Side by side diff - New and old line numbers - Inserted and removed lines - GitHub like style - Code syntax highlight - Line similarity matching - Easy code selection ## Online Example > Go to [diff2html](https://diff2html.xyz/) ## Distributions - [WebJar](http://www.webjars.org/) - [Node Module](https://www.npmjs.org/package/diff2html) - [Node CLI](https://www.npmjs.org/package/diff2html-cli) - Manually download and import: - Browser - [build/browser/diff2html.min.js](./build/browser/diff2html.min.js) - includes the diff parser and html generator - [build/browser/diff2html-ui.min.js](./build/browser/diff2html-ui.min.js) - includes the wrapper of diff2html that adds highlight, synchronized scroll, and other nice features - Node.js - [build/commonjs-node/diff2html.js](./build/commonjs-node/diff2html.js) - includes the diff parser and html generator ## How to use To load correctly in the Browser you always need to include the stylesheet in the final HTML. Import the stylesheet ```html ``` You can also refer to it from a CDN like [CDNJS](https://cdnjs.com/libraries/diff2html). ### Browser Library Import the stylesheet and the library code ```html ``` It will now be available as a global variable named `global.Diff2Html`. ```js document.addEventListener("DOMContentLoaded", () => { var diffHtml = global.Diff2Html.html("", { drawFileList: true, matching: "lines", outputFormat: "side-by-side" }); document.getElementById("destination-elem-id").innerHTML = diffHtml; }); ``` ### Node Module ```js const Diff2html = require("diff2html"); const diffJson = Diff2html.parse(""); const diffHtml = Diff2html.html(diffJson, { drawFileList: true }); document.getElementById("destination-elem-id").innerHTML = diffHtml; ``` ### Angular - Typescript ```typescript import * as Diff2Html from "diff2html"; import { Component, OnInit } from "@angular/core"; export class AppDiffComponent implements OnInit { outputHtml: string; constructor() { this.init(); } ngOnInit() {} init() { let strInput = "--- a/server/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go\n+++ b/server/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go\n@@ -1035,6 +1035,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (\n \n // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n \n+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {\n+\tr0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))\n+\tn = int(r0)\n+\tif e1 != 0 {\n+\t\terr = errnoErr(e1)\n+\t}\n+\treturn\n+}\n+\n+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n+\n func read(fd int, p []byte) (n int, err error) {\n \tvar _p0 unsafe.Pointer\n \tif len(p) > 0 {\n"; let outputHtml = Diff2Html.html(strInput, { drawFileList: true, matching: "lines" }); this.outputHtml = outputHtml; } } ``` - HTML ```html diff2html
``` - `.angular-cli.json` - Add styles ```json "styles": [ "diff2html.min.css" ] ``` ### Vue.js ```vue ``` ## API > Intermediate Json From Git Word Diff Output getJsonFromDiff(input: string, configuration?: Options): Result[] > Pretty HTML diff getPrettyHtml(input: any, configuration?: Options): string > Check out the [docs/demo.html](./docs/demo.html) for a demo example. ## Configuration The HTML output accepts a Javascript object with configuration. Possible options: - `inputFormat`: the format of the input data: `'diff'` or `'json'`, default is `'diff'` - `outputFormat`: the format of the output data: `'line-by-line'` or `'side-by-side'`, default is `'line-by-line'` - `drawFileList`: show a file list before the diff: `true` or `false`, default is `false` - `diffStyle`: show differences level in each line: `word` or `char`, default is `word` - `matching`: matching level: `'lines'` for matching lines, `'words'` for matching lines and words or `'none'`, default is `none` - `matchWordsThreshold`: similarity threshold for word matching, default is 0.25 - `matchingMaxComparisons`: perform at most this much comparisons for line matching a block of changes, default is `2500` - `maxLineSizeInBlockForComparison`: maximum number os characters of the bigger line in a block to apply comparison, default is `200` - `maxLineLengthHighlight`: only perform diff changes highlight if lines are smaller than this, default is `10000` - `compiledTemplates`: object with previously compiled templates to replace parts of the html - `rawTemplates`: object with raw not compiled templates to replace parts of the html - `renderNothingWhenEmpty`: render nothing if the diff shows no change in its comparison: `true` or `false`, default is `false` > For more information regarding the possible templates look into [src/templates](https://github.com/rtfpessoa/diff2html/tree/master/src/templates) ** Diff2HtmlUI Helper Options ** - `synchronisedScroll`: scroll both panes in side-by-side mode: `true` or `false`, default is `false` > For more information regarding the possible templates look into [src/templates](https://github.com/rtfpessoa/diff2html/tree/master/src/templates) ## Diff2HtmlUI Helper > Simple wrapper to ease simple tasks in the browser such as: code highlight and js effects - Invoke Diff2html - Inject output in DOM element - Enable collapsible file summary list - Enable syntax highlight of the code in the diffs ### How to use #### Mandatory HTML resource imports ```html ``` #### Init ```js const targetElement = document.getElementById("destination-elem-id"); const configuration = { drawFileList: true, matching: "lines" }; const diff2htmlUi = new global.Diff2HtmlUI(diffString, targetElement, configuration); // or const diff2htmlUi = new global.Diff2HtmlUI(diffJson, targetElement, configuration); ``` #### Draw ```js diff2htmlUi.draw(); ``` #### Syntax Highlight ```html ``` > Pass the option `highlight` with value true or invoke `diff2htmlUi.highlightCode()` after `diff2htmlUi.draw()`. ```js document.addEventListener("DOMContentLoaded", () => { const diffString = `diff --git a/sample.js b/sample.js index 0000001..0ddf2ba --- a/sample.js +++ b/sample.js @@ -1 +1 @@ -console.log("Hello World!") +console.log("Hello from Diff2Html!")`; const targetElement = document.getElementById("myDiffElement"); const configuration = { inputFormat: "json", drawFileList: true, matching: "lines", highlight: true }; const diff2htmlUi = new global.Diff2HtmlUI(diffString, targetElement, configuration); diff2htmlUi.draw(); diff2htmlUi.highlightCode(); }); ``` #### Collapsable File Summary List > Add the dependencies. ```html ``` > Invoke the Diff2HtmlUI helper > Pass the option `fileListToggle` with value true or invoke `diff2htmlUi.fileListToggle()` after `diff2htmlUi.draw()`. ```js document.addEventListener("DOMContentLoaded", () => { const targetElement = document.getElementById("myDiffElement"); var diff2htmlUi = new global.Diff2HtmlUI(lineDiffExample, targetElement, { drawFileList: true, matching: "lines" }); diff2htmlUi.draw(); diff2htmlUi.fileListToggle(false); }); ``` # Troubleshooting ### 1. Out of memory or Slow execution #### Causes: - Big files - Big lines #### Fix: - Disable the line matching algorithm, by setting the option `{"matching": "none"}` when invoking diff2html ## Contributions This is a developer friendly project, all the contributions are welcome. To contribute just send a pull request with your changes following the guidelines described in `CONTRIBUTING.md`. I will try to review them as soon as possible. ## Contributors ✨ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
Rodrigo Fernandes
Rodrigo Fernandes

πŸ’»
stockmind
stockmind

πŸ’»
Ivan Vorontsov
Ivan Vorontsov

πŸ’»
Nick Brewer
Nick Brewer

πŸ’»
Matt Wade
Matt Wade

πŸ›
Rafael CortΓͺs
Rafael CortΓͺs

πŸ’»
Nuno Teixeira
Nuno Teixeira

πŸ’»
Koki Oyatsu
Koki Oyatsu

πŸ›
James Monger
James Monger

πŸ“–
Wessel van der Pal
Wessel van der Pal

πŸ›‘οΈ
jk-kim
jk-kim

πŸ’»
Sergey Semenov
Sergey Semenov

πŸ›
Nick Mitchell
Nick Mitchell

πŸ›
Samir Aguiar
Samir Aguiar

πŸ“–
pubkey
pubkey

πŸ“–
Илья
Илья

πŸ“–
Mohamed Akram
Mohamed Akram

πŸ›
Eugene Marcotte
Eugene Marcotte

πŸ’»
Dima Sabanin
Dima Sabanin

🚧
Ben Abbott
Ben Abbott

πŸ“–
εΌ˜ζ ‘@ι˜Ώι‡Œ
εΌ˜ζ ‘@ι˜Ώι‡Œ

πŸ›
Mikko Rantanen
Mikko Rantanen

πŸ›
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! ## License Copyright 2014-2016 Rodrigo Fernandes. Released under the terms of the MIT license. ## Thanks This project is inspired in [pretty-diff](https://github.com/scottgonzalez/pretty-diff) by [Scott GonzΓ‘lez](https://github.com/scottgonzalez). ---