exlim/cyberchef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge d7a9578b937c430111ae81c3a78aa0b441bad4f5 into 4290ea753912378913b1f3f54e0fc5720afeda5d

Browse Source
This commit is contained in:
Sushanth012 2026-08-10 03:32:04 -07:00 committed by GitHub
commit a58261426f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 349 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/operations/Diff.mjs
View File

@ -57,6 +57,12 @@ class Diff extends Operation {
"type": "boolean",
"value": false,
"hint": "Relevant for word and line"
},
{
"name": "Show +/- notation",
"hint": "Works only in Line diff mode.",
"type": "boolean",
"value": false
}
];
}
@ -73,7 +79,8 @@ class Diff extends Operation {
showAdded,
showRemoved,
showSubtraction,
ignoreWhitespace
ignoreWhitespace,
showNotation
] = args,
samples = input.split(sampleDelim);
let output = "",
@ -86,6 +93,34 @@ class Diff extends Operation {
throw new OperationError("Incorrect number of samples, perhaps you need to modify the sample delimiter or add more samples?");
}
// +/- notation only works properly with Line diff mode
// For other modes, it falls back to HTML format and this option is ignored (see hint).
const useNotation = showNotation && diffBy === "Line";
if (useNotation) {
const patch = jsdiff.createTwoFilesPatch("original", "modified", samples[0], samples[1], "", "", {
context: Infinity,
ignoreWhitespace: ignoreWhitespace,
});
const lines = patch.split("\n");
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
if (line.startsWith("@@")) {
if (showSubtraction) output += line + "\n";
} else if (line.startsWith("+") && !line.startsWith("+++")) {
if (showAdded) output += line + "\n";
} else if (line.startsWith("-") && !line.startsWith("---")) {
if (showRemoved) output += line + "\n";
} else if (line.startsWith("===") || line.startsWith("---") || line.startsWith("+++") || line.startsWith("\\")) {
continue;
} else if (line.length > 0 && !showSubtraction) {
output += line.substring(1) + "\n";
}
}
return output.slice(0, -1);
}
switch (diffBy) {
case "Character":
diff = jsdiff.diffChars(samples[0], samples[1]);

313
tests/operations/tests/Diff.mjs Normal file
View File

@ -0,0 +1,313 @@
/**
* @author mikecat
* @copyright Crown Copyright 2023
* @license Apache-2.0
*/
import TestRegister from "../../lib/TestRegister.mjs";
TestRegister.addTests([
{
"name": "Diff: Show +/- notation - true (Line mode)",
"input": "line1\nline2\nline3\n\nline1\nline2modified\nline3",
"expectedOutput": "line1\n-line2\n+line2modified\nline3",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n\\n",
"Line",
true,
true,
false,
false,
true
],
},
],
},
{
"name": "Diff: Show +/- notation - false (Line mode)",
"input": "line1\nline2\nline3\n\nline1\nline2modified\nline3",
"expectedOutput": "line1\n<del>line2\n</del><ins>line2modified\n</ins>line3",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n\\n",
"Line",
true,
true,
false,
false,
false
],
},
],
},
{
"name": "Diff: Show +/- notation - with showAdded false (Line mode)",
"input": "line1\nline2\nline3\n\nline1\nline2modified\nline3",
"expectedOutput": "line1\n-line2\nline3",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n\\n",
"Line",
false,
true,
false,
false,
true
],
},
],
},
{
"name": "Diff: Show +/- notation - with showRemoved false (Line mode)",
"input": "line1\nline2\nline3\n\nline1\nline2modified\nline3",
"expectedOutput": "line1\n+line2modified\nline3",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n\\n",
"Line",
true,
false,
false,
false,
true
],
},
],
},
{
"name": "Diff: Show +/- notation - with showSubtraction true (Line mode)",
"input": "line1\nline2\nline3\n\nline1\nline2modified\nline3",
"expectedOutput": "@@ -1,3 +1,3 @@\n-line2\n+line2modified",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n\\n",
"Line",
true,
true,
true,
false,
true
],
},
],
},
{
"name": "Diff: Show +/- notation ignored for Character mode",
"input": "abc\ndef",
"expectedOutput": "<del>abc</del><ins>def</ins>",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Character",
true,
true,
false,
false,
true
],
},
],
},
{
"name": "Diff: Show +/- notation ignored for Word mode",
"input": "hello world\nhello cruel world",
"expectedOutput": "hello <ins>cruel </ins>world",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Word",
true,
true,
false,
false,
true
],
},
],
},
{
"name": "Diff: Show +/- notation ignored for Sentence mode",
"input": "Hello world.\nHello there.",
"expectedOutput": "<del>Hello world.</del><ins>Hello there.</ins>",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Sentence",
true,
true,
false,
false,
true
],
},
],
},
{
"name": "Diff: Character mode basic",
"input": "abc\nabc",
"expectedOutput": "abc",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Character",
true,
true,
false,
false,
false
],
},
],
},
{
"name": "Diff: Character mode with changes",
"input": "abc\nabcdef",
"expectedOutput": "abc<ins>def</ins>",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Character",
true,
true,
false,
false,
false
],
},
],
},
{
"name": "Diff: Word mode basic",
"input": "hello world\nhello world",
"expectedOutput": "hello world",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Word",
true,
true,
false,
false,
false
],
},
],
},
{
"name": "Diff: Word mode with changes",
"input": "hello world\nhello cruel world",
"expectedOutput": "hello <ins>cruel </ins>world",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Word",
true,
true,
false,
false,
false
],
},
],
},
{
"name": "Diff: Line mode basic",
"input": "line1\nline2\nline3\n\nline1\nline2\nline3",
"expectedOutput": "line1\nline2\nline3",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n\\n",
"Line",
true,
true,
false,
false,
false
],
},
],
},
{
"name": "Diff: Line mode with changes",
"input": "line1\nline2\nline3\n\nline1\nline4\nline3",
"expectedOutput": "line1\n<del>line2\n</del><ins>line4\n</ins>line3",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n\\n",
"Line",
true,
true,
false,
false,
false
],
},
],
},
{
"name": "Diff: Sentence mode basic",
"input": "Hello world.\nHello world.",
"expectedOutput": "Hello world.",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Sentence",
true,
true,
false,
false,
false
],
},
],
},
{
"name": "Diff: Sentence mode with changes",
"input": "Hello world.\nHello there.",
"expectedOutput": "<del>Hello world.</del><ins>Hello there.</ins>",
"recipeConfig": [
{
"op": "Diff",
"args": [
"\\n",
"Sentence",
true,
true,
false,
false,
false
],
},
],
},
]);