From 67dc0f741298854a2a340de50b1e732be0d597e0 Mon Sep 17 00:00:00 2001
From: r4mos <ramosnosvamos@gmail.com>
Date: Tue, 9 Sep 2025 09:45:55 +0200
Subject: [PATCH] Simplify regular expresion for magic and alphabet range

---
 src/core/lib/Base32.mjs            | 2 +-
 src/core/operations/FromBase32.mjs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/lib/Base32.mjs b/src/core/lib/Base32.mjs
index c772dfca..e4361866 100644
--- a/src/core/lib/Base32.mjs
+++ b/src/core/lib/Base32.mjs
@@ -21,7 +21,7 @@ export const ALPHABET_OPTIONS = [
     },
     {
         name: "Crockford's alphabet", // https://www.crockford.com/base32.html
-        value: "0123456789ABCDEFGHJKMNPQRSTVWXYZ=",
+        value: "0-9A-HJKMNP-TV-Z=",
     },
 ];
 
diff --git a/src/core/operations/FromBase32.mjs b/src/core/operations/FromBase32.mjs
index 863475a0..06674919 100644
--- a/src/core/operations/FromBase32.mjs
+++ b/src/core/operations/FromBase32.mjs
@@ -50,7 +50,7 @@ class FromBase32 extends Operation {
                 args: [ALPHABET_OPTIONS.find(opt => opt.name === "Hex Extended").value, false]
             },
             {
-                pattern: "^(?:(?:[0Oo]|[1IiLl]|[2-9]|[ABCDEFGHJKMNPQRSTVWXYZabcdefghjkmnpqrstvwxyz]){8})+(?:(?:[0Oo]|[1IiLl]|[2-9]|[ABCDEFGHJKMNPQRSTVWXYZabcdefghjkmnpqrstvwxyz]){2}={6}|(?:[0Oo]|[1IiLl]|[2-9]|[ABCDEFGHJKMNPQRSTVWXYZabcdefghjkmnpqrstvwxyz]){4}={4}|(?:[0Oo]|[1IiLl]|[2-9]|[ABCDEFGHJKMNPQRSTVWXYZabcdefghjkmnpqrstvwxyz]){5}={3}|(?:[0Oo]|[1IiLl]|[2-9]|[ABCDEFGHJKMNPQRSTVWXYZabcdefghjkmnpqrstvwxyz]){7}={1})?$",
+                pattern: "^(?:[0-9A-TV-Za-tv-z]{8})+(?:[0-9A-TV-Za-tv-z]{2}={6}|[0-9A-TV-Za-tv-z]{4}={4}|[0-9A-TV-Za-tv-z]{5}={3}|[0-9A-TV-Za-tv-z]{7}=)?$",
                 flags: "",
                 args: [ALPHABET_OPTIONS.find(opt => opt.name === "Crockford's alphabet").value, false]
             }