bireader 1.0.36 → 1.0.38

package/lib/esm/index.mjs

@@ -1,16 +1,16 @@
-export function isBuffer(obj) {
+function isBuffer(obj) {
     return buffcheck(obj);
 }
-export function check_size(_this, write_bytes, write_bit, offset) {
+function check_size(_this, write_bytes, write_bit, offset) {
     return checkSize(_this, write_bytes || 0, write_bit || 0, offset || _this.offset);
 }
-export function buffcheck(obj) {
+function buffcheck(obj) {
     return (typeof Buffer !== 'undefined' && obj instanceof Buffer);
 }
-export function arraybuffcheck(_this, obj) {
+function arraybuffcheck(_this, obj) {
     return obj instanceof Uint8Array || isBuffer(obj);
 }
-export function extendarray(_this, to_padd) {
+function extendarray(_this, to_padd) {
     if ((typeof Buffer !== 'undefined' && _this.data instanceof Buffer)) {
         var paddbuffer = Buffer.alloc(to_padd);
         _this.data = Buffer.concat([_this.data, paddbuffer]);
@@ -20,7 +20,7 @@ export function extendarray(_this, to_padd) {
         _this.data = new Uint8Array([..._this.data, ...addArray]);
     }
 }
-export function checkSize(_this, write_bytes, write_bit, offset) {
+function checkSize(_this, write_bytes, write_bit, offset) {
     const bits = (write_bit || 0) + _this.bitoffset;
     var new_off = (offset || _this.offset);
     var writesize = write_bytes || 0;
@@ -43,7 +43,7 @@ export function checkSize(_this, write_bytes, write_bit, offset) {
     //start read location
     return new_off;
 }
-export function skip(_this, bytes, bits) {
+function skip(_this, bytes, bits) {
     var new_size = (((bytes || 0) + _this.offset) + Math.ceil((_this.bitoffset + (bits || 0)) / 8));
     if (bits && bits < 0) {
         new_size = Math.floor(((((bytes || 0) + _this.offset) * 8) + _this.bitoffset + (bits || 0)) / 8);
@@ -57,11 +57,30 @@ export function skip(_this, bytes, bits) {
             throw new Error("\x1b[33m[Strict mode]\x1b[0m: Seek of range of data: seek " + new_size + " of " + _this.size);
         }
     }
-    const total_bits = (((bytes || 0) + _this.offset) * 8) + (bits || 0) + _this.bitoffset;
-    _this.bitoffset = total_bits % 8;
-    _this.offset = Math.floor(total_bits / 8);
+    // Adjust byte offset based on bit overflow
+    _this.offset += Math.floor((_this.bitoffset + (bits || 0)) / 8);
+    // Adjust bit offset
+    _this.bitoffset = (_this.bitoffset + (bits || 0) + 64) % 8;
+    // Adjust byte offset based on byte overflow
+    _this.offset += bytes;
+    // 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);
 }
-export function goto(_this, byte, bit) {
+function align(_this, n) {
+    var a = _this.offset % n;
+    if (a) {
+        _this.skip(n - a);
+    }
+}
+function alignRev(_this, n) {
+    var a = _this.offset % n;
+    if (a) {
+        _this.skip(a * -1);
+    }
+}
+function goto(_this, byte, bit) {
     const new_size = (byte + Math.ceil((bit || 0) / 8));
     if (new_size > _this.size) {
         if (_this.strict == false) {
@@ -75,7 +94,7 @@ export function goto(_this, byte, bit) {
     _this.offset = byte;
     _this.bitoffset = (bit || 0) % 8;
 }
-export function remove(_this, startOffset, endOffset, consume, remove, fillValue) {
+function remove(_this, startOffset, endOffset, consume, remove, fillValue) {
     const new_start = Math.abs(startOffset || 0);
     const new_offset = (endOffset || _this.offset);
     if (new_offset > _this.size) {
@@ -128,7 +147,7 @@ export function remove(_this, startOffset, endOffset, consume, remove, fillValue
     }
     return data_removed;
 }
-export function addData(_this, data, consume, offset, repalce) {
+function addData(_this, data, consume, offset, repalce) {
     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.`);
@@ -186,7 +205,7 @@ export function addData(_this, data, consume, offset, repalce) {
         _this.bitoffset = 0;
     }
 }
-export function hexDump(_this, options) {
+function hexDump(_this, options) {
     var length = options && options.length;
     var startByte = options && options.startByte;
     var supressUnicode = options && options.supressUnicode || false;
@@ -368,7 +387,7 @@ export function hexDump(_this, options) {
     }
     console.log(rows.join("\n"));
 }
-export function AND(_this, and_key, start, end, consume) {
+function AND(_this, and_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -389,7 +408,7 @@ export function AND(_this, and_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(and_key)) {
+        if (arraybuffcheck(_this, and_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != and_key.length - 1) {
@@ -410,7 +429,7 @@ export function AND(_this, and_key, start, end, consume) {
         }
     }
 }
-export function OR(_this, or_key, start, end, consume) {
+function OR(_this, or_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -431,7 +450,7 @@ export function OR(_this, or_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(or_key)) {
+        if (arraybuffcheck(_this, or_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != or_key.length - 1) {
@@ -452,7 +471,7 @@ export function OR(_this, or_key, start, end, consume) {
         }
     }
 }
-export function XOR(_this, xor_key, start, end, consume) {
+function XOR(_this, xor_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -473,7 +492,7 @@ export function XOR(_this, xor_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(xor_key)) {
+        if (arraybuffcheck(_this, xor_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != xor_key.length - 1) {
@@ -494,7 +513,7 @@ export function XOR(_this, xor_key, start, end, consume) {
         }
     }
 }
-export function NOT(_this, start, end, consume) {
+function NOT(_this, start, end, consume) {
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
             _this.extendArray((end || 0) - _this.size);
@@ -512,7 +531,7 @@ export function NOT(_this, start, end, consume) {
         }
     }
 }
-export function LSHIFT(_this, shift_key, start, end, consume) {
+function LSHIFT(_this, shift_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -533,7 +552,7 @@ export function LSHIFT(_this, shift_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(shift_key)) {
+        if (arraybuffcheck(_this, shift_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != shift_key.length - 1) {
@@ -554,7 +573,7 @@ export function LSHIFT(_this, shift_key, start, end, consume) {
         }
     }
 }
-export function RSHIFT(_this, shift_key, start, end, consume) {
+function RSHIFT(_this, shift_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -575,7 +594,7 @@ export function RSHIFT(_this, shift_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(shift_key)) {
+        if (arraybuffcheck(_this, shift_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != shift_key.length - 1) {
@@ -596,7 +615,7 @@ export function RSHIFT(_this, shift_key, start, end, consume) {
         }
     }
 }
-export function ADD(_this, add_key, start, end, consume) {
+function ADD(_this, add_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -617,7 +636,7 @@ export function ADD(_this, add_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(add_key)) {
+        if (arraybuffcheck(_this, add_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != add_key.length - 1) {
@@ -638,7 +657,7 @@ export function ADD(_this, add_key, start, end, consume) {
         }
     }
 }
-export function wbit(_this, value, bits, unsigned, endian) {
+function wbit(_this, value, bits, unsigned, endian) {
     if (value == undefined) {
         throw new Error('Must supply value.');
     }
@@ -698,7 +717,7 @@ export function wbit(_this, value, bits, unsigned, endian) {
     _this.offset = _this.offset + Math.floor(((bits) + _this.bitoffset) / 8); //end byte
     _this.bitoffset = ((bits) + _this.bitoffset) % 8;
 }
-export function rbit(_this, bits, unsigned, endian) {
+function rbit(_this, bits, unsigned, endian) {
     if (bits == undefined || typeof bits != "number") {
         throw new Error("Enter number of bits to read");
     }
@@ -742,7 +761,7 @@ export function rbit(_this, bits, unsigned, endian) {
     }
     return value;
 }
-export function wbyte(_this, value, unsigned) {
+function wbyte(_this, value, unsigned) {
     check_size(_this, 1, 0);
     if (unsigned == true) {
         if (value < 0 || value > 255) {
@@ -762,7 +781,7 @@ export function wbyte(_this, value, unsigned) {
     _this.offset += 1;
     _this.bitoffset = 0;
 }
-export function rbyte(_this, unsigned) {
+function rbyte(_this, unsigned) {
     check_size(_this, 1);
     var read = _this.data[_this.offset];
     _this.offset += 1;
@@ -774,7 +793,7 @@ export function rbyte(_this, unsigned) {
         return read > 127 ? read - 256 : read;
     }
 }
-export function wint16(_this, value, unsigned, endian) {
+function wint16(_this, value, unsigned, endian) {
     check_size(_this, 2, 0);
     if (unsigned == true) {
         if (value < 0 || value > 65535) {
@@ -801,7 +820,7 @@ export function wint16(_this, value, unsigned, endian) {
     _this.offset += 2;
     _this.bitoffset = 0;
 }
-export function rint16(_this, unsigned, endian) {
+function rint16(_this, unsigned, endian) {
     check_size(_this, 2);
     var read;
     if ((endian != undefined ? endian : _this.endian) == "little") {
@@ -819,7 +838,7 @@ export function rint16(_this, unsigned, endian) {
         return read & 0xFFFF;
     }
 }
-export function rhalffloat(_this, endian) {
+function rhalffloat(_this, endian) {
     var uint16Value = _this.readInt16(true, (endian != undefined ? endian : _this.endian));
     const sign = (uint16Value & 0x8000) >> 15;
     const exponent = (uint16Value & 0x7C00) >> 10;
@@ -848,7 +867,7 @@ export function rhalffloat(_this, endian) {
     }
     return floatValue;
 }
-export function whalffloat(_this, value, endian) {
+function whalffloat(_this, value, endian) {
     check_size(_this, 2, 0);
     const maxValue = 65504;
     const minValue = 5.96e-08;
@@ -891,7 +910,7 @@ export function whalffloat(_this, value, endian) {
     _this.offset += 2;
     _this.bitoffset = 0;
 }
-export function wint32(_this, value, unsigned, endian) {
+function wint32(_this, value, unsigned, endian) {
     check_size(_this, 4, 0);
     if (unsigned == true) {
         if (value < 0 || value > 4294967295) {
@@ -922,7 +941,7 @@ export function wint32(_this, value, unsigned, endian) {
     _this.offset += 4;
     _this.bitoffset = 0;
 }
-export function rint32(_this, unsigned, endian) {
+function rint32(_this, unsigned, endian) {
     check_size(_this, 4);
     var read;
     if ((endian != undefined ? endian : _this.endian) == "little") {
@@ -940,7 +959,7 @@ export function rint32(_this, unsigned, endian) {
         return read >>> 0;
     }
 }
-export function rfloat(_this, endian) {
+function rfloat(_this, endian) {
     var uint32Value = _this.readInt32(true, (endian == undefined ? _this.endian : endian));
     // Check if the value is negative (i.e., the most significant bit is set)
     const isNegative = (uint32Value & 0x80000000) !== 0 ? 1 : 0;
@@ -963,7 +982,7 @@ export function rfloat(_this, endian) {
     }
     return floatValue;
 }
-export function wfloat(_this, value, endian) {
+function wfloat(_this, value, endian) {
     check_size(_this, 4, 0);
     const maxValue = 3.402823466e+38;
     const minValue = 1.175494351e-38;
@@ -985,7 +1004,7 @@ export function wfloat(_this, value, endian) {
     _this.offset += 4;
     _this.bitoffset = 0;
 }
-export function rint64(_this, unsigned, endian) {
+function rint64(_this, unsigned, endian) {
     check_size(_this, 8);
     // Convert the byte array to a BigInt
     let value = BigInt(0);
@@ -1015,7 +1034,7 @@ export function rint64(_this, unsigned, endian) {
     _this.bitoffset = 0;
     return value;
 }
-export function wint64(_this, value, unsigned, endian) {
+function wint64(_this, value, unsigned, endian) {
     check_size(_this, 8, 0);
     if (unsigned == true) {
         if (value < 0 || value > Math.pow(2, 64) - 1) {
@@ -1069,7 +1088,7 @@ export function wint64(_this, value, unsigned, endian) {
     _this.offset += 8;
     _this.bitoffset = 0;
 }
-export function wdfloat(_this, value, endian) {
+function wdfloat(_this, value, endian) {
     check_size(_this, 8, 0);
     const maxValue = 1.7976931348623158e308;
     const minValue = 2.2250738585072014e-308;
@@ -1092,7 +1111,7 @@ export function wdfloat(_this, value, endian) {
     _this.offset += 8;
     _this.bitoffset = 0;
 }
-export function rdfloat(_this, endian) {
+function rdfloat(_this, endian) {
     var uint64Value = _this.readInt64(true, (endian == undefined ? _this.endian : endian));
     const sign = (uint64Value & 0x8000000000000000n) >> 63n;
     const exponent = Number((uint64Value & 0x7ff0000000000000n) >> 52n) - 1023;
@@ -1121,7 +1140,7 @@ export function rdfloat(_this, endian) {
     }
     return floatValue;
 }
-export function rstring(_this, options) {
+function rstring(_this, options) {
     var length = options && options.length;
     var stringType = options && options.stringType || 'utf-8';
     var terminateValue = options && options.terminateValue;
@@ -1243,7 +1262,7 @@ export function rstring(_this, options) {
         throw new Error('Unsupported string type: ' + stringType);
     }
 }
-export function wstring(_this, string, options) {
+function wstring(_this, string, options) {
     var length = options && options.length;
     var stringType = options && options.stringType || 'utf-8';
     var terminateValue = options && options.terminateValue;
@@ -1496,6 +1515,26 @@ export class bireader {
     // move from current position
     //
     /**
+    * Aligns current byte position
+    *
+    * Note: Will extend array if strict mode is off and outside of max size
+    *
+    * @param {number} number - Byte to align
+    */
+    align(number) {
+        return align(this, number);
+    }
+    /**
+    * Reverse aligns current byte position
+    *
+    * Note: Will extend array if strict mode is off and outside of max size
+    *
+    * @param {number} number - Byte to align
+    */
+    alignRev(number) {
+        return alignRev(this, number);
+    }
+    /**
     * Offset current byte or bit position
     * Note: Will extend array if strict mode is off and outside of max size
     *
@@ -4445,6 +4484,14 @@ export class bireader {
         return wbyte(this, value, unsigned);
     }
     /**
+    * Write unsigned byte
+    *
+    * @param {number} value - value as int
+    */
+    writeUByte(value) {
+        return wbyte(this, value, true);
+    }
+    /**
     * Read byte
     *
     * @param {boolean} unsigned - if value is unsigned or not
@@ -4510,6 +4557,15 @@ export class bireader {
         return wint16(this, value, unsigned, endian);
     }
     /**
+    * Write unsigned int16
+    *
+    * @param {number} value - value as int
+    * @param {string} endian - ``big`` or ``little`
+    */
+    writeUInt16(value, endian) {
+        return wint16(this, value, true, endian);
+    }
+    /**
     * Read short
     *
     * @param {boolean} unsigned - if value is unsigned or not
@@ -4818,6 +4874,15 @@ export class bireader {
         return wint32(this, value, unsigned, endian);
     }
     /**
+    * Write unsigned int32
+    *
+    * @param {number} value - value as int
+    * @param {string} endian - ``big`` or ``little``
+    */
+    writeUInt32(value, endian) {
+        return wint32(this, value, true, endian);
+    }
+    /**
     * Read 32 bit integer
     *
     * @param {boolean} unsigned - if value is unsigned or not
@@ -5912,7 +5977,28 @@ export class biwriter {
     // move from current position
     //
     /**
+    * Aligns current byte position
+    *
+    * Note: Will extend array if strict mode is off and outside of max size
+    *
+    * @param {number} number - Byte to align
+    */
+    align(number) {
+        return align(this, number);
+    }
+    /**
+    * Reverse aligns current byte position
+    *
+    * Note: Will extend array if strict mode is off and outside of max size
+    *
+    * @param {number} number - Byte to align
+    */
+    alignRev(number) {
+        return alignRev(this, number);
+    }
+    /**
     * Offset current byte or bit position
+    *
     * Note: Will extend array if strict mode is off and outside of max size
     *
     * @param {number} bytes - Bytes to skip
@@ -9126,6 +9212,14 @@ export class biwriter {
         return rbyte(this, unsigned);
     }
     /**
+    * Read unsigned byte
+    *
+    * @returns number
+    */
+    readUByte() {
+        return rbyte(this, true);
+    }
+    /**
     * Write byte
     *
     * @param {number} value - value as int

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bireader",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "Read and write data in binary",
   "module": "lib/esm/index.mjs",
   "main": "lib/cjs/index.js",