json-as 0.8.3 → 0.8.4

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/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/src/json.ts

@@ -126,11 +126,11 @@ 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 {
-      throw new Error(
+      throw abort(
         `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
       );
     }
@@ -211,7 +211,7 @@ export namespace JSON {
         return;
       }
     } else {
-      throw new Error(
+      throw abort(
         `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
       );
     }
@@ -251,7 +251,7 @@ export namespace JSON {
       // @ts-ignore
       return parseDate(data);
     } else {
-      throw new Error(
+      throw abort(
         `Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
       );
     }
@@ -284,7 +284,7 @@ export namespace JSON {
     // @ts-ignore
     return parseDate(data);
   } else {
-    throw new Error(
+    throw abort(
       `Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
     );
   }
@@ -411,7 +411,7 @@ export namespace JSON {
         break;
       }
       default: {
-        throw new Error(`JSON: Cannot parse "${data}" as string. Invalid escape sequence: \\${data.charAt(i)}`);
+        throw abort(`JSON: Cannot parse "${data}" as string. Invalid escape sequence: \\${data.charAt(i)}`);
       }
     }
   }
@@ -425,7 +425,7 @@ export namespace JSON {
 @inline function parseBoolean<T extends boolean>(data: string): T {
   if (data.length > 3 && data.startsWith(trueWord)) return <T>true;
   else if (data.length > 4 && data.startsWith(falseWord)) return <T>false;
-  else throw new Error(`JSON: Cannot parse "${data}" as boolean`);
+  else throw abort(`JSON: Cannot parse "${data}" as boolean`);
 }
 
 // @ts-ignore: Decorator
@@ -584,7 +584,7 @@ export namespace JSON {
   );
 
   if (!isDefined(map.set)) {
-    return unreachable();
+    throw abort("Tried to parse a map, but the types did not match!")
   }
 
   const key = Virtual.createEmpty<string>();
@@ -729,7 +729,7 @@ export namespace JSON {
     return parseNumber<T>(k);
   }
 
-  throw new Error(`JSON: Cannot parse JSON object to a Map with a key of type ${nameof<T>()}`);
+  throw abort(`JSON: Cannot parse JSON object to a Map with a key of type ${nameof<T>()}`);
 }
 
 // @ts-ignore: Decorator
@@ -758,7 +758,7 @@ export namespace JSON {
     }
   }
 
-  return unreachable();
+  throw abort("Tried to parse array, but failed!")
 }
 
 // @ts-ignore: Decorator
@@ -892,7 +892,7 @@ 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) {
@@ -963,11 +963,11 @@ 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 {
-    throw new Error(
+    throw abort(
       `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
     );
   }

package/assembly/test.ts

@@ -1,7 +1,24 @@
 import { JSON } from "./src/json";
 
-console.log(JSON.stringify(JSON.parse<f64[]>(`[
-    1,
-    2,
-    3
-  ]`)));
+@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;
+  }
+}
+
+const o = new DerivedObject("1", "2");
+
+console.log(JSON.stringify(o))

package/package.json

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

package/transform/lib/index.js

@@ -53,18 +53,27 @@ 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) {

package/transform/package.json

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

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) {