json-as 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## 2025-05-21 - 1.0.8
+
+- fix: inline warnings on layer-2 serialize and deserialize functions
+- feat: fully support `JSON.Obj` and `JSON.Box` everywhere
+- fix: temp disable SIMD
+- feat: write fair benchmarks with `v8` using `jsvu`
+
+## 2025-05-14 - 1.0.7
+
+- merge: pull request [#128](https://github.com/JairusSW/json-as/pull/128) from [loredanacirstea/nested-custom-serializer-fix](https://github.com/loredanacirstea/nested-custom-serializer-fix)
+
+## 2025-05-12 - 1.0.6
+
+- fix: support zero-param serialization and make sure types are consistent
+- fix: [#124](https://github.com/JairusSW/json-as/issues/124)
+
 ## 2025-05-11 - 1.0.5
 
 - feat: add sanity checks for badly formatted strings

package/README.md

@@ -6,7 +6,7 @@
 ██   ██      ██ ██    ██ ██  ██ ██       ██   ██      ██
  █████  ███████  ██████  ██   ████       ██   ██ ███████
  </span>
-    AssemblyScript - v1.0.6
+    AssemblyScript - v1.0.8
   </pre>
 </h6>
 
@@ -57,7 +57,6 @@ If you'd like to see the code that the transform generates, run the build step w
 ```typescript
 import { JSON } from "json-as";
 
-
 @json
 class Vec3 {
   x: f32 = 0.0;
@@ -65,10 +64,8 @@ class Vec3 {
   z: f32 = 0.0;
 }
 
-
 @json
 class Player {
-
   @alias("first name")
   firstName!: string;
   lastName!: string;
@@ -76,8 +73,6 @@ class Player {
   // Drop in a code block, function, or expression that evaluates to a boolean
   @omitif((self: Player) => self.age < 18)
   age!: i32;
-
-
   @omitnull()
   pos!: Vec3 | null;
   isVerified!: boolean;
@@ -114,12 +109,9 @@ This library allows selective omission of fields during serialization using the
 This decorator excludes a field from serialization entirely.
 
 ```typescript
-
 @json
 class Example {
   name!: string;
-
-
   @omit
   SSN!: string;
 }
@@ -136,12 +128,9 @@ console.log(JSON.stringify(obj)); // { "name": "Jairus" }
 This decorator omits a field only if its value is null.
 
 ```typescript
-
 @json
 class Example {
   name!: string;
-
-
   @omitnull()
   optionalField!: string | null;
 }
@@ -158,12 +147,9 @@ console.log(JSON.stringify(obj)); // { "name": "Jairus" }
 This decorator omits a field based on a custom predicate function.
 
 ```typescript
-
 @json
 class Example {
   name!: string;
-
-
   @omitif((self: Example) => self.age <= 18)
   age!: number;
 }
@@ -188,7 +174,6 @@ AssemblyScript doesn't support using nullable primitive types, so instead, json-
 For example, this schema won't compile in AssemblyScript:
 
 ```typescript
-
 @json
 class Person {
   name!: string;
@@ -199,7 +184,6 @@ class Person {
 Instead, use `JSON.Box` to allow nullable primitives:
 
 ```typescript
-
 @json
 class Person {
   name: string;
@@ -262,7 +246,6 @@ More often, objects will be completely statically typed except for one or two va
 In such cases, `JSON.Value` can be used to handle fields that may hold different types at runtime.
 
 ```typescript
-
 @json
 class DynamicObj {
   id: i32 = 0;
@@ -319,7 +302,6 @@ Here's an example of creating a custom data type called `Point` which serializes
 ```typescript
 import { bytes } from "json-as/assembly/util";
 
-
 @json
 class Point {
   x: f64 = 0.0;
@@ -329,13 +311,11 @@ class Point {
     this.y = y;
   }
 
-
   @serializer
   serializer(self: Point): string {
     return `(${self.x},${self.y})`;
   }
 
-
   @deserializer
   deserializer(data: string): Point {
     const dataSize = bytes(data);
@@ -365,8 +345,8 @@ The deserializer function parses the string `(x,y)` back into a `Point` instance
 These functions are then wrapped before being consumed by the json-as library:
 
 ```typescript
-@inline __SERIALIZE_CUSTOM(ptr: usize): void {
-  const data = this.serializer(changetype<Point>(ptr));
+@inline __SERIALIZE_CUSTOM(): void {
+  const data = this.serializer(this);
   const dataSize = data.length << 1;
   memory.copy(bs.offset, changetype<usize>(data), dataSize);
   bs.offset += dataSize;
@@ -391,7 +371,7 @@ These benchmarks compare this library to JavaScript's native `JSON.stringify` an
 
 | Test Case       | Size       | Serialization (ops/s) | Deserialization (ops/s) | Serialization (MB/s) | Deserialization (MB/s) |
 | --------------- | ---------- | --------------------- | ----------------------- | -------------------- | ---------------------- |
-| Vector3 Object  | 38 bytes   | 35,714,285 ops/s      | 35,435,552 ops/s        | 1,357 MB/s           | 1,348 MB/s             |
+| Vector3 Object  | 38 bytes   | 26,611,226 ops/s      | 32,160,804 ops/s        | 1,357 MB/s           | 1,348 MB/s             |
 | Alphabet String | 104 bytes  | 13,617,021 ops/s      | 18,390,804 ops/s        | 1,416 MB/s           | 1,986 MB/s             |
 | Small Object    | 88 bytes   | 24,242,424 ops/s      | 12,307,692 ops/s        | 2,133 MB/s           | 1,083 MB/s             |
 | Medium Object   | 494 bytes  | 4,060,913 ops/s       | 1,396,160 ops/s         | 2,006 MB/s           | 689.7 MB/s             |

package/asconfig.json

@@ -3,6 +3,5 @@
   "options": {
     "transform": [],
     "disableWarning": []
-  },
-  "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
+  }
 }

package/assembly/__benches__/abc.bench.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { bench } from "../custom/bench";
+import { bench } from "./lib/bench";
 
 const v1 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 const v2 = '"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"';
@@ -7,15 +7,15 @@ const v2 = '"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"';
 bench(
   "Serialize Alphabet",
   () => {
-    JSON.stringify(v1);
+    inline.always(JSON.stringify(v1));
   },
-  1_000_00,
+  64_000_00,
 );
 
 bench(
   "Deserialize Alphabet",
   () => {
-    JSON.parse<string>(v2);
+    inline.always(JSON.parse<string>(v2));
   },
-  1_000_00,
+  64_000_00,
 );

package/assembly/__benches__/large.bench.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { bench } from "../custom/bench";
+import { bench } from "./lib/bench";
 
 
 @json
@@ -7,52 +7,6 @@ class Vec3 {
   public x!: i32;
   public y!: i32;
   public z!: i32;
-
-
-  @inline __SERIALIZE(ptr: usize): void {
-    bs.proposeSize(98);
-    store<u64>(bs.offset, 9570664606466171, 0); // {"x"
-    store<u16>(bs.offset, 58, 8); // :
-    bs.offset += 10;
-    JSON.__serialize<i32>(load<i32>(ptr, offsetof<this>("x")));
-    store<u64>(bs.offset, 9570668901433388, 0); // ,"y"
-    store<u16>(bs.offset, 58, 8); // :
-    bs.offset += 10;
-    JSON.__serialize<i32>(load<i32>(ptr, offsetof<this>("y")));
-    store<u64>(bs.offset, 9570673196400684, 0); // ,"z"
-    store<u16>(bs.offset, 58, 8); // :
-    bs.offset += 10;
-    JSON.__serialize<i32>(load<i32>(ptr, offsetof<this>("z")));
-    store<u16>(bs.offset, 125, 0); // }
-    bs.offset += 2;
-  }
-
-
-  @inline __INITIALIZE(): this {
-    return this;
-  }
-
-
-  @inline __DESERIALIZE(keyStart: usize, keyEnd: usize, valStart: usize, valEnd: usize, ptr: usize): void {
-    switch (load<u16>(keyStart)) {
-      case 120: {
-        // x
-        store<i32>(ptr, JSON.__deserialize<i32>(valStart, valEnd, 0), offsetof<this>("x"));
-        return;
-      }
-      case 121: {
-        // y
-        store<i32>(ptr, JSON.__deserialize<i32>(valStart, valEnd, 0), offsetof<this>("y"));
-        return;
-      }
-      case 122: {
-        // z
-        store<i32>(ptr, JSON.__deserialize<i32>(valStart, valEnd, 0), offsetof<this>("z"));
-        return;
-      }
-    }
-    return;
-  }
 }
 
 
@@ -161,17 +115,17 @@ const v1: LargeJSON = {
 const v2 = `{"id":2,"name":"Medium Object","age":18,"email":"me@jairus.dev","street":"I don't want to say my street","city":"I don't want to say this either","state":"It really depends","zip":"I forget what it is","tags":["me","dogs","mountains","bar","foo"],"theme":"Hyper Term Black","notifications":true,"language":"en-US","movement":[{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3}]}`;
 
 bench(
-  "Serialize Medium Object",
+  "Serialize Large Object",
   () => {
     JSON.stringify(v1);
   },
-  3_000_00,
+  2_000_00,
 );
 
 bench(
-  "Deserialize Medium Object",
+  "Deserialize Large Object",
   () => {
     JSON.parse<LargeJSON>(v2);
   },
-  3_000_00,
+  2_000_00,
 );

package/assembly/{custom → __benches__/lib}/bench.ts

@@ -1,5 +1,9 @@
 export function bench(description: string, routine: () => void, ops: u64 = 1_000_000): void {
   console.log(" - Benchmarking " + description);
+  let warmup = ops/10;
+  while (--warmup) {
+    routine();
+  }
   const start = Date.now();
   let count = ops;
   while (count != 0) {

package/assembly/__benches__/medium.bench.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { bench } from "../custom/bench";
+import { bench } from "./lib/bench";
 
 
 @json
@@ -34,7 +34,7 @@ bench(
   () => {
     JSON.stringify(v1);
   },
-  8_000_00,
+  6_000_00,
 );
 
 bench(
@@ -42,5 +42,5 @@ bench(
   () => {
     JSON.parse<MediumJSON>(v2);
   },
-  8_000_00,
+  6_000_00,
 );

package/assembly/__benches__/small.bench.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { bench } from "../custom/bench";
+import { bench } from "./lib/bench";
 
 
 @json

package/assembly/__benches__/vec3.bench.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { bench } from "../custom/bench";
+import { bench } from "./lib/bench";
 
 
 @json
@@ -63,7 +63,7 @@ bench(
   () => {
     JSON.stringify(v1);
   },
-  16_000_00,
+  128_000_00,
 );
 
 bench(
@@ -71,5 +71,5 @@ bench(
   () => {
     JSON.parse<Vec3>(v2);
   },
-  16_000_00,
+  128_000_00,
 );

package/assembly/__tests__/custom.spec.ts

@@ -32,6 +32,14 @@ class Point {
   }
 }
 
+@json
+export class ObjectWithCustom {
+  value: Point = new Point(0, 0)
+  constructor(value: Point) {
+    this.value = value
+  }
+}
+
 describe("Should serialize using custom serializers", () => {
   expect(JSON.stringify<Point>(new Point(1, 2))).toBe("(1.0,2.0)");
 });
@@ -41,3 +49,7 @@ describe("Should deserialize using custom deserializers", () => {
   expect(p1.x.toString()).toBe("1.0");
   expect(p1.y.toString()).toBe("2.0");
 });
+
+describe("Should serialize and deserialize using nested custom serializers", () => {
+  expect(JSON.stringify<ObjectWithCustom>(new ObjectWithCustom(new Point(1, 2)))).toBe(`{"value":(1.0,2.0)}`);
+});

package/assembly/custom/util.ts

@@ -1,7 +1,3 @@
-import { isSpace } from "util/string";
-import { BACK_SLASH, QUOTE } from "./chars";
-import { Sink } from "./sink";
-
 /** Scientific Notation Integer Parsing - SNIP
  * This is absolutely the fastest algorithm I could think of while adding full support for Scientific Notation
  * Loads 32 bits and retrieves the high/low bits.

package/assembly/deserialize/simple/array/box.ts

@@ -0,0 +1,45 @@
+import { isSpace } from "../../../util";
+import { COMMA, BRACKET_RIGHT } from "../../../custom/chars";
+import { JSON } from "../../..";
+
+export function deserializeBoxArray<T extends JSON.Box<any>[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
+    const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
+    if (isBoolean<valueof<T>>()) {
+        srcStart += 2; // skip [
+        while (srcStart < srcEnd) {
+            const block = load<u64>(srcStart);
+            if (block == 28429475166421108) {
+                out.push(JSON.Box.from(true));
+                srcStart += 10;
+            } else if (block == 32370086184550502 && load<u16>(srcStart, 8) == 101) {
+                out.push(JSON.Box.from(false));
+                srcStart += 12;
+            } else {
+                srcStart += 2;
+            }
+        }
+        return out;
+    } else {
+        let lastIndex: usize = 0;
+        while (srcStart < srcEnd) {
+            const code = load<u16>(srcStart);
+            if (code - 48 <= 9 || code == 45) {
+                lastIndex = srcStart;
+                srcStart += 2;
+                while (srcStart < srcEnd) {
+                    const code = load<u16>(srcStart);
+                    if (code == COMMA || code == BRACKET_RIGHT || isSpace(code)) {
+                        out.push(JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
+                        // while (isSpace(load<u16>((srcStart += 2)))) {
+                        //   /* empty */
+                        // }
+                        break;
+                    }
+                    srcStart += 2;
+                }
+            }
+            srcStart += 2;
+        }
+    }
+    return out;
+}

package/assembly/deserialize/simple/array/object.ts

@@ -0,0 +1,28 @@
+import { BRACE_LEFT, BRACE_RIGHT, BRACKET_LEFT, BRACKET_RIGHT } from "../../../custom/chars";
+import { JSON } from "../../..";
+import { isSpace } from "util/string";
+
+export function deserializeObjectArray<T extends unknown[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
+  let lastIndex: usize = 0;
+  let depth: u32 = 0;
+
+  while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
+  while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;
+
+  if (srcStart - srcEnd == 0) throw new Error("Input string had zero length or was all whitespace");
+
+  if (load<u16>(srcStart) != BRACKET_LEFT) throw new Error("Expected '[' at start of object at position " + (srcEnd - srcStart).toString());
+  if (load<u16>(srcEnd - 2) != BRACKET_RIGHT) throw new Error("Expected ']' at end of object at position " + (srcEnd - srcStart).toString());
+
+  while (srcStart < srcEnd) {
+    const code = load<u16>(srcStart);
+    if (code == BRACE_LEFT && depth++ == 0) {
+      lastIndex = srcStart;
+    } else if (code == BRACE_RIGHT && --depth == 0) {
+      out.push(JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 2)));
+    }
+    srcStart += 2;
+  }
+  return out;
+}

package/assembly/deserialize/simple/array.ts

@@ -7,6 +7,8 @@ import { deserializeIntegerArray } from "./array/integer";
 import { deserializeMapArray } from "./array/map";
 import { deserializeStructArray } from "./array/struct";
 import { deserializeStringArray } from "./array/string";
+import { deserializeObjectArray } from "./array/object";
+import { deserializeBoxArray } from "./array/box";
 
 // @ts-ignore: Decorator valid here
 export function deserializeArray<T extends unknown[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
@@ -29,7 +31,13 @@ export function deserializeArray<T extends unknown[]>(srcStart: usize, srcEnd: u
     if (type instanceof JSON.Value) {
       // @ts-ignore: type
       return deserializeArbitraryArray(srcStart, srcEnd, dst);
-    } else if (type instanceof Map) {
+    } else if (type instanceof JSON.Box) {
+      // @ts-ignore: type
+      return deserializeBoxArray<T>(srcStart, srcEnd, dst);
+    } else if (type instanceof JSON.Obj) {
+      // @ts-ignore: type
+      return deserializeObjectArray<T>(srcStart, srcEnd, dst);
+    }else if (type instanceof Map) {
       // @ts-ignore: type
       return deserializeMapArray<T>(srcStart, srcEnd, dst);
       // @ts-ignore: defined by transform

package/assembly/index.ts

@@ -15,7 +15,6 @@ import { deserializeInteger } from "./deserialize/simple/integer";
 import { deserializeString } from "./deserialize/simple/string";
 import { serializeArbitrary } from "./serialize/simple/arbitrary";
 
-import { Sink } from "./custom/sink";
 import { NULL_WORD, QUOTE } from "./custom/chars";
 import { dtoa_buffered, itoa_buffered } from "util/number";
 import { serializeBool } from "./serialize/simple/bool";
@@ -31,6 +30,7 @@ import { serializeRaw } from "./serialize/simple/raw";
 import { deserializeRaw } from "./deserialize/simple/raw";
 import { isSpace } from "util/string";
 import { deserializeString_SIMD } from "./deserialize/simd/string";
+import { serializeString_SIMD } from "./serialize/simd/string";
 
 /**
  * Offset of the 'storage' property in the JSON.Value class.
@@ -116,7 +116,11 @@ export namespace JSON {
       //   bs.setBuffer(oldBuf);
       //   return changetype<string>(newBuf);
       // }
-      serializeString(changetype<string>(data));
+      // if (ASC_FEATURE_SIMD) {
+      //   serializeString_SIMD(data as string);
+      // } else {
+        serializeString(data as string);
+      // }
       return bs.out<string>();
       // @ts-ignore: Supplied by transform
     } else if (isDefined(data.__SERIALIZE_CUSTOM)) {
@@ -145,7 +149,7 @@ export namespace JSON {
       inline.always(serializeMap(changetype<nonnull<T>>(data)));
       return bs.out<string>();
     } else if (data instanceof JSON.Raw) {
-      inline.always(serializeRaw(data));
+      serializeRaw(data);
       return bs.out<string>();
     } else if (data instanceof JSON.Value) {
       inline.always(serializeArbitrary(data));
@@ -404,18 +408,16 @@ export namespace JSON {
         case JSON.Types.Array: {
           const arr = this.get<JSON.Value[]>();
           if (!arr.length) return "[]";
-          const out = Sink.fromStringLiteral("[");
+          let out = "["
           const end = arr.length - 1;
           for (let i = 0; i < end; i++) {
             const element = unchecked(arr[i]);
-            out.write(element.toString());
-            out.write(",");
+            out += element.toString() + ",";
           }
 
           const element = unchecked(arr[end]);
-          out.write(element.toString());
+          out += element.toString() + "]";
 
-          out.write("]");
           return out.toString();
         }
         case JSON.Types.Object: {
@@ -438,7 +440,7 @@ export namespace JSON {
     // @ts-ignore: type
     private storage: Map<string, JSON.Value> = new Map<string, JSON.Value>();
 
-    constructor() {}
+    constructor() { }
 
     // @ts-ignore: decorator
     @inline get size(): i32 {
@@ -552,26 +554,26 @@ export namespace JSON {
       // @ts-ignore: Supplied by transform
     } else if (isDefined(src.__SERIALIZE_CUSTOM)) {
       // @ts-ignore
-      return src.__SERIALIZE_CUSTOM(changetype<usize>(src));
+      return src.__SERIALIZE_CUSTOM();
       // @ts-ignore: Supplied by transform
     } else if (isDefined(src.__SERIALIZE)) {
       // @ts-ignore
-      inline.always(serializeStruct(changetype<nonnull<T>>(src)));
+      serializeStruct(changetype<nonnull<T>>(src));
     } else if (src instanceof Date) {
       // @ts-ignore
       inline.always(serializeDate(changetype<nonnull<T>>(src)));
     } else if (src instanceof Array) {
       // @ts-ignore
-      inline.always(serializeArray(changetype<nonnull<T>>(src)));
+      serializeArray(changetype<nonnull<T>>(src));
     } else if (src instanceof Map) {
       // @ts-ignore
-      inline.always(serializeMap(changetype<nonnull<T>>(src)));
+      serializeMap(changetype<nonnull<T>>(src));
     } else if (src instanceof JSON.Raw) {
       serializeRaw(src);
     } else if (src instanceof JSON.Value) {
-      inline.always(serializeArbitrary(src));
+      serializeArbitrary(src);
     } else if (src instanceof JSON.Obj) {
-      inline.always(serializeObject(src));
+      serializeObject(src);
     } else if (src instanceof JSON.Box) {
       __serialize(src.value);
     } else {
@@ -596,7 +598,7 @@ export namespace JSON {
       return null;
     } else if (isArray<T>()) {
       // @ts-ignore: type
-      return inline.always(deserializeArray<T>(srcStart, srcEnd, dst));
+      return deserializeArray<T>(srcStart, srcEnd, dst);
     } else {
       let type: nonnull<T> = changetype<nonnull<T>>(0);
       // @ts-ignore: Defined by transform
@@ -608,10 +610,10 @@ export namespace JSON {
         return changetype<nonnull<T>>(out).__DESERIALIZE_CUSTOM(ptrToStr(srcStart, srcEnd));
         // @ts-ignore: Defined by transform
       } else if (isDefined(type.__DESERIALIZE)) {
-        return inline.always(deserializeStruct<T>(srcStart, srcEnd, dst));
+        return deserializeStruct<T>(srcStart, srcEnd, dst);
       } else if (type instanceof Map) {
         // @ts-ignore: type
-        return inline.always(deserializeMap<T>(srcStart, srcEnd, dst));
+        return deserializeMap<T>(srcStart, srcEnd, dst);
       } else if (type instanceof Date) {
         // @ts-ignore: type
         return deserializeDate(srcStart, srcEnd);
@@ -620,7 +622,10 @@ export namespace JSON {
         return deserializeRaw(srcStart, srcEnd);
       } else if (type instanceof JSON.Value) {
         // @ts-ignore: type
-        return inline.always(deserializeArbitrary(srcStart, srcEnd, 0));
+        return deserializeArbitrary(srcStart, srcEnd, 0);
+      }else if (type instanceof JSON.Obj) {
+        // @ts-ignore: type
+        return deserializeObject(srcStart, srcEnd, 0);
       } else if (type instanceof JSON.Box) {
         // @ts-ignore: type
         return new JSON.Box(deserializeBox(srcStart, srcEnd, dst, changetype<nonnull<T>>(0).value));

package/assembly/serialize/simd/string.ts

@@ -1,13 +1,7 @@
 import { bs } from "../../../lib/as-bs";
 import { BACK_SLASH } from "../../custom/chars";
 import { SERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
-import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
-
-const SPLAT_34 = i16x8.splat(34); /* " */
-const SPLAT_92 = i16x8.splat(92); /* \ */
-
-const SPLAT_32 = i16x8.splat(32); /* [ESC] */
-const SPLAT_0 = i16x8.splat(0); /* 0 */
+import { bytes } from "../../util";
 
 /**
  * Serializes strings into their JSON counterparts using SIMD operations
@@ -15,16 +9,23 @@ const SPLAT_0 = i16x8.splat(0); /* 0 */
  * @param srcEnd pointer to end serialization at
  */
 export function serializeString_SIMD(src: string): void {
-  const srcSize = changetype<OBJECT>(changetype<usize>(src) - TOTAL_OVERHEAD).rtSize;
+  const SPLAT_34 = i16x8.splat(34); /* " */
+  const SPLAT_92 = i16x8.splat(92); /* \ */
+
+  const SPLAT_32 = i16x8.splat(32); /* [ESC] */
+  const SPLAT_0 = i16x8.splat(0); /* 0 */
+
+  const srcSize = bytes(src);
   let srcStart = changetype<usize>(src);
   const srcEnd = srcStart + srcSize;
+  const srcEnd16 = srcEnd - 16;
+
   bs.proposeSize(srcSize + 4);
-  const srcEnd16 = srcEnd - 15;
 
   store<u8>(changetype<usize>(bs.offset), 34); /* " */
   bs.offset += 2;
 
-  while (srcStart < srcEnd16) {
+  while (srcStart <= srcEnd16) {
     const block = v128.load(srcStart);
     v128.store(bs.offset, block);
 
@@ -62,8 +63,7 @@ export function serializeString_SIMD(src: string): void {
     bs.offset += 16;
   }
 
-  let rem = srcEnd - srcStart;
-
+  const rem = srcEnd - srcStart;
   if (rem & 8) {
     const block = v128.load64_zero(srcStart);
     v128.store64_lane(bs.offset, block, 0);