From 34357dde7cc2a4b06ec0ddf51642ea8c4bdba1a5 Mon Sep 17 00:00:00 2001 From: ShareVB Date: Sun, 4 Feb 2024 13:58:01 +0100 Subject: [PATCH] fix(integer-base-converter): fix conversion for number of more than 32bits --- .../integer-base-converter.model.test.ts | 3 +++ .../integer-base-converter.model.ts | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/tools/integer-base-converter/integer-base-converter.model.test.ts b/src/tools/integer-base-converter/integer-base-converter.model.test.ts index b7bcf95b..ed16c142 100644 --- a/src/tools/integer-base-converter/integer-base-converter.model.test.ts +++ b/src/tools/integer-base-converter/integer-base-converter.model.test.ts @@ -26,6 +26,9 @@ describe('integer-base-converter', () => { expect(convertBase({ value: '0b10101010', fromBase: -1, toBase: 10 })).toEqual('170'); expect(convertBase({ value: '0b_1010_1010', fromBase: -1, toBase: 10 })).toEqual('170'); expect(convertBase({ value: '192,654', fromBase: 10, toBase: 8 })).toEqual('570216'); + expect(convertBase({ value: '42540766411283223938465490632011909384', fromBase: 10, toBase: 10 })).toEqual('42540766411283223938465490632011909384'); + expect(convertBase({ value: '42540766411283223938465490632011909384', fromBase: 10, toBase: 16 })).toEqual('20010db8000085a300000000ac1f8908'); + expect(convertBase({ value: '20010db8000085a300000000ac1f8908', fromBase: 16, toBase: 10 })).toEqual('42540766411283223938465490632011909384'); }); }); }); diff --git a/src/tools/integer-base-converter/integer-base-converter.model.ts b/src/tools/integer-base-converter/integer-base-converter.model.ts index 431876f3..89154000 100644 --- a/src/tools/integer-base-converter/integer-base-converter.model.ts +++ b/src/tools/integer-base-converter/integer-base-converter.model.ts @@ -46,16 +46,16 @@ export function convertBase( let decValue = cleanedValue .split('') .reverse() - .reduce((carry: number, digit: string, index: number) => { + .reduce((carry: bigint, digit: string, index: number) => { if (!fromRange.includes(digit)) { throw new Error(`Invalid digit "${digit}" for base ${finalFromBase}.`); } - return (carry += fromRange.indexOf(digit) * finalFromBase ** index); - }, 0); + return (carry += BigInt(fromRange.indexOf(digit)) * BigInt(finalFromBase) ** BigInt(index)); + }, 0n); let newValue = ''; while (decValue > 0) { - newValue = toRange[decValue % toBase] + newValue; - decValue = (decValue - (decValue % toBase)) / toBase; + newValue = toRange[Number(decValue % BigInt(toBase))] + newValue; + decValue = (decValue - (decValue % BigInt(toBase))) / BigInt(toBase); } return newValue || '0'; }