Remove support for old module systems, make zbase32 a standard JavaScript module

Author: warpr

.babelrc

@@ -1,6 +1,5 @@
 {
     "bracketSpacing": true,
-    "jsxBracketSameLine": true,
     "printWidth": 100,
     "singleQuote": true,
     "tabWidth": 4,

.gitlab-ci.yml

@@ -10,3 +10,4 @@ export NODE_PATH="$DIR/../lib/"
 echo node path: $NODE_PATH
 
 npx mocha --ui tdd --reporter spec test/test.js
+

.prettierrc.json

@@ -6,138 +6,126 @@
  *   it under the terms of copyleft-next 0.3.1.  See copyleft-next-0.3.1.txt.
  */
 
-'use strict';
-
-(function (factory) {
-    const imports = ['require'];
-
-    if (typeof define === 'function' && define.amd) {
-        define(imports, factory);
-    } else if (typeof module === 'object' && module.exports) {
-        module.exports = factory(require);
-    } else {
-        console.log('Module system not recognized, please use AMD or CommonJS');
-    }
-})(function (require) {
-    const MNET32 = 'ybndrfg8ejkmcpqxot1uwisza345h769';
-    const MNET32Reverse = {};
-    for (let i = 0; i < MNET32.length; i++) {
-        MNET32Reverse[MNET32[i]] = i;
-    }
-
-    function IntegerTooLargeException(message) {
-        this.message = message;
-        this.name = 'IntegerTooLargeException';
-    }
-
-    function getBit(byte, offset) {
-        return (byte >> offset) & 0x01;
-    }
-
-    function to5bit(ab) {
-        const bytes = new Uint8Array(ab);
-
-        let bitCount = 0;
-        let chunks = [];
-        let currentChunk = 0;
-        for (let i = bytes.length - 1; i >= 0; i--) {
-            for (let j = 0; j < 8; j++) {
-                currentChunk = (currentChunk >> 1) | (getBit(bytes[i], j) << 4);
-                if (++bitCount > 4) {
-                    bitCount = 0;
-                    chunks.push(currentChunk);
-                    currentChunk = 0;
-                }
+const MNET32 = 'ybndrfg8ejkmcpqxot1uwisza345h769';
+const MNET32Reverse = {};
+for (let i = 0; i < MNET32.length; i++) {
+    MNET32Reverse[MNET32[i]] = i;
+}
+
+function IntegerTooLargeException(message) {
+    this.message = message;
+    this.name = 'IntegerTooLargeException';
+}
+
+function getBit(byte, offset) {
+    return (byte >> offset) & 0x01;
+}
+
+export function to5bit(ab) {
+    const bytes = new Uint8Array(ab);
+
+    let bitCount = 0;
+    let chunks = [];
+    let currentChunk = 0;
+    for (let i = bytes.length - 1; i >= 0; i--) {
+        for (let j = 0; j < 8; j++) {
+            currentChunk = (currentChunk >> 1) | (getBit(bytes[i], j) << 4);
+            if (++bitCount > 4) {
+                bitCount = 0;
+                chunks.push(currentChunk);
+                currentChunk = 0;
             }
         }
-
-        if (bitCount) {
-            chunks.push(currentChunk >> (5 - bitCount));
-        }
-
-        chunks.reverse();
-        return chunks;
     }
 
-    function from5bit(ab) {
-        const chunks = new Uint8Array(ab);
-
-        let bitCount = 0;
-        let bytes = [];
-        let currentByte = 0;
-        for (let i = chunks.length - 1; i >= 0; i--) {
-            for (let j = 0; j < 5; j++) {
-                currentByte = (currentByte >> 1) | (getBit(chunks[i], j) << 7);
-                if (++bitCount > 7) {
-                    bitCount = 0;
-                    bytes.push(currentByte);
-                    currentByte = 0;
-                }
-            }
-        }
-
-        bytes.reverse();
-        return new Uint8Array(bytes);
-    }
-
-    function toNumber(ab) {
-        return (
-            (ab[0] << 30) |
-            (ab[1] << 25) |
-            (ab[2] << 20) |
-            (ab[3] << 15) |
-            (ab[4] << 10) |
-            (ab[5] << 5) |
-            ab[6]
-        );
+    if (bitCount) {
+        chunks.push(currentChunk >> (5 - bitCount));
     }
 
-    function fromNumber(num) {
-        if (num < 0 || num > 0x7fffffff) {
-            throw new IntegerTooLargeException('fromNumber expects a 32-bit signed integer');
+    chunks.reverse();
+    return chunks;
+}
+
+export function from5bit(ab) {
+    const chunks = new Uint8Array(ab);
+
+    let bitCount = 0;
+    let bytes = [];
+    let currentByte = 0;
+    for (let i = chunks.length - 1; i >= 0; i--) {
+        for (let j = 0; j < 5; j++) {
+            currentByte = (currentByte >> 1) | (getBit(chunks[i], j) << 7);
+            if (++bitCount > 7) {
+                bitCount = 0;
+                bytes.push(currentByte);
+                currentByte = 0;
+            }
         }
-
-        // Although javascript Numbers can safely represent integers up to (2^53)-1, the
-        // bitwise operators operate on them as 32-bit signed integers.
-        // FIXME: look for a popular bigint library which can easily convert big integers as
-        // ArrayBuffers.
-        return new Uint8Array([
-            (num >>> 30) & 0x03,
-            (num >>> 25) & 0x1f,
-            (num >>> 20) & 0x1f,
-            (num >>> 15) & 0x1f,
-            (num >>> 10) & 0x1f,
-            (num >>> 5) & 0x1f,
-            (num >>> 0) & 0x1f,
-        ]);
-    }
-
-    function decode32bitNumber(str) {
-        return toNumber(decode(str));
-    }
-
-    function encode32bitNumber(int) {
-        return encode(fromNumber(int));
-    }
-
-    function decode(x) {
-        return from5bit(x.split('').map((chr) => MNET32Reverse[chr]));
     }
 
-    function encode(x) {
-        return to5bit(x)
-            .map((value) => MNET32[value])
-            .join('');
+    bytes.reverse();
+    return new Uint8Array(bytes);
+}
+
+export function toNumber(ab) {
+    return (
+        (ab[0] << 30) |
+        (ab[1] << 25) |
+        (ab[2] << 20) |
+        (ab[3] << 15) |
+        (ab[4] << 10) |
+        (ab[5] << 5) |
+        ab[6]
+    );
+}
+
+export function fromNumber(num) {
+    if (num < 0 || num > 0x7fffffff) {
+        throw new IntegerTooLargeException('fromNumber expects a 32-bit signed integer');
     }
 
-    return {
-        decode: decode,
-        encode: encode,
-        from5bit: from5bit,
-        to5bit: to5bit,
-        fromNumber: fromNumber,
-        toNumber: toNumber,
-        decode32bitNumber: decode32bitNumber,
-        encode32bitNumber: encode32bitNumber,
-    };
-});
+    // Although javascript Numbers can safely represent integers up to (2^53)-1, the
+    // bitwise operators operate on them as 32-bit signed integers.
+    // FIXME: look for a popular bigint library which can easily convert big integers as
+    // ArrayBuffers.
+    return new Uint8Array([
+        (num >>> 30) & 0x03,
+        (num >>> 25) & 0x1f,
+        (num >>> 20) & 0x1f,
+        (num >>> 15) & 0x1f,
+        (num >>> 10) & 0x1f,
+        (num >>> 5) & 0x1f,
+        (num >>> 0) & 0x1f,
+    ]);
+}
+
+export function decode32bitNumber(str) {
+    return toNumber(decode(str));
+}
+
+export function encode32bitNumber(int) {
+    return encode(fromNumber(int));
+}
+
+export function decode(x) {
+    return from5bit(x.split('').map((chr) => MNET32Reverse[chr]));
+}
+
+export function encode(x) {
+    return to5bit(x)
+        .map((value) => MNET32[value])
+        .join('');
+}
+
+const zbase32 = {
+    decode: decode,
+    encode: encode,
+    from5bit: from5bit,
+    to5bit: to5bit,
+    fromNumber: fromNumber,
+    toNumber: toNumber,
+    decode32bitNumber: decode32bitNumber,
+    encode32bitNumber: encode32bitNumber,
+};
+
+export default zbase32;

bin/test

@@ -1,12 +1,13 @@
 {
     "name": "zbase32",
-    "version": "1.0.5",
+    "version": "2.0.0",
     "description": "z-base-32 encoding/decoding library",
     "main": "index.js",
     "typings": "index.d.ts",
     "scripts": {
         "test": "bin/test"
     },
+    "type": "module",
     "author": "Kuno Woudt <kuno@frob.nl>",
     "license": "copyleft-next-0.3.1",
     "repository": "https://github.com/warpr/zbase32.git",