json-as 0.8.3 → 0.8.5

package/CHANGELOG

@@ -1,2 +1,3 @@
 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.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.

package/README.md

@@ -7,7 +7,7 @@
 ██║  ██║███████║      ╚█████╔╝███████║╚██████╔╝██║ ╚████║
 ╚═╝  ╚═╝╚══════╝       ╚════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝
 
-v0.8.3
+v0.8.5
 </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

@@ -14,7 +14,32 @@ function canSer<T>(data: T, toBe: string): void {
   const serialized = JSON.stringify<T>(data);
   expect(serialized).toBe(toBe);
 }
+@json
+class BaseObject {
+  a: string;
+
+  constructor(a: string) {
+    this.a = a;
+  }
+}
+
+@json
+class DerivedObject extends BaseObject {
+  b: string;
+
+  constructor(a: string, b: string) {
+    super(a);
+    this.b = b;
+  }
+}
 
+describe("Ser/de object hierarchies", () => {
+  it("should ser/de objects derived from base objects", () => {
+    const o = new DerivedObject("1", "2");
+    const s = '{"a":"1","b":"2"}';
+    canSerde(o, s);
+  });
+});
 @json
 class Map4 {
   a: string;

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)) {
@@ -126,7 +132,7 @@ export namespace JSON {
       result.write(serializeString(unchecked(keys[end]).toString()));
       result.writeCodePoint(colonCode);
       result.write(__JSON_Stringify(unchecked(values[end])));
-      
+
       result.writeCodePoint(rightBraceCode);
       return result.toString();
     } else {
@@ -135,86 +141,10 @@ export namespace JSON {
       );
     }
   }
-  /**
-   * 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 new Error(
-        `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;
@@ -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;
@@ -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)) {
-    return unreachable();
+    throw new Error("Tried to parse a map, but the types did not match!")
   }
 
   const key = Virtual.createEmpty<string>();
@@ -758,7 +716,7 @@ export namespace JSON {
     }
   }
 
-  return unreachable();
+  throw new Error("Tried to parse array, but failed!")
 }
 
 // @ts-ignore: Decorator
@@ -892,14 +850,14 @@ function parseDate(dateTimeString: string): Date {
 }
 
 // Dirty fix
- // @ts-ignore: Decorator
+// @ts-ignore: Decorator
 @global @inline function __JSON_Stringify<T>(data: T): string {
   // String
   if (isString<T>() && data != null) {
     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) {
@@ -963,7 +926,7 @@ function parseDate(dateTimeString: string): Date {
     result.write(serializeString(unchecked(keys[end]).toString()));
     result.writeCodePoint(colonCode);
     result.write(__JSON_Stringify(unchecked(values[end])));
-    
+
     result.writeCodePoint(rightBraceCode);
     return result.toString();
   } else {
@@ -971,4 +934,8 @@ function parseDate(dateTimeString: string): Date {
       `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,7 +1,23 @@
+import { Box } from "as-container";
 import { JSON } from "./src/json";
 
-console.log(JSON.stringify(JSON.parse<f64[]>(`[
-    1,
-    2,
-    3
-  ]`)));
+@json
+class Foo {
+  @omitnull
+  optionalNumber: Box<i32> | null = null;
+  @omitif("this.tristateValue!.unwrap() == false")
+  tristateValue: Box<bool> | null = null;
+}
+
+const foo: Foo = {
+  optionalNumber: null,
+  tristateValue: Box.from(true)
+}
+
+console.log(JSON.stringify(foo));
+
+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.3",
+  "version": "0.8.5",
   "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/lib/index.js

@@ -22,7 +22,7 @@ class AsJSONTransform extends BaseVisitor {
     }
     visitMethodDeclaration() { }
     visitClassDeclaration(node) {
-        var _c, _d;
+        var _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const className = node.name.text;
         if (!((_c = node.decorators) === null || _c === void 0 ? void 0 : _c.length))
             return;
@@ -53,94 +53,123 @@ class AsJSONTransform extends BaseVisitor {
             setDataStmts: [],
             initializeStmts: []
         };
-        if (this.currentClass.parent.length > 0) {
+        if (this.currentClass.parent.length) {
             const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
             if (parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts) {
                 parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts.push((parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts.pop()) + ",");
-                this.currentClass.encodeStmts.push(...parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts);
+                for (let i = 0; i < parentSchema.keys.length; i++) {
+                    const key = parentSchema.keys[i];
+                    if (node.members.filter(v => v.name.text == key) == undefined)
+                        this.currentClass.encodeStmts.unshift(parentSchema.encodeStmts[i]);
+                }
             }
         }
         const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
         const members = [
-            ...node.members,
-            ...(parentSchema ? parentSchema.node.members : []),
+            ...node.members
         ];
+        if (parentSchema) {
+            for (const mem of parentSchema.node.members) {
+                if (members.find(v => v.name === mem.name) == undefined)
+                    members.unshift(mem);
+            }
+        }
         for (const mem of members) {
             // @ts-ignore
             if (mem.type && mem.type.name && mem.type.name.identifier.text) {
                 const member = mem;
                 const lineText = toString(member);
                 //console.log("Member: " + lineText)
-                if (!lineText.startsWith("private ") && !lineText.startsWith("static ")) {
-                    // @ts-ignore
-                    let type = toString(member.type);
-                    const name = member.name.text;
-                    let aliasName = name;
-                    // @ts-ignore
-                    if (member.decorators && ((_d = member.decorators[0]) === null || _d === void 0 ? void 0 : _d.name.text) === "alias") {
-                        if (member.decorators[0] && member.decorators[0].args[0]) {
-                            // @ts-ignore
-                            aliasName = member.decorators[0].args[0].value;
-                        }
+                if (lineText.startsWith("private ") && lineText.startsWith("static "))
+                    continue;
+                const omitnull = (_d = member.decorators) === null || _d === void 0 ? void 0 : _d.find(v => v.name.text == "omitnull");
+                console.log((_e = member.decorators) === null || _e === void 0 ? void 0 : _e.find(v => v.name.text === "omitif"));
+                const omitif = (_k = (_j = (_h = (_g = (_f = member.decorators) === null || _f === void 0 ? void 0 : _f.find(v => v.name.text === "omitif")) === null || _g === void 0 ? void 0 : _g.args) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.value) !== null && _k !== void 0 ? _k : null;
+                // @ts-ignore
+                let type = toString(member.type);
+                const name = member.name.text;
+                let aliasName = name;
+                // @ts-ignore
+                if (member.decorators && ((_l = member.decorators[0]) === null || _l === void 0 ? void 0 : _l.name.text) === "alias") {
+                    if (member.decorators[0] && member.decorators[0].args[0]) {
+                        // @ts-ignore
+                        aliasName = member.decorators[0].args[0].value;
+                    }
+                }
+                this.currentClass.keys.push(name);
+                // @ts-ignore
+                this.currentClass.types.push(type);
+                // @ts-ignore
+                if ([
+                    "u8",
+                    "i8",
+                    "u16",
+                    "i16",
+                    "u32",
+                    "i32",
+                    "u64",
+                    "i64",
+                ].includes(type.toLowerCase())) {
+                    if (omitif) {
+                        this.currentClass.encodeStmts.push(`\${${omitif} ? "" : \`,${encodeKey(aliasName)}:\${this.${name}}\`}`);
+                    }
+                    else {
+                        this.currentClass.encodeStmts.push(`,${encodeKey(aliasName)}:\${this.${name}}`);
                     }
-                    this.currentClass.keys.push(name);
-                    // @ts-ignore
-                    this.currentClass.types.push(type);
                     // @ts-ignore
-                    if ([
-                        "u8",
-                        "i8",
-                        "u16",
-                        "i16",
-                        "u32",
-                        "i32",
-                        "u64",
-                        "i64",
-                    ].includes(type.toLowerCase())) {
-                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${this.${name}},`);
-                        // @ts-ignore
-                        this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
+                    this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
           this.${name} = __atoi_fast<${type}>(data, val_start << 1, val_end << 1);
           return;
         }`);
-                        if (member.initializer) {
-                            this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
-                        }
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
                     }
-                    else // @ts-ignore
-                     if ([
-                        "f32",
-                        "f64",
-                    ].includes(type.toLowerCase())) {
-                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${this.${name}},`);
-                        // @ts-ignore
-                        this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
+                }
+                else if ([
+                    "f32",
+                    "f64",
+                ].includes(type.toLowerCase())) {
+                    if (omitif) {
+                        this.currentClass.encodeStmts.push(`\${${omitif} ? "" : \`,${encodeKey(aliasName)}:\${this.${name}}\`}`);
+                    }
+                    else {
+                        this.currentClass.encodeStmts.push(`,${encodeKey(aliasName)}:\${this.${name}}`);
+                    }
+                    // @ts-ignore
+                    this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
             this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
             return;
           }`);
-                        if (member.initializer) {
-                            this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
-                        }
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                    }
+                }
+                else {
+                    if (omitnull) {
+                        this.currentClass.encodeStmts.push(`c\${changetype<usize>(this.${name}) !== <usize>0 ? "" : \`${encodeKey(aliasName)}:\${__JSON_Stringify<${type}>(this.${name})}\`}`);
+                        console.log(`\${changetype<usize>(this.${name}) != <usize>0 ? \`${encodeKey(aliasName)}:,\${__JSON_Stringify<${type}>(this.${name})}\` : ""}`);
+                    }
+                    else if (omitif) {
+                        this.currentClass.encodeStmts.push(`\${${omitif} ? "" : \`${encodeKey(aliasName)}:,\${__JSON_Stringify<${type}>(this.${name})}\`}`);
                     }
                     else {
-                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${__JSON_Stringify<${type}>(this.${name})},`);
-                        // @ts-ignore
-                        this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
+                        this.currentClass.encodeStmts.push(`,${encodeKey(aliasName)}:\${__JSON_Stringify<${type}>(this.${name})}`);
+                    }
+                    // @ts-ignore
+                    this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
             this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data, initializeDefaultValues);
             return;
           }`);
-                        if (member.initializer) {
-                            this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
-                        }
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
                     }
                 }
             }
         }
         let serializeFunc = "";
         if (this.currentClass.encodeStmts.length > 0) {
-            const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];
-            this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
-                stmt.slice(0, stmt.length - 1);
+            const stmt = this.currentClass.encodeStmts[0];
+            this.currentClass.encodeStmts[0] = stmt.slice(1);
             serializeFunc = `
       __JSON_Serialize(): string {
         return \`{${this.currentClass.encodeStmts.join("")}}\`;
@@ -179,7 +208,7 @@ class AsJSONTransform extends BaseVisitor {
         this.schemasList.push(this.currentClass);
         this.sources.add(node.name.range.source);
         // Uncomment to see the generated code for debugging.
-        //console.log(serializeFunc);
+        console.log(serializeFunc);
         //console.log(setKeyFunc);
         //console.log(initializeFunc);
     }

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "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

@@ -61,24 +61,33 @@ class AsJSONTransform extends BaseVisitor {
       initializeStmts: []
     };
 
-    if (this.currentClass.parent.length > 0) {
+    if (this.currentClass.parent.length) {
       const parentSchema = this.schemasList.find(
         (v) => v.name == this.currentClass.parent
       );
       if (parentSchema?.encodeStmts) {
         parentSchema?.encodeStmts.push(parentSchema?.encodeStmts.pop() + ",");
-        this.currentClass.encodeStmts.push(...parentSchema?.encodeStmts);
+        for (let i = 0; i < parentSchema.keys.length; i++) {
+          const key = parentSchema.keys[i];
+          if (node.members.filter(v => v.name.text == key) == undefined) this.currentClass.encodeStmts.unshift(parentSchema.encodeStmts[i]!);
+        }
       }
     }
 
     const parentSchema = this.schemasList.find(
       (v) => v.name == this.currentClass.parent
     );
+
     const members = [
-      ...node.members,
-      ...(parentSchema ? parentSchema.node.members : []),
+      ...node.members
     ];
 
+    if (parentSchema) {
+      for (const mem of parentSchema.node.members) {
+        if (members.find(v => v.name === mem.name) == undefined) members.unshift(mem);
+      }
+    }
+
     for (const mem of members) {
       // @ts-ignore
       if (mem.type && mem.type.name && mem.type.name.identifier.text) {
@@ -86,91 +95,116 @@ class AsJSONTransform extends BaseVisitor {
         const lineText = toString(member);
         //console.log("Member: " + lineText)
 
-        if (!lineText.startsWith("private ") && !lineText.startsWith("static ")) {
+        if (lineText.startsWith("private ") && lineText.startsWith("static ")) continue;
 
-          // @ts-ignore
-          let type = toString(member.type);
+        const omitnull = member.decorators?.find(v => v.name.text == "omitnull");
+        console.log(member.decorators?.find(v => v.name.text === "omitif"))
+        const omitif = member.decorators?.find(v => v.name.text === "omitif")?.args?.[0]?.value ?? null;
 
-          const name = member.name.text;
-          let aliasName = name;
+        // @ts-ignore
+        let type = toString(member.type);
 
-          // @ts-ignore
-          if (member.decorators && member.decorators[0]?.name.text === "alias") {
-            if (member.decorators[0] && member.decorators[0].args![0]) {
-              // @ts-ignore
-              aliasName = member.decorators[0].args![0].value;
-            }
+        const name = member.name.text;
+        let aliasName = name;
+
+        // @ts-ignore
+        if (member.decorators && member.decorators[0]?.name.text === "alias") {
+          if (member.decorators[0] && member.decorators[0].args![0]) {
+            // @ts-ignore
+            aliasName = member.decorators[0].args![0].value;
           }
-          this.currentClass.keys.push(name);
-          // @ts-ignore
-          this.currentClass.types.push(type);
-          // @ts-ignore
-          if (
-            [
-              "u8",
-              "i8",
-              "u16",
-              "i16",
-              "u32",
-              "i32",
-              "u64",
-              "i64",
-            ].includes(type.toLowerCase())
-          ) {
+        }
+        this.currentClass.keys.push(name);
+        // @ts-ignore
+        this.currentClass.types.push(type);
+        // @ts-ignore
+        if (
+          [
+            "u8",
+            "i8",
+            "u16",
+            "i16",
+            "u32",
+            "i32",
+            "u64",
+            "i64",
+          ].includes(type.toLowerCase())
+        ) {
+          if (omitif) {
             this.currentClass.encodeStmts.push(
-              `${encodeKey(aliasName)}:\${this.${name}},`
+              `\${${omitif} ? "" : \`,${encodeKey(aliasName)}:\${this.${name}}\`}`
             );
-            // @ts-ignore
-            this.currentClass.setDataStmts.push(
-              `if (key.equals(${JSON.stringify(aliasName)})) {
+          } else {
+            this.currentClass.encodeStmts.push(
+              `,${encodeKey(aliasName)}:\${this.${name}}`
+            );
+          }
+          // @ts-ignore
+          this.currentClass.setDataStmts.push(
+            `if (key.equals(${JSON.stringify(aliasName)})) {
           this.${name} = __atoi_fast<${type}>(data, val_start << 1, val_end << 1);
           return;
         }`
+          );
+          if (member.initializer) {
+            this.currentClass.initializeStmts.push(
+              `this.${name} = ${toString(member.initializer)}`
             );
-            if (member.initializer) {
-              this.currentClass.initializeStmts.push(
-                `this.${name} = ${toString(member.initializer)}`
-              );
-            }
-          } else // @ts-ignore
-            if (
-              [
-                "f32",
-                "f64",
-              ].includes(type.toLowerCase())
-            ) {
-              this.currentClass.encodeStmts.push(
-                `${encodeKey(aliasName)}:\${this.${name}},`
-              );
-              // @ts-ignore
-              this.currentClass.setDataStmts.push(
-                `if (key.equals(${JSON.stringify(aliasName)})) {
+          }
+        } else if (
+          [
+            "f32",
+            "f64",
+          ].includes(type.toLowerCase())
+        ) {
+          if (omitif) {
+            this.currentClass.encodeStmts.push(
+              `\${${omitif} ? "" : \`,${encodeKey(aliasName)}:\${this.${name}}\`}`
+            );
+          } else {
+            this.currentClass.encodeStmts.push(
+              `,${encodeKey(aliasName)}:\${this.${name}}`
+            );
+          }
+          // @ts-ignore
+          this.currentClass.setDataStmts.push(
+            `if (key.equals(${JSON.stringify(aliasName)})) {
             this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
             return;
           }`
-              );
-              if (member.initializer) {
-                this.currentClass.initializeStmts.push(
-                  `this.${name} = ${toString(member.initializer)}`
-                );
-              }
-            } else {
-              this.currentClass.encodeStmts.push(
-                `${encodeKey(aliasName)}:\${__JSON_Stringify<${type}>(this.${name})},`
-              );
-              // @ts-ignore
-              this.currentClass.setDataStmts.push(
-                `if (key.equals(${JSON.stringify(aliasName)})) {
+          );
+          if (member.initializer) {
+            this.currentClass.initializeStmts.push(
+              `this.${name} = ${toString(member.initializer)}`
+            );
+          }
+        } else {
+          if (omitnull) {
+            this.currentClass.encodeStmts.push(
+              `${comma}\${changetype<usize>(this.${name}) !== <usize>0 ? "" : \`${encodeKey(aliasName)}:\${__JSON_Stringify<${type}>(this.${name})}\`}`
+            );
+            console.log(`\${changetype<usize>(this.${name}) != <usize>0 ? \`${encodeKey(aliasName)}:,\${__JSON_Stringify<${type}>(this.${name})}\` : ""}`)
+          } else if (omitif) {
+            this.currentClass.encodeStmts.push(
+              `\${${omitif} ? "" : \`${encodeKey(aliasName)}:,\${__JSON_Stringify<${type}>(this.${name})}\`}`
+            );
+          } else {
+            this.currentClass.encodeStmts.push(
+              `,${encodeKey(aliasName)}:\${__JSON_Stringify<${type}>(this.${name})}`
+            );
+          }
+          // @ts-ignore
+          this.currentClass.setDataStmts.push(
+            `if (key.equals(${JSON.stringify(aliasName)})) {
             this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data, initializeDefaultValues);
             return;
           }`
-              );
-              if (member.initializer) {
-                this.currentClass.initializeStmts.push(
-                  `this.${name} = ${toString(member.initializer)}`
-                );
-              }
-            }
+          );
+          if (member.initializer) {
+            this.currentClass.initializeStmts.push(
+              `this.${name} = ${toString(member.initializer)}`
+            );
+          }
         }
       }
     }
@@ -179,11 +213,8 @@ class AsJSONTransform extends BaseVisitor {
 
     if (this.currentClass.encodeStmts.length > 0) {
       const stmt =
-        this.currentClass.encodeStmts[
-        this.currentClass.encodeStmts.length - 1
-        ]!;
-      this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
-        stmt!.slice(0, stmt.length - 1);
+        this.currentClass.encodeStmts[0]!;
+      this.currentClass.encodeStmts[0] = stmt!.slice(1);
       serializeFunc = `
       __JSON_Serialize(): string {
         return \`{${this.currentClass.encodeStmts.join("")}}\`;
@@ -227,7 +258,7 @@ class AsJSONTransform extends BaseVisitor {
     this.sources.add(node.name.range.source);
 
     // Uncomment to see the generated code for debugging.
-    //console.log(serializeFunc);
+    console.log(serializeFunc);
     //console.log(setKeyFunc);
     //console.log(initializeFunc);
   }