2020-08-01 03:43:15 +02:00
|
|
|
"use strict";
|
|
|
|
|
2017-12-04 09:49:22 +01:00
|
|
|
/**
|
|
|
|
* mdiff.js
|
|
|
|
*
|
|
|
|
* Used to produce colorful and informative diffs for comparison of generated
|
|
|
|
* Markdown. Unlike the built-in diffs used in python or node.js assert libraries,
|
|
|
|
* is actually designed to be effective for long, single-line comparisons.
|
|
|
|
*
|
|
|
|
* Based on diffing library difflib, a js port of the python library.
|
|
|
|
*
|
|
|
|
* The sole exported function diff_strings(string_0, string_1) returns a pretty-printed
|
2020-10-23 02:43:28 +02:00
|
|
|
* Unicode string containing their diff.
|
2017-12-04 09:49:22 +01:00
|
|
|
*/
|
|
|
|
|
2020-07-15 01:29:15 +02:00
|
|
|
const difflib = require("difflib");
|
2017-12-04 09:49:22 +01:00
|
|
|
|
|
|
|
function apply_color(input_string, changes) {
|
|
|
|
let previous_index = 0;
|
2018-12-07 22:14:28 +01:00
|
|
|
let processed_string = input_string.slice(0, 2);
|
2017-12-04 09:49:22 +01:00
|
|
|
input_string = input_string.slice(2);
|
|
|
|
|
2020-05-27 01:08:49 +02:00
|
|
|
const formatter = new Map([
|
2020-10-07 10:24:09 +02:00
|
|
|
["delete", (string) => "\u001B[31m" + string + "\u001B[0m"],
|
|
|
|
["insert", (string) => "\u001B[32m" + string + "\u001B[0m"],
|
|
|
|
["replace", (string) => "\u001B[33m" + string + "\u001B[0m"],
|
2020-05-27 01:08:49 +02:00
|
|
|
]);
|
2021-01-22 22:29:08 +01:00
|
|
|
for (const change of changes) {
|
2020-05-27 01:08:49 +02:00
|
|
|
if (formatter.has(change.tag)) {
|
2017-12-04 09:49:22 +01:00
|
|
|
processed_string += input_string.slice(previous_index, change.beginning_index);
|
2020-05-27 01:08:49 +02:00
|
|
|
processed_string += formatter.get(change.tag)(
|
2020-07-02 02:16:03 +02:00
|
|
|
input_string.slice(change.beginning_index, change.ending_index),
|
2017-12-04 09:49:22 +01:00
|
|
|
);
|
|
|
|
previous_index = change.ending_index;
|
|
|
|
}
|
2021-01-22 22:29:08 +01:00
|
|
|
}
|
2017-12-04 09:49:22 +01:00
|
|
|
|
|
|
|
processed_string += input_string.slice(previous_index);
|
|
|
|
return processed_string;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The library difflib produces diffs that look as follows:
|
|
|
|
*
|
|
|
|
* - <p>upgrade! yes</p>
|
|
|
|
* ? ^^ -
|
|
|
|
* + <p>downgrade yes.</p>
|
|
|
|
* ? ^^^^ +
|
|
|
|
*
|
|
|
|
* The purpose of this function is to facilitate converting these diffs into
|
|
|
|
* colored versions, where the question-mark lines are removed, replaced with
|
|
|
|
* directions to add appropriate color to the lines that they annotate.
|
|
|
|
*/
|
|
|
|
function parse_questionmark_line(questionmark_line) {
|
2020-07-16 23:29:01 +02:00
|
|
|
let current_sequence = ""; // Either "^", "-", "+", or ""
|
2017-12-04 09:49:22 +01:00
|
|
|
let beginning_index = 0;
|
|
|
|
let index = 0;
|
|
|
|
|
|
|
|
const changes_list = [];
|
2020-05-27 01:08:49 +02:00
|
|
|
const aliases = new Map([
|
|
|
|
["^", "replace"],
|
|
|
|
["+", "insert"],
|
|
|
|
["-", "delete"],
|
|
|
|
]);
|
2017-12-04 09:49:22 +01:00
|
|
|
const add_change = () => {
|
|
|
|
if (current_sequence) {
|
|
|
|
changes_list.push({
|
2020-05-27 01:08:49 +02:00
|
|
|
tag: aliases.get(current_sequence),
|
2017-12-04 09:49:22 +01:00
|
|
|
beginning_index,
|
2018-12-18 19:34:45 +01:00
|
|
|
ending_index: index,
|
2017-12-04 09:49:22 +01:00
|
|
|
});
|
|
|
|
current_sequence = "";
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
questionmark_line = questionmark_line.slice(2).trimRight("\n");
|
|
|
|
|
|
|
|
for (const character of questionmark_line) {
|
2020-05-27 01:08:49 +02:00
|
|
|
if (aliases.has(character)) {
|
2017-12-04 09:49:22 +01:00
|
|
|
if (current_sequence !== character) {
|
|
|
|
add_change();
|
|
|
|
current_sequence = character;
|
|
|
|
beginning_index = index;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
add_change();
|
|
|
|
}
|
|
|
|
index += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// In case we have a "change" involving the last character on a line
|
|
|
|
// e.g. a string such as "? ^^ -- ++++"
|
|
|
|
add_change();
|
|
|
|
|
|
|
|
return changes_list;
|
|
|
|
}
|
|
|
|
|
|
|
|
function diff_strings(string_0, string_1) {
|
|
|
|
let output_lines = [];
|
|
|
|
let ndiff_output = "";
|
|
|
|
let changes_list = [];
|
|
|
|
|
|
|
|
ndiff_output = difflib.ndiff(string_0.split("\n"), string_1.split("\n"));
|
|
|
|
|
2021-01-22 22:29:08 +01:00
|
|
|
for (const line of ndiff_output) {
|
2017-12-04 09:49:22 +01:00
|
|
|
if (line.startsWith("+")) {
|
|
|
|
output_lines.push(line);
|
|
|
|
} else if (line.startsWith("-")) {
|
|
|
|
output_lines.push(line);
|
|
|
|
} else if (line.startsWith("?")) {
|
|
|
|
changes_list = parse_questionmark_line(line);
|
2022-01-24 09:05:06 +01:00
|
|
|
output_lines.push(apply_color(output_lines.pop(), changes_list));
|
2017-12-04 09:49:22 +01:00
|
|
|
} else {
|
|
|
|
output_lines.push(line);
|
|
|
|
}
|
2021-01-22 22:29:08 +01:00
|
|
|
}
|
2017-12-04 09:49:22 +01:00
|
|
|
|
2021-01-23 02:36:54 +01:00
|
|
|
output_lines = output_lines.map(
|
|
|
|
(string) => "\u001B[34m" + string.slice(0, 1) + "\u001B[0m" + string.slice(1),
|
|
|
|
);
|
2017-12-04 09:49:22 +01:00
|
|
|
|
|
|
|
return output_lines.join("\n");
|
|
|
|
}
|
|
|
|
|
2020-07-16 22:40:18 +02:00
|
|
|
module.exports = {diff_strings};
|
2017-12-04 09:49:22 +01:00
|
|
|
|
|
|
|
// Simple CLI for this module
|
|
|
|
// Only run this code if called as a command-line utility
|
|
|
|
if (require.main === module) {
|
2024-11-11 00:10:00 +01:00
|
|
|
const {parseArgs} = require("node:util");
|
|
|
|
|
|
|
|
const usage =
|
|
|
|
"Usage: mdiff <string_0> <string_1>\nWhere <string_0> and <string_1> are the strings to be diffed";
|
|
|
|
const {
|
|
|
|
values: {help},
|
|
|
|
positionals: [string_0, string_1],
|
|
|
|
} = parseArgs({options: {help: {type: "boolean"}}, allowPositionals: true});
|
|
|
|
|
|
|
|
if (help) {
|
|
|
|
console.log(usage);
|
2024-11-11 00:17:32 +01:00
|
|
|
process.exit(0);
|
2017-12-04 09:49:22 +01:00
|
|
|
}
|
2024-11-11 00:10:00 +01:00
|
|
|
if (string_1 === undefined) {
|
|
|
|
console.error(usage);
|
|
|
|
process.exit(1);
|
|
|
|
}
|
2017-12-04 09:49:22 +01:00
|
|
|
|
2024-11-11 00:10:00 +01:00
|
|
|
const output = diff_strings(string_0, string_1);
|
2017-12-04 09:49:22 +01:00
|
|
|
console.log(output);
|
|
|
|
}
|