json-as 1.2.5 → 1.3.0

package/assembly/index.ts

@@ -1,40 +1,40 @@
 /// <reference path="./index.d.ts" />
 
 import { bs } from "../lib/as-bs";
-import { serializeArray } from "./serialize/simple/array";
-import { serializeMap } from "./serialize/simple/map";
-import { serializeDate } from "./serialize/simple/date";
-import { deserializeBoolean } from "./deserialize/simple/bool";
-import { deserializeArray } from "./deserialize/simple/array";
-import { deserializeFloat } from "./deserialize/simple/float";
-import { deserializeMap } from "./deserialize/simple/map";
-import { deserializeDate } from "./deserialize/simple/date";
-import { deserializeInteger } from "./deserialize/simple/integer";
-import { serializeArbitrary } from "./serialize/simple/arbitrary";
-import { serializeSet } from "./serialize/simple/set";
-import { deserializeSet } from "./deserialize/simple/set";
-import { serializeStaticArray } from "./serialize/simple/staticarray";
-import { deserializeStaticArray } from "./deserialize/simple/staticarray";
+import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
+import { serializeArray } from "./serialize/index/array";
+import { serializeMap } from "./serialize/index/map";
+import { serializeDate } from "./serialize/index/date";
+import { deserializeBoolean } from "./deserialize/index/bool";
+import { deserializeArray } from "./deserialize/index/array";
+import { deserializeFloat } from "./deserialize/index/float";
+import { deserializeMap } from "./deserialize/index/map";
+import { deserializeDate } from "./deserialize/index/date";
+import { deserializeInteger } from "./deserialize/index/integer";
+import { deserializeUnsigned } from "./deserialize/index/unsigned";
+import { serializeArbitrary } from "./serialize/index/arbitrary";
+import { serializeSet } from "./serialize/index/set";
+import { deserializeSet } from "./deserialize/index/set";
+import { serializeStaticArray } from "./serialize/index/staticarray";
+import { deserializeStaticArray } from "./deserialize/index/staticarray";
 
 import { NULL_WORD, QUOTE, NULL_WORD_U64, TRUE_WORD_U64, FALSE_WORD_U64 } from "./custom/chars";
 import { dtoa_buffered, itoa_buffered } from "util/number";
-import { serializeBool } from "./serialize/simple/bool";
-import { serializeInteger } from "./serialize/simple/integer";
-import { serializeFloat } from "./serialize/simple/float";
-import { serializeStruct } from "./serialize/simple/struct";
+import { serializeBool } from "./serialize/index/bool";
+import { serializeInteger } from "./serialize/index/integer";
+import { serializeFloat } from "./serialize/index/float";
+import { serializeStruct } from "./serialize/index/struct";
 import { ptrToStr } from "./util/ptrToStr";
 import { atoi, bytes } from "./util";
-import { deserializeArbitrary } from "./deserialize/simple/arbitrary";
-import { serializeObject } from "./serialize/simple/object";
-import { deserializeObject } from "./deserialize/simple/object";
-import { serializeRaw } from "./serialize/simple/raw";
-import { deserializeRaw } from "./deserialize/simple/raw";
-import { serializeString_SIMD } from "./serialize/simd/string";
-import { serializeString_SWAR } from "./serialize/swar/string";
-import { deserializeString_SWAR } from "./deserialize/swar/string";
-import { deserializeString } from "./deserialize/simple/string";
-import { serializeString } from "./serialize/simple/string";
-import { deserializeString_SIMD } from "./deserialize/simd/string";
+import { deserializeArbitrary } from "./deserialize/index/arbitrary";
+import { serializeObject } from "./serialize/index/object";
+import { deserializeObject } from "./deserialize/index/object";
+import { serializeRaw } from "./serialize/index/raw";
+import { deserializeRaw } from "./deserialize/index/raw";
+import { deserializeString } from "./deserialize/index/string";
+import { serializeString } from "./serialize/index/string";
+import { deserializeArrayBuffer, deserializeTypedArray } from "./deserialize/index/typedarray";
+import { serializeArrayBufferUnsafe, serializeTypedArray } from "./serialize/index/typedarray";
 
 /**
  * Offset of the 'storage' property in the JSON.Value class.
@@ -96,7 +96,6 @@ export namespace JSON {
       if (out) {
         out = changetype<string>(__renew(changetype<usize>(out), sizeof<T>() << 3));
 
-        // @ts-expect-error
         const bytes = itoa_buffered(changetype<usize>(out), data) << 1;
         return (out = changetype<string>(__renew(changetype<usize>(out), bytes)));
       }
@@ -105,12 +104,10 @@ export namespace JSON {
       if (out) {
         out = changetype<string>(__renew(changetype<usize>(out), 64));
 
-        // @ts-expect-error
         const bytes = dtoa_buffered(changetype<usize>(out), data) << 1;
         return (out = changetype<string>(__renew(changetype<usize>(out), bytes)));
       }
       return data.toString();
-      // @ts-expect-error: Function is generated by transform
     } else if (isNullable<T>() && changetype<usize>(data) == <usize>0) {
       if (out) {
         out = changetype<string>(__renew(changetype<usize>(out), 8));
@@ -118,22 +115,14 @@ export namespace JSON {
         return out;
       }
       return NULL_WORD;
-      // @ts-expect-error
     } else if (isString<nonnull<T>>()) {
-      if (JSON_MODE === JSONMode.SIMD) {
-        serializeString_SIMD(data as string);
-      } else if (JSON_MODE === JSONMode.SWAR) {
-        serializeString_SWAR(data as string);
-      } else {
-        serializeString(data as string);
-      }
+      serializeString(data as string);
       return bs.out<string>();
       // @ts-expect-error: Supplied by transform
     } else if (isDefined(data.__SERIALIZE)) {
       // @ts-expect-error
       inline.always(data.__SERIALIZE(changetype<usize>(data)));
       return bs.out<string>();
-      // @ts-expect-error: Supplied by transform
     } else if (data instanceof Date) {
       out = out ? changetype<string>(__renew(changetype<usize>(out), 52)) : changetype<string>(__new(52, idof<string>()));
 
@@ -149,6 +138,39 @@ export namespace JSON {
       // @ts-expect-error
       inline.always(serializeStaticArray(changetype<nonnull<T>>(data)));
       return bs.out<string>();
+    } else if (data instanceof Int8Array) {
+      inline.always(serializeTypedArray<Int8Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Uint8Array) {
+      inline.always(serializeTypedArray<Uint8Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Uint8ClampedArray) {
+      inline.always(serializeTypedArray<Uint8ClampedArray>(data));
+      return bs.out<string>();
+    } else if (data instanceof Int16Array) {
+      inline.always(serializeTypedArray<Int16Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Uint16Array) {
+      inline.always(serializeTypedArray<Uint16Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Int32Array) {
+      inline.always(serializeTypedArray<Int32Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Uint32Array) {
+      inline.always(serializeTypedArray<Uint32Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Int64Array) {
+      inline.always(serializeTypedArray<Int64Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Uint64Array) {
+      inline.always(serializeTypedArray<Uint64Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Float32Array) {
+      inline.always(serializeTypedArray<Float32Array>(data));
+      return bs.out<string>();
+    } else if (data instanceof Float64Array) {
+      inline.always(serializeTypedArray<Float64Array>(data));
+      return bs.out<string>();
     } else if (data instanceof Set) {
       // @ts-expect-error
       inline.always(serializeSet(changetype<nonnull<T>>(data)));
@@ -169,14 +191,16 @@ export namespace JSON {
     } else if (data instanceof JSON.Box) {
       return JSON.stringify(data.value);
     } else {
-      throw new Error(
-        `Could not serialize data of type '${nameof<T>()}'. ` +
-        `If this is a custom class, add the @json decorator: @json class ${nameof<T>()} { ... }. ` +
-        `Supported types: primitives, string, Array, Map, Date, and @json decorated classes.`
-      );
+      throw new Error(`Could not serialize data of type '${nameof<T>()}'. ` + `If this is a custom class, add the @json decorator: @json class ${nameof<T>()} { ... }. ` + `Supported types: primitives, string, Array, StaticArray, TypedArray, Map, Date, and @json decorated classes. ` + `For ArrayBuffer, use JSON.stringifyArrayBuffer(changetype<usize>(...)).`);
     }
   }
 
+
+  @inline export function stringifyArrayBuffer(dataStart: usize): string {
+    serializeArrayBufferUnsafe(dataStart, changetype<OBJECT>(dataStart - TOTAL_OVERHEAD).rtSize);
+    return bs.out<string>();
+  }
+
   /**
    * Parses valid JSON strings into their original format
    * ```js
@@ -192,23 +216,13 @@ export namespace JSON {
     if (isBoolean<T>()) {
       return deserializeBoolean(dataPtr, dataPtr + dataSize) as T;
     } else if (isInteger<T>()) {
-      return deserializeInteger<T>(dataPtr, dataPtr + dataSize);
+      return isSigned<T>() ? deserializeInteger<T>(dataPtr, dataPtr + dataSize) : deserializeUnsigned<T>(dataPtr, dataPtr + dataSize);
     } else if (isFloat<T>()) {
       return deserializeFloat<T>(dataPtr, dataPtr + dataSize);
     } else if (isNullable<T>() && dataSize == 8 && load<u64>(dataPtr) == NULL_WORD_U64) {
-      // @ts-expect-error
       return null;
     } else if (isString<T>()) {
-      if (JSON_MODE === JSONMode.NAIVE) {
-        // @ts-expect-error: type
-        return deserializeString(dataPtr, dataPtr + dataSize);
-      } else if (JSON_MODE === JSONMode.SWAR) {
-        // @ts-expect-error: type
-        return deserializeString_SWAR(dataPtr, dataPtr + dataSize);
-      } else if (JSON_MODE === JSONMode.SIMD) {
-        // @ts-expect-error: type
-        return deserializeString_SIMD(dataPtr, dataPtr + dataSize);
-      }
+      return deserializeString(dataPtr, dataPtr + dataSize) as T;
     } else {
       let type: nonnull<T> = changetype<nonnull<T>>(0);
       if (type instanceof StaticArray) {
@@ -217,16 +231,41 @@ export namespace JSON {
       } else if (type instanceof Array) {
         // @ts-expect-error
         return inline.always(deserializeArray<nonnull<T>>(dataPtr, dataPtr + dataSize, changetype<usize>(instantiate<T>())));
-      }  else if (type instanceof Set) {
+      } else if (type instanceof Int8Array) {
+        return deserializeTypedArray<Int8Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Uint8Array) {
+        return deserializeTypedArray<Uint8Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Uint8ClampedArray) {
+        return deserializeTypedArray<Uint8ClampedArray>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Int16Array) {
+        return deserializeTypedArray<Int16Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Uint16Array) {
+        return deserializeTypedArray<Uint16Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Int32Array) {
+        return deserializeTypedArray<Int32Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Uint32Array) {
+        return deserializeTypedArray<Uint32Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Int64Array) {
+        return deserializeTypedArray<Int64Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Uint64Array) {
+        return deserializeTypedArray<Uint64Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Float32Array) {
+        return deserializeTypedArray<Float32Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Float64Array) {
+        return deserializeTypedArray<Float64Array>(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof ArrayBuffer) {
+        return deserializeArrayBuffer(dataPtr, dataPtr + dataSize, 0) as T;
+      } else if (type instanceof Set) {
         // @ts-expect-error
         return inline.always(deserializeSet<nonnull<T>>(dataPtr, dataPtr + dataSize, 0));
-      // @ts-expect-error: Defined by transform
+        // @ts-expect-error: Defined by transform
       } else if (isDefined(type.__DESERIALIZE)) {
         const out = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()));
         // @ts-expect-error: Defined by transform
         if (isDefined(type.__INITIALIZE)) out.__INITIALIZE();
         // @ts-expect-error
-        return out.__DESERIALIZE(dataPtr, dataPtr + dataSize, out);
+        out.__DESERIALIZE(dataPtr, dataPtr + dataSize, out);
+        return out;
       } else if (type instanceof Map) {
         // @ts-expect-error
         return inline.always(deserializeMap<nonnull<T>>(dataPtr, dataPtr + dataSize, 0));
@@ -246,11 +285,7 @@ export namespace JSON {
         // @ts-expect-error
         return new JSON.Box(parseBox(data, changetype<nonnull<T>>(0).value));
       } else {
-        throw new Error(
-          `Could not deserialize JSON to type '${nameof<T>()}'. ` +
-          `If this is a custom class, ensure it has the @json decorator: @json class ${nameof<T>()} { ... }. ` +
-          `Input: "${data.length > 50 ? data.slice(0, 50) + '...' : data}"`
-        );
+        throw new Error(`Could not deserialize JSON to type '${nameof<T>()}'. ` + `If this is a custom class, ensure it has the @json decorator: @json class ${nameof<T>()} { ... }. ` + `Input: "${data.length > 50 ? data.slice(0, 50) + "..." : data}"`);
       }
     }
   }
@@ -353,13 +388,11 @@ export namespace JSON {
      * @param data - A valid JSON string
      * @returns A new Raw instance
      */
-    // @ts-expect-error: inline
     @inline static from(data: string): JSON.Raw {
       return new JSON.Raw(data);
     }
   }
 
-
   /**
    * Dynamic value container that can hold any JSON-compatible type at runtime.
    *
@@ -427,14 +460,14 @@ export namespace JSON {
       // @ts-expect-error: can assume that T is ArrayLike based on previous condition
       if (isArray<T>() && idof<valueof<T>>() == idof<JSON.Value>()) return JSON.Types.Array;
       if (value instanceof JSON.Box) return this.getType(value.value);
-      if (value instanceof u8 || value instanceof i8) return JSON.Types.U8;
-      if (value instanceof u16 || value instanceof i16) return JSON.Types.U16;
-      if (value instanceof u32 || value instanceof i32) return JSON.Types.U32;
-      if (value instanceof u64 || value instanceof i64) return JSON.Types.U64;
       if (value instanceof i8) return JSON.Types.I8;
       if (value instanceof i16) return JSON.Types.I16;
       if (value instanceof i32) return JSON.Types.I32;
       if (value instanceof i64) return JSON.Types.I64;
+      if (value instanceof u8) return JSON.Types.U8;
+      if (value instanceof u16) return JSON.Types.U16;
+      if (value instanceof u32) return JSON.Types.U32;
+      if (value instanceof u64) return JSON.Types.U64;
       if (value instanceof f32) return JSON.Types.F32;
       if (value instanceof f64) return JSON.Types.F64;
       if (value instanceof Map) return JSON.Types.Map;
@@ -468,13 +501,11 @@ export namespace JSON {
       } else if (isDefined(value.__SERIALIZE) && isManaged<T>(value)) {
         // @ts-expect-error
         if (!JSON.Value.METHODS.has(idof<T>())) JSON.Value.METHODS.set(idof<T>(), value.__SERIALIZE.index);
-        // @ts-expect-error
         store<usize>(changetype<usize>(this), changetype<usize>(value), STORAGE);
       } else if (value instanceof JSON.Obj) {
         store<T>(changetype<usize>(this), value, STORAGE);
         // @ts-expect-error
       } else if (isArray<T>() && idof<valueof<T>>() == idof<JSON.Value>()) {
-        // @ts-expect-error: T satisfies constraints of any[]
         store<T>(changetype<usize>(this), value, STORAGE);
       }
     }
@@ -522,6 +553,14 @@ export namespace JSON {
           return this.get<u32>().toString();
         case JSON.Types.U64:
           return this.get<u64>().toString();
+        case JSON.Types.I8:
+          return this.get<i8>().toString();
+        case JSON.Types.I16:
+          return this.get<i16>().toString();
+        case JSON.Types.I32:
+          return this.get<i32>().toString();
+        case JSON.Types.I64:
+          return this.get<i64>().toString();
         case JSON.Types.F32:
           return this.get<f32>().toString();
         case JSON.Types.F64:
@@ -560,6 +599,7 @@ export namespace JSON {
       }
     }
 
+
     @unsafe private __visit(cookie: u32): void {
       if (this.type >= JSON.Types.String) {
         __visit(load<usize>(changetype<usize>(this), STORAGE), cookie);
@@ -588,15 +628,13 @@ export namespace JSON {
    */
   export class Obj {
     /** Internal storage map */
-    // @ts-expect-error: type
     storage: Map<string, JSON.Value> = new Map<string, JSON.Value>();
 
-    constructor() { }
+    constructor() {}
 
     /**
      * Gets the number of key-value pairs in the object.
      */
-    // @ts-expect-error: decorator
     @inline get size(): i32 {
       return this.storage.size;
     }
@@ -606,7 +644,6 @@ export namespace JSON {
      * @param key - The string key
      * @param value - The value (will be wrapped in JSON.Value)
      */
-    // @ts-expect-error: decorator
     @inline set<T>(key: string, value: T): void {
       this.storage.set(key, JSON.Value.from<T>(value));
     }
@@ -616,7 +653,6 @@ export namespace JSON {
      * @param key - The key to look up
      * @returns The JSON.Value or null if not found
      */
-    // @ts-expect-error: decorator
     @inline get(key: string): JSON.Value | null {
       if (!this.storage.has(key)) return null;
       return this.storage.get(key);
@@ -627,7 +663,6 @@ export namespace JSON {
      * @param key - The key to check
      * @returns true if the key exists
      */
-    // @ts-expect-error: decorator
     @inline has(key: string): bool {
       return this.storage.has(key);
     }
@@ -637,7 +672,6 @@ export namespace JSON {
      * @param key - The key to delete
      * @returns true if the key was found and deleted
      */
-    // @ts-expect-error: decorator
     @inline delete(key: string): bool {
       return this.storage.delete(key);
     }
@@ -646,7 +680,6 @@ export namespace JSON {
      * Gets all keys in the object.
      * @returns Array of string keys
      */
-    // @ts-expect-error: decorator
     @inline keys(): string[] {
       return this.storage.keys();
     }
@@ -655,7 +688,6 @@ export namespace JSON {
      * Gets all values in the object.
      * @returns Array of JSON.Value instances
      */
-    // @ts-expect-error: decorator
     @inline values(): JSON.Value[] {
       return this.storage.values();
     }
@@ -664,7 +696,6 @@ export namespace JSON {
      * Serializes the object to a JSON string.
      * @returns JSON string representation
      */
-    // @ts-expect-error: decorator
     @inline toString(): string {
       return JSON.stringify(this);
     }
@@ -674,14 +705,27 @@ export namespace JSON {
      * @param value - The value to convert
      * @returns A new JSON.Obj instance
      */
-    // @ts-expect-error: decorator
     @inline static from<T>(value: T): JSON.Obj {
       if (value instanceof JSON.Obj) return value;
-      const out = new JSON.Obj();
-
       if (value instanceof Map) {
+        const out = new JSON.Obj();
+        if (!isString<indexof<T>>()) {
+          throw new Error("JSON.Obj.from only supports maps with string keys");
+        }
+
+        const keys = value.keys();
+        const values = value.values();
+        for (let i = 0; i < keys.length; i++) {
+          out.set(unchecked(keys[i]), unchecked(values[i]));
+        }
+        return out;
       }
-      return out;
+
+      const parsed = JSON.parse<JSON.Value>(JSON.stringify(value));
+      if (parsed.type != JSON.Types.Object) {
+        throw new Error("JSON.Obj.from expects a value that serializes to a JSON object");
+      }
+      return parsed.get<JSON.Obj>();
     }
   }
   /**
@@ -689,7 +733,7 @@ export namespace JSON {
    */
   export class Box<T> {
     constructor(public value: T) {
-      if (!isInteger<T>() && !isFloat<T>()) ERROR("JSON.Box should only hold primitive types!");
+      if (!isInteger<T>() && !isFloat<T>() && !isBoolean<T>()) ERROR("JSON.Box should only hold primitive types!");
     }
     /**
      * Set the internal value of Box to new value
@@ -716,7 +760,7 @@ export namespace JSON {
       if (value.type === JSON.Types.Null) return null;
       const v = value.type === JSON.Types.F64 ? value.get<f64>() : value.get<T>();
       // @ts-expect-error
-      return new Box(isInteger<T>() || isFloat<T>() ? <T>(v) : v);
+      return new Box(isInteger<T>() || isFloat<T>() ? <T>v : v);
     }
     /**
      * Creates a reference to a primitive type
@@ -758,19 +802,12 @@ export namespace JSON {
     } else if (isFloat<T>(data)) {
       // @ts-expect-error
       serializeFloat<T>(data);
-      // @ts-expect-error: Function is generated by transform
     } else if (isNullable<T>() && changetype<usize>(data) == <usize>0) {
       bs.proposeSize(8);
       store<u64>(bs.offset, NULL_WORD_U64);
       bs.offset += 8;
     } else if (isString<nonnull<T>>()) {
-      if (JSON_MODE === JSONMode.SIMD) {
-        serializeString_SIMD(data as string);
-      } else if (JSON_MODE === JSONMode.SWAR) {
-        serializeString_SWAR(data as string);
-      } else {
-        serializeString(data as string);
-      }
+      serializeString(data as string);
       // @ts-expect-error: Supplied by transform
     } else if (isDefined(data.__SERIALIZE_CUSTOM)) {
       // @ts-expect-error
@@ -788,6 +825,28 @@ export namespace JSON {
     } else if (data instanceof StaticArray) {
       // @ts-expect-error
       serializeStaticArray(changetype<nonnull<T>>(data));
+    } else if (data instanceof Int8Array) {
+      serializeTypedArray<Int8Array>(data);
+    } else if (data instanceof Uint8Array) {
+      serializeTypedArray<Uint8Array>(data);
+    } else if (data instanceof Uint8ClampedArray) {
+      serializeTypedArray<Uint8ClampedArray>(data);
+    } else if (data instanceof Int16Array) {
+      serializeTypedArray<Int16Array>(data);
+    } else if (data instanceof Uint16Array) {
+      serializeTypedArray<Uint16Array>(data);
+    } else if (data instanceof Int32Array) {
+      serializeTypedArray<Int32Array>(data);
+    } else if (data instanceof Uint32Array) {
+      serializeTypedArray<Uint32Array>(data);
+    } else if (data instanceof Int64Array) {
+      serializeTypedArray<Int64Array>(data);
+    } else if (data instanceof Uint64Array) {
+      serializeTypedArray<Uint64Array>(data);
+    } else if (data instanceof Float32Array) {
+      serializeTypedArray<Float32Array>(data);
+    } else if (data instanceof Float64Array) {
+      serializeTypedArray<Float64Array>(data);
     } else if (data instanceof Set) {
       // @ts-expect-error
       serializeSet(changetype<nonnull<T>>(data));
@@ -803,14 +862,33 @@ export namespace JSON {
     } else if (data instanceof JSON.Box) {
       __serialize(data.value);
     } else {
-      throw new Error(
-        `Could not serialize data of type '${nameof<T>()}'. ` +
-        `If this is a custom class, add the @json decorator: @json class ${nameof<T>()} { ... }. ` +
-        `Supported types: primitives, string, Array, Map, Date, and @json decorated classes.`
-      );
+      throw new Error(`Could not serialize data of type '${nameof<T>()}'. ` + `If this is a custom class, add the @json decorator: @json class ${nameof<T>()} { ... }. ` + `Supported types: primitives, string, Array, StaticArray, TypedArray, Map, Date, and @json decorated classes. ` + `For ArrayBuffer, use JSON.stringifyArrayBuffer(changetype<usize>(...)).`);
     }
   }
 
+
+  @inline export function __serializeArrayBufferUnsafe(dataStart: usize): void {
+    serializeArrayBufferUnsafe(dataStart, changetype<OBJECT>(dataStart - TOTAL_OVERHEAD).rtSize);
+  }
+
+
+  @inline export function __serializeArrayBuffer(data: ArrayBuffer): void {
+    const dataStart = changetype<usize>(data);
+    serializeArrayBufferUnsafe(dataStart, changetype<OBJECT>(dataStart - TOTAL_OVERHEAD).rtSize);
+  }
+
+
+  @inline export function parseArrayBuffer(data: string): ArrayBuffer {
+    const dataSize = bytes(data);
+    const dataPtr = changetype<usize>(data);
+    return deserializeArrayBuffer(dataPtr, dataPtr + dataSize, 0);
+  }
+
+
+  @inline export function __deserializeArrayBuffer(srcStart: usize, srcEnd: usize, dst: usize = 0): ArrayBuffer {
+    return deserializeArrayBuffer(srcStart, srcEnd, dst);
+  }
+
   /**
    * Deserializes JSON data directly from the buffer.
    * Should only be used if you know what you are doing.
@@ -824,16 +902,14 @@ export namespace JSON {
       // @ts-expect-error: type
       return deserializeBoolean(srcStart, srcEnd);
     } else if (isInteger<T>()) {
-      return atoi<T>(srcStart, srcEnd);
+      return isSigned<T>() ? deserializeInteger<T>(srcStart, srcEnd) : deserializeUnsigned<T>(srcStart, srcEnd);
     } else if (isFloat<T>()) {
       return deserializeFloat<T>(srcStart, srcEnd);
     } else if (isString<T>()) {
       if (srcEnd - srcStart < 4) throw new Error("Cannot parse data as string because it was formatted incorrectly!");
 
-      // @ts-expect-error: type
-      return deserializeString(srcStart, srcEnd);
+      return deserializeString(srcStart, srcEnd) as T;
     } else if (isNullable<T>() && srcEnd - srcStart == 8 && load<u64>(srcStart) == NULL_WORD_U64) {
-      // @ts-expect-error
       return null;
     } else {
       let type: nonnull<T> = changetype<nonnull<T>>(0);
@@ -843,16 +919,41 @@ export namespace JSON {
       } else if (type instanceof Array) {
         // @ts-expect-error: type
         return deserializeArray<T>(srcStart, srcEnd, dst);
+      } else if (type instanceof Int8Array) {
+        return deserializeTypedArray<Int8Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Uint8Array) {
+        return deserializeTypedArray<Uint8Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Uint8ClampedArray) {
+        return deserializeTypedArray<Uint8ClampedArray>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Int16Array) {
+        return deserializeTypedArray<Int16Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Uint16Array) {
+        return deserializeTypedArray<Uint16Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Int32Array) {
+        return deserializeTypedArray<Int32Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Uint32Array) {
+        return deserializeTypedArray<Uint32Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Int64Array) {
+        return deserializeTypedArray<Int64Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Uint64Array) {
+        return deserializeTypedArray<Uint64Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Float32Array) {
+        return deserializeTypedArray<Float32Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof Float64Array) {
+        return deserializeTypedArray<Float64Array>(srcStart, srcEnd, dst) as T;
+      } else if (type instanceof ArrayBuffer) {
+        return deserializeArrayBuffer(srcStart, srcEnd, dst) as T;
       } else if (type instanceof Set) {
         // @ts-expect-error: type
         return deserializeSet<T>(srcStart, srcEnd, dst);
-      // @ts-expect-error: Defined by transform
+        // @ts-expect-error: Defined by transform
       } else if (isDefined(type.__DESERIALIZE)) {
         const out = changetype<nonnull<T>>(dst || __new(offsetof<nonnull<T>>(), idof<nonnull<T>>()));
         // @ts-expect-error: Defined by transform
         if (isDefined(type.__INITIALIZE)) out.__INITIALIZE();
         // @ts-expect-error: Defined by transform
-        return out.__DESERIALIZE(srcStart, srcEnd, out);
+        out.__DESERIALIZE(srcStart, srcEnd, out);
+        return out;
       } else if (type instanceof Map) {
         // @ts-expect-error: type
         return deserializeMap<T>(srcStart, srcEnd, dst);
@@ -874,11 +975,7 @@ export namespace JSON {
       }
     }
     const snippet = ptrToStr(srcStart, srcEnd);
-    throw new Error(
-      `Could not deserialize JSON to type '${nameof<T>()}'. ` +
-      `If this is a custom class, ensure it has the @json decorator: @json class ${nameof<T>()} { ... }. ` +
-      `Input: "${snippet.length > 50 ? snippet.slice(0, 50) + '...' : snippet}"`
-    );
+    throw new Error(`Could not deserialize JSON to type '${nameof<T>()}'. ` + `If this is a custom class, ensure it has the @json decorator: @json class ${nameof<T>()} { ... }. ` + `Input: "${snippet.length > 50 ? snippet.slice(0, 50) + "..." : snippet}"`);
   }
   export namespace Util {
     // @ts-expect-error: decorator
@@ -929,7 +1026,6 @@ export namespace JSON {
         if (out) {
           out = changetype<string>(__renew(changetype<usize>(out), sizeof<T>() << 3));
 
-          // @ts-expect-error
           const bytes = itoa_buffered(changetype<usize>(out), data) << 1;
           return (out = changetype<string>(__renew(changetype<usize>(out), bytes)));
         }
@@ -938,12 +1034,10 @@ export namespace JSON {
         if (out) {
           out = changetype<string>(__renew(changetype<usize>(out), 64));
 
-          // @ts-expect-error
           const bytes = dtoa_buffered(changetype<usize>(out), data) << 1;
           return (out = changetype<string>(__renew(changetype<usize>(out), bytes)));
         }
         return data.toString();
-        // @ts-expect-error: Function is generated by transform
       } else if (isNullable<T>() && changetype<usize>(data) == <usize>0) {
         if (out) {
           out = changetype<string>(__renew(changetype<usize>(out), 8));
@@ -951,15 +1045,8 @@ export namespace JSON {
           return out;
         }
         return NULL_WORD;
-        // @ts-expect-error
       } else if (isString<nonnull<T>>()) {
-        if (JSON_MODE === JSONMode.SIMD) {
-          serializeString_SIMD(data as string);
-        } else if (JSON_MODE === JSONMode.SWAR) {
-          serializeString_SWAR(data as string);
-        } else {
-          serializeString(data as string);
-        }
+        serializeString(data as string);
         return bs.cpyOut<string>();
         // @ts-expect-error: Supplied by transform
       } else if (isDefined(data.__SERIALIZE)) {
@@ -967,7 +1054,6 @@ export namespace JSON {
         // @ts-expect-error
         inline.always(data.__SERIALIZE(changetype<usize>(data)));
         return bs.cpyOut<string>();
-        // @ts-expect-error: Supplied by transform
       } else if (data instanceof Date) {
         out = out ? changetype<string>(__renew(changetype<usize>(out), 52)) : changetype<string>(__new(52, idof<string>()));
 
@@ -1010,11 +1096,7 @@ export namespace JSON {
       } else if (data instanceof JSON.Box) {
         return JSON.internal.stringify(data.value);
       } else {
-        throw new Error(
-          `Could not serialize data of type '${nameof<T>()}'. ` +
-          `If this is a custom class, add the @json decorator: @json class ${nameof<T>()} { ... }. ` +
-          `Supported types: primitives, string, Array, Map, Date, and @json decorated classes.`
-        );
+        throw new Error(`Could not serialize data of type '${nameof<T>()}'. ` + `If this is a custom class, add the @json decorator: @json class ${nameof<T>()} { ... }. ` + `Supported types: primitives, string, Array, Map, Date, and @json decorated classes.`);
       }
     }
   }
@@ -1023,7 +1105,7 @@ export namespace JSON {
 export enum JSONMode {
   SWAR = 0,
   SIMD = 1,
-  NAIVE = 2
+  NAIVE = 2,
 }
 
 // @ts-expect-error: decorator