bireader 1.0.44 → 1.0.46

package/lib/esm/index.mjs

@@ -170,7 +170,7 @@ function addData(_this, data, consume, offset, replace) {
     }
     var needed_size = offset || _this.offset;
     if (replace) {
-        needed_size = offset || _this.offset + data.length;
+        needed_size = (offset || _this.offset) + data.length;
     }
     if (needed_size > _this.size) {
         if (_this.strict == false) {
@@ -183,35 +183,29 @@ function addData(_this, data, consume, offset, replace) {
         _this.size = _this.data.length;
     }
     if (replace) {
+        const part1 = _this.data.subarray(0, needed_size - data.length);
+        const part2 = _this.data.subarray(needed_size, _this.size);
         if (isBuffer(_this.data)) {
-            const part1 = _this.data.subarray(0, needed_size - data.length);
-            const part2 = _this.data.subarray(needed_size, _this.size);
             _this.data = Buffer.concat([part1, data, part2]);
-            _this.size = _this.data.length;
         }
         else {
-            const part1 = _this.data.subarray(0, needed_size - data.length);
-            const part2 = _this.data.subarray(needed_size, _this.size);
             _this.data = new Uint8Array([...part1, ...data, ...part2]);
-            _this.size = _this.data.length;
         }
+        _this.size = _this.data.length;
     }
     else {
+        const part1 = _this.data.subarray(0, needed_size);
+        const part2 = _this.data.subarray(needed_size, _this.size);
         if (isBuffer(_this.data)) {
-            const part1 = _this.data.subarray(0, needed_size);
-            const part2 = _this.data.subarray(needed_size, _this.size);
             _this.data = Buffer.concat([part1, data, part2]);
-            _this.size = _this.data.length;
         }
         else {
-            const part1 = _this.data.subarray(0, needed_size);
-            const part2 = _this.data.subarray(needed_size, _this.size);
             _this.data = new Uint8Array([...part1, ...data, ...part2]);
-            _this.size = _this.data.length;
         }
+        _this.size = _this.data.length;
     }
     if (consume) {
-        _this.offset = needed_size;
+        _this.offset = (offset || _this.offset) + data.length;
         _this.bitoffset = 0;
     }
 }
@@ -1643,6 +1637,16 @@ export class bireader {
         this.strict = false;
         this.errorDump = true;
         this.data = [];
+        if (data == undefined) {
+            throw new Error("Data required");
+        }
+        else {
+            if (!this.isBufferOrUint8Array(data)) {
+                throw new Error("Write data must be Uint8Array or Buffer");
+            }
+        }
+        this.size = data.length;
+        this.data = data;
         if (endianness != undefined && typeof endianness != "string") {
             throw new Error("Endian must be big or little");
         }
@@ -1650,6 +1654,14 @@ export class bireader {
             throw new Error("Byte order must be big or little");
         }
         this.endian = endianness || "little";
+        if (typeof strict == "boolean") {
+            this.strict = strict;
+        }
+        else {
+            if (strict != undefined) {
+                throw new Error("Strict mode must be true of false");
+            }
+        }
         if (byteOffset != undefined || bitOffset != undefined) {
             this.offset = ((Math.abs(byteOffset || 0)) + Math.ceil((Math.abs(bitOffset || 0)) / 8));
             // Adjust byte offset based on bit overflow
@@ -1660,25 +1672,15 @@ export class bireader {
             this.bitoffset = Math.min(Math.max(this.bitoffset, 0), 7);
             // Ensure offset doesn't go negative
             this.offset = Math.max(this.offset, 0);
-        }
-        if (typeof strict == "boolean") {
-            this.strict = strict;
-        }
-        else {
-            if (strict != undefined) {
-                throw new Error("Strict mode must be true of false");
-            }
-        }
-        if (data == undefined) {
-            throw new Error("Data required");
-        }
-        else {
-            if (!this.isBufferOrUint8Array(data)) {
-                throw new Error("Write data must be Uint8Array or Buffer");
+            if (this.offset > this.size) {
+                if (this.strict == false) {
+                    this.extendArray(this.offset - this.size);
+                }
+                else {
+                    throw new Error(`Starting offset outside of size: ${this.offset} of ${this.size}`);
+                }
             }
         }
-        this.size = data.length;
-        this.data = data;
     }
     /**
     *
@@ -2374,7 +2376,7 @@ export class bireader {
     * @param {number} offset - Byte position to add at (defaults to current position)
     */
     insert(data, consume, offset) {
-        return addData(this, data, consume || false, offset || this.offset);
+        return addData(this, data, consume || false, offset || this.offset, false);
     }
     /**
     * Inserts data into data
@@ -2385,7 +2387,7 @@ export class bireader {
     * @param {number} offset - Byte position to add at (defaults to current position)
     */
     place(data, consume, offset) {
-        return addData(this, data, consume || false, offset || this.offset);
+        return addData(this, data, consume || false, offset || this.offset, false);
     }
     /**
     * Replaces data in data
@@ -2417,7 +2419,7 @@ export class bireader {
     * @param {boolean} consume - Move current write position to end of data (default false)
     */
     unshift(data, consume) {
-        return addData(this, data, consume || false, 0);
+        return addData(this, data, consume || false, 0, false);
     }
     /**
     * Adds data to start of supplied data
@@ -2427,7 +2429,7 @@ export class bireader {
     * @param {boolean} consume - Move current write position to end of data (default false)
     */
     prepend(data, consume) {
-        return addData(this, data, consume || false, 0);
+        return addData(this, data, consume || false, 0, false);
     }
     /**
     * Adds data to end of supplied data
@@ -2437,7 +2439,7 @@ export class bireader {
     * @param {boolean} consume - Move current write position to end of data (default false)
     */
     push(data, consume) {
-        return addData(this, data, consume || false, this.size);
+        return addData(this, data, consume || false, this.size, false);
     }
     /**
     * Adds data to end of supplied data
@@ -2447,7 +2449,7 @@ export class bireader {
     * @param {boolean} consume - Move current write position to end of data (default false)
     */
     append(data, consume) {
-        return addData(this, data, consume || false, this.size);
+        return addData(this, data, consume || false, this.size, false);
     }
     //
     //finishing
@@ -6209,11 +6211,34 @@ export class biwriter {
         this.strict = false;
         this.errorDump = true;
         this.data = [];
+        if (data == undefined) {
+            if (typeof Buffer !== 'undefined') {
+                this.data = Buffer.alloc(this.offset || 1 + (this.bitoffset != 0 ? 1 : 0));
+            }
+            else {
+                this.data = new Uint8Array(this.offset || 1 + (this.bitoffset != 0 ? 1 : 0));
+            }
+        }
+        else {
+            if (!this.isBufferOrUint8Array(data)) {
+                throw new Error("Write data must be Uint8Array or Buffer.");
+            }
+            this.data = data;
+        }
+        this.size = this.data.length;
+        if (typeof strict == "boolean") {
+            this.strict = strict;
+        }
+        else {
+            if (strict != undefined) {
+                throw new Error("Strict mode must be true of false.");
+            }
+        }
         if (endianness != undefined && typeof endianness != "string") {
-            throw new Error("endianness must be big or little");
+            throw new Error("endianness must be big or little.");
         }
         if (endianness != undefined && !(endianness == "big" || endianness == "little")) {
-            throw new Error("Endianness must be big or little");
+            throw new Error("Endianness must be big or little.");
         }
         this.endian = endianness || "little";
         if (byteOffset != undefined || bitOffset != undefined) {
@@ -6226,30 +6251,15 @@ export class biwriter {
             this.bitoffset = Math.min(Math.max(this.bitoffset, 0), 7);
             // Ensure offset doesn't go negative
             this.offset = Math.max(this.offset, 0);
-        }
-        if (typeof strict == "boolean") {
-            this.strict = strict;
-        }
-        else {
-            if (strict != undefined) {
-                throw new Error("Strict mode must be true of false");
-            }
-        }
-        if (data == undefined) {
-            if (typeof Buffer !== 'undefined') {
-                this.data = Buffer.alloc(this.offset || 1 + (this.bitoffset != 0 ? 1 : 0));
-            }
-            else {
-                this.data = new Uint8Array(this.offset || 1 + (this.bitoffset != 0 ? 1 : 0));
-            }
-        }
-        else {
-            if (!this.isBufferOrUint8Array(data)) {
-                throw new Error("Write data must be Uint8Array or Buffer");
+            if (this.offset > this.size) {
+                if (this.strict == false) {
+                    this.extendArray(this.offset - this.size);
+                }
+                else {
+                    throw new Error(`Starting offset outside of size: ${this.offset} of ${this.size}`);
+                }
             }
         }
-        this.data = data;
-        this.size = this.data.length;
     }
     /**
     * Change Endian (default little)
@@ -6951,7 +6961,7 @@ export class biwriter {
     * @param {number} offset - Byte position to add at (defaults to current position)
     */
     insert(data, consume, offset) {
-        return addData(this, data, consume || false, offset || this.offset);
+        return addData(this, data, consume || false, offset || this.offset, false);
     }
     /**
     * Inserts data into data
@@ -6962,7 +6972,7 @@ export class biwriter {
     * @param {number} offset - Byte position to add at (defaults to current position)
     */
     place(data, consume, offset) {
-        return addData(this, data, consume || false, offset || this.offset);
+        return addData(this, data, consume || false, offset || this.offset, false);
     }
     /**
     * Replaces data in data
@@ -6994,7 +7004,7 @@ export class biwriter {
     * @param {boolean} consume - Move current write position to end of data (default false)
     */
     unshift(data, consume) {
-        return addData(this, data, consume || false, 0);
+        return addData(this, data, consume || false, 0, false);
     }
     /**
     * Adds data to start of supplied data
@@ -7004,7 +7014,7 @@ export class biwriter {
     * @param {boolean} consume - Move current write position to end of data (default false)
     */
     prepend(data, consume) {
-        return addData(this, data, consume || false, 0);
+        return addData(this, data, consume || false, 0, false);
     }
     /**
     * Adds data to end of supplied data
@@ -7014,7 +7024,7 @@ export class biwriter {
     * @param {boolean} consume - Move current write position to end of data (default false)
     */
     push(data, consume) {
-        return addData(this, data, consume || false, this.size);
+        return addData(this, data, consume || false, this.size, false);
     }
     /**
     * Adds data to end of supplied data
@@ -7024,7 +7034,7 @@ export class biwriter {
     * @param {boolean} consume - Move current write position to end of data (default false)
     */
     append(data, consume) {
-        return addData(this, data, consume || false, this.size);
+        return addData(this, data, consume || false, this.size, false);
     }
     //
     //finishing

package/package.json

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