Skip to content

Commit e336ebe

Browse files
committed
fix(integer-basee-converter): handle prefix/suffix and case in sensitive
Handle common languages prefix : 0x, 0o, 0b (C/C#), &H, &O, &B (vb.net) Handle common languages suffix : I (vb.net), U/L (C/C# unsigned and long), n (js bigint) Handle case insensitive for base < 36 (ie, hexa) ( 36 = décimal + lower letters) Fix CorentinTh#694
1 parent a07806c commit e336ebe

File tree

3 files changed

+65
-7
lines changed

3 files changed

+65
-7
lines changed

src/tools/integer-base-converter/integer-base-converter.model.test.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@ describe('integer-base-converter', () => {
1111
expect(convertBase({ value: '10100101', fromBase: 2, toBase: 16 })).toEqual('a5');
1212
expect(convertBase({ value: '192654', fromBase: 10, toBase: 8 })).toEqual('570216');
1313
expect(convertBase({ value: 'zz', fromBase: 64, toBase: 10 })).toEqual('2275');
14+
expect(convertBase({ value: 'AA', fromBase: 16, toBase: 10 })).toEqual('170');
15+
expect(convertBase({ value: 'aa', fromBase: 16, toBase: 10 })).toEqual('170');
16+
expect(convertBase({ value: '0xAA', fromBase: -1, toBase: 10 })).toEqual('170');
17+
expect(convertBase({ value: '&HAA', fromBase: -1, toBase: 10 })).toEqual('170');
18+
expect(convertBase({ value: '0xAAUL', fromBase: -1, toBase: 10 })).toEqual('170');
19+
expect(convertBase({ value: '0XAAUL', fromBase: -1, toBase: 10 })).toEqual('170');
20+
expect(convertBase({ value: '10UL', fromBase: 10, toBase: 10 })).toEqual('10');
21+
expect(convertBase({ value: '10n', fromBase: 10, toBase: 10 })).toEqual('10');
22+
expect(convertBase({ value: '0o252', fromBase: -1, toBase: 10 })).toEqual('170');
23+
expect(convertBase({ value: '&O252', fromBase: -1, toBase: 10 })).toEqual('170');
24+
expect(convertBase({ value: '192 654', fromBase: 10, toBase: 8 })).toEqual('570216');
25+
expect(convertBase({ value: '192.654', fromBase: 10, toBase: 8 })).toEqual('570216');
26+
expect(convertBase({ value: '0b10101010', fromBase: -1, toBase: 10 })).toEqual('170');
27+
expect(convertBase({ value: '0b_1010_1010', fromBase: -1, toBase: 10 })).toEqual('170');
28+
expect(convertBase({ value: '192,654', fromBase: 10, toBase: 8 })).toEqual('570216');
1429
});
1530
});
1631
});

src/tools/integer-base-converter/integer-base-converter.model.ts

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,56 @@
1-
export function convertBase({ value, fromBase, toBase }: { value: string; fromBase: number; toBase: number }) {
1+
export function hasNumberPrefix(value: string) {
2+
return (value ?? '').trim().match(/^(0[xob].|&[hob].)/i);
3+
}
4+
5+
export function convertBase(
6+
{
7+
value, fromBase, toBase,
8+
ignorePunctuationsRegexChars = ' \u00A0_\.,-',
9+
handlePrefixSuffix = true,
10+
ignoreCase = true,
11+
}: {
12+
value: string
13+
fromBase: number
14+
toBase: number
15+
ignorePunctuationsRegexChars?: string
16+
handlePrefixSuffix?: boolean
17+
ignoreCase?: boolean
18+
}) {
19+
let cleanedValue = (value ?? '0').trim();
20+
if (ignorePunctuationsRegexChars) {
21+
cleanedValue = cleanedValue.replace(new RegExp(`[${ignorePunctuationsRegexChars}]`, 'g'), '');
22+
}
23+
let finalFromBase = fromBase;
24+
if (handlePrefixSuffix) {
25+
for (const regBase of [
26+
{ base: 2, regex: /^(&b|0b)?([01]+)([IULZn]*)$/i },
27+
{ base: 8, regex: /^(&o|0o)?([0-7]+)([IULZn]*)$/i },
28+
{ base: 16, regex: /^(&h|0x)?([a-f0-9]+)([IULZn]*)$/i },
29+
]) {
30+
const match = cleanedValue.match(regBase.regex);
31+
if (match) {
32+
if (match[1]) {
33+
finalFromBase = regBase.base;
34+
}
35+
cleanedValue = match[2];
36+
break;
37+
}
38+
}
39+
}
40+
if (ignoreCase && finalFromBase <= 36) {
41+
cleanedValue = cleanedValue.toLowerCase();
42+
}
243
const range = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+/'.split('');
3-
const fromRange = range.slice(0, fromBase);
44+
const fromRange = range.slice(0, finalFromBase);
445
const toRange = range.slice(0, toBase);
5-
let decValue = value
46+
let decValue = cleanedValue
647
.split('')
748
.reverse()
849
.reduce((carry: number, digit: string, index: number) => {
950
if (!fromRange.includes(digit)) {
10-
throw new Error(`Invalid digit "${digit}" for base ${fromBase}.`);
51+
throw new Error(`Invalid digit "${digit}" for base ${finalFromBase}.`);
1152
}
12-
return (carry += fromRange.indexOf(digit) * fromBase ** index);
53+
return (carry += fromRange.indexOf(digit) * finalFromBase ** index);
1354
}, 0);
1455
let newValue = '';
1556
while (decValue > 0) {

src/tools/integer-base-converter/integer-base-converter.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import InputCopyable from '../../components/InputCopyable.vue';
3-
import { convertBase } from './integer-base-converter.model';
3+
import { convertBase, hasNumberPrefix } from './integer-base-converter.model';
44
import { getErrorMessageIfThrows } from '@/utils/error';
55
66
const inputProps = {
@@ -15,6 +15,8 @@ const input = ref('42');
1515
const inputBase = ref(10);
1616
const outputBase = ref(42);
1717
18+
const hasInputNumberPrefix = computed(() => hasNumberPrefix(input.value));
19+
1820
function errorlessConvert(...args: Parameters<typeof convertBase>) {
1921
try {
2022
return convertBase(...args);
@@ -36,7 +38,7 @@ const error = computed(() =>
3638
<c-card>
3739
<c-input-text v-model:value="input" label="Input number" placeholder="Put your number here (ex: 42)" label-position="left" label-width="110px" mb-2 label-align="right" />
3840

39-
<n-form-item label="Input base" label-placement="left" label-width="110" :show-feedback="false">
41+
<n-form-item v-if="!hasInputNumberPrefix" label="Input base" label-placement="left" label-width="110" :show-feedback="false">
4042
<n-input-number v-model:value="inputBase" max="64" min="2" placeholder="Put your input base here (ex: 10)" w-full />
4143
</n-form-item>
4244

0 commit comments

Comments
 (0)