feat: support deserialization of nullables in JSON.Value

Author: JairusSW

assembly/deserialize/simple/arbitrary.ts

@@ -5,8 +5,6 @@ import { deserializeFloat } from "./float";
 import { deserializeString } from "./string";
 import { deserializeObject } from "./object";
 import { BRACE_LEFT, BRACKET_LEFT, CHAR_N, QUOTE } from "../../custom/chars";
-import { bs } from "../../../lib/as-bs";
-import { deserializeString_SWAR } from "../swar/string";
 
 export function deserializeArbitrary(srcStart: usize, srcEnd: usize, dst: usize): JSON.Value {
   const firstChar = load<u16>(srcStart);
@@ -21,4 +19,4 @@ export function deserializeArbitrary(srcStart: usize, srcEnd: usize, dst: usize)
     return JSON.Value.from<usize>(0);
   }
   return unreachable();
-}
+}

assembly/deserialize/simple/array/arbitrary.ts

@@ -121,7 +121,7 @@ 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));
+        // console.log("Value (null): " + ptrToStr(srcStart, srcStart + 8));
         // @ts-ignore: type
         out.push(JSON.__deserialize<JSON.Value>(srcStart, (srcStart += 8)));
         // while (isSpace(load<u16>((srcStart += 2)))) {

assembly/index.ts

@@ -308,6 +308,7 @@ export namespace JSON {
      */
     @inline set<T>(value: T): void {
       if (isNullable<T>()) {
+
         if (value instanceof JSON.Box) {
           if (isBoolean<T>()) {
             this.type = JSON.Types.BoolNull;
@@ -331,8 +332,6 @@ export namespace JSON {
             this.type = JSON.Types.F64Null;
             store<T>(changetype<usize>(this), value, STORAGE);
           }
-
-          this.isNull = changetype<usize>(value) === 0;
         } else if (isBoolean<T>()) {
           this.type = JSON.Types.BoolNull;
           store<T>(changetype<usize>(this), value, STORAGE);
@@ -382,6 +381,7 @@ export namespace JSON {
           this.type = JSON.Types.ArrayNull;
           store<T>(changetype<usize>(this), value, STORAGE);
         }
+        this.isNull = changetype<usize>(value) === 0;
       } else {
         if (value instanceof JSON.Box) {
           return this.set(value.value);

assembly/test.ts

@@ -1,15 +1,30 @@
 import { JSON } from ".";
 
+@json
+class Vec3 {
+  x!: f32;
+  y!: f32;
+  z!: f32;
+}
+
+const vec: Vec3 = {
+  x: 1.0,
+  y: 2.0,
+  z: 3.0
+}
 const str: JSON.Value[] = [
   JSON.Value.from<string>("foo"),
   JSON.Value.from("bar"),
   JSON.Value.from(1),
   JSON.Value.from(2),
   JSON.Value.from(true),
-  JSON.Value.from<JSON.Box<i32> | null>(null)
+  JSON.Value.from<JSON.Box<i32> | null>(null),
+  JSON.Value.from(vec),
+  JSON.Value.from<Vec3 | null>(null)
 ];
 
-console.log(JSON.stringify(str));
-// for (let i = 0; i < str.length; i++) {
-  // console.log(str.toString());
-// }
+const serialized = JSON.stringify(str);
+console.log("Serialized: " + serialized);
+
+const deserialized = JSON.parse<JSON.Value[]>(serialized);
+console.log("Deserialized: " + JSON.stringify(deserialized).toString());

package.json

@@ -60,7 +60,7 @@
     "test": "bash ./run-tests.sh",
     "bench:as": "bash ./run-bench.as.sh",
     "bench:js": "bash ./run-bench.js.sh",
-    "build:test": "JSON_DEBUG=2 asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --enable simd --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
+    "build:test": "JSON_DEBUG=0 asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --enable simd --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
     "build:tmp:test": "JSON_DEBUG=1 asc assembly/test.tmp.ts -o ./build/test.wasm --textFile ./build/test.wat --enable simd --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
     "build:test:wine": "JSON_DEBUG=1 JSON_WRITE=assembly/test.ts NODE_SKIP_PLATFORM_CHECK=1 wine ~/.win-bin/node/node.exe ./node_modules/assemblyscript/bin/asc.js assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
     "test:wasmtime": "wasmtime ./build/test.wasm",