bireader 1.0.39 → 1.0.41

package/lib/esm/index.mjs

@@ -80,8 +80,11 @@ function alignRev(_this, n) {
         _this.skip(a * -1);
     }
 }
-function goto(_this, byte, bit) {
-    const new_size = (byte + Math.ceil((bit || 0) / 8));
+function goto(_this, bytes, bits) {
+    var new_size = (((bytes || 0)) + Math.ceil(((bits || 0)) / 8));
+    if (bits && bits < 0) {
+        new_size = Math.floor(((((bytes || 0)) * 8) + (bits || 0)) / 8);
+    }
     if (new_size > _this.size) {
         if (_this.strict == false) {
             _this.extendArray(new_size - _this.size);
@@ -91,8 +94,15 @@ function goto(_this, byte, bit) {
             throw new Error("\x1b[33m[Strict mode]\x1b[0m: Goto utside of range of data: goto " + new_size + " of " + _this.size);
         }
     }
-    _this.offset = byte;
-    _this.bitoffset = (bit || 0) % 8;
+    _this.offset = bytes;
+    // Adjust byte offset based on bit overflow
+    _this.offset += Math.floor(((bits || 0)) / 8);
+    // Adjust bit offset
+    _this.bitoffset = ((bits || 0) + 64) % 8;
+    // Ensure bit offset stays between 0-7
+    _this.bitoffset = Math.min(Math.max(_this.bitoffset, 0), 7);
+    // Ensure offset doesn't go negative
+    _this.offset = Math.max(_this.offset, 0);
 }
 function remove(_this, startOffset, endOffset, consume, remove, fillValue) {
     const new_start = Math.abs(startOffset || 0);
@@ -147,7 +157,7 @@ function remove(_this, startOffset, endOffset, consume, remove, fillValue) {
     }
     return data_removed;
 }
-function addData(_this, data, consume, offset, repalce) {
+function addData(_this, data, consume, offset, replace) {
     if (_this.strict == true) {
         _this.errorDump ? "\x1b[31m[Error]\x1b[0m: hexdump:\n" + _this.hexdump() : "";
         throw new Error(`\x1b[33m[Strict mode]\x1b[0m: Can not insert data in strict mode. Use unrestrict() to enable.`);
@@ -159,7 +169,7 @@ function addData(_this, data, consume, offset, repalce) {
         throw new Error("Data insert must be a Uint8Array");
     }
     var needed_size = offset || _this.offset;
-    if (repalce) {
+    if (replace) {
         needed_size = offset || _this.offset + data.length;
     }
     if (needed_size > _this.size) {
@@ -172,7 +182,7 @@ function addData(_this, data, consume, offset, repalce) {
         }
         _this.size = _this.data.length;
     }
-    if (repalce) {
+    if (replace) {
         if (isBuffer(_this.data)) {
             const part1 = _this.data.subarray(0, needed_size - data.length);
             const part2 = _this.data.subarray(needed_size, _this.size);
@@ -664,6 +674,9 @@ function wbit(_this, value, bits, unsigned, endian) {
     if (bits == undefined) {
         throw new Error("Enter number of bits to write");
     }
+    if (bits == 0) {
+        return;
+    }
     if (bits <= 0 || bits > 32) {
         throw new Error('Bit length must be between 1 and 32.');
     }
@@ -721,6 +734,9 @@ function rbit(_this, bits, unsigned, endian) {
     if (bits == undefined || typeof bits != "number") {
         throw new Error("Enter number of bits to read");
     }
+    if (bits == 0) {
+        return 0;
+    }
     if (bits <= 0 || bits > 32) {
         throw new Error('Bit length must be between 1 and 32.');
     }
@@ -1455,7 +1471,7 @@ export class bireader {
                 throw new Error("Write data must be Uint8Array or Buffer");
             }
         }
-        this.size = data.length + ((bitOffset || 0) % 8);
+        this.size = data.length;
         this.data = data;
     }
     /**
@@ -1539,7 +1555,7 @@ export class bireader {
     * Note: Will extend array if strict mode is off and outside of max size
     *
     * @param {number} bytes - Bytes to skip
-    * @param {number} bits - Bits to skip (0-7)
+    * @param {number} bits - Bits to skip
     */
     skip(bytes, bits) {
         return skip(this, bytes, bits);
@@ -1549,7 +1565,7 @@ export class bireader {
     * Note: Will extend array if strict mode is off and outside of max size
     *
     * @param {number} bytes - Bytes to skip
-    * @param {number} bits - Bits to skip (0-7)
+    * @param {number} bits - Bits to skip
     */
     jump(bytes, bits) {
         this.skip(bytes, bits);
@@ -1562,7 +1578,7 @@ export class bireader {
     * Note: Will extend array if strict mode is off and outside of max size
     *
     * @param {number} byte - byte to set to
-    * @param {number} bit - bit to set to (0-7)
+    * @param {number} bit - bit to set to
     */
     goto(byte, bit) {
         return goto(this, byte, bit);
@@ -1572,7 +1588,7 @@ export class bireader {
     * Note: Will extend array if strict mode is off and outside of max size
     *
     * @param {number} bytes - Bytes to skip
-    * @param {number} bits - Bits to skip (0-7)
+    * @param {number} bits - Bits to skip
     */
     seek(bytes, bits) {
         return this.skip(bytes, bits);
@@ -1582,7 +1598,7 @@ export class bireader {
     * Note: Will extend array if strict mode is off and outside of max size
     *
     * @param {number} byte - byte to set to
-    * @param {number} bit - bit to set to (0-7)
+    * @param {number} bit - bit to set to
     */
     pointer(byte, bit) {
         return this.goto(byte, bit);
@@ -1592,7 +1608,7 @@ export class bireader {
     * Note: Will extend array if strict mode is off and outside of max size
     *
     * @param {number} byte - byte to set to
-    * @param {number} bit - bit to set to (0-7)
+    * @param {number} bit - bit to set to
     */
     warp(byte, bit) {
         return this.goto(byte, bit);
@@ -1611,8 +1627,7 @@ export class bireader {
     * Set byte and bit position to start of data
     */
     gotostart() {
-        this.offset = 0;
-        this.bitoffset = 0;
+        return this.rewind();
     }
     //
     //get position
@@ -1631,7 +1646,7 @@ export class bireader {
     * @return {number} current byte position
     */
     getOffset() {
-        return this.offset;
+        return this.tell();
     }
     /**
     * Get the current byte position
@@ -1639,7 +1654,7 @@ export class bireader {
     * @return {number} current byte position
     */
     saveOffset() {
-        return this.offset;
+        return this.tell();
     }
     /**
     * Get the current bit position (0-7)
@@ -1655,7 +1670,7 @@ export class bireader {
     * @return {number} current bit position
     */
     getOffsetBit() {
-        return this.bitoffset;
+        return this.tellB();
     }
     /**
     * Get the current bit position (0-7)
@@ -1671,7 +1686,7 @@ export class bireader {
     * @return {number} current absolute bit position
     */
     tellAbsB() {
-        return (this.offset * 8) + this.bitoffset;
+        return this.saveOffsetAbsBit();
     }
     /**
     * Get the current absolute bit position (from start of data)
@@ -1679,7 +1694,7 @@ export class bireader {
     * @return {number} current absolute bit position
     */
     getOffsetAbsBit() {
-        return (this.offset * 8) + this.bitoffset;
+        return this.saveOffsetAbsBit();
     }
     /**
     * Get the current absolute bit position (from start of data)
@@ -1687,7 +1702,7 @@ export class bireader {
     * @return {number} current absolute bit position
     */
     saveOffsetBit() {
-        return (this.offset * 8) + this.bitoffset;
+        return this.saveOffsetAbsBit();
     }
     //
     //strict mode change
@@ -5913,7 +5928,7 @@ export class biwriter {
             }
         }
         this.data = data;
-        this.size = this.data.length + ((bitOffset || 0) % 8);
+        this.size = this.data.length;
     }
     /**
     * Change Endian (default little)
@@ -6074,8 +6089,7 @@ export class biwriter {
     * Set byte and bit position to start of data
     */
     gotostart() {
-        this.offset = 0;
-        this.bitoffset = 0;
+        return this.rewind();
     }
     //
     //get position
@@ -6094,7 +6108,7 @@ export class biwriter {
     * @return {number} current byte position
     */
     getOffset() {
-        return this.offset;
+        return this.tell();
     }
     /**
     * Get the current byte position
@@ -6102,7 +6116,7 @@ export class biwriter {
     * @return {number} current byte position
     */
     saveOffset() {
-        return this.offset;
+        return this.tell();
     }
     /**
     * Get the current bit position (0-7)
@@ -6118,7 +6132,7 @@ export class biwriter {
     * @return {number} current bit position
     */
     getOffsetBit() {
-        return this.bitoffset;
+        return this.tellB();
     }
     /**
     * Get the current bit position (0-7)
@@ -6134,7 +6148,7 @@ export class biwriter {
     * @return {number} current absolute bit position
     */
     tellAbsB() {
-        return (this.offset * 8) + this.bitoffset;
+        return this.saveOffsetAbsBit();
     }
     /**
     * Get the current absolute bit position (from start of data)
@@ -6142,7 +6156,7 @@ export class biwriter {
     * @return {number} current absolute bit position
     */
     getOffsetAbsBit() {
-        return (this.offset * 8) + this.bitoffset;
+        return this.saveOffsetAbsBit();
     }
     /**
     * Get the current absolute bit position (from start of data)
@@ -6150,7 +6164,7 @@ export class biwriter {
     * @return {number} current absolute bit position
     */
     saveOffsetBit() {
-        return (this.offset * 8) + this.bitoffset;
+        return this.saveOffsetAbsBit();
     }
     //
     //strict mode change

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bireader",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "Read and write data in binary",
   "module": "lib/esm/index.mjs",
   "main": "lib/cjs/index.js",
@@ -19,7 +19,7 @@
     "./*": "./*"
   },
   "scripts": {
-    "clean": "rmdir /s lib",
+    "clean": "rmdir /S /Q lib",
     "build": "npm run clean && npm run build:esm && npm run move && npm run build:cjs",
     "build:esm": "tsc --module esnext --outDir lib/esm",
     "move": "cd ./lib/esm/ && ren index.js index.mjs && cd ../../",