json-as 0.8.2 → 0.8.4

package/.github/workflows/nodejs.yml

@@ -18,8 +18,5 @@ jobs:
         if: steps.node-cache.outputs.cache-hit != 'true'
         run: yarn
 
-      - name: Test to see if the project compiles
-        run: yarn build:test
-
       - name: Perform tests
         run: yarn run test

package/CHANGELOG

@@ -1 +1,3 @@
-v0.8.2 - Properties starting with `static` or `private` would be ignored
+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.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.2
+v0.8.3
 </pre>
 </h3>
 

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;
@@ -102,6 +127,11 @@ describe("Ser/de Array", () => {
 
     canSerde<i32[]>([0, 100, 101, -100, -101]);
     canSerde<i64[]>([0, 100, 101, -100, -101]);
+    canDeser<i32[]>(`[
+      1,
+      2,
+      3
+    ]`, [1,2,3]);
   });
 
   it("should ser/de float arrays", () => {

package/assembly/src/json.ts

@@ -27,7 +27,7 @@ import {
   tabCode,
   formFeedCode,
   newLineCode,
-  
+
   commaWord,
   quoteWord,
 
@@ -50,7 +50,7 @@ export namespace JSON {
   /**
    * Stringifies valid JSON data.
    * ```js
-   * JSON.stringify<T>(data)
+   * __JSON_Stringify<T>(data)
    * ```
    * @param data T
    * @returns string
@@ -104,11 +104,11 @@ export namespace JSON {
         // @ts-ignore
         for (let i = 0; i < data.length - 1; i++) {
           // @ts-ignore
-          result.write(JSON.stringify(unchecked(data[i])));
+          result.write(__JSON_Stringify(unchecked(data[i])));
           result.writeCodePoint(commaCode);
         }
         // @ts-ignore
-        result.write(JSON.stringify(unchecked(data[data.length - 1])));
+        result.write(__JSON_Stringify(unchecked(data[data.length - 1])));
         result.writeCodePoint(rightBracketCode);
         return result.toString();
       }
@@ -116,18 +116,21 @@ export namespace JSON {
       let result = new StringSink(leftBraceWord);
       let keys = data.keys();
       let values = data.values();
-      for (let i = 0; i < data.size; i++) {
+      const end = data.size - 1;
+      for (let i = 0; i < end; i++) {
         result.write(serializeString(unchecked(keys[i]).toString()));
         result.writeCodePoint(colonCode);
-        result.write(JSON.stringify(unchecked(values[i])));
-        if (i < data.size - 1) {
-          result.writeCodePoint(commaCode);
-        }
+        result.write(__JSON_Stringify(unchecked(values[i])));
+        result.writeCodePoint(commaCode);
       }
+      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.`
       );
     }
@@ -135,7 +138,7 @@ export namespace JSON {
   /**
    * Stringifies valid JSON data.
    * ```js
-   * JSON.stringify<T>(data)
+   * __JSON_Stringify<T>(data)
    * ```
    * @param data T
    * @returns string
@@ -198,17 +201,17 @@ export namespace JSON {
         // @ts-ignore
         for (let i = 0; i < data.length - 1; i++) {
           // @ts-ignore
-          result.write(JSON.stringify(unchecked(data[i])));
+          result.write(__JSON_Stringify(unchecked(data[i])));
           result.writeCodePoint(commaCode);
         }
         // @ts-ignore
-        result.write(JSON.stringify(unchecked(data[data.length - 1])));
+        result.write(__JSON_Stringify(unchecked(data[data.length - 1])));
         result.writeCodePoint(rightBracketCode);
         out = result.toString();
         return;
       }
     } else {
-      throw new Error(
+      throw abort(
         `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
       );
     }
@@ -248,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.`
       );
     }
@@ -281,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.`
     );
   }
@@ -350,7 +353,7 @@ export namespace JSON {
 
 // @ts-ignore: Decorator
 @inline function parseString(data: string, start: i32 = 0, end: i32 = 0): string {
-  end = end || data.length - 1; 
+  end = end || data.length - 1;
   let result = StringSink.withCapacity(end - start - 1);
   let last = start + 1;
   for (let i = last; i < end; i++) {
@@ -408,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)}`);
       }
     }
   }
@@ -422,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
@@ -444,7 +447,7 @@ export namespace JSON {
   const schema: nonnull<T> = changetype<nonnull<T>>(
     __new(offsetof<nonnull<T>>(), idof<nonnull<T>>())
   );
-  
+
   // @ts-ignore
   if (initializeDefaultValues) schema.__JSON_Initialize();
 
@@ -579,9 +582,9 @@ export namespace JSON {
   const map: nonnull<T> = changetype<nonnull<T>>(
     __new(offsetof<nonnull<T>>(), idof<nonnull<T>>())
   );
-  
+
   if (!isDefined(map.set)) {
-    return unreachable();
+    throw abort("Tried to parse a map, but the types did not match!")
   }
 
   const key = Virtual.createEmpty<string>();
@@ -652,7 +655,7 @@ export namespace JSON {
                 key.reinst(data, outerLoopIndex, stringValueIndex);
               }
               isKey = true;
-            } else {              
+            } else {
               if (isString<valueof<T>>()) {
                 const value = parseString(data, outerLoopIndex - 1, stringValueIndex);
                 map.set(parseMapKey<indexof<T>>(key), value);
@@ -702,7 +705,7 @@ export namespace JSON {
         if (char === colonCode || char === commaCode || char === rightBraceCode || isSpace(char)) {
           if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
             map.set(parseMapKey<indexof<T>>(key), parseNumber<valueof<T>>(data.slice(outerLoopIndex - 1, numberValueIndex)));
-          }          
+          }
           outerLoopIndex = numberValueIndex;
           isKey = false;
           break;
@@ -726,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
@@ -754,8 +757,8 @@ export namespace JSON {
       return parseObjectArray<T>(data);
     }
   }
-  
-  return unreachable();
+
+  throw abort("Tried to parse array, but failed!")
 }
 
 // @ts-ignore: Decorator
@@ -805,22 +808,18 @@ export namespace JSON {
   const result = instantiate<T>();
   let lastPos = 0;
   let i = 1;
-  for (; i < data.length - 1; i++) {
+  let awaitingParse = false;
+  for (; i < data.length; i++) {
     const char = unsafeCharCodeAt(data, i);
     if (lastPos === 0 && ((char >= 48 && char <= 57) || char === 45)) {
+      awaitingParse = true;
       lastPos = i;
-    } else if ((isSpace(char) || char == commaCode) && lastPos > 0) {
+    } else if (awaitingParse && (isSpace(char) || char == commaCode || char == rightBracketCode) && lastPos > 0) {
+      awaitingParse = false;
       result.push(parseNumber<valueof<T>>(data.slice(lastPos, i)));
       lastPos = 0;
     }
   }
-  for (; i > lastPos - 1; i--) {
-    const char = unsafeCharCodeAt(data, i);
-    if (char !== rightBracketCode) {
-      result.push(parseNumber<valueof<T>>(data.slice(lastPos, i + 1)));
-      break;
-    }
-  }
   return result;
 }
 
@@ -876,7 +875,7 @@ export namespace JSON {
   return result;
 }
 
-function parseDate(dateTimeString: string): Date { 
+function parseDate(dateTimeString: string): Date {
   // Use AssemblyScript's date parser
   const d = Date.fromString(dateTimeString);
 
@@ -891,3 +890,85 @@ function parseDate(dateTimeString: string): Date {
   let type = changetype<T>(0);
   return type instanceof Map;
 }
+
+// Dirty fix
+// @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) {
+    return nullWord;
+    // @ts-ignore
+  } else if ((isInteger<T>() || isFloat<T>()) && isFinite(data)) {
+    // @ts-ignore
+    return data.toString();
+    // @ts-ignore: Hidden function
+  } else if (isDefined(data.__JSON_Serialize)) {
+    // @ts-ignore: Hidden function
+    return data.__JSON_Serialize();
+  } else if (data instanceof Date) {
+    return `"${data.toISOString()}"`;
+  } else if (isArrayLike<T>()) {
+    // @ts-ignore
+    if (data.length == 0) {
+      return emptyArrayWord;
+      // @ts-ignore
+    } else if (isString<valueof<T>>()) {
+      let result = leftBracketWord;
+      // @ts-ignore
+      for (let i = 0; i < data.length - 1; i++) {
+        // @ts-ignore
+        result += serializeString(unchecked(data[i]));
+        result += commaWord;
+      }
+      // @ts-ignore
+      result += serializeString(unchecked(data[data.length - 1]));
+      result += rightBracketWord;
+      return result;
+      // @ts-ignore
+    } else if (isBoolean<valueof<T>>()) {
+      // @ts-ignore
+      return leftBracketWord + data.join(commaWord) + rightBracketWord;
+      // @ts-ignore
+    } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
+      // @ts-ignore
+      return leftBracketWord + data.join(commaWord) + rightBracketWord;
+    } 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);
+      return result.toString();
+    }
+  } else if (data instanceof Map) {
+    let result = new StringSink(leftBraceWord);
+    let keys = data.keys();
+    let values = data.values();
+    const end = data.size - 1;
+    for (let i = 0; i < end; i++) {
+      result.write(serializeString(unchecked(keys[i]).toString()));
+      result.writeCodePoint(colonCode);
+      result.write(__JSON_Stringify(unchecked(values[i])));
+      result.writeCodePoint(commaCode);
+    }
+    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 abort(
+      `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
+    );
+  }
+}

package/assembly/test.ts

@@ -1,23 +1,24 @@
 import { JSON } from "./src/json";
+
 @json
-class Person {
-  staticprng: i32 = 23;
-  public country: string = '';
+class BaseObject {
+  a: string;
 
-  constructor(id: u32) {
-    this.staticprng = 321;
-    const seed = id.toString();
-    this.country = this.getCountry();
+  constructor(a: string) {
+    this.a = a;
   }
+}
 
-  // temp method, returns hard-coded string for now
-  private getCountry(): string {
-    return "USA";
+@json
+class DerivedObject extends BaseObject {
+  b: string;
+
+  constructor(a: string, b: string) {
+    super(a);
+    this.b = b;
   }
 }
 
-const person = new Person(1);
-person.staticprng = 32
-let result = JSON.stringify<Person>(person);
-console.log(JSON.stringify(JSON.parse<Person>(result)));
-console.log(result);
+const o = new DerivedObject("1", "2");
+
+console.log(JSON.stringify(o))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.8.2",
+  "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) {
@@ -123,7 +132,7 @@ class AsJSONTransform extends BaseVisitor {
                         }
                     }
                     else {
-                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${JSON.stringify<${type}>(this.${name})},`);
+                        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);
@@ -194,11 +203,11 @@ class AsJSONTransform extends BaseVisitor {
         //
         // const stmt = SimpleParser.parseTopLevelStatement('import { Virtual as __Virtual } from "as-virtual/assembly";');
         // ... So we have to do it the long way:
-        const s = 'import { Virtual as __Virtual } from "as-virtual/assembly";';
-        const t = new Tokenizer(new Source(0 /* SourceKind.User */, "index.ts", s));
-        const p = new Parser();
-        p.currentSource = t.source;
-        const stmt = p.parseTopLevelStatement(t);
+        const txt = 'import { Virtual as __Virtual } from "as-virtual/assembly";';
+        const tokenizer = new Tokenizer(new Source(0 /* SourceKind.User */, node.normalizedPath, txt));
+        const parser = new Parser();
+        parser.currentSource = tokenizer.source;
+        const stmt = parser.parseTopLevelStatement(tokenizer);
         // Add the import statement to the top of the source.
         node.statements.unshift(stmt);
     }

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.8.2",
+  "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) {
@@ -156,7 +165,7 @@ class AsJSONTransform extends BaseVisitor {
               }
             } else {
               this.currentClass.encodeStmts.push(
-                `${encodeKey(aliasName)}:\${JSON.stringify<${type}>(this.${name})},`
+                `${encodeKey(aliasName)}:\${__JSON_Stringify<${type}>(this.${name})},`
               );
               // @ts-ignore
               this.currentClass.setDataStmts.push(
@@ -246,11 +255,11 @@ class AsJSONTransform extends BaseVisitor {
     // const stmt = SimpleParser.parseTopLevelStatement('import { Virtual as __Virtual } from "as-virtual/assembly";');
 
     // ... So we have to do it the long way:
-    const s = 'import { Virtual as __Virtual } from "as-virtual/assembly";'
-    const t = new Tokenizer(new Source(SourceKind.User, "index.ts", s));
-    const p = new Parser();
-    p.currentSource = t.source;
-    const stmt = p.parseTopLevelStatement(t)!;
+    const txt = 'import { Virtual as __Virtual } from "as-virtual/assembly";'
+    const tokenizer = new Tokenizer(new Source(SourceKind.User, node.normalizedPath, txt));
+    const parser = new Parser();
+    parser.currentSource = tokenizer.source;
+    const stmt = parser.parseTopLevelStatement(tokenizer)!;
 
     // Add the import statement to the top of the source.
     node.statements.unshift(stmt);