@amodx/binary 0.0.14 → 0.0.16

package/Object/Constants/BinaryObjectMarkers.d.ts

@@ -1,4 +1,4 @@
-import { BinaryNumberTypes } from "../../Constants/BinaryTypes";
+import { BinaryNumberTypes } from "../../Constants/BinaryTypes.js";
 export declare enum BinaryObjectMarkers {
     Name = 0,
     Object = 1,
@@ -22,6 +22,7 @@ export declare enum BinaryObjectMarkers {
     ArrayBuffer = 19,
     TypedArray = 20,
     Json = 21,
-    Blob = 22
+    Blob = 22,
+    Null = 23
 }
 export declare const MappedMarkertoPrimitive: Partial<Record<BinaryObjectMarkers, BinaryNumberTypes>>;

package/Object/Constants/BinaryObjectMarkers.js

@@ -1,4 +1,4 @@
-import { BinaryNumberTypes } from "../../Constants/BinaryTypes";
+import { BinaryNumberTypes } from "../../Constants/BinaryTypes.js";
 export var BinaryObjectMarkers;
 (function (BinaryObjectMarkers) {
     BinaryObjectMarkers[BinaryObjectMarkers["Name"] = 0] = "Name";
@@ -24,6 +24,7 @@ export var BinaryObjectMarkers;
     BinaryObjectMarkers[BinaryObjectMarkers["TypedArray"] = 20] = "TypedArray";
     BinaryObjectMarkers[BinaryObjectMarkers["Json"] = 21] = "Json";
     BinaryObjectMarkers[BinaryObjectMarkers["Blob"] = 22] = "Blob";
+    BinaryObjectMarkers[BinaryObjectMarkers["Null"] = 23] = "Null";
 })(BinaryObjectMarkers || (BinaryObjectMarkers = {}));
 export const MappedMarkertoPrimitive = {
     [BinaryObjectMarkers.Int8]: BinaryNumberTypes.Int8,

package/Object/Functions/BufferToObject.js

@@ -1,8 +1,8 @@
 import { BinaryObjectMarkers } from "../Constants/BinaryObjectMarkers.js";
 import { BinaryNumberTypes, ByteCounts, MappedByteCounts, } from "../../Constants/BinaryTypes.js";
 import { TypedNode } from "../Classes/TypedNode.js";
-import { ByteDataGet } from "../../Util/ByteDataGet";
-import { TypedArrayCreate } from "../../Util/TypedArrayCreate";
+import { ByteDataGet } from "../../Util/ByteDataGet.js";
+import { TypedArrayCreate } from "../../Util/TypedArrayCreate.js";
 export class BufferToObject {
     static _mode = "object";
     static _sharedMemory = false;
@@ -108,6 +108,15 @@ export class BufferToObject {
             }
             return ByteCounts.Uint8 + index;
         },
+        [BinaryObjectMarkers.Null]: (dv, index) => {
+            if (this._mode != "type-node") {
+                this._assign(null);
+            }
+            else {
+                this._assign(this._newTypedNode(BinaryObjectMarkers.Null, null));
+            }
+            return ByteCounts.Uint8 + index;
+        },
         [BinaryObjectMarkers.Int8]: (dv, index) => {
             const value = ByteDataGet[BinaryNumberTypes.Int8](dv, index + 1);
             if (this._mode != "type-node") {
@@ -308,18 +317,18 @@ export class BufferToObject {
     }
     static toObject(buffer, byteOffSet = 0, byteOffSetEnd = 0) {
         this._mode = "object";
-        let legnth;
+        let byteEnd;
         if (byteOffSetEnd == 0) {
-            legnth = buffer.byteLength;
+            byteEnd = buffer.byteLength;
         }
         else {
-            legnth = byteOffSetEnd;
+            byteEnd = byteOffSet + byteOffSetEnd;
         }
         const dv = new DataView(buffer);
         this._objCount = 0;
         let index = byteOffSet;
         let markType = BinaryObjectMarkers.Object;
-        while (index < legnth) {
+        while (index < byteEnd) {
             markType = ByteDataGet[BinaryNumberTypes.Uint8](dv, index);
             index = this.markFunctions[markType](dv, index);
         }
@@ -327,18 +336,18 @@ export class BufferToObject {
     }
     static toJSON(buffer, byteOffSet = 0, byteOffSetEnd = 0) {
         this._mode = "json";
-        let legnth;
+        let byteEnd;
         if (byteOffSetEnd == 0) {
-            legnth = buffer.byteLength;
+            byteEnd = buffer.byteLength;
         }
         else {
-            legnth = byteOffSetEnd;
+            byteEnd = byteOffSet + byteOffSetEnd;
         }
         const dv = new DataView(buffer);
         this._objCount = 0;
         let index = byteOffSet;
         let markType = BinaryObjectMarkers.Object;
-        while (index < legnth) {
+        while (index < byteEnd) {
             markType = ByteDataGet[BinaryNumberTypes.Uint8](dv, index);
             index = this.markFunctions[markType](dv, index);
         }
@@ -346,19 +355,19 @@ export class BufferToObject {
     }
     static toTypedNodes(buffer, byteOffSet = 0, byteOffSetEnd = 0) {
         this._mode = "type-node";
-        let legnth;
+        let byteEnd;
         if (byteOffSetEnd == 0) {
-            legnth = buffer.byteLength;
+            byteEnd = buffer.byteLength;
         }
         else {
-            legnth = byteOffSetEnd;
+            byteEnd = byteOffSet + byteOffSetEnd;
         }
         this._mode = "object";
         const dv = new DataView(buffer);
         this._objCount = 0;
         let index = byteOffSet;
         let markType = BinaryObjectMarkers.Object;
-        while (index < legnth) {
+        while (index < byteEnd) {
             markType = ByteDataGet[BinaryNumberTypes.Uint8](dv, index);
             index = this.markFunctions[markType](dv, index);
         }

package/Object/Functions/ObjectToTypedNodes.js

@@ -9,6 +9,10 @@ export class ObjectToTypedNodes {
         for (const key of Object.keys(obj)) {
             const value = obj[key];
             this._name = key;
+            if (typeof value == "undefined" || value === null) {
+                node.value[key] = this._addPrimitive(value);
+                continue;
+            }
             if (value instanceof TypedNode) {
                 node.value[key] = value;
                 continue;
@@ -40,6 +44,10 @@ export class ObjectToTypedNodes {
     static _traverseArray(array) {
         const node = TypedNodes.array([]);
         for (const value of array) {
+            if (typeof value == "undefined" || value === null) {
+                node.value.push(this._addPrimitive(value));
+                continue;
+            }
             if (value instanceof TypedNode) {
                 node.value.push(value);
                 continue;
@@ -63,6 +71,9 @@ export class ObjectToTypedNodes {
         return node;
     }
     static _addPrimitive(node) {
+        if (node === null) {
+            return TypedNodes.null();
+        }
         if (typeof node == "string") {
             return TypedNodes.string(node);
         }

package/Object/Functions/TypedNodesToBuffer.js

@@ -38,6 +38,10 @@ export class TypedNodesToBuffer {
         //for object array start and end marks
         const array = data.value;
         for (const node of array) {
+            if (typeof node.value == "undefined" || node.value === null) {
+                this._tokenizePrimiives(node);
+                continue;
+            }
             if (typeof node.value == "object" &&
                 !Array.isArray(node.value) &&
                 !ArrayBuffer.isView(node.value)) {
@@ -73,6 +77,10 @@ export class TypedNodesToBuffer {
             this._addToken(BinaryNumberTypes.Uint8, node.value ? 0 : 1);
             return;
         }
+        if (node.value == null) {
+            this._addMarker(BinaryObjectMarkers.Null);
+            return;
+        }
         if (typeof node.value == "undefined") {
             this._addMarker(BinaryObjectMarkers.Undefined);
             return;
@@ -117,8 +125,7 @@ export class TypedNodesToBuffer {
             !Array.isArray(node.value)) {
             this._traverseObj(node);
         }
-        if (node.marker == BinaryObjectMarkers.Array &&
-            Array.isArray(node.value)) {
+        if (node.marker == BinaryObjectMarkers.Array && Array.isArray(node.value)) {
             this._traverseArray(node);
         }
     }

package/Object/TypedNodes.d.ts

@@ -17,6 +17,7 @@ export declare class TypedNodes {
     static bigUint(value: number): TypedNode<number>;
     static boolean(value: boolean): TypedNode<boolean>;
     static undefined(): TypedNode<undefined>;
+    static null(): TypedNode<null>;
     static arrayBuffer(value: ArrayBuffer | SharedArrayBuffer): TypedNode<ArrayBuffer>;
     static typedArray(type: BinaryNumberTypes, value: number[] | ArrayBufferView): TypedNode<TypedArrays>;
     static string(value: string): TypedNode<string>;

package/Object/TypedNodes.js

@@ -48,6 +48,9 @@ export class TypedNodes {
     static undefined() {
         return new TypedNode(BinaryObjectMarkers.Undefined, undefined);
     }
+    static null() {
+        return new TypedNode(BinaryObjectMarkers.Null, null);
+    }
     static arrayBuffer(value) {
         return new TypedNode(BinaryObjectMarkers.ArrayBuffer, value);
     }

package/Struct/Classes/BinraryStructBase.d.ts

@@ -12,7 +12,7 @@ export declare class BinraryStructBase {
     indexMap: Record<string, number>;
     index: DataView<ArrayBuffer>;
     constructor(id: string);
-    setData(data: DataView): void;
+    setData(data: DataView<any>): void;
     setBuffer(data: BufferTypes): void;
     getBuffer(): ArrayBuffer;
     setStructArrayIndex(index: number): void;

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@amodx/binary",
- "version": "0.0.14",
+ "version": "0.0.16",
  "module": "index.js",
  "types": "index.d.ts",
  "type": "module",