base128-ascii 0.0.2 → 2.0.0

package/README.md

@@ -1,29 +1,30 @@
 Smaller than Base64, only use ASCII, can run in web browser.
 
----
-
-Char Code (ASCII) :
+```
+npm i base128-ascii
+```
 
 ```js
-'\0\1\2\3\4\5\6\7\b\t\n\v\f\r\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7F';
+import base128 from "base128-ascii"
 ```
 
-The first byte indicates the length of the last incomplete block, 0 means no incomplete block.
+---
+
+Char Code (ASCII) :
 
 ```js
-`4LF3 `
-`0LF3!Tl7`
+'\0\1\2\3\4\5\6\7\b\t\n\v\f\r\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7F'
 ```
 
-Test effect, Base128 is 10KB smaller than Base64:
+Test effect, Base128 is 102KiB smaller than Base64:
 
 ```
 screenshot-45.519.jpg
 file length: 682086
 
-encodeToTemplateLiterals:
-bytes length: 804861
-eval length: 779528
+encode:
+bytes length: 804860
+eval length: 779527
 decoded length: 682086
 equal: true
 

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-export declare function encode(input: Uint8Array): string;
-export declare function stringToTemplateLiterals(input: string): string;
-export declare function encodeToTemplateLiterals(input: Uint8Array): string;
+export declare function encode(input: Uint8Array): {
+    uint8Array: Uint8Array<ArrayBuffer>;
+    toString(): string;
+    toJSTemplateLiterals(): string;
+};
 export declare function decode(input: string): Uint8Array<ArrayBuffer>;
 declare const base128: {
     encode: typeof encode;
-    encodeToTemplateLiterals: typeof encodeToTemplateLiterals;
     decode: typeof decode;
 };
 export default base128;

package/dist/index.js

@@ -1,68 +1,62 @@
 export function encode(input) {
-    let out = new Uint8Array(Math.ceil(input.length / 7) * 8 + 1);
-    const suffixSize = input.length % 7;
-    out[0] = suffixSize + 48;
-    for (let ii = 0, oi = 1; ii < input.length;) {
-        let chunk = BigInt(input[ii++] || 0) << 48n;
-        chunk |= BigInt(input[ii++] || 0) << 40n;
-        chunk |= BigInt(input[ii++] || 0) << 32n;
-        chunk |= BigInt(input[ii++] || 0) << 24n;
-        chunk |= BigInt(input[ii++] || 0) << 16n;
-        chunk |= BigInt(input[ii++] || 0) << 8n;
-        chunk |= BigInt(input[ii++] || 0);
-        out[oi++] = Number(chunk >> 49n);
-        out[oi++] = Number((chunk >> 42n) & 127n);
-        out[oi++] = Number((chunk >> 35n) & 127n);
-        out[oi++] = Number((chunk >> 28n) & 127n);
-        out[oi++] = Number((chunk >> 21n) & 127n);
-        out[oi++] = Number((chunk >> 14n) & 127n);
-        out[oi++] = Number((chunk >> 7n) & 127n);
-        out[oi++] = Number(chunk & 127n);
+    let ii = 0, oi = 0, str, jstl;
+    const out = new Uint8Array(Math.ceil(input.length / 7 * 8));
+    while (ii < input.length) {
+        //     0        1        2        3        4        5        6        7
+        // in  00000000 11111111 22222222 33333333 44444444 55555555 66666666
+        // out _0000000 _0111111 _1122222 _2223333 _3333444 _4444455 _5555556 _6666666
+        /* 0 */ out[oi++] = input[ii] >> 1;
+        /* 1 */ out[oi++] = input[ii++] << 6 & 127 | input[ii] >> 2;
+        /* 2 */ out[oi++] = input[ii++] << 5 & 127 | input[ii] >> 3;
+        /* 3 */ out[oi++] = input[ii++] << 4 & 127 | input[ii] >> 4;
+        /* 4 */ out[oi++] = input[ii++] << 3 & 127 | input[ii] >> 5;
+        /* 5 */ out[oi++] = input[ii++] << 2 & 127 | input[ii] >> 6;
+        /* 6 */ out[oi++] = input[ii++] << 1 & 127 | input[ii] >> 7;
+        /* 7 */ out[oi++] = input[ii++] & 127;
     }
-    if (suffixSize)
-        out = out.slice(0, Math.ceil(suffixSize / 7 * 8) - 8);
-    return new TextDecoder().decode(out);
-}
-export function stringToTemplateLiterals(input) {
-    return '`' + input.replace(/[\r\\`]|\${|\0\d?/g, (match) => match[0] == '\0'
-        ? match.length == 2
-            ? '\\x00' + match[1]
-            : '\\0'
-        : match == '\r'
-            ? '\\r'
-            : '\\' + match) + '`';
-}
-export function encodeToTemplateLiterals(input) {
-    return stringToTemplateLiterals(encode(input));
+    return {
+        uint8Array: out,
+        toString() {
+            return str ??= new TextDecoder().decode(out);
+        },
+        toJSTemplateLiterals() {
+            return jstl ??= '`' + this.toString().replace(/[\r\\`]|\${|\0\d?|<\/script/g, (match) => {
+                if (match == '\r')
+                    return '\\r';
+                if (match == '</script')
+                    return '<\\/script';
+                if (match[0] == '\0') {
+                    if (match.length == 2)
+                        return '\\x00' + match[1];
+                    return '\\0';
+                }
+                return '\\' + match;
+            }) + '`';
+        }
+    };
 }
 export function decode(input) {
-    const u8a = new TextEncoder().encode(input);
-    const out = new Uint8Array(Math.ceil((u8a.length - 1) / 8) * 7);
-    for (let ii = 1, oi = 0; ii < u8a.length;) {
-        let chunk = BigInt(u8a[ii++] || 0) << 49n;
-        chunk |= BigInt(u8a[ii++] || 0) << 42n;
-        chunk |= BigInt(u8a[ii++] || 0) << 35n;
-        chunk |= BigInt(u8a[ii++] || 0) << 28n;
-        chunk |= BigInt(u8a[ii++] || 0) << 21n;
-        chunk |= BigInt(u8a[ii++] || 0) << 14n;
-        chunk |= BigInt(u8a[ii++] || 0) << 7n;
-        chunk |= BigInt(u8a[ii++] || 0);
-        out[oi++] = Number(chunk >> 48n);
-        out[oi++] = Number((chunk >> 40n) & 255n);
-        out[oi++] = Number((chunk >> 32n) & 255n);
-        out[oi++] = Number((chunk >> 24n) & 255n);
-        out[oi++] = Number((chunk >> 16n) & 255n);
-        out[oi++] = Number((chunk >> 8n) & 255n);
-        out[oi++] = Number(chunk & 255n);
+    let ii = 0, oi = 0, cache;
+    const out = new Uint8Array(Math.floor(input.length / 8 * 7));
+    function update() {
+        return cache = input.charCodeAt(ii++) || 0;
+    }
+    while (ii < input.length) {
+        //     0        1        2        3        4        5        6        7
+        // in  _0000000 _1111111 _2222222 _3333333 _4444444 _5555555 _6666666 _7777777
+        // out 00000001 11111122 22222333 33334444 44455555 55666666 67777777
+        /* 0 */ out[oi++] = update() << 1 | update() >> 6;
+        /* 1 */ out[oi++] = cache << 2 | update() >> 5;
+        /* 2 */ out[oi++] = cache << 3 | update() >> 4;
+        /* 3 */ out[oi++] = cache << 4 | update() >> 3;
+        /* 4 */ out[oi++] = cache << 5 | update() >> 2;
+        /* 5 */ out[oi++] = cache << 6 | update() >> 1;
+        /* 6 */ out[oi++] = cache << 7 | update();
     }
-    const suffixSize = u8a[0] - 48;
-    if (suffixSize)
-        return out.slice(0, suffixSize - 7);
     return out;
 }
 const base128 = {
     encode,
-    encodeToTemplateLiterals,
     decode
 };
 export default base128;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "base128-ascii",
-  "version": "0.0.2",
+  "version": "2.0.0",
   "main": "dist/index.js",
   "type": "module",
   "scripts": {