Merge branch 'fix/integer-base-converter' into chore/all-my-stuffs

# Conflicts:
#	src/tools/integer-base-converter/integer-base-converter.model.ts

Author: sharevb

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

@@ -2,6 +2,48 @@ 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();
+  }
+export function hasNumberPrefix(value: string) {
+  return (value ?? '').trim().match(/^(0[xob].|&[hob].)/i);
+}
+
 export function convertBase(
   {
     value, fromBase, toBase,
@@ -42,20 +84,26 @@ export function convertBase(
   }
   const range = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+/'.split('');
   const fromRange = range.slice(0, finalFromBase);
+  const fromRange = range.slice(0, finalFromBase);
   const toRange = range.slice(0, toBase);
+  let decValue = cleanedValue
   let decValue = cleanedValue
     .split('')
     .reverse()
+    .reduce((carry: bigint, digit: string, index: number) => {
     .reduce((carry: bigint, digit: string, index: number) => {
       if (!fromRange.includes(digit)) {
         throw new Error(`Invalid digit "${digit}" for base ${finalFromBase}.`);
+        throw new Error(`Invalid digit "${digit}" for base ${finalFromBase}.`);
       }
       return (carry += BigInt(fromRange.indexOf(digit)) * BigInt(fromBase) ** BigInt(index));
     }, 0n);
   let newValue = '';
   while (decValue > 0) {
     newValue = toRange[Number(decValue % BigInt(toBase))] + newValue;
     decValue = (decValue - (decValue % BigInt(toBase))) / BigInt(toBase);
+    newValue = toRange[Number(decValue % BigInt(toBase))] + newValue;
+    decValue = (decValue - (decValue % BigInt(toBase))) / BigInt(toBase);
   }
   return newValue || '0';
 }

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import InputCopyable from '../../components/InputCopyable.vue';
-import { convertBase } from './integer-base-converter.model';
+import { convertBase, hasNumberPrefix } from './integer-base-converter.model';
 import { getErrorMessageIfThrows } from '@/utils/error';
 
 const inputProps = {
@@ -15,6 +15,8 @@ const input = ref('42');
 const inputBase = ref(10);
 const outputBase = ref(42);
 
+const hasInputNumberPrefix = computed(() => hasNumberPrefix(input.value));
+
 function errorlessConvert(...args: Parameters<typeof convertBase>) {
   try {
     return convertBase(...args);
@@ -36,7 +38,7 @@ const error = computed(() =>
     <c-card>
       <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" />
 
-      <n-form-item label="Input base" label-placement="left" label-width="110" :show-feedback="false">
+      <n-form-item v-if="!hasInputNumberPrefix" label="Input base" label-placement="left" label-width="110" :show-feedback="false">
         <n-input-number v-model:value="inputBase" max="64" min="2" placeholder="Put your input base here (ex: 10)" w-full />
       </n-form-item>