add Base36 support to Multibase

Author: ssg

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 5.2.0
+
+## New features
+- Multibase support for Base36 (upper and lower)
+
 # 5.1.0
 
 ## New features

src/Multibase.cs

@@ -40,6 +40,8 @@ public static byte[] Decode(ReadOnlySpan<char> text)
             MultibaseEncoding.Base32HexLower => Base32.ExtendedHexLower.Decode(rest),
             MultibaseEncoding.Base32HexUpper => Base32.ExtendedHex.Decode(rest),
             MultibaseEncoding.Base32Z => Base32.ZBase32.Decode(rest),
+            MultibaseEncoding.Base36Lower => Base36.LowerCase.Decode(rest),
+            MultibaseEncoding.Base36Upper => Base36.UpperCase.Decode(rest),
             MultibaseEncoding.Base45 => Base45.Default.Decode(rest),
             MultibaseEncoding.Base58Bitcoin => Base58.Bitcoin.Decode(rest),
             MultibaseEncoding.Base58Flickr => Base58.Flickr.Decode(rest),
@@ -79,6 +81,8 @@ public static bool TryDecode(ReadOnlySpan<char> text, Span<byte> bytes, out int
             MultibaseEncoding.Base32HexLower => Base32.ExtendedHexLower.TryDecode(rest, bytes, out bytesWritten),
             MultibaseEncoding.Base32HexUpper => Base32.ExtendedHex.TryDecode(rest, bytes, out bytesWritten),
             MultibaseEncoding.Base32Z => Base32.ZBase32.TryDecode(rest, bytes, out bytesWritten),
+            MultibaseEncoding.Base36Lower => Base36.LowerCase.TryDecode(rest, bytes, out bytesWritten),
+            MultibaseEncoding.Base36Upper => Base36.UpperCase.TryDecode(rest, bytes, out bytesWritten),
             MultibaseEncoding.Base45 => Base45.Default.TryDecode(rest, bytes, out bytesWritten),
             MultibaseEncoding.Base58Bitcoin => Base58.Bitcoin.TryDecode(rest, bytes, out bytesWritten),
             MultibaseEncoding.Base58Flickr => Base58.Flickr.TryDecode(rest, bytes, out bytesWritten),
@@ -113,6 +117,8 @@ public static string Encode(ReadOnlySpan<byte> bytes, MultibaseEncoding encoding
                 MultibaseEncoding.Base32HexLower => Base32.ExtendedHexLower.Encode(bytes),
                 MultibaseEncoding.Base32HexUpper => Base32.ExtendedHex.Encode(bytes),
                 MultibaseEncoding.Base32Z => Base32.ZBase32.Encode(bytes),
+                MultibaseEncoding.Base36Lower => Base36.LowerCase.Encode(bytes),
+                MultibaseEncoding.Base36Upper => Base36.UpperCase.Encode(bytes),
                 MultibaseEncoding.Base45 => Base45.Default.Encode(bytes),
                 MultibaseEncoding.Base58Bitcoin => Base58.Bitcoin.Encode(bytes),
                 MultibaseEncoding.Base58Flickr => Base58.Flickr.Encode(bytes),

src/MultibaseEncoding.cs

@@ -24,6 +24,8 @@ public enum MultibaseEncoding
 
     // marked as "draft"
     Base32Z         = 'h',
+    Base36Lower     = 'k',
+    Base36Upper     = 'K',
     Base45          = 'R',
 
     // marked as "experimental"

src/PublicAPI.Unshipped.txt

@@ -12,6 +12,8 @@ SimpleBase.Base36Alphabet
 SimpleBase.Base36Alphabet.Base36Alphabet(string! alphabet) -> void
 SimpleBase.DividingCoder<TAlphabet>.DividingCoder(TAlphabet! alphabet) -> void
 SimpleBase.MultibaseEncoding.Base256Emoji = 55357 -> SimpleBase.MultibaseEncoding
+SimpleBase.MultibaseEncoding.Base36Lower = 107 -> SimpleBase.MultibaseEncoding
+SimpleBase.MultibaseEncoding.Base36Upper = 75 -> SimpleBase.MultibaseEncoding
 SimpleBase.MultibaseEncoding.Base64Pad = 77 -> SimpleBase.MultibaseEncoding
 static SimpleBase.Base256Emoji.Default.get -> SimpleBase.Base256Emoji!
 static SimpleBase.Base36.LowerCase.get -> SimpleBase.Base36!

src/SimpleBase.csproj

@@ -12,21 +12,20 @@
 		<AssemblyOriginatorKeyFile>..\SimpleBase.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
 
-		<PackageVersion>5.1.0</PackageVersion>
+		<PackageVersion>5.2.0</PackageVersion>
 		<DocumentationFile>SimpleBase.xml</DocumentationFile>
 		<PackageProjectUrl>https://github.com/ssg/SimpleBase</PackageProjectUrl>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<PackageTags>base16 base32 base45 base58 base62 base85 ascii85 z85 hexadecimal bitcoin ripple flickr crockford extended hex rfc4648 z-base-32 geohash bech32 rfc1924</PackageTags>
+		<PackageTags>base16 base32 base36 base45 base58 base62 base85 ascii85 z85 hexadecimal bitcoin ripple flickr crockford extended hex rfc4648 z-base-32 geohash bech32 rfc1924</PackageTags>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<PlatformTarget>AnyCPU</PlatformTarget>
         <PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageReleaseNotes>
 			<![CDATA[
 ## New features
-- Base36
-- Base256Emoji            
+- Multibase support for Base36 (upper and lower)
 ]]>
 		</PackageReleaseNotes>
 	</PropertyGroup>

test/Multibase/MultibaseTest.cs

@@ -14,8 +14,6 @@ You may obtain a copy of the License at
    limitations under the License.
 */
 using System;
-using System.Buffers.Text;
-using System.Runtime.Intrinsics.X86;
 using System.Text;
 using NUnit.Framework;
 using SimpleBase;
@@ -53,6 +51,8 @@ public void Encode_InvalidEncoding_ThrowsArgumentException()
         [MultibaseEncoding.Base32Upper, "BKNJUOICXIFJSASCFKJCSAIJBYKV4HDODT3B36"],
         [MultibaseEncoding.Base32HexLower, "vad9ke82n859i0i25a92i0891oals73e3jr1ru"],
         [MultibaseEncoding.Base32HexUpper, "VAD9KE82N859I0I25A92I0891OALS73E3JR1RU"],
+        [MultibaseEncoding.Base36Lower, "k2p81m7y66k71a7teel1hfa4ldp6bneq0hj9b"],
+        [MultibaseEncoding.Base36Upper, "K2P81M7Y66K71A7TEEL1HFA4LDP6BNEQ0HJ9B"],
         [MultibaseEncoding.Base32Z, "hkpjwqenzefj1y1nfkjn1yejbakih8dqdu5b56"],
         [MultibaseEncoding.Base45, "R1OAS:8H1B+MA6691IAZ242C46WLL-H83KB4"],
         [MultibaseEncoding.Base58Flickr, "Z2HPxwKnQi8s2ugkrzPrrR6nyDEpMhoe6"],
@@ -78,8 +78,8 @@ public void Encode_InvalidEncoding_ThrowsArgumentException()
         [MultibaseEncoding.Base32HexLower, "vf5in683dc5n6i811"],
         [MultibaseEncoding.Base32HexUpper, "VF5IN683DC5N6I811"],
         [MultibaseEncoding.Base32Z, "hxf1zgedpcfzg1ebb"],
-        //[base36, "k2lcpzo5yikidynfl"],
-        //[base36upper, "K2LCPZO5YIKIDYNFL"],
+        [MultibaseEncoding.Base36Lower, "k2lcpzo5yikidynfl"],
+        [MultibaseEncoding.Base36Upper, "K2LCPZO5YIKIDYNFL"],
         [MultibaseEncoding.Base58Flickr, "Z7Pznk19XTTzBtx"],
         [MultibaseEncoding.Base58Bitcoin, "z7paNL19xttacUY"],
         [MultibaseEncoding.Base64, "meWVzIG1hbmkgIQ"],