bireader 1.0.4 → 1.0.6

package/README.md

@@ -173,6 +173,16 @@ Common functions for setup and movement shared by both (unless indicated).
   <tr>
     <td>Aliases</td>
     <td>clip(startOffset, endOffset)<br>truncate(startOffset, endOffset)<br>slice(startOffset, endOffset)</td>
+  </tr>
+   <tr>
+    <td>Name</td>
+    <td>extract(<b>length</b>)</td>
+    <td align="center" rowspan="2">length of data from current position</td>
+    <td rowspan="2">Returns data from current read position to supplied length. <br><b>Note:</b> Does not affect supplied data or current read position.</td>
+  </tr>
+  <tr>
+    <td>Aliases</td>
+    <td>wrap(<b>length</b>)<br>lift(<b>length</b>)</td>
   </tr>
   <tr>
     <td>Name</td>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bireader",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Read and write data in binary",
   "main": "index.js",
   "directories": {

package/src/reader.js

@@ -21,10 +21,6 @@ class bireader {
         }
     }
 
-    #flip = function(unsignedValue){
-        return unsignedValue > 127 ? unsignedValue - 256 : unsignedValue;
-    }
-
     /**
     *
     * byte reader, includes bitfields and strings
@@ -148,6 +144,18 @@ class bireader {
     clip = this.crop = this.truncate = this.slice = function(startOffset, endOffset){
         return this.data.slice(startOffset || 0, endOffset || this.offset)
     }
+
+     /**
+    * Extract array from current position to length supplied
+    * Note: Does not affect supplied data
+    * @param {number} length - length of data to copy from current offset
+    */
+    extract = this.wrap = this.lift = function(length){
+        if(this.offset + (length ||0) > this.size){
+            throw new Error("End offset outside of data: " + this.size)
+        }
+        return this.data.slice(this.offset, this.offset + (length ||0))
+    }
     
     /**
     * Returns current data
@@ -2477,12 +2485,12 @@ class bireader {
     */
     readByte = this.byte = this.int8 = function(unsigned){
         this.#check_size(1)
-        const read = this.#flip(this.data[this.offset])
+        var read = this.data[this.offset]
         this.offset += 1
         if(unsigned == true){
             return read & 0xFF
         } else {
-            return read 
+            return read > 127 ? read - 256 : read; 
         }
     }
 
@@ -2510,13 +2518,13 @@ class bireader {
         this.#check_size(2)
         var read
         if((endian != undefined ? endian : this.endian)  == "little"){
-            read = (this.#flip(this.data[this.offset + 1]) << 8) | this.#flip(this.data[this.offset]);
+            read = ((this.data[this.offset + 1] & 0xFFFF) << 8) | (this.data[this.offset]& 0xFFFF);
         } else {
-            read = (this.#flip(this.data[this.offset]) << 8) | this.#flip(this.data[this.offset + 1]);
+            read = ((this.data[this.offset]& 0xFFFF) << 8) | (this.data[this.offset + 1] & 0xFFFF);
         }
         this.offset += 2
         if(unsigned == undefined || unsigned == false){
-            return read
+            return read & 0x8000 ? -(0x10000 - read) : read
         } else {
             return read & 0xFFFF
         }
@@ -2781,7 +2789,7 @@ class bireader {
         let value = BigInt(0);
         if((endian == undefined ? this.endian : endian) == "little"){
             for (let i = 0; i < 8; i++) {
-                value |= BigInt(this.#flip(this.data[this.offset])) << BigInt(8 * i);
+                value |= BigInt((this.data[this.offset] & 0xFF)) << BigInt(8 * i);
                 this.offset += 1
             }
             if(unsigned == undefined || unsigned == false){
@@ -2794,7 +2802,7 @@ class bireader {
             }
         } else {
             for (let i = 0; i < 8; i++) {
-                value = (value << BigInt(8)) | BigInt(this.#flip(this.data[this.offset]));
+                value = (value << BigInt(8)) | BigInt((this.data[this.offset] & 0xFF));
                 this.offset += 1
                 }
             if(unsigned == undefined || unsigned == false){

package/src/writer.js

@@ -213,6 +213,23 @@ class biwriter {
         }
         return this.data.slice(Math.abs(startOffset || 0), endOffset || this.offset)
     }
+
+    /**
+    * Extract array from current position to length supplied
+    * Note: Does not affect supplied data
+    * Note: Will extend array if strict mode is off
+    * @param {number} length - length of data to copy from current offset
+    */
+    extract = this.wrap = this.lift = function(length){
+        if(this.offset + (length ||0) > this.size){
+            if(this.strict == false){
+                this.extendArray(this.offset + (length ||0) - this.size)
+            } else {
+                throw new Error("End offset outside of data: " + this.size)
+            }
+        }
+        return this.data.slice(this.offset, this.offset + (length ||0))
+    }
     
     /**
     * Returns current data