json-as 0.8.4 → 0.8.6

package/CHANGELOG

@@ -1,3 +1,5 @@
 v0.8.2 - Properties starting with `static` or `private` would be ignored
 v0.8.3 - Dirty fix to issue #68. Add __JSON_Stringify callable to global scope.
-v0.8.4 - Fix #71. Classes with the extending class overriding a property cause the property to be serialized twice.
+v0.8.4 - Fix #71. Classes with the extending class overriding a property cause the property to be serialized twice.
+v0.8.5 - Fix #73. Support for nullable primatives with Box<T> from as-container
+v0.8.6 - Fix. Forgot to stash before publishing. Stash and push what should have been v0.8.5

package/README.md

@@ -7,7 +7,7 @@
 ██║  ██║███████║      ╚█████╔╝███████║╚██████╔╝██║ ╚████║
 ╚═╝  ╚═╝╚══════╝       ╚════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝
 
-v0.8.3
+v0.8.6
 </pre>
 </h3>
 
@@ -80,6 +80,43 @@ const parsed = JSON.parse<Player>(stringified);
 
 If you use this project in your codebase, consider dropping a [star](https://github.com/JairusSW/as-json). I would really appreciate it!
 
+## Performance
+
+Run or view the benchmarks [here](https://github.com/JairusSW/as-json/tree/master/bench)
+
+Below are benchmark results comparing JavaScript's built-in JSON implementation and `JSON-AS`
+
+My library beats JSON (written in C++) on all counts *and*, I see many places where I can pull at least a 60% uplift in performance if I implement it.
+
+
+Serialization Benchmarks:
+
+| Value                      | JavaScript (ops/s) | JSON-as (ops/s) | JSON-AS with Pages |
+|----------------------------|--------------------|-----------------|--------------------|
+| "hello world"              | 28,629,598         | 64,210,666      | + 124%             |
+| 12345                      | 31,562,431         | 56,329,066      | 321,783,941 ops/s  |
+| 1.2345                     | 15,977,278         | 20,322,939      | 30,307,616 ops/s  |
+| [[],[[]],[[],[[]]]]        | 8,998,624          | 34,453,102      | + 283% |
+
+
+
+Deserialization Benchmarks: (WIP)
+
+| Value                      | JavaScript (ops/s) | JSON-AS (ops/s) | % Diff |
+|----------------------------|--------------------|-----------------|--------|
+| "12345"                    | 34,647,886         | 254,640,930     | + 635% |
+
+
+And my PC specs:
+
+| Component       | Specification                        |
+|-----------------|--------------------------------------|
+| Wasmer Version  | v4.3.0                               |
+| CPU             | AMD Ryzen 7 7800x3D @ 6.00 GHz       |
+| Memory          | T-Force DDR5 6000 MHz                |
+| OS              | Ubuntu WSL2                          |
+| Graphics        | AMD Radeon RX 6750XT                 |
+
 ## Issues
 
 Please submit an issue to https://github.com/JairusSW/as-json/issues if you find anything wrong with this library

package/assembly/__tests__/as-json.spec.ts

@@ -53,6 +53,8 @@ class Vec3 {
   x: f64;
   y: f64;
   z: f64;
+
+  static shouldIgnore: string = "should not be serialized";
 }
 
 @json

package/assembly/index.d.ts

@@ -12,3 +12,13 @@ declare function serializable(target: any): void;
  * Property decorator that provides an alias name for JSON serialization.
  */
 declare function alias(name: string): Function;
+
+/**
+ * Property decorator that allows a field to be omitted when equal to an Expression.
+ */
+declare function omitwhen(condition: string): Function;
+
+/**
+ * Property decorator that allows a field to be omitted when a property is null.
+ */
+declare function omitnull(): Function;

package/assembly/src/json.ts

@@ -42,6 +42,7 @@ import {
 } from "./chars";
 import { snip_fast, unsafeCharCodeAt, containsCodePoint } from "./util";
 import { Virtual } from "as-virtual/assembly";
+import { Box } from "as-container/assembly";
 
 /**
  * JSON Encoder/Decoder for AssemblyScript
@@ -62,7 +63,12 @@ export namespace JSON {
       return serializeString(data as string);
     } else if (isBoolean<T>()) {
       return data ? "true" : "false";
-    } else if (isNullable<T>() && data == null) {
+    } else if (data instanceof Box) {
+      if (isNullable<T>() && (changetype<usize>(data._val) == <usize>0 || changetype<usize>(data) == <usize>0)) {
+        return nullWord;
+      }
+      return JSON.stringify(data.unwrap());
+    } else if (isNullable<T>() && changetype<usize>(data) == <usize>0) {
       return nullWord;
       // @ts-ignore
     } else if ((isInteger<T>() || isFloat<T>()) && isFinite(data)) {
@@ -130,91 +136,15 @@ export namespace JSON {
       result.writeCodePoint(rightBraceCode);
       return result.toString();
     } else {
-      throw abort(
+      throw new Error(
         `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
       );
     }
   }
-  /**
-   * Stringifies valid JSON data.
-   * ```js
-   * __JSON_Stringify<T>(data)
-   * ```
-   * @param data T
-   * @returns string
-   */
   // @ts-ignore: Decorator
+  @unsafe
   @inline export function stringifyTo<T>(data: T, out: string): void {
-    // String
-    if (isString<T>() && data != null) {
-      out = serializeString(data as string);
-      return;
-    } else if (isBoolean<T>()) {
-      out = data ? trueWord : falseWord;
-      return;
-    } else if (isNullable<T>() && data == null) {
-      out = nullWord;
-      return;
-      // @ts-ignore
-    } else if ((isInteger<T>() || isFloat<T>()) && isFinite(data)) {
-      // @ts-ignore
-      out = data.toString();
-      return;
-      // @ts-ignore: Hidden function
-    } else if (isDefined(data.__JSON_Serialize)) {
-      // @ts-ignore: Hidden function
-      out = data.__JSON_Serialize();
-      return;
-    } else if (data instanceof Date) {
-      out = quoteWord + data.toISOString() + quoteWord;
-      return;
-    } else if (isArrayLike<T>()) {
-      // @ts-ignore
-      if (data.length == 0) {
-        out = emptyArrayWord;
-        return;
-        // @ts-ignore
-      } else if (isString<valueof<T>>()) {
-        out = leftBracketWord;
-        // @ts-ignore
-        for (let i = 0; i < data.length - 1; i++) {
-          // @ts-ignore
-          out += serializeString(unchecked(data[i]));
-          out += commaWord;
-        }
-        // @ts-ignore
-        out += serializeString(unchecked(data[data.length - 1]));
-        out += rightBracketWord;
-        return;
-        // @ts-ignore
-      } else if (isBoolean<valueof<T>>()) {
-        // @ts-ignore
-        out = leftBracketWord + data.join(commaWord) + rightBracketWord;
-        return;
-        // @ts-ignore
-      } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
-        // @ts-ignore
-        out = leftBracketWord + data.join(commaWord) + rightBracketWord;
-        return;
-      } else {
-        let result = new StringSink(leftBracketWord);
-        // @ts-ignore
-        for (let i = 0; i < data.length - 1; i++) {
-          // @ts-ignore
-          result.write(__JSON_Stringify(unchecked(data[i])));
-          result.writeCodePoint(commaCode);
-        }
-        // @ts-ignore
-        result.write(__JSON_Stringify(unchecked(data[data.length - 1])));
-        result.writeCodePoint(rightBracketCode);
-        out = result.toString();
-        return;
-      }
-    } else {
-      throw abort(
-        `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
-      );
-    }
+    throw new Error("Method is deprecated");
   }
   /**
    * Parses valid JSON strings into their original format.
@@ -227,7 +157,6 @@ export namespace JSON {
 
   // @ts-ignore: Decorator
   @inline export function parse<T>(data: string, initializeDefaultValues: boolean = false): T {
-    let type: T;
     if (isString<T>()) {
       // @ts-ignore
       return parseString(data);
@@ -239,6 +168,15 @@ export namespace JSON {
     } else if (isArrayLike<T>()) {
       // @ts-ignore
       return parseArray<T>(data.trimStart());
+      // @ts-ignore
+    }
+    let type: nonnull<T> = changetype<nonnull<T>>(0);
+    if (type instanceof Box) {
+      const instance = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()))// as Box<usize>;
+      const val = instance._val;
+      instance._val = parseDirectInference(val, data);
+      // @ts-ignore
+      return changetype<T>(instance);
     } else if (isNullable<T>() && data == nullWord) {
       // @ts-ignore
       return null;
@@ -251,7 +189,7 @@ export namespace JSON {
       // @ts-ignore
       return parseDate(data);
     } else {
-      throw abort(
+      throw new Error(
         `Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
       );
     }
@@ -260,7 +198,6 @@ export namespace JSON {
 
 // @ts-ignore: Decorator
 @global @inline function __parseObjectValue<T>(data: string, initializeDefaultValues: boolean): T {
-  let type: T;
   if (isString<T>()) {
     // @ts-ignore
     return data;
@@ -272,6 +209,15 @@ export namespace JSON {
   } else if (isArrayLike<T>()) {
     // @ts-ignore
     return parseArray<T>(data);
+    // @ts-ignore
+  }
+  let type: nonnull<T> = changetype<nonnull<T>>(0);
+  if (type instanceof Box) {
+    const instance = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()))// as Box<usize>;
+    const val = instance._val;
+    instance._val = parseDirectInference(val, data);
+    // @ts-ignore
+    return changetype<T>(instance);
   } else if (isNullable<T>() && data == nullWord) {
     // @ts-ignore
     return null;
@@ -284,7 +230,7 @@ export namespace JSON {
     // @ts-ignore
     return parseDate(data);
   } else {
-    throw abort(
+    throw new Error(
       `Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
     );
   }
@@ -411,7 +357,7 @@ export namespace JSON {
         break;
       }
       default: {
-        throw abort(`JSON: Cannot parse "${data}" as string. Invalid escape sequence: \\${data.charAt(i)}`);
+        throw new Error(`JSON: Cannot parse "${data}" as string. Invalid escape sequence: \\${data.charAt(i)}`);
       }
     }
   }
@@ -425,7 +371,7 @@ export namespace JSON {
 @inline function parseBoolean<T extends boolean>(data: string): T {
   if (data.length > 3 && data.startsWith(trueWord)) return <T>true;
   else if (data.length > 4 && data.startsWith(falseWord)) return <T>false;
-  else throw abort(`JSON: Cannot parse "${data}" as boolean`);
+  else throw new Error(`JSON: Cannot parse "${data}" as boolean`);
 }
 
 // @ts-ignore: Decorator
@@ -442,6 +388,18 @@ export namespace JSON {
   else if (type instanceof f32) return f32.parse(data);
 }
 
+// @ts-ignore: Decorator
+@inline function parseNumberDirectInference<T>(type: T, data: string): T {
+  if (isInteger(type)) {
+    // @ts-ignore
+    return snip_fast<T>(data);
+  }
+  // @ts-ignore
+  if (type instanceof f64) return f64.parse(data);
+  // @ts-ignore
+  else if (type instanceof f32) return f32.parse(data);
+}
+
 // @ts-ignore: Decorator
 @inline function parseObject<T>(data: string, initializeDefaultValues: boolean): T {
   const schema: nonnull<T> = changetype<nonnull<T>>(
@@ -584,7 +542,7 @@ export namespace JSON {
   );
 
   if (!isDefined(map.set)) {
-    throw abort("Tried to parse a map, but the types did not match!")
+    throw new Error("Tried to parse a map, but the types did not match!")
   }
 
   const key = Virtual.createEmpty<string>();
@@ -729,7 +687,7 @@ export namespace JSON {
     return parseNumber<T>(k);
   }
 
-  throw abort(`JSON: Cannot parse JSON object to a Map with a key of type ${nameof<T>()}`);
+  throw new Error(`JSON: Cannot parse JSON object to a Map with a key of type ${nameof<T>()}`);
 }
 
 // @ts-ignore: Decorator
@@ -758,7 +716,7 @@ export namespace JSON {
     }
   }
 
-  throw abort("Tried to parse array, but failed!")
+  throw new Error("Tried to parse array, but failed!")
 }
 
 // @ts-ignore: Decorator
@@ -899,7 +857,7 @@ function parseDate(dateTimeString: string): Date {
     return serializeString(data as string);
   } else if (isBoolean<T>()) {
     return data ? "true" : "false";
-  } else if (isNullable<T>() && data == null) {
+  } else if (isNullable<T>() && changetype<usize>(data) == <usize>0) {
     return nullWord;
     // @ts-ignore
   } else if ((isInteger<T>() || isFloat<T>()) && isFinite(data)) {
@@ -911,6 +869,11 @@ function parseDate(dateTimeString: string): Date {
     return data.__JSON_Serialize();
   } else if (data instanceof Date) {
     return `"${data.toISOString()}"`;
+  } else if (data instanceof Box) {
+    if (isNullable<T>() && changetype<usize>(data) == <usize>0) {
+      return nullWord;
+    }
+    return JSON.stringify(data.unwrap());
   } else if (isArrayLike<T>()) {
     // @ts-ignore
     if (data.length == 0) {
@@ -967,8 +930,12 @@ function parseDate(dateTimeString: string): Date {
     result.writeCodePoint(rightBraceCode);
     return result.toString();
   } else {
-    throw abort(
+    throw new Error(
       `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
     );
   }
+}
+
+@inline function parseDirectInference<T>(type: T, data: string, initializeDefaultValues: boolean = false): T {
+  return JSON.parse<T>(data, initializeDefaultValues)
 }

package/assembly/test.ts

@@ -1,24 +1,23 @@
+import { Box } from "as-container";
 import { JSON } from "./src/json";
 
 @json
-class BaseObject {
-  a: string;
-
-  constructor(a: string) {
-    this.a = a;
-  }
+class Foo {
+  @omitnull
+  optionalNumber: Box<i32> | null = null;
+  @omitif("this.tristateValue!.unwrap() == false")
+  tristateValue: Box<bool> | null = null;
 }
 
-@json
-class DerivedObject extends BaseObject {
-  b: string;
-
-  constructor(a: string, b: string) {
-    super(a);
-    this.b = b;
-  }
+const foo: Foo = {
+  optionalNumber: null,
+  tristateValue: Box.from(true)
 }
 
-const o = new DerivedObject("1", "2");
+console.log(JSON.stringify(foo));
 
-console.log(JSON.stringify(o))
+const p1 = JSON.parse<Box<i32> | null>("null");
+console.log(JSON.stringify<Box<i32> | null>(p1));
+console.log(changetype<usize>(p1).toString())
+const p2 = JSON.parse<Foo>("{\"optionalNumber\":null,\"tristateValue\":false}");
+console.log(JSON.stringify(p2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -44,9 +44,10 @@
     "visitor-as": "^0.11.4"
   },
   "dependencies": {
+    "as-container": "^0.8.0",
     "as-string-sink": "^0.5.3",
     "as-variant": "^0.4.1",
-    "as-virtual": "^0.1.9"
+    "as-virtual": "^0.2.0"
   },
   "overrides": {
     "assemblyscript": "$assemblyscript"

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "JSON encoder/decoder for AssemblyScript",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",
@@ -25,6 +25,8 @@
     "json",
     "serialize",
     "deserialize",
+    "stringify",
+    "data",
     "serde"
   ],
   "bugs": {

package/transform/src/index.ts

@@ -309,4 +309,4 @@ export default class Transformer extends Transform {
       }
     }
   }
-}
+}