json-as 1.0.0-beta.9 → 1.0.1

package/assembly/__benches__/large.bench.ts

@@ -0,0 +1,174 @@
+import { JSON } from "..";
+import { bench } from "../custom/bench";
+
+
+@json
+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;
+  }
+}
+
+
+@json
+class LargeJSON {
+  public id!: i32;
+  public name!: string;
+  public age!: i32;
+  public email!: string;
+  public street!: string;
+  public city!: string;
+  public state!: string;
+  public zip!: string;
+  public tags!: string[];
+  public theme!: string;
+  public notifications!: boolean;
+  public language!: string;
+  public movement!: Vec3[];
+}
+
+const v1: LargeJSON = {
+  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 },
+  ],
+};
+
+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",
+  () => {
+    JSON.stringify(v1);
+  },
+  3_000_00,
+);
+
+bench(
+  "Deserialize Medium Object",
+  () => {
+    JSON.parse<LargeJSON>(v2);
+  },
+  3_000_00,
+);

package/assembly/__benches__/lib/index.ts

@@ -0,0 +1,26 @@
+export function describe(description: string, routine: () => void): void {
+  routine();
+}
+
+export function it(description: string, routine: () => void): void {
+  routine();
+}
+
+export function expect(left: string): Expectation {
+  return new Expectation(left);
+}
+
+class Expectation {
+  public left: string;
+
+  constructor(left: string) {
+    this.left = left;
+  }
+  toBe(right: string): void {
+    if (this.left != right) {
+      console.log("  (expected) -> " + right);
+      console.log("  (received) -> " + this.left);
+      process.exit(1);
+    }
+  }
+}

package/assembly/__benches__/medium.bench.ts

@@ -0,0 +1,46 @@
+import { JSON } from "..";
+import { bench } from "../custom/bench";
+
+
+@json
+class MediumJSON {
+  public id!: i32;
+  public name!: string;
+  public age!: i32;
+  public email!: string;
+  public street!: string;
+  public city!: string;
+  public state!: string;
+  public zip!: string;
+  public tags!: string[];
+}
+
+const v1: MediumJSON = {
+  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"],
+};
+
+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"]}`;
+
+bench(
+  "Serialize Medium Object",
+  () => {
+    JSON.stringify(v1);
+  },
+  8_000_00,
+);
+
+bench(
+  "Deserialize Medium Object",
+  () => {
+    JSON.parse<MediumJSON>(v2);
+  },
+  8_000_00,
+);

package/assembly/__benches__/small.bench.ts

@@ -0,0 +1,33 @@
+import { JSON } from "..";
+import { bench } from "../custom/bench";
+
+
+@json
+class SmallJSON {
+  public id!: i32;
+  public name!: string;
+  public active!: boolean;
+}
+
+const v1: SmallJSON = {
+  id: 1,
+  name: "Small Object",
+  active: true,
+};
+const v2 = '{"id":1,"name":"Small Object","active":true}';
+
+bench(
+  "Serialize Small Object",
+  () => {
+    JSON.stringify(v1);
+  },
+  16_000_00,
+);
+
+bench(
+  "Deserialize Small Object",
+  () => {
+    JSON.parse<SmallJSON>(v2);
+  },
+  16_000_00,
+);

package/assembly/__benches__/vec3.bench.ts

@@ -0,0 +1,72 @@
+import { JSON } from "..";
+import { bench } from "../custom/bench";
+
+
+@json
+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;
+  }
+}
+
+const v1: Vec3 = { x: 1, y: 2, z: 3 };
+const v2 = '{"x":1,"y":2,"z":3}';
+
+bench(
+  "Serialize Vec3",
+  () => {
+    JSON.stringify(v1);
+  },
+  16_000_00,
+);
+
+bench(
+  "Deserialize Vec3",
+  () => {
+    JSON.parse<Vec3>(v2);
+  },
+  16_000_00,
+);

package/assembly/__tests__/array.spec.ts

@@ -58,6 +58,48 @@ describe("Should serialize object arrays", () => {
   ).toBe('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]');
 });
 
+describe("Should deserialize integer arrays", () => {
+  expect(JSON.stringify(JSON.parse<u32[]>("[0,100,101]"))).toBe('[0,100,101]');
+  expect(JSON.stringify(JSON.parse<u64[]>("[0,100,101]"))).toBe('[0,100,101]');
+  expect(JSON.stringify(JSON.parse<i32[]>("[0,100,101,-100,-101]"))).toBe("[0,100,101,-100,-101]");
+  expect(JSON.stringify(JSON.parse<i64[]>("[0,100,101,-100,-101]"))).toBe("[0,100,101,-100,-101]");
+});
+
+describe("Should deserialize float arrays", () => {
+  expect(JSON.stringify(JSON.parse<f64[]>("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]"))).toBe("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]");
+  expect(JSON.stringify(JSON.parse<f64[]>("[1e+21,1e+22,1e-7,1e-8,1e-9]"))).toBe("[1e+21,1e+22,1e-7,1e-8,1e-9]");
+});
+
+describe("Should deserialize boolean arrays", () => {
+  expect(JSON.stringify(JSON.parse<bool[]>("[true,false]"))).toBe("[true,false]");
+  expect(JSON.stringify(JSON.parse<boolean[]>("[true,false]"))).toBe("[true,false]");
+});
+
+describe("Should deserialize string arrays", () => {
+  expect(JSON.stringify(JSON.parse<string[]>("[\"string \\\"with random spa\\nces and \\nnewlines\\n\\n\\n\"]"))).toBe("[\"string \\\"with random spa\\nces and \\nnewlines\\n\\n\\n\"]");
+});
+
+describe("Should deserialize nested integer arrays", () => {
+  expect(JSON.stringify(JSON.parse<i64[][]>("[[100,101],[-100,-101],[0]]"))).toBe("[[100,101],[-100,-101],[0]]");
+});
+
+describe("Should deserialize nested float arrays", () => {
+  expect(JSON.stringify(JSON.parse<f64[][]>("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]"))).toBe("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]");
+});
+
+describe("Should deserialize nested boolean arrays", () => {
+  expect(JSON.stringify(JSON.parse<bool[][]>("[[true],[false]]"))).toBe("[[true],[false]]");
+  expect(JSON.stringify(JSON.parse<boolean[][]>("[[true],[false]]"))).toBe("[[true],[false]]");
+});
+
+describe("Should deserialize object arrays", () => {
+  expect(
+    JSON.stringify(JSON.parse<Vec3[]>(
+      '[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]'
+    )
+  )).toBe('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]');
+});
+
 @json
 class Vec3 {
   x: f64 = 0.0;

package/assembly/__tests__/float.spec.ts

@@ -34,9 +34,9 @@ describe("Should deserialize floats", () => {
 
   expect(JSON.parse<f64>("0.000001").toString()).toBe("0.000001");
 
-  // expect(JSON.parse<f64>("1e-7")).toBe(1e-7);
+  expect(JSON.parse<f64>("1e-7").toString()).toBe(1e-7.toString());
 
-  // expect(JSON.parse<f64>("100000000000000000000.0").toString()).toBe(1e20);
+  expect(JSON.parse<f64>("100000000000000000000.0").toString()).toBe(1e20.toString());
 
-  // expect(JSON.parse<f64>("1e+21")).toBe(1e21);
+  expect(JSON.parse<f64>("1e+21").toString()).toBe(1e21.toString());
 });

package/assembly/__tests__/map.spec.ts

@@ -0,0 +1,7 @@
+import { JSON } from "..";
+import { describe, expect } from "./lib";
+
+describe("Should deserialize complex objects", () => {
+  const input = '{"a":{"b":{"c":[{"d":"random value 1"},{"e":["value 2","value 3"]}],"f":{"g":{"h":[1,2,3],"i":{"j":"nested value"}}}},"k":"simple value"},"l":[{"m":"another value","n":{"o":"deep nested","p":[{"q":"even deeper"},"final value"]}}],"r":null}';
+  expect(JSON.stringify(JSON.parse<Map<string, JSON.Raw>>(input))).toBe(input);
+})

package/assembly/__tests__/raw.spec.ts

@@ -17,8 +17,7 @@ describe("Should serialize Map<string, JSON.Raw>", () => {
   expect(JSON.stringify(m1)).toBe('{"hello":"world","pos":{"x":1.0,"y":2.0,"z":3.0}}');
 });
 
-// describe("Should deserialize Map<string, JSON.Raw>", () => {
-//   const m1 = JSON.parse<Map<string, JSON.Raw>>('{"hello":"world","pos":{"x":1.0,"y":2.0,"z":3.0}}');
-
-//   expect(JSON.stringify(m1)).toBe('{"hello":"world","pos":{"x":1.0,"y":2.0,"z":3.0}}');
-// });
+describe("Should deserialize Map<string, JSON.Raw>", () => {
+  const m1 = JSON.parse<Map<string, JSON.Raw>>('{"hello":"world","pos":{"x":1.0,"y":2.0,"z":3.0}}');
+  expect(JSON.stringify(m1)).toBe('{"hello":"world","pos":{"x":1.0,"y":2.0,"z":3.0}}');
+});

package/assembly/__tests__/struct.spec.ts

@@ -64,9 +64,9 @@ describe("Should deserialize structs with whitespace", () => {
   ).toBe('{"x":3.4,"y":1.2,"z":8.3}');
 });
 
-describe("Should serialize Suite struct", () => {
+// describe("Should serialize Suite struct", () => {
 
-});
+// });
 
 @json
 class BaseObject {

package/assembly/deserialize/simple/arbitrary.ts

@@ -4,14 +4,18 @@ import { deserializeBoolean } from "./bool";
 import { deserializeFloat } from "./float";
 import { deserializeString } from "./string";
 import { deserializeObject } from "./object";
+import { BRACE_LEFT, BRACKET_LEFT, CHAR_N, QUOTE } from "../../custom/chars";
 
 export function deserializeArbitrary(srcStart: usize, srcEnd: usize, dst: usize): JSON.Value {
   const firstChar = load<u16>(srcStart);
-  if (firstChar == 34) return JSON.Value.from(deserializeString(srcStart, srcEnd, dst));
-  else if (firstChar == 123) return JSON.Value.from(deserializeObject(srcStart, srcEnd, dst));
+  if (firstChar == QUOTE) return JSON.Value.from(deserializeString(srcStart, srcEnd, 0));
+  else if (firstChar == BRACE_LEFT) return JSON.Value.from(deserializeObject(srcStart, srcEnd, 0));
   else if (firstChar - 48 <= 9 || firstChar == 45) return JSON.Value.from(deserializeFloat<f64>(srcStart, srcEnd));
-  else if (firstChar == 91) {
-    return JSON.Value.from(deserializeArray<JSON.Value[]>(srcStart, srcEnd, dst));
+  else if (firstChar == BRACKET_LEFT) {
+    return JSON.Value.from(deserializeArray<JSON.Value[]>(srcStart, srcEnd, 0));
   } else if (firstChar == 116 || firstChar == 102) return JSON.Value.from(deserializeBoolean(srcStart, srcEnd));
+  else if (firstChar == CHAR_N) {
+    return JSON.Value.from(null);
+  }
   return unreachable();
 }

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

@@ -4,7 +4,7 @@ import { isSpace } from "util/string";
 import { ptrToStr } from "../../../util/ptrToStr";
 
 export function deserializeArbitraryArray(srcStart: usize, srcEnd: usize, dst: usize): JSON.Value[] {
-  const out = dst ? changetype<JSON.Value[]>(dst) : instantiate<JSON.Value[]>();
+  const out = changetype<JSON.Value[]>(dst || changetype<usize>(instantiate<JSON.Value[]>()));
   let lastIndex: usize = 0;
   let depth: u32 = 0;
   // if (load<u16>(srcStart) != BRACKET_LEFT)
@@ -121,12 +121,12 @@ export function deserializeArbitraryArray(srcStart: usize, srcEnd: usize, dst: u
       }
     } else if (code == CHAR_N) {
       if (load<u64>(srcStart) == 30399761348886638) {
+        console.log("Value (null): " + ptrToStr(srcStart, srcStart + 8));
         // @ts-ignore: type
-        out.push(JSON.__deserialize<JSON.Value>(lastIndex, (srcStart += 8)));
-        // console.log("Value (null): " + ptrToStr(srcStart - 8, srcStart));
-        while (isSpace(load<u16>((srcStart += 2)))) {
-          /* empty */
-        }
+        out.push(JSON.__deserialize<JSON.Value>(srcStart, (srcStart += 8)));
+        // while (isSpace(load<u16>((srcStart += 2)))) {
+        //   /* empty */
+        // }
       }
     }
     srcStart += 2;

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

@@ -2,15 +2,16 @@ import { BRACKET_LEFT, BRACKET_RIGHT } from "../../../custom/chars";
 import { JSON } from "../../../";
 
 export function deserializeArrayArray<T extends unknown[][]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   let depth: u32 = 0;
-  while (srcStart < srcEnd) {
+  srcStart += 2;
+  while (srcStart < srcEnd - 2) {
     const code = load<u16>(srcStart);
     if (code == BRACKET_LEFT && depth++ == 0) {
       lastIndex = srcStart;
     } else if (code == BRACKET_RIGHT && --depth == 0) {
-      out.push(JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
+      out.push(JSON.__deserialize<valueof<T>>(lastIndex, srcStart + 2));
     }
     srcStart += 2;
   }

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

@@ -1,17 +1,17 @@
-import { CHAR_E, CHAR_F, CHAR_T } from "../../../custom/chars";
-
 export function deserializeBooleanArray<T extends boolean[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
+  srcStart += 2; // skip [
   while (srcStart < srcEnd) {
-    const code = load<u16>(srcStart);
-    if (code == CHAR_T && load<u16>(srcStart, 8) == CHAR_E) {
+    const block = load<u64>(srcStart);
+    if (block == 28429475166421108) {
       out.push(true);
       srcStart += 10;
-    } else if (code == CHAR_F && load<u16>(srcStart, 10) == CHAR_E) {
+    } else if (block == 32370086184550502 && load<u16>(srcStart, 8) == 101) {
       out.push(false);
       srcStart += 12;
+    } else {
+      srcStart += 2;
     }
-    srcStart += 2;
   }
   return out;
 }

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

@@ -1,9 +1,9 @@
 import { isSpace } from "../../../util";
-import { COMMA, BRACE_RIGHT, BRACKET_RIGHT } from "../../../custom/chars";
+import { COMMA, BRACKET_RIGHT } from "../../../custom/chars";
 import { JSON } from "../../..";
 
 export function deserializeFloatArray<T extends number[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   while (srcStart < srcEnd) {
     const code = load<u16>(srcStart);

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

@@ -2,7 +2,7 @@ import { atoi, isSpace } from "../../../util";
 import { COMMA, BRACKET_RIGHT } from "../../../custom/chars";
 
 export function deserializeIntegerArray<T extends number[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out: T = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   while (srcStart < srcEnd) {
     const code = load<u16>(srcStart);

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

@@ -2,7 +2,7 @@ import { BRACE_LEFT, BRACE_RIGHT } from "../../../custom/chars";
 import { JSON } from "../../..";
 
 export function deserializeMapArray<T extends Map<any, any>[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   let depth: u32 = 0;
   while (srcStart < srcEnd) {

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

@@ -2,8 +2,8 @@ import { JSON } from "../../..";
 import { BACK_SLASH, QUOTE } from "../../../custom/chars";
 
 export function deserializeStringArray(srcStart: usize, srcEnd: usize, dst: usize): string[] {
-  const out = dst ? changetype<string[]>(dst) : new Array<string>();
-  let lastPos = 2;
+  const out = changetype<string[]>(dst || changetype<usize>(instantiate<string[]>()));
+  let lastPos: usize = 2;
   let inString = false;
   while (srcStart < srcEnd) {
     const code = load<u16>(srcStart);
@@ -12,7 +12,7 @@ export function deserializeStringArray(srcStart: usize, srcEnd: usize, dst: usiz
         inString = true;
         lastPos = srcStart;
       } else if (load<u16>(srcStart - 2) != BACK_SLASH) {
-        out.push(JSON.__deserialize<string>(lastPos, srcStart));
+        out.push(JSON.__deserialize<string>(lastPos, srcStart + 2));
         inString = false;
       }
     }

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

@@ -1,16 +1,27 @@
-import { BRACE_LEFT, BRACE_RIGHT } from "../../../custom/chars";
+import { BRACE_LEFT, BRACE_RIGHT, BRACKET_LEFT, BRACKET_RIGHT } from "../../../custom/chars";
 import { JSON } from "../../..";
+import { isSpace } from "util/string";
 
 export function deserializeStructArray<T extends unknown[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<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));
+      out.push(JSON.__deserialize<valueof<T>>(lastIndex, srcStart += 2));
     }
     srcStart += 2;
   }

package/assembly/deserialize/simple/array.ts

@@ -33,6 +33,9 @@ export function deserializeArray<T extends unknown[]>(srcStart: usize, srcEnd: u
       // @ts-ignore: type
       return deserializeMapArray<T>(srcStart, srcEnd, dst);
       // @ts-ignore: defined by transform
+    } else if (isDefined(type.__DESERIALIZE_CUSTOM)) {
+      return deserializeStructArray<T>(srcStart, srcEnd, dst);
+      // @ts-ignore: defined by transform
     } else if (isDefined(type.__DESERIALIZE)) {
       return deserializeStructArray<T>(srcStart, srcEnd, dst);
     }