json-as 0.5.31 → 0.5.33

package/README.md

@@ -2,7 +2,7 @@
 ![AssemblyScript](https://img.shields.io/badge/AssemblyScript-blue)
 ![WebAssembly](https://img.shields.io/badge/WebAssemby-purple)
 
-Probably the fastest JSON implementation for AssemblyScript with many more optimizations coming down the pipeline.
+JSON for AssemblyScript focused on performance, low-overhead, and ease-of-use.
 ## Installation
 
 ```bash
@@ -18,13 +18,13 @@ For arbitrary-length numbers, use
 npm install as-bignum
 ```
 
-Add the transform to your `asc` command
+Add the transform to your `asc` command (e.g. in package.json)
 
 ```bash
 --transform json-as/transform
 ```
 
-Or, add it to `asconfig.json`
+Alternatively, add it to your `asconfig.json`
 
 ```
 {
@@ -75,10 +75,6 @@ const stringified = JSON.stringify<Player>(player);
 const parsed = JSON.parse<Player>(stringified);
 ```
 
-## Notes
-
-Performance exceeds JavaScript JSON implementation by an average of 230% but this decreases with larger data packets.
-
 ## Planned Features
 
 - [x] Serialize
@@ -101,17 +97,25 @@ Performance exceeds JavaScript JSON implementation by an average of 230% but thi
   - [ ] Arrays
 ## Performance
 
-**Serialize Object (Vec3):** ~11.1m ops/s
+Number parsing speed has doubled over the last 5 versions due to the use of a `atoi_fast` function found in `assembly/util.ts`. This can be further optimized with SIMD.
+
+String serialization has more than tripled in performance (+360%). The algorithm was rewritten for less if statements and more traps.
+
+String deserialization was quadrupled from 3.4m ops to 14.8 ops (435%). It went from using `.replaceAll` to a specialized algorithm.
+
+Schema (object) parsing is being optimized on GitHub and should be at least doubled if not tripled. (Current speed of barely-optimized version is 6.9m ops) This is due to taking advantage of the types with a type map and eliminating extra checking.
+
+**Serialize Object (Vec3):** 6.7m ops/5s
 
-**Deserialize Object (Vec3):** ~3.2m ops/s
+**Deserialize Object (Vec3):** 3.8m ops/5s
 
-**Serialize Array (int[]):** ~1.4m ops/s
+**Serialize Array (int[]):** 6.6m ops/5s
 
-**Deserialize Array (int[]):** ~2.8m ops/s
+**Deserialize Array (int[]):** 8.6m ops/5s
 
-**Serialize String (5):** ~4.2m ops/s
+**Serialize String (5):** 5.9m ops/5s
 
-**Deserialize String (5):** ~12m ops/s
+**Deserialize String (5):** 16.3m ops/5s
 
 ## Issues
 

package/asconfig.json

@@ -13,7 +13,8 @@
     "transform": [
       "./transform"
     ],
-    "bindings": "esm"
+    "bindings": "esm",
+    "exportStart": "_start"
   },
   "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
 }

package/assembly/__benches__/as-json.ts

@@ -1,51 +1,95 @@
 import { JSON } from "..";
+import { backSlashCode, quoteCode } from "../src/chars";
+import { atoi_fast, unsafeCharCodeAt } from "../src/util";
+import { HASH } from "util/hash";
 
 @json
 class Vec3 {
   x: i32;
   y: i32;
   z: i32;
+
+  /*@inline __JSON_Serialize(data: Vec3): string {
+    return `{"x":${data.x.toString()},"y":${data.y.toString()},"z":${data.z.toString()}}`;
+  }*/
+
+  @inline __JSON_Deserialize(data: string, to: Vec3): Vec3 {
+    let last = 1;
+    let char = 0;
+    let inStr = false;
+    let key: string | null = null;
+    let pos = 0;
+    for (; pos < data.length - 1; pos++) {
+      char = unsafeCharCodeAt(data, pos);
+      if (inStr === false && char === quoteCode) {
+        if (key != null) {
+          if (unsafeCharCodeAt(key, 0) == 120) {
+            to.x = atoi_fast<i32>(data.substring(last, pos - 1))
+          } else if (unsafeCharCodeAt(key, 0) == 121) {
+            to.y = atoi_fast<i32>(data.substring(last, pos - 1))
+          } else if (unsafeCharCodeAt(key, 0) == 122) {
+            to.z = atoi_fast<i32>(data.substring(last, pos - 1))
+          }
+        }
+        last = ++pos;
+        inStr = true;
+      } else if (char === quoteCode && unsafeCharCodeAt(data, pos - 1) != backSlashCode) {
+        inStr = false;
+        key = data.substring(last, pos);
+        last = pos += 2;
+      }
+    }
+    if (key != null) {
+      if (unsafeCharCodeAt(key, 0) == 120) {
+        to.x = atoi_fast<i32>(data.substring(last, pos - 1))
+      } else if (unsafeCharCodeAt(key, 0) == 121) {
+        to.y = atoi_fast<i32>(data.substring(last, pos - 1))
+      } else if (unsafeCharCodeAt(key, 0) == 122) {
+        to.z = atoi_fast<i32>(data.substring(last, pos - 1))
+      }
+    }
+    return to;
+  }
 }
 
-const vec: Vec3 = blackbox<Vec3>({
-  x: 0,
-  y: 0,
-  z: 0
-});
+const vec: Vec3 = {
+  x: 3,
+  y: 1,
+  z: 8
+};
+
+const vecOut = new Vec3();
 
+const i32Max = blackbox("429496729");
+/*
 bench("Stringify Object (Vec3)", () => {
-  blackbox(JSON.stringify(vec));
-});
+  blackbox<string>(vec.__JSON_Serialize(vec));
+});*/
 
+bench("HASH String", () => {
+  blackbox<number>(HASH("Hello"));
+})
+// TODO: Make this allocate without crashing
 bench("Parse Object (Vec3)", () => {
-  blackbox(JSON.parse<Vec3>(blackbox('{"x":0,"y":0,"z":0}')));
-});/*
-
-bench("Stringify Array", () => {
-  blackbox(JSON.stringify(blackbox([1, 2, 3, 4, 5])));
+  blackbox<Vec3>(vec.__JSON_Deserialize('{"x":0,"y":0,"z":0}', vec));
 });
-bench("Stringify String Array", () => {
-  blackbox(JSON.stringify(blackbox(["a", "b", "c", "d", "e"])));
+
+bench("Stringify Number Array", () => {
+  blackbox(JSON.stringify<i32[]>([1, 2, 3]));
 });
-/*
+
 bench("Parse Array", () => {
-  blackbox(JSON.parse<i32[]>(blackbox("[1,2,3,4]")));
+  blackbox(JSON.parse<i32[]>(blackbox("[1,2,3]")));
 });
 
-bench("Stringify Nested Array", () => {
-  blackbox(
-    JSON.stringify<string[][]>(
-      blackbox([
-        ["a", "b", "c"]
-      ])
-    )
-  );
+bench("Stringify Boolean Array", () => {
+  blackbox(JSON.stringify<boolean[]>([true, false, true]));
 });
 
-bench("Parse Nested Array", () => {
-  blackbox(JSON.parse<string[][]>(blackbox('[["a","b","c"]]')));
+bench("Stringify String Array", () => {
+  blackbox(JSON.stringify<string[]>(["a", "b", "c"]));
 });
-*/
+
 bench("Stringify String", () => {
   blackbox(JSON.stringify(blackbox("Hello \"World!")));
 });
@@ -53,7 +97,7 @@ bench("Stringify String", () => {
 bench("Parse String", () => {
   blackbox(JSON.parse<string>(blackbox('"Hello \"World!"')));
 });
-/*
+
 bench("Stringify Boolean", () => {
   blackbox(JSON.stringify(blackbox(true)));
 });
@@ -76,4 +120,4 @@ bench("Stringify Float", () => {
 
 bench("Parse Float", () => {
   blackbox(JSON.parse<f32>(blackbox("3.14")));
-});*/
+});

package/assembly/src/json.ts

@@ -23,7 +23,7 @@ import {
     uCode,
     emptyArrayWord
 } from "./chars";
-import { escapeChar, isBigNum, unsafeCharCodeAt } from "./util";
+import { atoi_fast, escapeChar, isBigNum, unsafeCharCodeAt } from "./util";
 
 /**
  * JSON Encoder/Decoder for AssemblyScript
@@ -42,34 +42,21 @@ export namespace JSON {
         if (isString<T>() && data != null) {
             // @ts-ignore
             return serializeString(data);
-        }
-        // Boolean
-        else if (isBoolean<T>()) {
+        } else if (isBoolean<T>()) {
             return data ? "true" : "false";
-        }
-        // Nullable
-        else if (isNullable<T>() && data == null) {
+        } else if (isNullable<T>() && data == null) {
             return "null";
-        }
-        // Integers/Floats
-        // @ts-ignore
-        else if ((isInteger<T>() || isFloat<T>()) && isFinite(data)) {
+            // @ts-ignore
+        } else if ((isInteger<T>() || isFloat<T>()) && isFinite(data)) {
             // @ts-ignore
             return data.toString();
-        }
-        // Class-Based serialization
-        // @ts-ignore
-        else if (isDefined(data.__JSON_Serialize)) {
             // @ts-ignore
-            //if (isNullable<T>()) return "null";
+        } else if (isDefined(data.__JSON_Serialize)) {
             // @ts-ignore
             return data.__JSON_Serialize();
-        }
-        else if (data instanceof Date) {
+        } else if (data instanceof Date) {
             return data.toISOString();
-        }
-        // ArrayLike
-        else if (isArrayLike<T>()) {
+        } else if (isArrayLike<T>()) {
             // @ts-ignore
             if (data.length == 0) {
                 return emptyArrayWord;
@@ -87,18 +74,13 @@ export namespace JSON {
                 result += rightBracketWord;
                 return result;
                 // @ts-ignore
-            } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
-                let result = new StringSink(leftBracketWord);
+            } else if (isBoolean<valueof<T>>()) {
                 // @ts-ignore
-                for (let i = 0; i < data.length - 1; i++) {
-                    // @ts-ignore
-                    result.write(JSON.stringify(unchecked(data[i])));
-                    result.write(commaWord);
-                }
+                return leftBracketWord + data.join(commaWord) + rightBracketWord;
                 // @ts-ignore
-                result.write(JSON.stringify(unchecked(data[data.length - 1])));
-                result.write(rightBracketWord);
-                return result.toString();
+            } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
+                // @ts-ignore
+                return leftBracketWord + data.join(commaWord) + rightBracketWord;
             } else {
                 let result = new StringSink(leftBracketWord);
                 // @ts-ignore
@@ -164,7 +146,48 @@ export namespace JSON {
         let type: T;
         if (isString<T>()) {
             // @ts-ignore
-            return data.replaceAll('\\"', '"');
+            let result = "";
+            let last = 0;
+            let char = 0;
+            for (let i = 0; i < data.length; i++) {
+                // \\"
+                if (unsafeCharCodeAt(data, i) === backSlashCode) {
+                    char = unsafeCharCodeAt(data, ++i);
+                    result += data.slice(last, i - 1)
+                    if (char === 34) {
+                        result += "\"";
+                        last = ++i;
+                    } else if (char === 110) {
+                        result += "\n";
+                        last = ++i;
+                        // 92 98 114 116 102 117
+                    } else if (char >= 92 && char <= 117) {
+                        if (char === 92) {
+                            result += "\\";
+                            last = ++i;
+                        } else if (char === 98) {
+                            result += "\b";
+                            last = ++i;
+                        } else if (char === 102) {
+                            result += "\f";
+                            last = ++i;
+                        } else if (char === 114) {
+                            result += "\r";
+                            last = ++i;
+                        } else if (char === 116) {
+                            result += "\t";
+                            last = ++i;
+                        } else if (char === 117 && load<u64>(changetype<usize>(data) + <usize>((i + 1) << 1)) === 27584753879220272) {
+                            result += "\u000b";
+                            i += 4;
+                            last = ++i;
+                        }
+                    }
+                }
+            }
+            result += data.slice(last);
+            // @ts-ignore
+            return result;
         } else if (isBoolean<T>()) {
             // @ts-ignore
             return parseBoolean<T>(data);
@@ -193,16 +216,16 @@ export namespace JSON {
     }
 }
 
+
 // @ts-ignore
 @inline
-// @ts-ignore
 function serializeString(data: string): string {
     // @ts-ignore
     if (data.length === 0) return "\"\"";
     // Fast path for Vectors (3)
     let char: i32 = 0;
     if (data.length === 1) {
-        char === unsafeCharCodeAt(data, 0);
+        char = unsafeCharCodeAt(data, 0);
         if (char === 34) {
             return "\\\"";
         } else if (char === 92) {
@@ -359,28 +382,16 @@ function parseBoolean<T extends boolean>(data: string): T {
 @inline
 // @ts-ignore
 export function parseNumber<T>(data: string): T {
+    if (isInteger<T>()) {
+        // @ts-ignore
+        return atoi_fast<T>(data);
+    }
     // @ts-ignore
     const type: T = 0;
     // @ts-ignore
     if (type instanceof f64) return f64.parse(data);
     // @ts-ignore
     else if (type instanceof f32) return f32.parse(data);
-    // @ts-ignore
-    else if (type instanceof u64) return u64.parse(data);
-    // @ts-ignore
-    else if (type instanceof u32) return u32.parse(data);
-    // @ts-ignore
-    else if (type instanceof u8) return u8.parse(data);
-    // @ts-ignore
-    else if (type instanceof u16) return u16.parse(data);
-    // @ts-ignore
-    else if (type instanceof i64) return i64.parse(data);
-    // @ts-ignore
-    else if (type instanceof i32) return i32.parse(data);
-    // @ts-ignore
-    else if (type instanceof i16) return i16.parse(data);
-    // @ts-ignore
-    else if (type instanceof i8) return i8.parse(data);
 }
 
 // @ts-ignore

package/assembly/src/util.ts

@@ -1,5 +1,5 @@
 import { StringSink } from "as-string-sink/assembly";
-import { isSpace } from "util/string";
+import { CharCode, isSpace } from "util/string";
 import { backSlashCode, quoteCode } from "./chars";
 import { u128, u128Safe, u256, u256Safe, i128, i128Safe, i256Safe } from "as-bignum/assembly";
 
@@ -78,3 +78,24 @@ export function getArrayDepth<T>(depth: i32 = 1): i32 {
     return depth;
   }
 }
+
+/**
+ * Implementation of ATOI. Can be much much faster with SIMD.
+ * Its pretty fast. (173m ops (atoi_fast) vs 89 ops (parseInt))
+*/
+@unsafe
+@inline
+export function atoi_fast<T extends number>(str: string): T {
+  // @ts-ignore
+  let val: T = 0;
+  for (let pos = 0; pos < str.length; pos += 2) {
+    // @ts-ignore
+    val = (val << 1) + (val << 3) + (load<u16>(changetype<usize>(str) + <usize>pos) - 48);
+    // We use load because in this case, there is no need to have bounds-checking
+  }
+  return val;
+}
+
+/**
+ * 
+ */

package/assembly/test.ts

@@ -1,38 +1,27 @@
+import { backSlashCode, quoteCode } from "./src/chars";
 import { JSON } from "./src/json";
+import { atoi_fast, unsafeCharCodeAt } from "./src/util";
 
 // @json or @serializable work here
 @json
 class Vec3 {
-  x!: f32;
-  y!: f32;
-  z!: f32;
+  x: i32;
+  y: i32;
+  z: i32;
 }
 
-@json
-class Player {
-  firstName!: string;
-  lastName!: string;
-  lastActive!: i32[];
-  age!: i32;
-  pos!: Vec3 | null;
-  isVerified!: boolean;
+const vec: Vec3 = {
+  x: 3,
+  y: 1,
+  z: 8
 }
 
-const player: Player = {
-  firstName: "Emmet",
-  lastName: "West",
-  lastActive: [8, 27, 2022],
-  age: 23,
-  pos: {
-    x: 3.4,
-    y: 1.2,
-    z: 8.3
-  },
-  isVerified: true
-};
+const serializedVec3 = JSON.stringify(vec);
+console.log(serializedVec3);
+
+const parsedVec3 = JSON.parse<Vec3>(serializedVec3);
+console.log(JSON.stringify(parsedVec3));
 
-const stringified = JSON.stringify<Player>(player);
-console.log(stringified);
+console.log(`atoi_fast("429496729"): ${atoi_fast<i32>("429496729")}`);
 
-const parsed = JSON.parse<Player>(stringified);
-console.log(JSON.stringify(parsed));
+console.log(`strtol("429496729"): ${i32.parse("429496729")}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.31",
+  "version": "0.5.33",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -12,7 +12,7 @@
   "license": "MIT",
   "scripts": {
     "aspect": "asp",
-    "bench:astral": "astral",
+    "bench:astral": "astral -Ospeed --noAssert --uncheckedBehavior always",
     "build:test": "asc assembly/test.ts --target test --runtime stub",
     "build:transform": "tsc -p ./transform",
     "test:wasmtime": "wasmtime ./build/test.wasm",
@@ -23,9 +23,9 @@
   "devDependencies": {
     "@as-pect/cli": "^8.0.1",
     "@as-tral/cli": "^2.0.0",
-    "@assemblyscript/loader": "^0.27.0",
+    "@assemblyscript/loader": "^0.27.1",
     "@assemblyscript/wasi-shim": "^0.1.0",
-    "assemblyscript": "^0.27.0",
+    "assemblyscript": "^0.27.1",
     "assemblyscript-prettier": "^1.0.7",
     "prettier": "^2.8.4",
     "typescript": "^4.9.5",

package/transform/lib/index.js

@@ -1,4 +1,4 @@
-import { getName, toString, isStdlib } from "visitor-as/dist/utils.js";
+import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
 class SchemaData {
@@ -19,39 +19,6 @@ class AsJSONTransform extends BaseVisitor {
         this.sources = [];
     }
     visitMethodDeclaration() { }
-    visitFieldDeclaration(node) {
-        if (toString(node).startsWith("static"))
-            return;
-        const lineText = toString(node);
-        if (lineText.startsWith("private"))
-            return;
-        const name = getName(node);
-        if (!node.type) {
-            throw new Error(`Field ${name} is missing a type declaration`);
-        }
-        let type = getName(node.type);
-        // @ts-ignore
-        if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
-            this.currentClass.encodeStmts.push(`"${name}":\${this.${name}.toString()},`);
-        }
-        else {
-            this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
-        }
-        // @ts-ignore
-        //this.decodeStmts.push(
-        //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
-        //);
-        // @ts-ignore
-        this.currentClass.setDataStmts.push(`if (key == "${name}") {
-        this.${name} = JSON.parseObjectValue<${type}>(value);
-        return;
-      }
-      `);
-        // @ts-ignore
-        //this.checkDecodeStmts.push(
-        //  ' if (!values.has("${name}")) throw new Error("Key "${name}" was not found. Cannot instantiate object.");\n'
-        //);
-    }
     visitClassDeclaration(node) {
         var _c;
         const className = node.name.text;
@@ -65,7 +32,7 @@ class AsJSONTransform extends BaseVisitor {
         }
         if (!foundDecorator)
             return;
-        // Prevent from being triggered twice
+        // Prevent from being triggered twice.
         for (const member of node.members) {
             if (member.name.text == "__JSON_Serialize")
                 return;
@@ -92,7 +59,35 @@ class AsJSONTransform extends BaseVisitor {
         }
         const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
         const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])];
-        this.visit(members);
+        for (const mem of members) {
+            if (mem.type && mem.type.name && mem.type.name.identifier.text) {
+                const member = mem;
+                if (toString(member).startsWith("static"))
+                    return;
+                const lineText = toString(member);
+                if (lineText.startsWith("private"))
+                    return;
+                // @ts-ignore
+                const type = member.type.name.identifier.text;
+                const name = member.name.text;
+                this.currentClass.keys.push(name);
+                // @ts-ignore
+                this.currentClass.types.push(type);
+                // @ts-ignore
+                if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
+                    this.currentClass.encodeStmts.push(`"${name}":\${this.${name}.toString()},`);
+                }
+                else {
+                    this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
+                }
+                // @ts-ignore
+                this.currentClass.setDataStmts.push(`if (key == "${name}") {
+        this.${name} = JSON.parseObjectValue<${type}>(value);
+        return;
+      }
+      `);
+            }
+        }
         let serializeFunc = "";
         if (this.currentClass.encodeStmts.length > 0) {
             const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];
@@ -125,8 +120,6 @@ class AsJSONTransform extends BaseVisitor {
         const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);
         node.members.push(setDataMethod);
         this.schemasList.push(this.currentClass);
-        //console.log(serializeFunc);
-        //console.log(setKeyFunc);
     }
     visitSource(node) {
         super.visitSource(node);

package/transform/lib/types.js

@@ -0,0 +1,15 @@
+export var Types;
+(function (Types) {
+    Types[Types["String"] = 0] = "String";
+    Types[Types["u8"] = 1] = "u8";
+    Types[Types["i8"] = 2] = "i8";
+    Types[Types["u16"] = 3] = "u16";
+    Types[Types["i16"] = 4] = "i16";
+    Types[Types["u32"] = 5] = "u32";
+    Types[Types["i32"] = 6] = "i32";
+    Types[Types["u64"] = 7] = "u64";
+    Types[Types["i64"] = 8] = "i64";
+    Types[Types["f32"] = 9] = "f32";
+    Types[Types["f64"] = 10] = "f64";
+    Types[Types["boolean"] = 11] = "boolean";
+})(Types || (Types = {}));

package/transform/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@json-as/transform",
-    "version": "0.5.31",
+    "version": "0.5.33",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",
@@ -10,7 +10,9 @@
         "Rom"
     ],
     "license": "MIT",
-    "devDependencies": {},
+    "devDependencies": {
+        "assemblyscript": "^0.27.1"
+    },
     "dependencies": {},
     "repository": {
         "type": "git",

package/transform/src/index.ts

@@ -4,7 +4,7 @@ import {
   Source,
   Parser
 } from "assemblyscript/dist/assemblyscript";
-import { getName, toString, isStdlib } from "visitor-as/dist/utils.js";
+import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
 
@@ -24,46 +24,6 @@ class AsJSONTransform extends BaseVisitor {
   public sources: Source[] = [];
 
   visitMethodDeclaration(): void { }
-  visitFieldDeclaration(node: FieldDeclaration): void {
-    if (toString(node).startsWith("static")) return;
-    const lineText = toString(node);
-    if (lineText.startsWith("private")) return;
-    const name = getName(node);
-    if (!node.type) {
-      throw new Error(`Field ${name} is missing a type declaration`);
-    }
-
-    let type = getName(node.type);
-    // @ts-ignore
-    if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
-      this.currentClass.encodeStmts.push(
-        `"${name}":\${this.${name}.toString()},`
-      );
-    } else {
-      this.currentClass.encodeStmts.push(
-        `"${name}":\${JSON.stringify<${type}>(this.${name})},`
-      );
-    }
-
-    // @ts-ignore
-    //this.decodeStmts.push(
-    //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
-    //);
-
-    // @ts-ignore
-    this.currentClass.setDataStmts.push(
-      `if (key == "${name}") {
-        this.${name} = JSON.parseObjectValue<${type}>(value);
-        return;
-      }
-      `
-    );
-
-    // @ts-ignore
-    //this.checkDecodeStmts.push(
-    //  ' if (!values.has("${name}")) throw new Error("Key "${name}" was not found. Cannot instantiate object.");\n'
-    //);
-  }
   visitClassDeclaration(node: ClassDeclaration): void {
     const className = node.name.text;
     if (!node.decorators?.length) return;
@@ -74,7 +34,7 @@ class AsJSONTransform extends BaseVisitor {
     }
     if (!foundDecorator) return;
 
-    // Prevent from being triggered twice
+    // Prevent from being triggered twice.
     for (const member of node.members) {
       if (member.name.text == "__JSON_Serialize") return;
     }
@@ -102,7 +62,40 @@ class AsJSONTransform extends BaseVisitor {
 
     const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
     const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])]
-    this.visit(members);
+
+    for (const mem of members) {
+      if (mem.type && mem.type.name && mem.type.name.identifier.text) {
+        const member: FieldDeclaration = mem;
+        if (toString(member).startsWith("static")) return;
+        const lineText = toString(member);
+        if (lineText.startsWith("private")) return;
+
+        // @ts-ignore
+        const type = member.type.name.identifier.text;
+        const name = member.name.text;
+        this.currentClass.keys.push(name);
+        // @ts-ignore
+        this.currentClass.types.push(type);
+        // @ts-ignore
+        if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
+          this.currentClass.encodeStmts.push(
+            `"${name}":\${this.${name}.toString()},`
+          );
+        } else {
+          this.currentClass.encodeStmts.push(
+            `"${name}":\${JSON.stringify<${type}>(this.${name})},`
+          );
+        }
+        // @ts-ignore
+        this.currentClass.setDataStmts.push(
+          `if (key == "${name}") {
+        this.${name} = JSON.parseObjectValue<${type}>(value);
+        return;
+      }
+      `
+        );
+      }
+    }
 
     let serializeFunc = "";
 
@@ -147,9 +140,6 @@ class AsJSONTransform extends BaseVisitor {
     node.members.push(setDataMethod);
 
     this.schemasList.push(this.currentClass);
-
-    //console.log(serializeFunc);
-    //console.log(setKeyFunc);
   }
   visitSource(node: Source): void {
     super.visitSource(node);
@@ -161,7 +151,7 @@ export default class Transformer extends Transform {
   afterParse(parser: Parser): void {
     // Create new transform
     const transformer = new AsJSONTransform();
-    
+
     // Sort the sources so that user scripts are visited last
     const sources = parser.sources.filter(source => !isStdlib(source)).sort((_a, _b) => {
       const a = _a.internalPath
@@ -174,7 +164,7 @@ export default class Transformer extends Transform {
         return 0;
       }
     })
-    
+
     // Loop over every source
     for (const source of sources) {
       // Ignore all lib and std. Visit everything else.