diff2html 3.4.37 → 3.4.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/bundles/css/diff2html.min.css +1 -1
- package/bundles/js/diff2html-ui-base.min.js +1 -1
- package/bundles/js/diff2html-ui-slim.min.js +1 -1
- package/bundles/js/diff2html-ui.min.js +1 -1
- package/bundles/js/diff2html.min.js +1 -1
- package/lib/diff-parser.js +55 -65
- package/lib/diff-parser.js.map +1 -1
- package/lib/diff2html-templates.d.ts +1 -1
- package/lib/diff2html-templates.d.ts.map +1 -1
- package/lib/diff2html-templates.js +2 -24
- package/lib/diff2html-templates.js.map +1 -1
- package/lib/diff2html.js +16 -54
- package/lib/diff2html.js.map +1 -1
- package/lib/file-list-renderer.js +15 -39
- package/lib/file-list-renderer.js.map +1 -1
- package/lib/hoganjs-utils.js +22 -59
- package/lib/hoganjs-utils.js.map +1 -1
- package/lib/line-by-line-renderer.d.ts +3 -3
- package/lib/line-by-line-renderer.d.ts.map +1 -1
- package/lib/line-by-line-renderer.js +75 -114
- package/lib/line-by-line-renderer.js.map +1 -1
- package/lib/rematch.d.ts +3 -3
- package/lib/rematch.d.ts.map +1 -1
- package/lib/rematch.js +28 -31
- package/lib/rematch.js.map +1 -1
- package/lib/render-utils.d.ts +2 -2
- package/lib/render-utils.d.ts.map +1 -1
- package/lib/render-utils.js +44 -79
- package/lib/render-utils.js.map +1 -1
- package/lib/side-by-side-renderer.d.ts +3 -3
- package/lib/side-by-side-renderer.d.ts.map +1 -1
- package/lib/side-by-side-renderer.js +83 -122
- package/lib/side-by-side-renderer.js.map +1 -1
- package/lib/types.d.ts +6 -6
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js +1 -1
- package/lib/types.js.map +1 -1
- package/lib/ui/js/diff2html-ui-base.js +61 -75
- package/lib/ui/js/diff2html-ui-base.js.map +1 -1
- package/lib/ui/js/diff2html-ui-slim.d.ts +2 -1
- package/lib/ui/js/diff2html-ui-slim.d.ts.map +1 -1
- package/lib/ui/js/diff2html-ui-slim.js +6 -24
- package/lib/ui/js/diff2html-ui-slim.js.map +1 -1
- package/lib/ui/js/diff2html-ui.d.ts +2 -1
- package/lib/ui/js/diff2html-ui.d.ts.map +1 -1
- package/lib/ui/js/diff2html-ui.js +7 -27
- package/lib/ui/js/diff2html-ui.js.map +1 -1
- package/lib/ui/js/highlight.js-helpers.d.ts +1 -1
- package/lib/ui/js/highlight.js-helpers.d.ts.map +1 -1
- package/lib/ui/js/highlight.js-helpers.js +17 -17
- package/lib/ui/js/highlight.js-helpers.js.map +1 -1
- package/lib/ui/js/highlight.js-slim.js +53 -55
- package/lib/ui/js/highlight.js-slim.js.map +1 -1
- package/lib/utils.js +4 -4
- package/lib/utils.js.map +1 -1
- package/lib-esm/diff-parser.js +53 -63
- package/lib-esm/diff-parser.js.map +1 -1
- package/lib-esm/diff2html-templates.d.ts +1 -1
- package/lib-esm/diff2html-templates.d.ts.map +1 -1
- package/lib-esm/diff2html-templates.js +1 -1
- package/lib-esm/diff2html-templates.js.map +1 -1
- package/lib-esm/diff2html.js +9 -22
- package/lib-esm/diff2html.js.map +1 -1
- package/lib-esm/file-list-renderer.js +13 -15
- package/lib-esm/file-list-renderer.js.map +1 -1
- package/lib-esm/hoganjs-utils.js +19 -35
- package/lib-esm/hoganjs-utils.js.map +1 -1
- package/lib-esm/line-by-line-renderer.d.ts +3 -3
- package/lib-esm/line-by-line-renderer.d.ts.map +1 -1
- package/lib-esm/line-by-line-renderer.js +71 -89
- package/lib-esm/line-by-line-renderer.js.map +1 -1
- package/lib-esm/rematch.d.ts +3 -3
- package/lib-esm/rematch.d.ts.map +1 -1
- package/lib-esm/rematch.js +28 -31
- package/lib-esm/rematch.js.map +1 -1
- package/lib-esm/render-utils.d.ts +2 -2
- package/lib-esm/render-utils.d.ts.map +1 -1
- package/lib-esm/render-utils.js +41 -54
- package/lib-esm/render-utils.js.map +1 -1
- package/lib-esm/side-by-side-renderer.d.ts +3 -3
- package/lib-esm/side-by-side-renderer.d.ts.map +1 -1
- package/lib-esm/side-by-side-renderer.js +79 -97
- package/lib-esm/side-by-side-renderer.js.map +1 -1
- package/lib-esm/types.d.ts +6 -6
- package/lib-esm/types.d.ts.map +1 -1
- package/lib-esm/types.js +3 -3
- package/lib-esm/types.js.map +1 -1
- package/lib-esm/ui/js/diff2html-ui-base.js +59 -74
- package/lib-esm/ui/js/diff2html-ui-base.js.map +1 -1
- package/lib-esm/ui/js/diff2html-ui-slim.d.ts +2 -1
- package/lib-esm/ui/js/diff2html-ui-slim.d.ts.map +1 -1
- package/lib-esm/ui/js/diff2html-ui-slim.js +4 -23
- package/lib-esm/ui/js/diff2html-ui-slim.js.map +1 -1
- package/lib-esm/ui/js/diff2html-ui.d.ts +2 -1
- package/lib-esm/ui/js/diff2html-ui.d.ts.map +1 -1
- package/lib-esm/ui/js/diff2html-ui.js +4 -23
- package/lib-esm/ui/js/diff2html-ui.js.map +1 -1
- package/lib-esm/ui/js/highlight.js-helpers.d.ts +1 -1
- package/lib-esm/ui/js/highlight.js-helpers.d.ts.map +1 -1
- package/lib-esm/ui/js/highlight.js-helpers.js +17 -17
- package/lib-esm/ui/js/highlight.js-helpers.js.map +1 -1
- package/lib-esm/ui/js/highlight.js-slim.js +1 -1
- package/lib-esm/ui/js/highlight.js-slim.js.map +1 -1
- package/lib-esm/utils.js +4 -4
- package/lib-esm/utils.js.map +1 -1
- package/package.json +35 -36
package/lib/render-utils.js
CHANGED
|
@@ -1,44 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
14
|
-
if (k2 === undefined) k2 = k;
|
|
15
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
16
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
17
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
18
|
-
}
|
|
19
|
-
Object.defineProperty(o, k2, desc);
|
|
20
|
-
}) : (function(o, m, k, k2) {
|
|
21
|
-
if (k2 === undefined) k2 = k;
|
|
22
|
-
o[k2] = m[k];
|
|
23
|
-
}));
|
|
24
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
25
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
26
|
-
}) : function(o, v) {
|
|
27
|
-
o["default"] = v;
|
|
28
|
-
});
|
|
29
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
30
|
-
if (mod && mod.__esModule) return mod;
|
|
31
|
-
var result = {};
|
|
32
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
33
|
-
__setModuleDefault(result, mod);
|
|
34
|
-
return result;
|
|
35
|
-
};
|
|
36
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
3
|
exports.diffHighlight = exports.getFileIcon = exports.getHtmlId = exports.filenameDiff = exports.deconstructLine = exports.escapeForHtml = exports.toCSSClass = exports.defaultRenderConfig = exports.CSSLineClass = void 0;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const jsDiff = tslib_1.__importStar(require("diff"));
|
|
6
|
+
const utils_1 = require("./utils");
|
|
7
|
+
const rematch = tslib_1.__importStar(require("./rematch"));
|
|
8
|
+
const types_1 = require("./types");
|
|
42
9
|
exports.CSSLineClass = {
|
|
43
10
|
INSERTS: 'd2h-ins',
|
|
44
11
|
DELETES: 'd2h-del',
|
|
@@ -53,9 +20,9 @@ exports.defaultRenderConfig = {
|
|
|
53
20
|
maxLineLengthHighlight: 10000,
|
|
54
21
|
diffStyle: types_1.DiffStyleType.WORD,
|
|
55
22
|
};
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
23
|
+
const separator = '/';
|
|
24
|
+
const distance = rematch.newDistanceFn((change) => change.value);
|
|
25
|
+
const matcher = rematch.newMatcherFn(distance);
|
|
59
26
|
function isDevNullName(name) {
|
|
60
27
|
return name.indexOf('dev/null') !== -1;
|
|
61
28
|
}
|
|
@@ -90,9 +57,8 @@ function escapeForHtml(str) {
|
|
|
90
57
|
.replace(/\//g, '/');
|
|
91
58
|
}
|
|
92
59
|
exports.escapeForHtml = escapeForHtml;
|
|
93
|
-
function deconstructLine(line, isCombined, escape) {
|
|
94
|
-
|
|
95
|
-
var indexToSplit = prefixLength(isCombined);
|
|
60
|
+
function deconstructLine(line, isCombined, escape = true) {
|
|
61
|
+
const indexToSplit = prefixLength(isCombined);
|
|
96
62
|
return {
|
|
97
63
|
prefix: line.substring(0, indexToSplit),
|
|
98
64
|
content: escape ? escapeForHtml(line.substring(indexToSplit)) : line.substring(indexToSplit),
|
|
@@ -100,18 +66,18 @@ function deconstructLine(line, isCombined, escape) {
|
|
|
100
66
|
}
|
|
101
67
|
exports.deconstructLine = deconstructLine;
|
|
102
68
|
function filenameDiff(file) {
|
|
103
|
-
|
|
104
|
-
|
|
69
|
+
const oldFilename = (0, utils_1.unifyPath)(file.oldName);
|
|
70
|
+
const newFilename = (0, utils_1.unifyPath)(file.newName);
|
|
105
71
|
if (oldFilename !== newFilename && !isDevNullName(oldFilename) && !isDevNullName(newFilename)) {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
72
|
+
const prefixPaths = [];
|
|
73
|
+
const suffixPaths = [];
|
|
74
|
+
const oldFilenameParts = oldFilename.split(separator);
|
|
75
|
+
const newFilenameParts = newFilename.split(separator);
|
|
76
|
+
const oldFilenamePartsSize = oldFilenameParts.length;
|
|
77
|
+
const newFilenamePartsSize = newFilenameParts.length;
|
|
78
|
+
let i = 0;
|
|
79
|
+
let j = oldFilenamePartsSize - 1;
|
|
80
|
+
let k = newFilenamePartsSize - 1;
|
|
115
81
|
while (i < j && i < k) {
|
|
116
82
|
if (oldFilenameParts[i] === newFilenameParts[i]) {
|
|
117
83
|
prefixPaths.push(newFilenameParts[i]);
|
|
@@ -131,10 +97,10 @@ function filenameDiff(file) {
|
|
|
131
97
|
break;
|
|
132
98
|
}
|
|
133
99
|
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
100
|
+
const finalPrefix = prefixPaths.join(separator);
|
|
101
|
+
const finalSuffix = suffixPaths.join(separator);
|
|
102
|
+
const oldRemainingPath = oldFilenameParts.slice(i, j + 1).join(separator);
|
|
103
|
+
const newRemainingPath = newFilenameParts.slice(i, k + 1).join(separator);
|
|
138
104
|
if (finalPrefix.length && finalSuffix.length) {
|
|
139
105
|
return (finalPrefix + separator + '{' + oldRemainingPath + ' → ' + newRemainingPath + '}' + separator + finalSuffix);
|
|
140
106
|
}
|
|
@@ -155,11 +121,11 @@ function filenameDiff(file) {
|
|
|
155
121
|
}
|
|
156
122
|
exports.filenameDiff = filenameDiff;
|
|
157
123
|
function getHtmlId(file) {
|
|
158
|
-
return
|
|
124
|
+
return `d2h-${(0, utils_1.hashCode)(filenameDiff(file)).toString().slice(-6)}`;
|
|
159
125
|
}
|
|
160
126
|
exports.getHtmlId = getHtmlId;
|
|
161
127
|
function getFileIcon(file) {
|
|
162
|
-
|
|
128
|
+
let templateName = 'file-changed';
|
|
163
129
|
if (file.isRename) {
|
|
164
130
|
templateName = 'file-renamed';
|
|
165
131
|
}
|
|
@@ -178,11 +144,10 @@ function getFileIcon(file) {
|
|
|
178
144
|
return templateName;
|
|
179
145
|
}
|
|
180
146
|
exports.getFileIcon = getFileIcon;
|
|
181
|
-
function diffHighlight(diffLine1, diffLine2, isCombined, config) {
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
var line2 = deconstructLine(diffLine2, isCombined, false);
|
|
147
|
+
function diffHighlight(diffLine1, diffLine2, isCombined, config = {}) {
|
|
148
|
+
const { matching, maxLineLengthHighlight, matchWordsThreshold, diffStyle } = Object.assign(Object.assign({}, exports.defaultRenderConfig), config);
|
|
149
|
+
const line1 = deconstructLine(diffLine1, isCombined, false);
|
|
150
|
+
const line2 = deconstructLine(diffLine2, isCombined, false);
|
|
186
151
|
if (line1.content.length > maxLineLengthHighlight || line2.content.length > maxLineLengthHighlight) {
|
|
187
152
|
return {
|
|
188
153
|
oldLine: {
|
|
@@ -195,17 +160,17 @@ function diffHighlight(diffLine1, diffLine2, isCombined, config) {
|
|
|
195
160
|
},
|
|
196
161
|
};
|
|
197
162
|
}
|
|
198
|
-
|
|
163
|
+
const diff = diffStyle === 'char'
|
|
199
164
|
? jsDiff.diffChars(line1.content, line2.content)
|
|
200
165
|
: jsDiff.diffWordsWithSpace(line1.content, line2.content);
|
|
201
|
-
|
|
166
|
+
const changedWords = [];
|
|
202
167
|
if (diffStyle === 'word' && matching === 'words') {
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
chunks.forEach(
|
|
168
|
+
const removed = diff.filter(element => element.removed);
|
|
169
|
+
const added = diff.filter(element => element.added);
|
|
170
|
+
const chunks = matcher(added, removed);
|
|
171
|
+
chunks.forEach(chunk => {
|
|
207
172
|
if (chunk[0].length === 1 && chunk[1].length === 1) {
|
|
208
|
-
|
|
173
|
+
const dist = distance(chunk[0][0], chunk[1][0]);
|
|
209
174
|
if (dist < matchWordsThreshold) {
|
|
210
175
|
changedWords.push(chunk[0][0]);
|
|
211
176
|
changedWords.push(chunk[1][0]);
|
|
@@ -213,13 +178,13 @@ function diffHighlight(diffLine1, diffLine2, isCombined, config) {
|
|
|
213
178
|
}
|
|
214
179
|
});
|
|
215
180
|
}
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
181
|
+
const highlightedLine = diff.reduce((highlightedLine, part) => {
|
|
182
|
+
const elemType = part.added ? 'ins' : part.removed ? 'del' : null;
|
|
183
|
+
const addClass = changedWords.indexOf(part) > -1 ? ' class="d2h-change"' : '';
|
|
184
|
+
const escapedValue = escapeForHtml(part.value);
|
|
220
185
|
return elemType !== null
|
|
221
|
-
?
|
|
222
|
-
:
|
|
186
|
+
? `${highlightedLine}<${elemType}${addClass}>${escapedValue}</${elemType}>`
|
|
187
|
+
: `${highlightedLine}${escapedValue}`;
|
|
223
188
|
}, '');
|
|
224
189
|
return {
|
|
225
190
|
oldLine: {
|
package/lib/render-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-utils.js","sourceRoot":"","sources":["../src/render-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render-utils.js","sourceRoot":"","sources":["../src/render-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,18 +31,18 @@ export default class SideBySideRenderer {
|
|
|
31
31
|
generateLineHtml(oldLine?: DiffPreparedLine, newLine?: DiffPreparedLine): FileHtml;
|
|
32
32
|
generateSingleHtml(line?: DiffPreparedLine): string;
|
|
33
33
|
}
|
|
34
|
-
|
|
34
|
+
type DiffLineGroups = [
|
|
35
35
|
(DiffLineContext & DiffLineContent)[],
|
|
36
36
|
(DiffLineDeleted & DiffLineContent)[],
|
|
37
37
|
(DiffLineInserted & DiffLineContent)[]
|
|
38
38
|
][];
|
|
39
|
-
|
|
39
|
+
type DiffPreparedLine = {
|
|
40
40
|
type: renderUtils.CSSLineClass;
|
|
41
41
|
prefix: string;
|
|
42
42
|
content: string;
|
|
43
43
|
number: number;
|
|
44
44
|
};
|
|
45
|
-
|
|
45
|
+
type FileHtml = {
|
|
46
46
|
left: string;
|
|
47
47
|
right: string;
|
|
48
48
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"side-by-side-renderer.d.ts","sourceRoot":"","sources":["../src/side-by-side-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,QAAQ,EAER,QAAQ,EACR,SAAS,EACT,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,wBAAyB,SAAQ,WAAW,CAAC,YAAY;IACxE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,+BAA+B;;;;;;;;CAK3C,CAAC;AAOF,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAEpD,UAAU,EAAE,YAAY,EAAE,MAAM,GAAE,wBAA6B;IAK3E,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM;IAgBrC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,MAAM;IAwBzD,iBAAiB,IAAI,QAAQ;IAU7B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ;IA0D1C,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,cAAc;IAsCpD,oBAAoB,CAClB,QAAQ,EAAE,QAAQ,EAAE,EACpB,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,GACnC,QAAQ,EAAE,EAAE,EAAE;IAcjB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM;IAS5D,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,QAAQ;IA0D9F,gBAAgB,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ;IAOlF,kBAAkB,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,MAAM;CAapD;AAED,
|
|
1
|
+
{"version":3,"file":"side-by-side-renderer.d.ts","sourceRoot":"","sources":["../src/side-by-side-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,QAAQ,EAER,QAAQ,EACR,SAAS,EACT,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,wBAAyB,SAAQ,WAAW,CAAC,YAAY;IACxE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,+BAA+B;;;;;;;;CAK3C,CAAC;AAOF,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAEpD,UAAU,EAAE,YAAY,EAAE,MAAM,GAAE,wBAA6B;IAK3E,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM;IAgBrC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,MAAM;IAwBzD,iBAAiB,IAAI,QAAQ;IAU7B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ;IA0D1C,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,cAAc;IAsCpD,oBAAoB,CAClB,QAAQ,EAAE,QAAQ,EAAE,EACpB,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,GACnC,QAAQ,EAAE,EAAE,EAAE;IAcjB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM;IAS5D,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,QAAQ;IA0D9F,gBAAgB,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ;IAOlF,kBAAkB,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,MAAM;CAapD;AAED,KAAK,cAAc,GAAG;IACpB,CAAC,eAAe,GAAG,eAAe,CAAC,EAAE;IACrC,CAAC,eAAe,GAAG,eAAe,CAAC,EAAE;IACrC,CAAC,gBAAgB,GAAG,eAAe,CAAC,EAAE;CACvC,EAAE,CAAC;AAEJ,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}
|
|
@@ -1,77 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
14
|
-
if (k2 === undefined) k2 = k;
|
|
15
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
16
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
17
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
18
|
-
}
|
|
19
|
-
Object.defineProperty(o, k2, desc);
|
|
20
|
-
}) : (function(o, m, k, k2) {
|
|
21
|
-
if (k2 === undefined) k2 = k;
|
|
22
|
-
o[k2] = m[k];
|
|
23
|
-
}));
|
|
24
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
25
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
26
|
-
}) : function(o, v) {
|
|
27
|
-
o["default"] = v;
|
|
28
|
-
});
|
|
29
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
30
|
-
if (mod && mod.__esModule) return mod;
|
|
31
|
-
var result = {};
|
|
32
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
33
|
-
__setModuleDefault(result, mod);
|
|
34
|
-
return result;
|
|
35
|
-
};
|
|
36
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
3
|
exports.defaultSideBySideRendererConfig = void 0;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const Rematch = tslib_1.__importStar(require("./rematch"));
|
|
6
|
+
const renderUtils = tslib_1.__importStar(require("./render-utils"));
|
|
7
|
+
const types_1 = require("./types");
|
|
8
|
+
exports.defaultSideBySideRendererConfig = Object.assign(Object.assign({}, renderUtils.defaultRenderConfig), { renderNothingWhenEmpty: false, matchingMaxComparisons: 2500, maxLineSizeInBlockForComparison: 200 });
|
|
9
|
+
const genericTemplatesPath = 'generic';
|
|
10
|
+
const baseTemplatesPath = 'side-by-side';
|
|
11
|
+
const iconsBaseTemplatesPath = 'icon';
|
|
12
|
+
const tagsBaseTemplatesPath = 'tag';
|
|
13
|
+
class SideBySideRenderer {
|
|
14
|
+
constructor(hoganUtils, config = {}) {
|
|
49
15
|
this.hoganUtils = hoganUtils;
|
|
50
|
-
this.config =
|
|
16
|
+
this.config = Object.assign(Object.assign({}, exports.defaultSideBySideRendererConfig), config);
|
|
51
17
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
var diffs;
|
|
18
|
+
render(diffFiles) {
|
|
19
|
+
const diffsHtml = diffFiles
|
|
20
|
+
.map(file => {
|
|
21
|
+
let diffs;
|
|
57
22
|
if (file.blocks.length) {
|
|
58
|
-
diffs =
|
|
23
|
+
diffs = this.generateFileHtml(file);
|
|
59
24
|
}
|
|
60
25
|
else {
|
|
61
|
-
diffs =
|
|
26
|
+
diffs = this.generateEmptyDiff();
|
|
62
27
|
}
|
|
63
|
-
return
|
|
28
|
+
return this.makeFileDiffHtml(file, diffs);
|
|
64
29
|
})
|
|
65
30
|
.join('\n');
|
|
66
31
|
return this.hoganUtils.render(genericTemplatesPath, 'wrapper', { content: diffsHtml });
|
|
67
|
-
}
|
|
68
|
-
|
|
32
|
+
}
|
|
33
|
+
makeFileDiffHtml(file, diffs) {
|
|
69
34
|
if (this.config.renderNothingWhenEmpty && Array.isArray(file.blocks) && file.blocks.length === 0)
|
|
70
35
|
return '';
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
36
|
+
const fileDiffTemplate = this.hoganUtils.template(baseTemplatesPath, 'file-diff');
|
|
37
|
+
const filePathTemplate = this.hoganUtils.template(genericTemplatesPath, 'file-path');
|
|
38
|
+
const fileIconTemplate = this.hoganUtils.template(iconsBaseTemplatesPath, 'file');
|
|
39
|
+
const fileTagTemplate = this.hoganUtils.template(tagsBaseTemplatesPath, renderUtils.getFileIcon(file));
|
|
75
40
|
return fileDiffTemplate.render({
|
|
76
41
|
file: file,
|
|
77
42
|
fileHtmlId: renderUtils.getHtmlId(file),
|
|
@@ -83,8 +48,8 @@ var SideBySideRenderer = (function () {
|
|
|
83
48
|
fileTag: fileTagTemplate,
|
|
84
49
|
}),
|
|
85
50
|
});
|
|
86
|
-
}
|
|
87
|
-
|
|
51
|
+
}
|
|
52
|
+
generateEmptyDiff() {
|
|
88
53
|
return {
|
|
89
54
|
right: '',
|
|
90
55
|
left: this.hoganUtils.render(genericTemplatesPath, 'empty-diff', {
|
|
@@ -92,30 +57,27 @@ var SideBySideRenderer = (function () {
|
|
|
92
57
|
CSSLineClass: renderUtils.CSSLineClass,
|
|
93
58
|
}),
|
|
94
59
|
};
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
var matcher = Rematch.newMatcherFn(Rematch.newDistanceFn(function (e) { return renderUtils.deconstructLine(e.content, file.isCombined).content; }));
|
|
60
|
+
}
|
|
61
|
+
generateFileHtml(file) {
|
|
62
|
+
const matcher = Rematch.newMatcherFn(Rematch.newDistanceFn((e) => renderUtils.deconstructLine(e.content, file.isCombined).content));
|
|
99
63
|
return file.blocks
|
|
100
|
-
.map(
|
|
101
|
-
|
|
102
|
-
left:
|
|
103
|
-
right:
|
|
64
|
+
.map(block => {
|
|
65
|
+
const fileHtml = {
|
|
66
|
+
left: this.makeHeaderHtml(block.header, file),
|
|
67
|
+
right: this.makeHeaderHtml(''),
|
|
104
68
|
};
|
|
105
|
-
|
|
106
|
-
var contextLines = _a[0], oldLines = _a[1], newLines = _a[2];
|
|
69
|
+
this.applyLineGroupping(block).forEach(([contextLines, oldLines, newLines]) => {
|
|
107
70
|
if (oldLines.length && newLines.length && !contextLines.length) {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
var _b = _this.processChangedLines(file.isCombined, oldLines, newLines), left = _b.left, right = _b.right;
|
|
71
|
+
this.applyRematchMatching(oldLines, newLines, matcher).map(([oldLines, newLines]) => {
|
|
72
|
+
const { left, right } = this.processChangedLines(file.isCombined, oldLines, newLines);
|
|
111
73
|
fileHtml.left += left;
|
|
112
74
|
fileHtml.right += right;
|
|
113
75
|
});
|
|
114
76
|
}
|
|
115
77
|
else if (contextLines.length) {
|
|
116
|
-
contextLines.forEach(
|
|
117
|
-
|
|
118
|
-
|
|
78
|
+
contextLines.forEach(line => {
|
|
79
|
+
const { prefix, content } = renderUtils.deconstructLine(line.content, file.isCombined);
|
|
80
|
+
const { left, right } = this.generateLineHtml({
|
|
119
81
|
type: renderUtils.CSSLineClass.CONTEXT,
|
|
120
82
|
prefix: prefix,
|
|
121
83
|
content: content,
|
|
@@ -125,13 +87,13 @@ var SideBySideRenderer = (function () {
|
|
|
125
87
|
prefix: prefix,
|
|
126
88
|
content: content,
|
|
127
89
|
number: line.newNumber,
|
|
128
|
-
})
|
|
90
|
+
});
|
|
129
91
|
fileHtml.left += left;
|
|
130
92
|
fileHtml.right += right;
|
|
131
93
|
});
|
|
132
94
|
}
|
|
133
95
|
else if (oldLines.length || newLines.length) {
|
|
134
|
-
|
|
96
|
+
const { left, right } = this.processChangedLines(file.isCombined, oldLines, newLines);
|
|
135
97
|
fileHtml.left += left;
|
|
136
98
|
fileHtml.right += right;
|
|
137
99
|
}
|
|
@@ -141,16 +103,16 @@ var SideBySideRenderer = (function () {
|
|
|
141
103
|
});
|
|
142
104
|
return fileHtml;
|
|
143
105
|
})
|
|
144
|
-
.reduce(
|
|
106
|
+
.reduce((accomulated, html) => {
|
|
145
107
|
return { left: accomulated.left + html.left, right: accomulated.right + html.right };
|
|
146
108
|
}, { left: '', right: '' });
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
for (
|
|
153
|
-
|
|
109
|
+
}
|
|
110
|
+
applyLineGroupping(block) {
|
|
111
|
+
const blockLinesGroups = [];
|
|
112
|
+
let oldLines = [];
|
|
113
|
+
let newLines = [];
|
|
114
|
+
for (let i = 0; i < block.lines.length; i++) {
|
|
115
|
+
const diffLine = block.lines[i];
|
|
154
116
|
if ((diffLine.type !== types_1.LineType.INSERT && newLines.length) ||
|
|
155
117
|
(diffLine.type === types_1.LineType.CONTEXT && oldLines.length > 0)) {
|
|
156
118
|
blockLinesGroups.push([[], oldLines, newLines]);
|
|
@@ -176,76 +138,75 @@ var SideBySideRenderer = (function () {
|
|
|
176
138
|
newLines = [];
|
|
177
139
|
}
|
|
178
140
|
return blockLinesGroups;
|
|
179
|
-
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
141
|
+
}
|
|
142
|
+
applyRematchMatching(oldLines, newLines, matcher) {
|
|
143
|
+
const comparisons = oldLines.length * newLines.length;
|
|
144
|
+
const maxLineSizeInBlock = Math.max.apply(null, [0].concat(oldLines.concat(newLines).map(elem => elem.content.length)));
|
|
145
|
+
const doMatching = comparisons < this.config.matchingMaxComparisons &&
|
|
184
146
|
maxLineSizeInBlock < this.config.maxLineSizeInBlockForComparison &&
|
|
185
147
|
(this.config.matching === 'lines' || this.config.matching === 'words');
|
|
186
148
|
return doMatching ? matcher(oldLines, newLines) : [[oldLines, newLines]];
|
|
187
|
-
}
|
|
188
|
-
|
|
149
|
+
}
|
|
150
|
+
makeHeaderHtml(blockHeader, file) {
|
|
189
151
|
return this.hoganUtils.render(genericTemplatesPath, 'block-header', {
|
|
190
152
|
CSSLineClass: renderUtils.CSSLineClass,
|
|
191
153
|
blockHeader: (file === null || file === void 0 ? void 0 : file.isTooBig) ? blockHeader : renderUtils.escapeForHtml(blockHeader),
|
|
192
154
|
lineClass: 'd2h-code-side-linenumber',
|
|
193
155
|
contentClass: 'd2h-code-side-line',
|
|
194
156
|
});
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
|
|
157
|
+
}
|
|
158
|
+
processChangedLines(isCombined, oldLines, newLines) {
|
|
159
|
+
const fileHtml = {
|
|
198
160
|
right: '',
|
|
199
161
|
left: '',
|
|
200
162
|
};
|
|
201
|
-
|
|
202
|
-
for (
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
163
|
+
const maxLinesNumber = Math.max(oldLines.length, newLines.length);
|
|
164
|
+
for (let i = 0; i < maxLinesNumber; i++) {
|
|
165
|
+
const oldLine = oldLines[i];
|
|
166
|
+
const newLine = newLines[i];
|
|
167
|
+
const diff = oldLine !== undefined && newLine !== undefined
|
|
206
168
|
? renderUtils.diffHighlight(oldLine.content, newLine.content, isCombined, this.config)
|
|
207
169
|
: undefined;
|
|
208
|
-
|
|
209
|
-
?
|
|
170
|
+
const preparedOldLine = oldLine !== undefined && oldLine.oldNumber !== undefined
|
|
171
|
+
? Object.assign(Object.assign({}, (diff !== undefined
|
|
210
172
|
? {
|
|
211
173
|
prefix: diff.oldLine.prefix,
|
|
212
174
|
content: diff.oldLine.content,
|
|
213
175
|
type: renderUtils.CSSLineClass.DELETE_CHANGES,
|
|
214
176
|
}
|
|
215
|
-
:
|
|
216
|
-
|
|
217
|
-
?
|
|
177
|
+
: Object.assign(Object.assign({}, renderUtils.deconstructLine(oldLine.content, isCombined)), { type: renderUtils.toCSSClass(oldLine.type) }))), { number: oldLine.oldNumber }) : undefined;
|
|
178
|
+
const preparedNewLine = newLine !== undefined && newLine.newNumber !== undefined
|
|
179
|
+
? Object.assign(Object.assign({}, (diff !== undefined
|
|
218
180
|
? {
|
|
219
181
|
prefix: diff.newLine.prefix,
|
|
220
182
|
content: diff.newLine.content,
|
|
221
183
|
type: renderUtils.CSSLineClass.INSERT_CHANGES,
|
|
222
184
|
}
|
|
223
|
-
:
|
|
224
|
-
|
|
185
|
+
: Object.assign(Object.assign({}, renderUtils.deconstructLine(newLine.content, isCombined)), { type: renderUtils.toCSSClass(newLine.type) }))), { number: newLine.newNumber }) : undefined;
|
|
186
|
+
const { left, right } = this.generateLineHtml(preparedOldLine, preparedNewLine);
|
|
225
187
|
fileHtml.left += left;
|
|
226
188
|
fileHtml.right += right;
|
|
227
189
|
}
|
|
228
190
|
return fileHtml;
|
|
229
|
-
}
|
|
230
|
-
|
|
191
|
+
}
|
|
192
|
+
generateLineHtml(oldLine, newLine) {
|
|
231
193
|
return {
|
|
232
194
|
left: this.generateSingleHtml(oldLine),
|
|
233
195
|
right: this.generateSingleHtml(newLine),
|
|
234
196
|
};
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
197
|
+
}
|
|
198
|
+
generateSingleHtml(line) {
|
|
199
|
+
const lineClass = 'd2h-code-side-linenumber';
|
|
200
|
+
const contentClass = 'd2h-code-side-line';
|
|
239
201
|
return this.hoganUtils.render(genericTemplatesPath, 'line', {
|
|
240
|
-
type: (line === null || line === void 0 ? void 0 : line.type) ||
|
|
241
|
-
lineClass: line !== undefined ? lineClass :
|
|
242
|
-
contentClass: line !== undefined ? contentClass :
|
|
202
|
+
type: (line === null || line === void 0 ? void 0 : line.type) || `${renderUtils.CSSLineClass.CONTEXT} d2h-emptyplaceholder`,
|
|
203
|
+
lineClass: line !== undefined ? lineClass : `${lineClass} d2h-code-side-emptyplaceholder`,
|
|
204
|
+
contentClass: line !== undefined ? contentClass : `${contentClass} d2h-code-side-emptyplaceholder`,
|
|
243
205
|
prefix: (line === null || line === void 0 ? void 0 : line.prefix) === ' ' ? ' ' : line === null || line === void 0 ? void 0 : line.prefix,
|
|
244
206
|
content: line === null || line === void 0 ? void 0 : line.content,
|
|
245
207
|
lineNumber: line === null || line === void 0 ? void 0 : line.number,
|
|
246
208
|
});
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
}());
|
|
209
|
+
}
|
|
210
|
+
}
|
|
250
211
|
exports.default = SideBySideRenderer;
|
|
251
212
|
//# sourceMappingURL=side-by-side-renderer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"side-by-side-renderer.js","sourceRoot":"","sources":["../src/side-by-side-renderer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"side-by-side-renderer.js","sourceRoot":"","sources":["../src/side-by-side-renderer.ts"],"names":[],"mappings":"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"}
|