json-as 0.6.3 → 0.6.5

package/assembly/test.ts

@@ -45,6 +45,29 @@ console.log("Implemented: " + JSON.stringify(JSON.parse<Vec3>('{}', true)));
 console.log("Original: " + JSON.stringify(player));
 //console.log("Revised: " + vec.__JSON_Deserialize('{"x":3,"y":1,"z":8}').__JSON_Serialize());
 console.log("Implemented: " + JSON.stringify(JSON.parse<Player>('{"firstName":"Emmet","lastName":"West","lastActive":"2023-11-16T04:06:35.108285303Z","age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}')));
+
+@serializable
+class Wrapper<T> {
+    data!: T;
+}
+
+@serializable
+class Foo {
+    foo!: string;
+}
+
+@serializable
+class Bar {
+    bar!: string;
+}
+
+const foo: Wrapper<Foo> = {
+    data: new Foo()
+}
+
+foo.data.foo = "ha";
+console.log(JSON.stringify(foo));
+console.log(JSON.stringify(JSON.parse<Wrapper<Foo>>("{\"data\":{\"foo\":\"ha\"}}")))
 /*
 // 9,325,755
 bench("Stringify Object (Vec3)", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/lib/index.js

@@ -58,11 +58,6 @@ class AsJSONTransform extends BaseVisitor {
                 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);
             }
-            else {
-                console.error("Class extends " +
-                    this.currentClass.parent +
-                    ", but parent class not found. Maybe add the @json decorator over parent class?");
-            }
         }
         const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
         const members = [
@@ -157,7 +152,7 @@ class AsJSONTransform extends BaseVisitor {
         // Odd behavior here... When pairing this transform with asyncify, having @inline on __JSON_Set_Key<T> with a generic will cause it to freeze.
         // Binaryen cannot predict and add/mangle code when it is genericed.
         const setKeyFunc = `
-      __JSON_Set_Key<T>(key: T, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
+      __JSON_Set_Key<__JSON_Key_Type>(key: __JSON_Key_Type, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
         ${
         // @ts-ignore
         this.currentClass.setDataStmts.join("")}

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "JSON encoder/decoder for AssemblyScript",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",

package/transform/src/index.ts

@@ -65,12 +65,6 @@ class AsJSONTransform extends BaseVisitor {
       if (parentSchema?.encodeStmts) {
         parentSchema?.encodeStmts.push(parentSchema?.encodeStmts.pop() + ",");
         this.currentClass.encodeStmts.push(...parentSchema?.encodeStmts);
-      } else {
-        console.error(
-          "Class extends " +
-          this.currentClass.parent +
-          ", but parent class not found. Maybe add the @json decorator over parent class?"
-        );
       }
     }
 
@@ -195,7 +189,7 @@ class AsJSONTransform extends BaseVisitor {
     // Odd behavior here... When pairing this transform with asyncify, having @inline on __JSON_Set_Key<T> with a generic will cause it to freeze.
     // Binaryen cannot predict and add/mangle code when it is genericed.
     const setKeyFunc = `
-      __JSON_Set_Key<T>(key: T, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
+      __JSON_Set_Key<__JSON_Key_Type>(key: __JSON_Key_Type, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
         ${
       // @ts-ignore
       this.currentClass.setDataStmts.join("")