base128-ascii 4.0.1 → 5.0.1

package/main.d.ts

@@ -1,6 +1,4 @@
-export declare class EncodeResult {
-    constructor(bytes: Uint8Array);
-
+interface EncodeResultPrototype {
     /**
      * Returns a base128 string.
      */
@@ -10,15 +8,20 @@ export declare class EncodeResult {
      * Returns a base128 [Template literals](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Template_literals).
      */
     toJSTemplateLiterals(): string;
+}
 
-    get buffer(): ArrayBufferLike;
-
-    readonly bytes: Uint8Array;
+interface EncodeResult extends EncodeResultPrototype {
+    bytes: Uint8Array<ArrayBuffer>;
 }
 
-export declare function encode(input: Uint8Array | string | ArrayLike<number> | ArrayBuffer | Pick<ArrayBufferView, "buffer">): EncodeResult;
+export declare var EncodeResult: {
+    new(bytes: Uint8Array<ArrayBuffer>): EncodeResult;
+    prototype: EncodeResultPrototype;
+};
+
+export declare function encode(input: Uint8Array): EncodeResult;
 
-export declare function decode(input: string): Uint8Array;
+export declare function decode(input: string): Uint8Array<ArrayBuffer>;
 
 declare const base128: {
     EncodeResult: typeof EncodeResult,

package/main.js

@@ -1,60 +1,41 @@
-//@ts-nocheck
-
 export class EncodeResult {
     /**
-     * @param {Uint8Array} bytes 
+     * @param {Uint8Array<ArrayBuffer>} bytes 
      */
     constructor(bytes) {
-        if (!(bytes instanceof Uint8Array)) {
-            throw TypeError(`EncodeResult: Must input Uint8Array`)
-        }
-        Object.defineProperty(this, "bytes", { value: bytes, enumerable: true })
-    }
-    toString() {
-        return new TextDecoder().decode(this.bytes)
+        this.bytes = bytes
     }
     toJSTemplateLiterals() {
         return `\`${this.toString().replace(
             /[\r\\`]|\$\{|<\/script/g,
             (match) => (
-                match == '\r'
+                match === '\r'
                     ? '\\r'
-                    : match == '</script'
+                    : match === '</script'
                         ? '<\\/script'
                         : '\\' + match
             )
         )}\``
     }
-    get buffer() {
-        return this.bytes.buffer
+}
+
+if (typeof Buffer == 'function' && Buffer.prototype && typeof Buffer.prototype.latin1Slice == 'function') {
+    EncodeResult.prototype.toString = function () {
+        return Buffer.prototype.latin1Slice.call(this.bytes)
+    }
+} else {
+    let _textDecoder
+    EncodeResult.prototype.toString = function () {
+        return (_textDecoder || (_textDecoder = new TextDecoder)).decode(this.bytes)
     }
 }
 
 /**
- * @param {Uint8Array | string | ArrayLike<number> | ArrayBuffer | Pick<ArrayBufferView, "buffer">} input
+ * @param {Uint8Array} input
  */
 export function encode(input) {
-    if (input == null) {
-        throw TypeError(`encode: Cannot input null or undefined`)
-    }
-    if (input instanceof Uint8Array) {
-        // Uint8Array | Buffer
-    } else if (typeof input == 'string') {
-        // string
-        input = new TextEncoder().encode(input)
-    } else if (input instanceof ArrayBuffer) {
-        // ArrayBuffer
-        input = new Uint8Array(input)
-    } else if (input.buffer instanceof ArrayBuffer) {
-        // TypedArray | DataView | Pick<ArrayBufferView, "buffer">
-        input = new Uint8Array(input.buffer)
-    }
-    // else ArrayLike<number>
     var il = input.length
-    if (typeof il != 'number') {
-        throw TypeError(`encode: typeof input.length must be number`)
-    }
-    var out = new Uint8Array(Math.ceil(il / 7 * 8))
+        , out = new Uint8Array(Math.ceil(il / 7 * 8))
         , ii = 0
         , oi = 0
     while (ii < il) {
@@ -62,14 +43,14 @@ export function encode(input) {
         // in  00000000 11111111 22222222 33333333 44444444 55555555 66666666
         // out _0000000 _0111111 _1122222 _2223333 _3333444 _4444455 _5555556 _6666666
 
-        /* 0 */ out[oi++] = input[ii] >> 1 & 127
-        /* 1 */ out[oi++] = (input[ii++] << 6 | input[ii] >> 2) & 127
-        /* 2 */ out[oi++] = (input[ii++] << 5 | input[ii] >> 3) & 127
-        /* 3 */ out[oi++] = (input[ii++] << 4 | input[ii] >> 4) & 127
-        /* 4 */ out[oi++] = (input[ii++] << 3 | input[ii] >> 5) & 127
-        /* 5 */ out[oi++] = (input[ii++] << 2 | input[ii] >> 6) & 127
-        /* 6 */ out[oi++] = (input[ii++] << 1 | input[ii] >> 7) & 127
-        /* 7 */ out[oi++] = input[ii++] & 127
+        /* 0 */ out[oi++] = 127 & input[ii] >> 1
+        /* 1 */ out[oi++] = 127 & (input[ii++] << 6 | input[ii] >> 2)
+        /* 2 */ out[oi++] = 127 & (input[ii++] << 5 | input[ii] >> 3)
+        /* 3 */ out[oi++] = 127 & (input[ii++] << 4 | input[ii] >> 4)
+        /* 4 */ out[oi++] = 127 & (input[ii++] << 3 | input[ii] >> 5)
+        /* 5 */ out[oi++] = 127 & (input[ii++] << 2 | input[ii] >> 6)
+        /* 6 */ out[oi++] = 127 & (input[ii++] << 1 | input[ii] >> 7)
+        /* 7 */ out[oi++] = 127 & input[ii++]
     }
     return new EncodeResult(out)
 }
@@ -78,31 +59,23 @@ export function encode(input) {
  * @param {string} input
  */
 export function decode(input) {
-    if (typeof input != 'string') {
-        throw TypeError(`decode: Must input string`)
-    }
     var il = input.length
         , out = new Uint8Array(il / 8 * 7)
         , ii = 0
         , oi = 0
+        , k
         , cache
-        , next = () => (
-            (cache = input.charCodeAt(ii++)) > 127
+        , next = _ =>
+            (cache = input.charCodeAt(ii++)) >> 7
                 ? cache = 0 // In HTML, 0 is likely to be converted to 65533 (�)
                 : cache
-        )
     while (ii < il) {
         //     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++] = next() << 1 | next() >> 6
-        /* 1 */ out[oi++] = cache << 2 | next() >> 5
-        /* 2 */ out[oi++] = cache << 3 | next() >> 4
-        /* 3 */ out[oi++] = cache << 4 | next() >> 3
-        /* 4 */ out[oi++] = cache << 5 | next() >> 2
-        /* 5 */ out[oi++] = cache << 6 | next() >> 1
-        /* 6 */ out[oi++] = cache << 7 | next()
+        for (next(), k = 7; k;) {
+            out[oi++] = cache << 7 - --k | next() >> k
+        }
     }
     return out
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "base128-ascii",
-  "version": "4.0.1",
+  "version": "5.0.1",
   "author": "bddjr",
   "license": "Unlicense",
   "type": "module",
@@ -10,7 +10,7 @@
     "main.d.ts"
   ],
   "scripts": {
-    "test": "es-check es6 --checkFeatures --module main.js && node scripts/test.mjs",
+    "test": "es-check es6 --checkFeatures --module main.js && tsc && node scripts/test.mjs",
     "prepublishOnly": "node --run test"
   },
   "repository": {
@@ -28,6 +28,7 @@
     "btoa"
   ],
   "devDependencies": {
-    "es-check": "^9.5.3"
+    "es-check": "^9.5.3",
+    "typescript": "^6.0.3"
   }
 }