json-as 0.4.9 → 0.5.1

package/transform/lib/index.js

@@ -1,5 +1,5 @@
 import { ClassDecorator, registerDecorator, } from "visitor-as/dist/decorator.js";
-import { getName } from "visitor-as/dist/utils.js";
+import { getName, toString } from "visitor-as/dist/utils.js";
 import { SimpleParser } from "visitor-as/dist/index.js";
 class AsJSONTransform extends ClassDecorator {
     constructor() {
@@ -7,28 +7,33 @@ class AsJSONTransform extends ClassDecorator {
         this.sources = [];
         this.encodeStmts = [];
         this.decodeStmts = [];
+        this.checkDecodeStmts = [];
     }
     visitMethodDeclaration() { }
     visitFieldDeclaration(node) {
+        const lineText = toString(node);
+        if (lineText.startsWith("private"))
+            return;
         const name = getName(node);
         if (!node.type) {
             throw new Error(`Field ${name} is missing a type declaration`);
         }
-        const type = getName(node.type);
+        let type = getName(node.type);
         // @ts-ignore
         this.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
         // @ts-ignore
         this.decodeStmts.push(`${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`);
+        // @ts-ignore
+        this.checkDecodeStmts.push(' if (!values.has("${name}")) throw new Error("Key "${name}" was not found. Cannot instantiate object.");\n');
     }
     visitClassDeclaration(node) {
         if (!node.members) {
             return;
         }
         this.currentClass = node;
-        const name = getName(node);
         this.visit(node.members);
-        const serializedProp = `__JSON_Serialized: string = "";`;
-        let serializeFunc = ``;
+        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);
@@ -49,7 +54,8 @@ class AsJSONTransform extends ClassDecorator {
         }
         const deserializeFunc = `
     @inline
-    __JSON_Deserialize(values: Map<string, string>): ${name} {
+    __JSON_Deserialize<T>(values: Map<string, string>): T {
+        ${process.argv.includes("--debugJSON") ? this.checkDecodeStmts.join("else") : ""}
         return {
           ${
         // @ts-ignore
@@ -59,7 +65,6 @@ class AsJSONTransform extends ClassDecorator {
     `;
         this.encodeStmts = [];
         this.decodeStmts = [];
-        //console.log(serializeFunc, deserializeFunc)
         const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
         node.members.push(serializedProperty);
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);

package/transform/package.json

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

package/transform/src/index.ts

@@ -7,7 +7,7 @@ import {
   ClassDecorator,
   registerDecorator,
 } from "visitor-as/dist/decorator.js";
-import { getName } from "visitor-as/dist/utils.js";
+import { getName, toString } from "visitor-as/dist/utils.js";
 import { SimpleParser } from "visitor-as/dist/index.js";
 
 class AsJSONTransform extends ClassDecorator {
@@ -15,16 +15,18 @@ class AsJSONTransform extends ClassDecorator {
   public sources: Source[] = [];
   public encodeStmts: string[] = [];
   public decodeStmts: string[] = [];
+  public checkDecodeStmts: string[] = [];
 
   visitMethodDeclaration(): void {}
   visitFieldDeclaration(node: FieldDeclaration): void {
+    const lineText = toString(node);
+    if (lineText.startsWith("private")) return;
     const name = getName(node);
     if (!node.type) {
       throw new Error(`Field ${name} is missing a type declaration`);
     }
 
-    const type = getName(node.type);
-
+    let type = getName(node.type);
     // @ts-ignore
     this.encodeStmts.push(
       `"${name}":\${JSON.stringify<${type}>(this.${name})},`
@@ -34,6 +36,9 @@ class AsJSONTransform extends ClassDecorator {
     this.decodeStmts.push(
       `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
     );
+
+    // @ts-ignore
+    this.checkDecodeStmts.push(' if (!values.has("${name}")) throw new Error("Key "${name}" was not found. Cannot instantiate object.");\n')
   }
   visitClassDeclaration(node: ClassDeclaration): void {
     if (!node.members) {
@@ -42,13 +47,11 @@ class AsJSONTransform extends ClassDecorator {
 
     this.currentClass = node;
 
-    const name = getName(node);
-
     this.visit(node.members);
 
-    const serializedProp = `__JSON_Serialized: string = "";`;
+    const serializedProp = '__JSON_Serialized: string = "";';
 
-    let serializeFunc = ``;
+    let serializeFunc = "";
 
     if (this.encodeStmts.length > 0) {
       const stmt = this.encodeStmts[this.encodeStmts.length - 1]!;
@@ -70,21 +73,20 @@ class AsJSONTransform extends ClassDecorator {
       }
       `;
     }
-
     const deserializeFunc = `
     @inline
-    __JSON_Deserialize(values: Map<string, string>): ${name} {
+    __JSON_Deserialize<T>(values: Map<string, string>): T {
+        ${process.argv.includes("--debugJSON") ? this.checkDecodeStmts.join("else") : ""}
         return {
           ${
-            // @ts-ignore
-            this.decodeStmts.join("")
+      // @ts-ignore
+      this.decodeStmts.join("")
           }
         }
     }
     `;
     this.encodeStmts = [];
     this.decodeStmts = [];
-    //console.log(serializeFunc, deserializeFunc)
     const serializedProperty = SimpleParser.parseClassMember(
       serializedProp,
       node