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

fix: handle Auto delimiter in fromDecimal (#2217)

Browse Source
This commit is contained in:
OndraDol 2026-04-04 21:08:54 +02:00
parent 167cc398ce
commit 2bef6e132c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/lib/Decimal.mjs
View File

@ -24,9 +24,9 @@ import Utils from "../Utils.mjs";
* fromDecimal("10:20:30", "Colon"); * fromDecimal("10:20:30", "Colon");
*/ */
export function fromDecimal(data, delim="Auto") { export function fromDecimal(data, delim="Auto") {
delim = Utils.charRep(delim); const delimRegex = delim === "Auto" ? /[^\d-]+/ : Utils.charRep(delim);
const output = []; const output = [];
let byteStr = data.split(delim); let byteStr = data.split(delimRegex);
if (byteStr[byteStr.length-1] === "") if (byteStr[byteStr.length-1] === "")
byteStr = byteStr.slice(0, byteStr.length-1); byteStr = byteStr.slice(0, byteStr.length-1);

6
tests/node/tests/operations.mjs
View File

@ -532,6 +532,12 @@ Top Drawer`, {
assert.strictEqual(chef.fromDecimal("72 101 108 108 111").toString(), "Hello"); assert.strictEqual(chef.fromDecimal("72 101 108 108 111").toString(), "Hello");
}), }),
it("From decimal with Auto delimiter", () => {
assert.strictEqual(chef.fromDecimal("72,101,108,108,111").toString(), "Hello");
assert.strictEqual(chef.fromDecimal("72:101:108:108:111").toString(), "Hello");
assert.strictEqual(chef.fromDecimal("72;101;108;108;111").toString(), "Hello");
}),
it("From hex", () => { it("From hex", () => {
assert.strictEqual(chef.fromHex("52 69 6e 67 20 41 6e 79 20 42 65 6c 6c 73 3f").toString(), "Ring Any Bells?"); assert.strictEqual(chef.fromHex("52 69 6e 67 20 41 6e 79 20 42 65 6c 6c 73 3f").toString(), "Ring Any Bells?");
}), }),