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 d0387b64..b7bcf95b 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 @@ -11,6 +11,21 @@ describe('integer-base-converter', () => { expect(convertBase({ value: '10100101', fromBase: 2, toBase: 16 })).toEqual('a5'); expect(convertBase({ value: '192654', fromBase: 10, toBase: 8 })).toEqual('570216'); expect(convertBase({ value: 'zz', fromBase: 64, toBase: 10 })).toEqual('2275'); + expect(convertBase({ value: 'AA', fromBase: 16, toBase: 10 })).toEqual('170'); + expect(convertBase({ value: 'aa', fromBase: 16, toBase: 10 })).toEqual('170'); + expect(convertBase({ value: '0xAA', fromBase: -1, toBase: 10 })).toEqual('170'); + expect(convertBase({ value: '&HAA', fromBase: -1, toBase: 10 })).toEqual('170'); + expect(convertBase({ value: '0xAAUL', fromBase: -1, toBase: 10 })).toEqual('170'); + expect(convertBase({ value: '0XAAUL', fromBase: -1, toBase: 10 })).toEqual('170'); + expect(convertBase({ value: '10UL', fromBase: 10, toBase: 10 })).toEqual('10'); + expect(convertBase({ value: '10n', fromBase: 10, toBase: 10 })).toEqual('10'); + expect(convertBase({ value: '0o252', fromBase: -1, toBase: 10 })).toEqual('170'); + expect(convertBase({ value: '&O252', fromBase: -1, toBase: 10 })).toEqual('170'); + expect(convertBase({ value: '192 654', fromBase: 10, toBase: 8 })).toEqual('570216'); + expect(convertBase({ value: '192.654', fromBase: 10, toBase: 8 })).toEqual('570216'); + 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'); }); }); }); 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 b4470e57..431876f3 100644 --- a/src/tools/integer-base-converter/integer-base-converter.model.ts +++ b/src/tools/integer-base-converter/integer-base-converter.model.ts @@ -1,15 +1,56 @@ -export function convertBase({ value, fromBase, toBase }: { value: string; fromBase: number; toBase: number }) { +export function hasNumberPrefix(value: string) { + return (value ?? '').trim().match(/^(0[xob].|&[hob].)/i); +} + +export function convertBase( + { + value, fromBase, toBase, + ignorePunctuationsRegexChars = ' \u00A0_\.,-', + handlePrefixSuffix = true, + ignoreCase = true, + }: { + value: string + fromBase: number + toBase: number + ignorePunctuationsRegexChars?: string + handlePrefixSuffix?: boolean + ignoreCase?: boolean + }) { + let cleanedValue = (value ?? '0').trim(); + if (ignorePunctuationsRegexChars) { + cleanedValue = cleanedValue.replace(new RegExp(`[${ignorePunctuationsRegexChars}]`, 'g'), ''); + } + let finalFromBase = fromBase; + if (handlePrefixSuffix) { + for (const regBase of [ + { base: 2, regex: /^(&b|0b)?([01]+)([IULZn]*)$/i }, + { base: 8, regex: /^(&o|0o)?([0-7]+)([IULZn]*)$/i }, + { base: 16, regex: /^(&h|0x)?([a-f0-9]+)([IULZn]*)$/i }, + ]) { + const match = cleanedValue.match(regBase.regex); + if (match) { + if (match[1]) { + finalFromBase = regBase.base; + } + cleanedValue = match[2]; + break; + } + } + } + if (ignoreCase && finalFromBase <= 36) { + cleanedValue = cleanedValue.toLowerCase(); + } const range = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+/'.split(''); - const fromRange = range.slice(0, fromBase); + const fromRange = range.slice(0, finalFromBase); const toRange = range.slice(0, toBase); - let decValue = value + let decValue = cleanedValue .split('') .reverse() .reduce((carry: number, digit: string, index: number) => { if (!fromRange.includes(digit)) { - throw new Error(`Invalid digit "${digit}" for base ${fromBase}.`); + throw new Error(`Invalid digit "${digit}" for base ${finalFromBase}.`); } - return (carry += fromRange.indexOf(digit) * fromBase ** index); + return (carry += fromRange.indexOf(digit) * finalFromBase ** index); }, 0); let newValue = ''; while (decValue > 0) { diff --git a/src/tools/integer-base-converter/integer-base-converter.vue b/src/tools/integer-base-converter/integer-base-converter.vue index 2445baa5..e2a3478d 100644 --- a/src/tools/integer-base-converter/integer-base-converter.vue +++ b/src/tools/integer-base-converter/integer-base-converter.vue @@ -1,6 +1,6 @@