json-as 0.6.0 → 0.6.1

package/README.md

@@ -59,7 +59,8 @@ const player: Player = {
   isVerified: true
 };
 
-const stringified = JSON.stringify<Player>(player);
+const stringified = JSON.stringify<Player>(player, true);
+// You can toggle on setting default values with the 2nd parameter
 // Alternative: use JSON.serializeTo(player, out);
 
 const parsed = JSON.parse<Player>(stringified);

package/assembly/src/json.ts

@@ -193,7 +193,7 @@ export namespace JSON {
    */
 
   // @ts-ignore: Decorator
-  @inline export function parse<T>(data: string): T {
+  @inline export function parse<T>(data: string, initializeDefaultValues: boolean = false): T {
     let type: T;
     if (isString<T>()) {
       // @ts-ignore
@@ -212,7 +212,7 @@ export namespace JSON {
       return null;
       // @ts-ignore
     } else if (isDefined(type.__JSON_Set_Key)) {
-      return parseObject<T>(data.trimStart());
+      return parseObject<T>(data.trimStart(), initializeDefaultValues);
     } else if (idof<nonnull<T>>() == idof<Date>()) {
       // @ts-ignore
       return parseDate(data);
@@ -226,7 +226,7 @@ export namespace JSON {
 }
 
 // @ts-ignore: Decorator
-@global @inline function __parseObjectValue<T>(data: string): T {
+@global @inline function __parseObjectValue<T>(data: string, initializeDefaultValues: boolean): T {
   let type: T;
   if (isString<T>()) {
     // @ts-ignore
@@ -289,7 +289,7 @@ export namespace JSON {
     return null;
     // @ts-ignore
   } else if (isDefined(type.__JSON_Set_Key)) {
-    return parseObject<T>(data.trimStart());
+    return parseObject<T>(data.trimStart(), initializeDefaultValues);
   } else if (idof<nonnull<T>>() == idof<Date>()) {
     // @ts-ignore
     return parseDate(data);
@@ -436,10 +436,13 @@ export namespace JSON {
 }
 
 // @ts-ignore: Decorator
-@inline function parseObject<T>(data: string): T {
+@inline function parseObject<T>(data: string, initializeDefaultValues: boolean): T {
   let schema: nonnull<T> = changetype<nonnull<T>>(
     __new(offsetof<nonnull<T>>(), idof<nonnull<T>>())
   );
+  // @ts-ignore
+  if (initializeDefaultValues) schema.__JSON_Initialize();
+
   let key = Virtual.createEmpty<string>();
   let isKey = false;
   let depth = 0;
@@ -460,7 +463,7 @@ export namespace JSON {
           if (depth === 0) {
             ++arrayValueIndex;
             // @ts-ignore
-            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, arrayValueIndex);
+            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, arrayValueIndex, initializeDefaultValues);
             outerLoopIndex = arrayValueIndex;
             isKey = false;
             break;
@@ -481,7 +484,7 @@ export namespace JSON {
           if (depth === 0) {
             ++objectValueIndex;
             // @ts-ignore
-            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, objectValueIndex);
+            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, objectValueIndex, initializeDefaultValues);
             outerLoopIndex = objectValueIndex;
             isKey = false;
             break;
@@ -507,7 +510,7 @@ export namespace JSON {
               isKey = true;
             } else {
               // @ts-ignore
-              schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, stringValueIndex);
+              schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, stringValueIndex, initializeDefaultValues);
               isKey = false;
             }
             outerLoopIndex = ++stringValueIndex;
@@ -518,7 +521,7 @@ export namespace JSON {
       }
     } else if (char == nCode) {
       // @ts-ignore
-      schema.__JSON_Set_Key<Virtual<string>>(key, nullWord, 0, 4);
+      schema.__JSON_Set_Key<Virtual<string>>(key, nullWord, 0, 4, initializeDefaultValues);
       isKey = false;
     } else if (
       char === tCode &&
@@ -527,7 +530,7 @@ export namespace JSON {
       unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
     ) {
       // @ts-ignore
-      schema.__JSON_Set_Key<Virtual<string>>(key, trueWord, 0, 4);
+      schema.__JSON_Set_Key<Virtual<string>>(key, trueWord, 0, 4, initializeDefaultValues);
       isKey = false;
     } else if (
       char === fCode &&
@@ -537,7 +540,7 @@ export namespace JSON {
       unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
     ) {
       // @ts-ignore
-      schema.__JSON_Set_Key<Virtual<string>>(key, falseWord, 0, 5);
+      schema.__JSON_Set_Key<Virtual<string>>(key, falseWord, 0, 5, initializeDefaultValues);
       isKey = false;
     } else if ((char >= 48 && char <= 57) || char === 45) {
       let numberValueIndex = ++outerLoopIndex;
@@ -545,7 +548,7 @@ export namespace JSON {
         const char = unsafeCharCodeAt(data, numberValueIndex);
         if (char === commaCode || char === rightBraceCode || isSpace(char)) {
           // @ts-ignore
-          schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex - 1, numberValueIndex);
+          schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex - 1, numberValueIndex, initializeDefaultValues);
           outerLoopIndex = numberValueIndex;
           isKey = false;
           break;

package/assembly/test.ts

@@ -40,7 +40,7 @@ JSON.stringifyTo(vec, out);
 
 console.log("Original: " + out);
 //console.log("Revised: " + vec.__JSON_Deserialize('{"x":3,"y":1,"z":8}').__JSON_Serialize());
-console.log("Implemented: " + JSON.stringify(JSON.parse<Vec3>('{}')));
+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());

package/package.json

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

package/transform/lib/index.js

@@ -10,6 +10,7 @@ class SchemaData {
         this.parent = "";
         this.encodeStmts = [];
         this.setDataStmts = [];
+        this.initializeStmts = [];
     }
 }
 class AsJSONTransform extends BaseVisitor {
@@ -49,6 +50,7 @@ class AsJSONTransform extends BaseVisitor {
             node: node,
             encodeStmts: [],
             setDataStmts: [],
+            initializeStmts: []
         };
         if (this.currentClass.parent.length > 0) {
             const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
@@ -100,6 +102,9 @@ class AsJSONTransform extends BaseVisitor {
         return;
       }
       `);
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                    }
                 }
                 else // @ts-ignore
                  if ([
@@ -109,19 +114,25 @@ class AsJSONTransform extends BaseVisitor {
                     this.currentClass.encodeStmts.push(`"${name}":\${this.${name}.toString()},`);
                     // @ts-ignore
                     this.currentClass.setDataStmts.push(`if (key.equals("${name}")) {
-        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end));
+        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
         return;
       }
       `);
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                    }
                 }
                 else {
                     this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
                     // @ts-ignore
                     this.currentClass.setDataStmts.push(`if (key.equals("${name}")) {
-        this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data);
+        this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data, initializeDefaultValues);
         return;
       }
       `);
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                    }
                 }
             }
         }
@@ -146,16 +157,31 @@ 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): void {
+      __JSON_Set_Key<T>(key: T, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
         ${
         // @ts-ignore
         this.currentClass.setDataStmts.join("")}
       }
     `;
+        let initializeFunc = "";
+        if (this.currentClass.initializeStmts.length > 0) {
+            initializeFunc = `
+      @inline __JSON_Initialize(): void {
+      ${this.currentClass.initializeStmts.join(";\n")};
+      }
+      `;
+        }
+        else {
+            initializeFunc = `
+      @inline __JSON_Initialize(): void {}
+      `;
+        }
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
         node.members.push(serializeMethod);
         const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);
         node.members.push(setDataMethod);
+        const initializeMethod = SimpleParser.parseClassMember(initializeFunc, node);
+        node.members.push(initializeMethod);
         this.schemasList.push(this.currentClass);
         //console.log(toString(node));
     }

package/transform/package.json

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

package/transform/src/index.ts

@@ -17,6 +17,7 @@ class SchemaData {
   public node!: ClassDeclaration;
   public encodeStmts: string[] = [];
   public setDataStmts: string[] = [];
+  public initializeStmts: string[] = [];
 }
 
 class AsJSONTransform extends BaseVisitor {
@@ -54,6 +55,7 @@ class AsJSONTransform extends BaseVisitor {
       node: node,
       encodeStmts: [],
       setDataStmts: [],
+      initializeStmts: []
     };
 
     if (this.currentClass.parent.length > 0) {
@@ -119,6 +121,11 @@ class AsJSONTransform extends BaseVisitor {
       }
       `
           );
+          if (member.initializer) {
+            this.currentClass.initializeStmts.push(
+              `this.${name} = ${toString(member.initializer)}`
+            );
+          }
         } else // @ts-ignore
           if (
             [
@@ -132,11 +139,16 @@ class AsJSONTransform extends BaseVisitor {
             // @ts-ignore
             this.currentClass.setDataStmts.push(
               `if (key.equals("${name}")) {
-        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end));
+        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
         return;
       }
       `
             );
+            if (member.initializer) {
+              this.currentClass.initializeStmts.push(
+                `this.${name} = ${toString(member.initializer)}`
+              );
+            }
           } else {
             this.currentClass.encodeStmts.push(
               `"${name}":\${JSON.stringify<${type}>(this.${name})},`
@@ -144,11 +156,16 @@ class AsJSONTransform extends BaseVisitor {
             // @ts-ignore
             this.currentClass.setDataStmts.push(
               `if (key.equals("${name}")) {
-        this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data);
+        this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data, initializeDefaultValues);
         return;
       }
       `
             );
+            if (member.initializer) {
+              this.currentClass.initializeStmts.push(
+                `this.${name} = ${toString(member.initializer)}`
+              );
+            }
           }
       }
     }
@@ -178,7 +195,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): void {
+      __JSON_Set_Key<T>(key: T, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
         ${
       // @ts-ignore
       this.currentClass.setDataStmts.join("")
@@ -186,12 +203,28 @@ class AsJSONTransform extends BaseVisitor {
       }
     `;
 
+    let initializeFunc = "";
+
+    if (this.currentClass.initializeStmts.length > 0) {
+      initializeFunc = `
+      @inline __JSON_Initialize(): void {
+      ${this.currentClass.initializeStmts.join(";\n")};
+      }
+      `;
+    } else {
+      initializeFunc = `
+      @inline __JSON_Initialize(): void {}
+      `;
+    }
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
     node.members.push(serializeMethod);
 
     const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);
     node.members.push(setDataMethod);
 
+    const initializeMethod = SimpleParser.parseClassMember(initializeFunc, node);
+    node.members.push(initializeMethod);
+
     this.schemasList.push(this.currentClass);
     //console.log(toString(node));
   }