json-as 0.5.6 → 0.5.8

package/README.md

@@ -1,10 +1,6 @@
 # AS-JSON
 ![AssemblyScript](https://img.shields.io/badge/AssemblyScript-blue)
 ![WebAssembly](https://img.shields.io/badge/WebAssemby-purple)
-
-## Features
-
-Full
 ## Installation
 
 ```bash
@@ -90,6 +86,19 @@ const stringified = JSON.stringify<Player>(data);
 const parsed = JSON.parse<Player>(stringified);
 ```
 
+# FAQ
+
+**Does it support the JSON specification?**
+Yes, it does. However, dynamic objects and arrays are not supported, but planned in the near future.
+
+**Is it fast?**
+Look below
+
+**How does it compare to other librarys?**
+Its pretty much the same as the other libraries out there (near/assemblyscript-json and @serial-as/json), but it focuses highly on performance
+
+**Will it catch invalid JSON?**
+No, it does not check for invalid JSON, but gives its best shot at parsing instead. Will probably throw an error.
 
 ## Performance
 

package/asconfig.json

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

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

@@ -40,16 +40,16 @@ describe("Ser/de Numbers", () => {
     canSerde<u64>(101);
     canSerde<i32>(-100);
     canSerde<i64>(-101);
-
+/*
     canSerde<u128>(u128.from("0"))
     canSerde<u128>(u128.from("100"))
     canSerde<u128>(u128.from("101"))
-
+`
     canSerde<u128Safe>(u128Safe.from("0"))
     canSerde<u128Safe>(u128Safe.from("100"))
     canSerde<u128Safe>(u128Safe.from("101"))
     
-  /*  canSerde<u256>(u256.fromU128(u128.from("0")))
+    canSerde<u256>(u256.fromU128(u128.from("0")))
     canSerde<u256>(u256.fromU128(u128.from("100")))
     canSerde<u256>(u256.fromU128(u128.from("101")))
 
@@ -65,9 +65,9 @@ describe("Ser/de Numbers", () => {
     canSerde<i128Safe>(i128Safe.from("100"))
     canSerde<i128Safe>(i128Safe.from("101"))
     canSerde<i128Safe>(i128Safe.from("-100"))
-    canSerde<i128Safe>(i128Safe.from("-101"))
+    canSerde<i128Safe>(i128Safe.from("-101"))*/
 
-    canSerde<i256Safe>(new i256Safe(10, 11, 500, 501))*/
+    //canSerde<i256Safe>(new i256Safe(10, 11, 500, 501))
   });
 
   it("should ser/de floats", () => {

package/assembly/src/json.ts

@@ -81,6 +81,8 @@ export namespace JSON {
         } else if ((isManaged<T>() || isReference<T>()) && isBigNum<T>()) {
             // @ts-ignore
             return data.toString();
+        } else if (data instanceof Date) {
+            return data.toISOString();
         } else {
             throw new Error(`Could not serialize data of type ${nameof<T>()}. Invalid data provided.`);
         }
@@ -152,21 +154,17 @@ export namespace JSON {
             throw new Error(`Could not deserialize data ${data} to type ${nameof<T>()}. Invalide data provided.`)
         }
     }
-    /*export class Arr extends Array<Variant> {
-        public data: Variant[] = [];
-        push<T>(data: T): i32 {
-            return this.data.push(Variant.from<T>(data));
-        }
-        at<T>(index: i32): T {
-            return this.data.at(index).get<T>();
-        }
-    }*/
+    // @ts-ignore
+    @unsafe
+    export function createObjectUnsafe<T>(): T {
+        return changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()))
+    }
 }
 
 // @ts-ignore
 @inline
-        // @ts-ignore
-    function parseBigNum<T>(data: string): T {
+// @ts-ignore
+function parseBigNum<T>(data: string): T {
     // @ts-ignore
     if (idof<T>() == idof<u128>()) return u128.fromString(data);
         // @ts-ignore
@@ -180,18 +178,18 @@ export namespace JSON {
         // @ts-ignore
     if (idof<T>() == idof<i128Safe>()) return i128Safe.fromString(data);
         // @ts-ignore
-    if (idof<T>() == idof<i256Safe>()) return i256Safe.fromString(data);
+    //if (idof<T>() == idof<i256Safe>()) return data.
 }
 
 // @ts-ignore
 @inline
-    function parseString(data: string): string {
+function parseString(data: string): string {
     return data.slice(1, data.length - 1).replaceAll('\\"', '"');
 }
 
 // @ts-ignore
 @inline
-    function parseBoolean<T extends boolean>(data: string): T {
+function parseBoolean<T extends boolean>(data: string): T {
     if (data.length > 3 && data.startsWith("true")) return <T>true;
     else if (data.length > 4 && data.startsWith("false")) return <T>false;
     else throw new Error(`JSON: Cannot parse "${data}" as boolean`);
@@ -199,7 +197,7 @@ export namespace JSON {
 
 // @ts-ignore
 @inline
-    function parseNumber<T>(data: string): T {
+function parseNumber<T>(data: string): T {
     let type: T;
     // @ts-ignore
     if (type instanceof f64) return F64.parseFloat(data);
@@ -221,15 +219,15 @@ export namespace JSON {
     else if (type instanceof i16) return I16.parseInt(data);
     // @ts-ignore
     else if (type instanceof i8) return I8.parseInt(data);
-    else
-        throw new Error(
-            `JSON: Cannot parse invalid data into a number. Either "${data}" is not a valid number, or <${nameof<T>()}> is an invald number type.`
-        );
+
+    throw new Error(
+        `JSON: Cannot parse invalid data into a number. Either "${data}" is not a valid number, or <${nameof<T>()}> is an invald number type.`
+    );
 }
 
 // @ts-ignore
 @inline
-    export function parseObject<T>(data: string): T {
+export function parseObject<T>(data: string): T {
     let schema: nonnull<T> = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()));
     let key = "";
     let isKey = false;
@@ -251,6 +249,7 @@ export namespace JSON {
                     depth = depth >> 1;
                     if (depth === 1) {
                         ++arrayValueIndex;
+                        // @ts-ignore
                         schema.__JSON_Set_Key(key, data.slice(outerLoopIndex, arrayValueIndex));
                         outerLoopIndex = arrayValueIndex;
                         isKey = false;
@@ -271,6 +270,7 @@ export namespace JSON {
                     depth = depth >> 1;
                     if (depth === 1) {
                         ++objectValueIndex;
+                        // @ts-ignore
                         schema.__JSON_Set_Key(key, data.slice(outerLoopIndex, objectValueIndex));
                         outerLoopIndex = objectValueIndex;
                         isKey = false;
@@ -293,6 +293,7 @@ export namespace JSON {
                         key = data.slice(outerLoopIndex, stringValueIndex);
                         isKey = true;
                     } else {
+                        // @ts-ignore
                         schema.__JSON_Set_Key(key, data.slice(outerLoopIndex, stringValueIndex));
                         isKey = false;
                     }
@@ -301,6 +302,7 @@ export namespace JSON {
                 }
             }
         } else if (char == nCode) {
+            // @ts-ignore
             schema.__JSON_Set_Key(key, nullWord);
             isKey = false;
         } else if (
@@ -309,6 +311,7 @@ export namespace JSON {
             unsafeCharCodeAt(data, ++outerLoopIndex) === uCode &&
             unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
         ) {
+            // @ts-ignore
             schema.__JSON_Set_Key(key, trueWord);
             isKey = false;
         } else if (
@@ -318,6 +321,7 @@ export namespace JSON {
             unsafeCharCodeAt(data, ++outerLoopIndex) === "s".charCodeAt(0) &&
             unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
         ) {
+            // @ts-ignore
             schema.__JSON_Set_Key(key, "false");
             isKey = false;
         } else if ((char >= 48 && char <= 57) || char === 45) {
@@ -325,6 +329,7 @@ export namespace JSON {
             for (; numberValueIndex < data.length; numberValueIndex++) {
                 char = unsafeCharCodeAt(data, numberValueIndex);
                 if (char === commaCode || char === rightBraceCode || isSpace(char)) {
+                    // @ts-ignore
                     schema.__JSON_Set_Key(key, data.slice(outerLoopIndex - 1, numberValueIndex));
                     outerLoopIndex = numberValueIndex;
                     isKey = false;
@@ -338,8 +343,8 @@ export namespace JSON {
 
 // @ts-ignore
 @inline
-    // @ts-ignore
-    export function parseArray<T extends unknown[]>(data: string): T {
+// @ts-ignore
+export function parseArray<T extends unknown[]>(data: string): T {
     let type!: valueof<T>;
     if (type instanceof String) {
         return <T>parseStringArray(data);
@@ -361,7 +366,7 @@ export namespace JSON {
 
 // @ts-ignore
 @inline
-    export function parseStringArray(data: string): string[] {
+export function parseStringArray(data: string): string[] {
     const result: string[] = [];
     let lastPos = 0;
     let instr = false;
@@ -381,7 +386,7 @@ export namespace JSON {
 
 // @ts-ignore
 @inline
-    export function parseBooleanArray<T extends boolean[]>(data: string): T {
+export function parseBooleanArray<T extends boolean[]>(data: string): T {
     const result = instantiate<T>();
     let lastPos = 1;
     let char = 0;
@@ -409,7 +414,7 @@ export namespace JSON {
 
 // @ts-ignore
 @inline
-    export function parseNumberArray<T extends number[]>(data: string): T {
+export function parseNumberArray<T extends number[]>(data: string): T {
     const result = instantiate<T>();
     let lastPos = 0;
     let char = 0;
@@ -435,7 +440,7 @@ export namespace JSON {
 
 // @ts-ignore
 @inline
-    export function parseArrayArray<T extends unknown[][]>(data: string): T {
+export function parseArrayArray<T extends unknown[][]>(data: string): T {
     const result = instantiate<T>();
     let char = 0;
     let lastPos = 0;
@@ -465,7 +470,7 @@ export namespace JSON {
 
 // @ts-ignore
 @inline
-    export function parseObjectArray<T extends unknown[][]>(data: string): T {
+export function parseObjectArray<T extends unknown[][]>(data: string): T {
     const result = instantiate<T>();
     let char = 0;
     let lastPos = 1;

package/assembly/test.ts

@@ -1,15 +1,50 @@
-import "wasi";
-import { u128 } from "as-bignum/assembly";
+import { wasi_console } from "@assemblyscript/wasi-shim/assembly/wasi_console";
 import {
   JSON
 } from ".";
+@json
+class Player {
+  firstName: string;
+  lastName: string;
+  lastActive: i32[];
+  age: i32;
+  pos: Vec3 | null;
+  isVerified: boolean;
+  stats: Stats
+}
+
+@json
+class Contacts {
+  type: string
+  player: string
+}
 
+const player = JSON.createObjectUnsafe<Player>()
+
+player.firstName = "John";
+player.lastName = "West";
+player.age = 23;
+
+const contact: Contacts = {
+  player: JSON.stringify(player),
+  type: "friends"
+}
+
+let stringifiedContact = JSON.stringify(contact);
+console.log("Input (Should see backslashes logged): " + stringifiedContact);
+const contacts = JSON.parse<Contacts>(stringifiedContact)
+console.log("Player: " + contacts.player);
+console.log("Type: " + contacts.type);
+const parsedPlayer = JSON.parse<Player>(contacts.player);
+console.log("Final Player: " + JSON.stringify(parsedPlayer));
+console.log("Final Result (Contacts): " + JSON.stringify(contacts));/*
+/*
 // @ts-ignore
 @json
 class Stats {
   wins: u128
   loss: u128
-}
+}*/
 // @ts-ignore
 @json
 class Vec3 {
@@ -17,7 +52,20 @@ class Vec3 {
   y: f32;
   z: f32;
 }
-
+// @ts-ignore
+@json
+class Test {
+  data: string
+}
+const vec: Vec3 = {
+  x: 3.4,
+  y: 1.2,
+  z: 8.3
+}
+const test: Test = {
+  data: JSON.stringify(vec)
+}
+/*
 // @ts-ignore
 @json
 class Player {
@@ -46,8 +94,10 @@ const player: Player = {
     loss: u128.fromString("693")
   }
 };
-
-const serializedPlayer = JSON.stringify<Player>(player);
-console.log("Serialized Player: " + serializedPlayer);
-const deserializedPlayer = JSON.parse<Player>(serializedPlayer);
-console.log("Deserialized Player: " + JSON.stringify(deserializedPlayer));
+*//*
+const serializedPlayer = JSON.stringify<Test>(test);
+wasi_console.log("Serialized Player: " + serializedPlayer);
+const deserializedPlayer = JSON.parse<Test>(serializedPlayer);
+wasi_console.log("Deserialized Player: " + JSON.stringify(deserializedPlayer));
+wasi_console.log("Deserialize Vec3: " + JSON.stringify(JSON.parse<Vec3>(deserializedPlayer.data)))
+*/

package/assembly/tsconfig.json

@@ -1,9 +1,6 @@
-{
-  "extends": "assemblyscript/std/assembly.json",
-  "compilerOptions": {
-    "experimentalDecorators": true
-  },
-  "include": [
-    "./**/*.ts"
-  ]
+{
+  "extends": "assemblyscript/std/assembly.json",
+  "include": [
+    "./**/*.ts"
+  ]
 }

package/build/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

package/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<script type="module">
+import { add } from "./build/release.js";
+document.body.innerText = add(1, 2);
+</script>
+</head>
+<body></body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -16,14 +16,20 @@
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:lunatic": "lunatic ./build/test.wasm",
     "test:wasm3": "wasm3 ./build/test.wasm",
-    "prettier": "as-prettier -w ."
+    "prettier": "as-prettier -w .",
+    "asbuild:debug": "asc assembly/index.ts --target debug",
+    "asbuild:release": "asc assembly/index.ts --target release",
+    "asbuild": "yarn asbuild:debug && yarn asbuild:release",
+    "test": "node tests",
+    "start": "npx serve ."
   },
   "devDependencies": {
     "@as-pect/cli": "^7.0.7",
-    "@as-tral/cli": "^1.1.1",
+    "@as-tral/cli": "^1.2.0",
     "@assemblyscript/loader": "^0.21.3",
-    "@serial-as/json": "^2.0.0",
-    "assemblyscript": "^0.20.7",
+    "@assemblyscript/wasi-shim": "^0.1.0",
+    "as-bignum": "^0.2.23",
+    "assemblyscript": "^0.24.1",
     "assemblyscript-prettier": "^1.0.2",
     "prettier": "^2.7.1",
     "typescript": "^4.7.2"
@@ -48,5 +54,11 @@
     "url": "https://github.com/JairusSW/as-json/issues"
   },
   "homepage": "https://github.com/JairusSW/as-json#readme",
-  "type": "module"
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./build/release.js",
+      "types": "./build/release.d.ts"
+    }
+  }
 }

package/transform/lib/index.js

@@ -1,15 +1,23 @@
 import { ClassDecorator, registerDecorator, } from "visitor-as/dist/decorator.js";
 import { getName, toString } from "visitor-as/dist/utils.js";
 import { SimpleParser } from "visitor-as/dist/index.js";
+class SchemaData {
+    constructor() {
+        this.keys = [];
+        this.values = [];
+        this.types = [];
+        this.name = "";
+        this.parent = "";
+        this.encodeStmts = [];
+        this.setDataStmts = [];
+    }
+}
 class AsJSONTransform extends ClassDecorator {
     constructor() {
         super(...arguments);
+        this.schemasList = [];
         this.sources = [];
-        this.encodeStmts = [];
-        //public decodeStmts: string[] = [];
-        this.setDataStmts = [];
     }
-    //public checkDecodeStmts: string[] = [];
     visitMethodDeclaration() { }
     visitFieldDeclaration(node) {
         const lineText = toString(node);
@@ -21,13 +29,13 @@ class AsJSONTransform extends ClassDecorator {
         }
         let type = getName(node.type);
         // @ts-ignore
-        this.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
+        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.setDataStmts.push(`if (key.length === ${name.length} && (memory.compare(changetype<usize>("${name}"), changetype<usize>(key), ${name.length}) == 0)) {
+        this.currentClass.setDataStmts.push(`if (key.length === ${name.length} && (memory.compare(changetype<usize>("${name}"), changetype<usize>(key), ${name.length}) == 0)) {
         this.${name} = JSON.parseObjectValue<${type}>(value);
         return;
       }
@@ -38,19 +46,43 @@ class AsJSONTransform extends ClassDecorator {
         //);
     }
     visitClassDeclaration(node) {
+        var _a, _b, _c;
         if (!node.members) {
             return;
         }
-        this.currentClass = node;
+        this.currentClass = {
+            name: toString(node.name),
+            keys: [],
+            values: [],
+            types: [],
+            parent: node.extendsType ? toString(node.extendsType) : "",
+            node: node,
+            encodeStmts: [],
+            setDataStmts: []
+        };
+        if (this.currentClass.parent.length > 0) {
+            const parentSchema = this.schemasList.map((v) => {
+                if (v.name == this.currentClass.parent) {
+                    return v;
+                }
+            });
+            if (parentSchema.length > 0) {
+                (_a = parentSchema[0]) === null || _a === void 0 ? void 0 : _a.encodeStmts.push(((_b = parentSchema[0]) === null || _b === void 0 ? void 0 : _b.encodeStmts.pop()) + ",");
+                this.currentClass.encodeStmts.push(...(_c = parentSchema[0]) === null || _c === void 0 ? void 0 : _c.encodeStmts);
+            }
+            else {
+                //console.log("Class extends " + this.currentClass.parent + ", but parent class not found. Maybe add the @json decorator over parent class?")
+            }
+        }
         this.visit(node.members);
-        const serializedProp = '__JSON_Serialized: string = "";';
+        // const serializedProp = '__JSON_Serialized: string = "";';
         let serializeFunc = "";
-        if (this.encodeStmts.length > 0) {
-            const stmt = this.encodeStmts[this.encodeStmts.length - 1];
-            this.encodeStmts[this.encodeStmts.length - 1] = stmt.slice(0, stmt.length - 1);
+        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);
             serializeFunc = `
       __JSON_Serialize(): string {
-        return \`{${this.encodeStmts.join("")}}\`;
+        return \`{${this.currentClass.encodeStmts.join("")}}\`;
       }
       `;
         }
@@ -61,44 +93,24 @@ class AsJSONTransform extends ClassDecorator {
       }
       `;
         }
-        /*const deserializeFunc = `
-        __JSON_Deserialize<T>(values: Map<string, string>): T {
-            ${
-              process.argv.includes("--debugJSON")
-                ? this.checkDecodeStmts.join("else")
-                : ""
-            }
-            return {
-              ${
-                // @ts-ignore
-                this.decodeStmts.join("")
-              }
-            }
-        }
-        `;*/
         const setKeyFunc = `
       __JSON_Set_Key(key: string, value: string): void {
         ${
         // @ts-ignore
-        this.setDataStmts.join("")}
+        this.currentClass.setDataStmts.join("")}
       }
     `;
-        //console.log(setKeyFunc, deserializeFunc, serializeFunc)
-        this.encodeStmts = [];
-        //this.decodeStmts = [];
-        this.setDataStmts = [];
-        //this.checkDecodeStmts = [];
-        const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
-        node.members.push(serializedProperty);
-        const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
-        node.members.push(serializeMethod);
-        //const deserializeMethod = SimpleParser.parseClassMember(
-        //  deserializeFunc,
+        //console.log(serializeFunc)
+        //const serializedProperty = SimpleParser.parseClassMember(
+        //  serializedProp,
         //  node
         //);
-        //node.members.push(deserializeMethod);
+        //node.members.push(serializedProperty);
+        const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
+        node.members.push(serializeMethod);
         const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);
         node.members.push(setDataMethod);
+        this.schemasList.push(this.currentClass);
     }
     get name() {
         return "json";

package/transform/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@json-as/transform",
-    "version": "0.5.6",
+    "version": "0.5.8",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",
@@ -10,7 +10,7 @@
     "license": "MIT",
     "devDependencies": {},
     "dependencies": {
-        "visitor-as": "^0.10.2"
+        "visitor-as": "^0.11.3"
     },
     "repository": {
         "type": "git",

package/transform/src/index.ts

@@ -10,15 +10,22 @@ import {
 import { getName, toString } from "visitor-as/dist/utils.js";
 import { SimpleParser } from "visitor-as/dist/index.js";
 
-class AsJSONTransform extends ClassDecorator {
-  public currentClass!: ClassDeclaration;
-  public sources: Source[] = [];
+class SchemaData {
+  public keys: string[] = [];
+  public values: string[] = [];
+  public types: string[] = [];
+  public name: string = "";
+  public parent: string = "";
+  public node!: ClassDeclaration;
   public encodeStmts: string[] = [];
-  //public decodeStmts: string[] = [];
   public setDataStmts: string[] = [];
-  //public checkDecodeStmts: string[] = [];
+}
+class AsJSONTransform extends ClassDecorator {
+  public schemasList: SchemaData[] = [];
+  public currentClass!: SchemaData;
+  public sources: Source[] = [];
 
-  visitMethodDeclaration(): void {}
+  visitMethodDeclaration(): void { }
   visitFieldDeclaration(node: FieldDeclaration): void {
     const lineText = toString(node);
     if (lineText.startsWith("private")) return;
@@ -29,17 +36,17 @@ class AsJSONTransform extends ClassDecorator {
 
     let type = getName(node.type);
     // @ts-ignore
-    this.encodeStmts.push(
+    this.currentClass.encodeStmts.push(
       `"${name}":\${JSON.stringify<${type}>(this.${name})},`
     );
 
     // @ts-ignore
     //this.decodeStmts.push(
-   //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
+    //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
     //);
 
     // @ts-ignore
-    this.setDataStmts.push(
+    this.currentClass.setDataStmts.push(
       `if (key.length === ${name.length} && (memory.compare(changetype<usize>("${name}"), changetype<usize>(key), ${name.length}) == 0)) {
         this.${name} = JSON.parseObjectValue<${type}>(value);
         return;
@@ -57,23 +64,46 @@ class AsJSONTransform extends ClassDecorator {
       return;
     }
 
-    this.currentClass = node;
+    this.currentClass = {
+      name: toString(node.name),
+      keys: [],
+      values: [],
+      types: [],
+      parent: node.extendsType ? toString(node.extendsType) : "",
+      node: node,
+      encodeStmts: [],
+      setDataStmts: []
+    }
+    
+    if (this.currentClass.parent.length > 0) {
+      const parentSchema = this.schemasList.map((v) => {
+        if (v.name == this.currentClass.parent) {
+          return v;
+        }
+      });
+      if (parentSchema.length > 0) {
+        parentSchema[0]?.encodeStmts.push(parentSchema[0]?.encodeStmts.pop() + ",")
+        this.currentClass.encodeStmts.push(...parentSchema[0]?.encodeStmts)
+      } else {
+        //console.log("Class extends " + this.currentClass.parent + ", but parent class not found. Maybe add the @json decorator over parent class?")
+      }
+    }
 
     this.visit(node.members);
 
-    const serializedProp = '__JSON_Serialized: string = "";';
+   // const serializedProp = '__JSON_Serialized: string = "";';
 
     let serializeFunc = "";
 
-    if (this.encodeStmts.length > 0) {
-      const stmt = this.encodeStmts[this.encodeStmts.length - 1]!;
-      this.encodeStmts[this.encodeStmts.length - 1] = stmt!.slice(
+    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
       );
       serializeFunc = `
       __JSON_Serialize(): string {
-        return \`{${this.encodeStmts.join("")}}\`;
+        return \`{${this.currentClass.encodeStmts.join("")}}\`;
       }
       `;
     } else {
@@ -83,53 +113,32 @@ class AsJSONTransform extends ClassDecorator {
       }
       `;
     }
-    /*const deserializeFunc = `
-    __JSON_Deserialize<T>(values: Map<string, string>): T {
-        ${
-          process.argv.includes("--debugJSON")
-            ? this.checkDecodeStmts.join("else")
-            : ""
-        }
-        return {
-          ${
-            // @ts-ignore
-            this.decodeStmts.join("")
-          }
-        }
-    }
-    `;*/
+
     const setKeyFunc = `
       __JSON_Set_Key(key: string, value: string): void {
         ${
-        // @ts-ignore
-        this.setDataStmts.join("")
-        }
+      // @ts-ignore
+      this.currentClass.setDataStmts.join("")
+      }
       }
     `
-    //console.log(setKeyFunc, deserializeFunc, serializeFunc)
-    this.encodeStmts = [];
-    //this.decodeStmts = [];
-    this.setDataStmts = [];
-    //this.checkDecodeStmts = [];
-    const serializedProperty = SimpleParser.parseClassMember(
-      serializedProp,
-      node
-    );
-    node.members.push(serializedProperty);
+    //console.log(serializeFunc)
+    //const serializedProperty = SimpleParser.parseClassMember(
+    //  serializedProp,
+    //  node
+    //);
+    //node.members.push(serializedProperty);
 
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
     node.members.push(serializeMethod);
 
-    //const deserializeMethod = SimpleParser.parseClassMember(
-    //  deserializeFunc,
-    //  node
-    //);
-    //node.members.push(deserializeMethod);
     const setDataMethod = SimpleParser.parseClassMember(
       setKeyFunc,
       node
     );
     node.members.push(setDataMethod);
+
+    this.schemasList.push(this.currentClass);
   }
   get name(): string {
     return "json";

package/assembly/json.ts

@@ -1,451 +0,0 @@
-import { StringSink } from "as-string-sink/assembly";
-import { isSpace } from "util/string";
-import {
-  backSlashCode,
-  commaCode,
-  eCode,
-  fCode,
-  leftBraceCode,
-  leftBracketCode,
-  nCode,
-  quoteCode,
-  rightBraceCode,
-  rightBracketCode,
-  tCode,
-} from "./chars";
-import { unsafeCharCodeAt } from "./util";
-
-/**
- * JSON Encoder/Decoder for AssemblyScript
- */
-export class JSON {
-  /**
-   * Stringifies valid JSON data.
-   * ```js
-   * JSON.stringify<T>(data)
-   * ```
-   * @param data T
-   * @returns string
-   */
-  static stringify<T>(data: T): string {
-    // String
-    if (isString<T>()) {
-      return '"' + (<string>data).replaceAll('"', '\\"') + '"';
-    }
-    // Boolean
-    else if (isBoolean<T>()) {
-      return data ? "true" : "false";
-    }
-    // Nullable
-    else if (isNullable<T>() && data == null) {
-      return "null";
-    }
-    // Integers/Floats
-    // @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";
-      // @ts-ignore
-      return data.__JSON_Serialize();
-    }
-    // ArrayLike
-    else if (isArrayLike<T>()) {
-      let result = new StringSink("[");
-      // @ts-ignore
-      if (data.length == 0) return "[]";
-      // @ts-ignore
-      for (let i = 0; i < data.length - 1; i++) {
-        // @ts-ignore
-        result.write(JSON.stringify(unchecked(data[i])) + ",");
-      }
-      // @ts-ignore
-      result.write(JSON.stringify(unchecked(data[data.length - 1])));
-      result.write("]");
-      return result.toString();
-    } else {
-      return "null";
-    }
-  }
-  /**
-   * Parses valid JSON strings into their original format.
-   * ```js
-   * JSON.parse<T>(data)
-   * ```
-   * @param data string
-   * @returns T
-   */
-  static parse<T>(data: string): T {
-    let type!: T;
-    if (isString<T>()) {
-      // @ts-ignore
-      return parseString(data);
-    } else if (isBoolean<T>()) {
-      // @ts-ignore
-      return parseBoolean<T>(data);
-    } else if (isFloat<T>() || isInteger<T>()) {
-      return parseNumber<T>(data);
-    } else if (isArrayLike<T>()) {
-      // @ts-ignore
-      return parseArray<T>(data.trimStart());
-      // @ts-ignore
-    } else if (isNullable<T>() && data == "null") {
-      // @ts-ignore
-      return null;
-      // @ts-ignore
-    } else if (isDefined(type.__JSON_Deserialize)) {
-      return parseObject<T>(data.trimStart());
-    } else {
-      // @ts-ignore
-      return null;
-    }
-  }
-  private static parseObjectValue<T>(data: string): T {
-    let type!: T;
-    if (isString<T>()) {
-      // @ts-ignore
-      return data.replaceAll('\\"', '"');
-    } else if (isBoolean<T>()) {
-      // @ts-ignore
-      return parseBoolean<T>(data);
-    } else if (isFloat<T>() || isInteger<T>()) {
-      return parseNumber<T>(data);
-    } else if (isArrayLike<T>()) {
-      // @ts-ignore
-      return parseArray<T>(data);
-      // @ts-ignore
-    } else if (isNullable<T>() && data == "null") {
-      // @ts-ignore
-      return null;
-      // @ts-ignore
-    } else if (isDefined(type.__JSON_Deserialize)) {
-      // @ts-ignore
-      //if (isNullable<T>()) return null;
-      return parseObject<T>(data);
-    } else {
-      // @ts-ignore
-      //return null;
-      throw new Error(`Could not parse value: ${data}`);
-    }
-  }
-}
-
-// @ts-ignore
-@inline
-function parseString(data: string): string {
-  return data.slice(1, data.length - 1).replaceAll('\\"', '"');
-}
-
-// @ts-ignore
-@inline
-function parseBoolean<T extends boolean>(data: string): T {
-  if (data.length > 3 && data.startsWith("true")) return <T>true;
-  else if (data.length > 4 && data.startsWith("false")) return <T>false;
-  else throw new Error(`JSON: Cannot parse "${data}" as boolean`);
-}
-
-// @ts-ignore
-@inline
-function parseNumber<T>(data: string): T {
-  let type: T;
-  // @ts-ignore
-  if (type instanceof f64) return F64.parseFloat(data);
-  // @ts-ignore
-  else if (type instanceof f32) return F32.parseFloat(data);
-  // @ts-ignore
-  else if (type instanceof u64) return U64.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof u32) return U32.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof u8) return U8.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof u16) return U16.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof i64) return I64.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof i32) return I32.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof i16) return I16.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof i8) return I8.parseInt(data);
-  else
-    throw new Error(
-      `JSON: Cannot parse invalid data into a number. Either "${data}" is not a valid number, or <${nameof<T>()}> is an invald number type.`
-    );
-}
-
-// @ts-ignore
-@inline
-export function parseObject<T>(data: string): T {
-  let schema: T = changetype<T>(__new(offsetof<T>(), idof<T>()));
-  const result = new Map<string, string>();
-  let key = "";
-  let isKey = false;
-  let depth = 1;
-  let char = 0;
-  let outerLoopIndex = 1;
-  for (; outerLoopIndex < data.length - 1; outerLoopIndex++) {
-    char = unsafeCharCodeAt(data, outerLoopIndex);
-    if (char === leftBracketCode) {
-      for (
-        let arrayValueIndex = outerLoopIndex;
-        arrayValueIndex < data.length - 1;
-        arrayValueIndex++
-      ) {
-        char = unsafeCharCodeAt(data, arrayValueIndex);
-        if (char === leftBracketCode) {
-          depth = depth << 1;
-        } else if (char === rightBracketCode) {
-          depth = depth >> 1;
-          if (depth === 1) {
-            ++arrayValueIndex;
-            result.set(key, data.slice(outerLoopIndex, arrayValueIndex));
-            outerLoopIndex = arrayValueIndex;
-            isKey = false;
-            break;
-          }
-        }
-      }
-    } else if (char === leftBraceCode) {
-      for (
-        let objectValueIndex = outerLoopIndex;
-        objectValueIndex < data.length - 1;
-        objectValueIndex++
-      ) {
-        char = unsafeCharCodeAt(data, objectValueIndex);
-        if (char === leftBraceCode) {
-          depth = depth << 1;
-        } else if (char === rightBraceCode) {
-          depth = depth >> 1;
-          if (depth === 1) {
-            ++objectValueIndex;
-            result.set(key, data.slice(outerLoopIndex, objectValueIndex));
-            outerLoopIndex = objectValueIndex;
-            isKey = false;
-            break;
-          }
-        }
-      }
-    } else if (char === quoteCode) {
-      for (
-        let stringValueIndex = ++outerLoopIndex;
-        stringValueIndex < data.length - 1;
-        stringValueIndex++
-      ) {
-        char = unsafeCharCodeAt(data, stringValueIndex);
-        if (
-          char === quoteCode &&
-          unsafeCharCodeAt(data, stringValueIndex - 1) !== backSlashCode
-        ) {
-          if (isKey === false) {
-            key = data.slice(outerLoopIndex, stringValueIndex);
-            isKey = true;
-          } else {
-            result.set(key, data.slice(outerLoopIndex, stringValueIndex));
-            isKey = false;
-          }
-          outerLoopIndex = ++stringValueIndex;
-          break;
-        }
-      }
-    } else if (char == nCode) {
-      result.set(key, "null");
-      isKey = false;
-    } else if (
-      char === tCode &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "r".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "u".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
-    ) {
-      result.set(key, "true");
-      isKey = false;
-    } else if (
-      char === fCode &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "a".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "l".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "s".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
-    ) {
-      result.set(key, "false");
-      isKey = false;
-    } else if ((char >= 48 && char <= 57) || char === 45) {
-      let numberValueIndex = ++outerLoopIndex;
-      for (; numberValueIndex < data.length; numberValueIndex++) {
-        char = unsafeCharCodeAt(data, numberValueIndex);
-        if (char === commaCode || char === rightBraceCode || isSpace(char)) {
-          result.set(key, data.slice(outerLoopIndex - 1, numberValueIndex));
-          outerLoopIndex = numberValueIndex;
-          isKey = false;
-          break;
-        }
-      }
-    }
-  }
-  // @ts-ignore
-  //const deserialized =
-    //changetype<nonnull<T>>(schema).__JSON_Deserialize<T>(result);
-  //heap.free(changetype<usize>(schema));
-  return changetype<nonnull<T>>(schema).__JSON_Deserialize<T>(result);
-}
-
-// @ts-ignore
-@inline
-// @ts-ignore
-export function parseArray<T extends unknown[]>(data: string): T {
-  let type!: valueof<T>;
-  if (type instanceof String) {
-    return <T>parseStringArray(data);
-  } else if (isBoolean<valueof<T>>()) {
-    // @ts-ignore
-    return parseBooleanArray<T>(data);
-  } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
-    // @ts-ignore
-    return parseNumberArray<T>(data);
-  } else if (isArrayLike<valueof<T>>()) {
-    // @ts-ignore
-    return parseArrayArray<T>(data);
-    // @ts-ignore
-  } else if (isDefined(type.__JSON_Deserialize)) {
-    // @ts-ignore
-    return parseObjectArray<T>(data);
-  }
-}
-
-// @ts-ignore
-@inline
-export function parseStringArray(data: string): string[] {
-  const result: string[] = [];
-  let lastPos = 0;
-  let instr = false;
-  for (let i = 1; i < data.length - 1; i++) {
-    if (unsafeCharCodeAt(data, i) === quoteCode) {
-      if (instr === false) {
-        instr = true;
-        lastPos = i;
-      } else if (unsafeCharCodeAt(data, i - 1) !== backSlashCode) {
-        instr = false;
-        result.push(data.slice(lastPos + 1, i).replaceAll('\\"', '"'));
-      }
-    }
-  }
-  return result;
-}
-
-// @ts-ignore
-@inline
-export function parseBooleanArray<T extends boolean[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos = 1;
-  let char = 0;
-  for (let i = 1; i < data.length - 1; i++) {
-    char = unsafeCharCodeAt(data, i);
-    /*// if char == "t" && i+3 == "e"
-        if (char === tCode && data.charCodeAt(i + 3) === eCode) {
-          //i += 3;
-          result.push(parseBoolean<valueof<T>>(data.slice(lastPos, i+2)));
-          //i++;
-        } else if (char === fCode && data.charCodeAt(i + 4) === eCode) {
-          //i += 4;
-          result.push(parseBoolean<valueof<T>>(data.slice(lastPos, i+3)));
-          //i++;
-        }*/
-    if (char === tCode || char === fCode) {
-      lastPos = i;
-    } else if (char === eCode) {
-      i++;
-      result.push(parseBoolean<valueof<T>>(data.slice(lastPos, i)));
-    }
-  }
-  return result;
-}
-
-// @ts-ignore
-@inline
-export function parseNumberArray<T extends number[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos = 0;
-  let char = 0;
-  let i = 1;
-  for (; i < data.length - 1; i++) {
-    char = unsafeCharCodeAt(data, i);
-    if ((lastPos === 0 && char >= 48 && char <= 57) || char === 45) {
-      lastPos = i;
-    } else if ((isSpace(char) || char == commaCode) && lastPos > 0) {
-      result.push(parseNumber<valueof<T>>(data.slice(lastPos, i)));
-      lastPos = 0;
-    }
-  }
-  for (; i > lastPos - 1; i--) {
-    char = unsafeCharCodeAt(data, i);
-    if (char !== rightBracketCode) {
-      result.push(parseNumber<valueof<T>>(data.slice(lastPos, i + 1)));
-      break;
-    }
-  }
-  return result;
-}
-
-// @ts-ignore
-@inline
-export function parseArrayArray<T extends unknown[][]>(data: string): T {
-  const result = instantiate<T>();
-  let char = 0;
-  let lastPos = 0;
-  let depth = 1;
-  let i = 1;
-  // Find start of bracket
-  //for (; unsafeCharCodeAt(data, i) !== leftBracketCode; i++) {}
-  //i++;
-  for (; i < data.length - 1; i++) {
-    char = unsafeCharCodeAt(data, i);
-    if (char === leftBracketCode) {
-      if (depth === 1) {
-        lastPos = i;
-      }
-      // Shifting is 6% faster than incrementing
-      depth = depth << 1;
-    } else if (char === rightBracketCode) {
-      depth = depth >> 1;
-      if (depth === 1) {
-        i++;
-        result.push(JSON.parse<valueof<T>>(data.slice(lastPos, i)));
-      }
-    }
-  }
-  return result;
-}
-
-// @ts-ignore
-@inline
-export function parseObjectArray<T extends unknown[][]>(data: string): T {
-  const result = instantiate<T>();
-  let char = 0;
-  let lastPos = 1;
-  let depth = 1;
-  let i = 1;
-  // Find start of bracket
-  //for (; unsafeCharCodeAt(data, i) !== leftBracketCode; i++) { }
-  //i++;
-  for (; i < data.length - 1; i++) {
-    char = unsafeCharCodeAt(data, i);
-    if (char === leftBraceCode) {
-      if (depth === 1) {
-        lastPos = i;
-      }
-      // Shifting is 6% faster than incrementing
-      depth = depth << 1;
-    } else if (char === rightBraceCode) {
-      depth = depth >> 1;
-      if (depth === 1) {
-        i++;
-        result.push(JSON.parse<valueof<T>>(data.slice(lastPos, i)));
-      }
-    }
-  }
-  return result;
-}