json-as 1.0.7 → 1.0.9

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## 2025-05-22 - 1.0.9
+
+- fix: [#132](https://github.com/JairusSW/json-as/issues/132)
+- feat: allow base classes to use their child classes if the signatures match
+- perf: rewrite struct deserialization to be significantly faster
+- fix: [#131](https://github.com/JairusSW/json-as/issues/131) Generic classes with custom deserializer crashing
+- fix: [#66](https://github.com/JairusSW/json-as/issues/66) Throw error when additional keys are in JSON
+
+## 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)

package/README.md

@@ -6,7 +6,7 @@
 ██   ██      ██ ██    ██ ██  ██ ██       ██   ██      ██
  █████  ███████  ██████  ██   ████       ██   ██ ███████
  </span>
-    AssemblyScript - v1.0.7
+    AssemblyScript - v1.0.9
   </pre>
 </h6>
 
@@ -57,6 +57,7 @@ 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;
@@ -64,8 +65,10 @@ class Vec3 {
   z: f32 = 0.0;
 }
 
+
 @json
 class Player {
+
   @alias("first name")
   firstName!: string;
   lastName!: string;
@@ -73,6 +76,7 @@ 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;
@@ -109,9 +113,11 @@ 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;
 }
@@ -128,9 +134,11 @@ 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;
 }
@@ -147,9 +155,11 @@ 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;
 }
@@ -174,6 +184,7 @@ 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;
@@ -184,6 +195,7 @@ class Person {
 Instead, use `JSON.Box` to allow nullable primitives:
 
 ```typescript
+
 @json
 class Person {
   name: string;
@@ -246,6 +258,7 @@ 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;
@@ -302,6 +315,7 @@ 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;
@@ -311,11 +325,13 @@ class Point {
     this.y = y;
   }
 
+
   @serializer
   serializer(self: Point): string {
     return `(${self.x},${self.y})`;
   }
 
+
   @deserializer
   deserializer(data: string): Point {
     const dataSize = bytes(data);
@@ -371,7 +387,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
@@ -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;
-  }
 }
 
 const v1: Vec3 = { x: 1, y: 2, z: 3 };
@@ -63,7 +17,7 @@ bench(
   () => {
     JSON.stringify(v1);
   },
-  16_000_00,
+  128_000_00,
 );
 
 bench(
@@ -71,5 +25,5 @@ bench(
   () => {
     JSON.parse<Vec3>(v2);
   },
-  16_000_00,
+  128_000_00,
 );

package/assembly/__tests__/custom.spec.ts

@@ -32,11 +32,12 @@ class Point {
   }
 }
 
+
 @json
-export class ObjectWithCustom {
-  value: Point = new Point(0, 0)
+class ObjectWithCustom {
+  value: Point = new Point(0, 0);
   constructor(value: Point) {
-    this.value = value
+    this.value = value;
   }
 }
 

package/assembly/__tests__/hierarchy.spec.ts

@@ -0,0 +1,55 @@
+import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
+import { JSON } from "..";
+import { describe, expect } from "./lib";
+
+@json
+class Foo {
+  a: i32 = 0;
+}
+
+@json
+class Bar extends Foo {
+  b: i32 = 0;
+
+  @serializer
+  serialize(self: Bar): string {
+    return `"bar"`;
+  }
+
+  @deserializer
+  deserialize(data: string): Bar {
+    return data == "\"bar\"" ? {
+      a: 1,
+      b: 2,
+    } : new Bar();
+  }
+}
+
+describe("should use custom serializer for subclasses", () => {
+  const bar = new Bar();
+  bar.a = 1;
+  bar.b = 2;
+  const data = JSON.stringify(bar);
+  expect(data).toBe('"bar"');
+});
+
+describe("should use custom serializer for subclasses when type is the parent", () => {
+  const bar = new Bar();
+  bar.a = 1;
+  bar.b = 2;
+  const data = JSON.stringify<Foo>(bar);
+  expect(data).toBe('"bar"');
+});
+
+describe("should use custom deserializer for subclass", () => {
+  const json = '"bar"';
+  const bar = JSON.parse<Bar>(json);
+  expect(bar.a.toString()).toBe("1");
+  expect(bar.b.toString()).toBe("2");
+});
+
+describe("should use custom deserializer even when type is the parent", () => {
+  const json = '"bar"';
+  const foo = JSON.parse<Bar>(json);
+  expect(foo.a.toString()).toBe("1");
+});

package/assembly/__tests__/lib/index.ts

@@ -1,5 +1,6 @@
 export function describe(description: string, routine: () => void): void {
   routine();
+  // console.log("  " + description + " OK");
 }
 
 export function expect(left: string): Expectation {

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,6 +31,12 @@ 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 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);