json-as 0.7.2 → 0.8.0

package/transform/lib/index.js

@@ -1,3 +1,4 @@
+import { Parser, Source, Tokenizer, } from "assemblyscript/dist/assemblyscript.js";
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
@@ -17,7 +18,7 @@ class AsJSONTransform extends BaseVisitor {
     constructor() {
         super(...arguments);
         this.schemasList = [];
-        this.sources = [];
+        this.sources = new Set();
     }
     visitMethodDeclaration() { }
     visitClassDeclaration(node) {
@@ -68,71 +69,69 @@ class AsJSONTransform extends BaseVisitor {
             // @ts-ignore
             if (mem.type && mem.type.name && mem.type.name.identifier.text) {
                 const member = mem;
-                if (toString(member).startsWith("static"))
-                    return;
                 const lineText = toString(member);
-                if (lineText.startsWith("private"))
-                    return;
-                // @ts-ignore
-                let type = toString(member.type);
-                const name = member.name.text;
-                let aliasName = name;
-                if (member.decorators && ((_d = member.decorators[0]) === null || _d === void 0 ? void 0 : _d.name.text) === "alias") {
-                    if (member.decorators[0] && member.decorators[0].args[0]) {
-                        aliasName = member.decorators[0].args[0].value;
-                    }
-                }
-                this.currentClass.keys.push(name);
-                // @ts-ignore
-                this.currentClass.types.push(type);
-                // @ts-ignore
-                if ([
-                    "u8",
-                    "i8",
-                    "u16",
-                    "i16",
-                    "u32",
-                    "i32",
-                    "u64",
-                    "i64",
-                ].includes(type.toLowerCase())) {
-                    this.currentClass.encodeStmts.push(`"${aliasName}":\${this.${name}.toString()},`);
+                console.log("Member: " + lineText);
+                if (!lineText.startsWith("private") && !lineText.startsWith("static")) {
                     // @ts-ignore
-                    this.currentClass.setDataStmts.push(`if (key.equals("${aliasName}")) {
-        this.${name} = __atoi_fast<${type}>(data, val_start << 1, val_end << 1);
-        return;
-      }
-      `);
-                    if (member.initializer) {
-                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
-                    }
-                }
-                else // @ts-ignore
-                 if ([
-                    "f32",
-                    "f64",
-                ].includes(type.toLowerCase())) {
-                    this.currentClass.encodeStmts.push(`"${aliasName}":\${this.${name}.toString()},`);
+                    let type = toString(member.type);
+                    const name = member.name.text;
+                    let aliasName = name;
                     // @ts-ignore
-                    this.currentClass.setDataStmts.push(`if (key.equals("${aliasName}")) {
-        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
-        return;
-      }
-      `);
-                    if (member.initializer) {
-                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                    if (member.decorators && ((_d = member.decorators[0]) === null || _d === void 0 ? void 0 : _d.name.text) === "alias") {
+                        if (member.decorators[0] && member.decorators[0].args[0]) {
+                            // @ts-ignore
+                            aliasName = member.decorators[0].args[0].value;
+                        }
                     }
-                }
-                else {
-                    this.currentClass.encodeStmts.push(`"${aliasName}":\${JSON.stringify<${type}>(this.${name})},`);
+                    this.currentClass.keys.push(name);
                     // @ts-ignore
-                    this.currentClass.setDataStmts.push(`if (key.equals("${aliasName}")) {
-        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)}`);
+                    this.currentClass.types.push(type);
+                    // @ts-ignore
+                    if ([
+                        "u8",
+                        "i8",
+                        "u16",
+                        "i16",
+                        "u32",
+                        "i32",
+                        "u64",
+                        "i64",
+                    ].includes(type.toLowerCase())) {
+                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${this.${name}},`);
+                        // @ts-ignore
+                        this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
+          this.${name} = __atoi_fast<${type}>(data, val_start << 1, val_end << 1);
+          return;
+        }`);
+                        if (member.initializer) {
+                            this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                        }
+                    }
+                    else // @ts-ignore
+                     if ([
+                        "f32",
+                        "f64",
+                    ].includes(type.toLowerCase())) {
+                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${this.${name}},`);
+                        // @ts-ignore
+                        this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
+            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(`${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);
+            return;
+          }`);
+                        if (member.initializer) {
+                            this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                        }
                     }
                 }
             }
@@ -143,38 +142,32 @@ class AsJSONTransform extends BaseVisitor {
             this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
                 stmt.slice(0, stmt.length - 1);
             serializeFunc = `
-      @inline __JSON_Serialize(): string {
+      __JSON_Serialize(): string {
         return \`{${this.currentClass.encodeStmts.join("")}}\`;
-      }
-      `;
+      }`;
         }
         else {
             serializeFunc = `
-      @inline __JSON_Serialize(): string {
+      __JSON_Serialize(): string {
         return "{}";
-      }
-      `;
+      }`;
         }
-        // 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<__JSON_Key_Type>(key: __JSON_Key_Type, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
-        ${
-        // @ts-ignore
-        this.currentClass.setDataStmts.join("")}
+      __JSON_Set_Key(key: __Virtual<string>, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
+        ${this.currentClass.setDataStmts.join("\n        ")}
       }
     `;
         let initializeFunc = "";
         if (this.currentClass.initializeStmts.length > 0) {
             initializeFunc = `
-      @inline __JSON_Initialize(): void {
+      __JSON_Initialize(): void {
       ${this.currentClass.initializeStmts.join(";\n")};
       }
       `;
         }
         else {
             initializeFunc = `
-      @inline __JSON_Initialize(): void {}
+      __JSON_Initialize(): void {}
       `;
         }
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
@@ -184,12 +177,37 @@ class AsJSONTransform extends BaseVisitor {
         const initializeMethod = SimpleParser.parseClassMember(initializeFunc, node);
         node.members.push(initializeMethod);
         this.schemasList.push(this.currentClass);
-        //console.log(toString(node));
+        this.sources.add(node.name.range.source);
+        // Uncomment to see the generated code for debugging.
+        //console.log(serializeFunc);
+        //console.log(setKeyFunc);
+        //console.log(initializeFunc);
     }
     visitSource(node) {
         super.visitSource(node);
+        // Only add the import statement to sources that have JSON decorated classes.
+        if (!this.sources.has(node)) {
+            return;
+        }
+        // Note, the following one liner would be easier, but it fails with an assertion error
+        // because as-virtual's SimpleParser doesn't set the parser.currentSource correctly.
+        //
+        // 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);
+        // Add the import statement to the top of the source.
+        node.statements.unshift(stmt);
     }
 }
+function encodeKey(aliasName) {
+    return JSON.stringify(aliasName)
+        .replace(/\\/g, "\\\\")
+        .replace(/\`/g, '\\`');
+}
 export default class Transformer extends Transform {
     // Trigger the transform after parse.
     afterParse(parser) {

package/transform/package.json

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

package/transform/src/index.ts

@@ -1,9 +1,12 @@
 import {
   ClassDeclaration,
   FieldDeclaration,
-  Source,
   Parser,
-} from "assemblyscript/dist/assemblyscript";
+  Source,
+  SourceKind,
+  Tokenizer,
+} from "assemblyscript/dist/assemblyscript.js";
+
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
@@ -23,7 +26,7 @@ class SchemaData {
 class AsJSONTransform extends BaseVisitor {
   public schemasList: SchemaData[] = [];
   public currentClass!: SchemaData;
-  public sources: Source[] = [];
+  public sources = new Set<Source>();
 
   visitMethodDeclaration(): void { }
   visitClassDeclaration(node: ClassDeclaration): void {
@@ -80,93 +83,95 @@ class AsJSONTransform extends BaseVisitor {
       // @ts-ignore
       if (mem.type && mem.type.name && mem.type.name.identifier.text) {
         const member = mem as FieldDeclaration;
-        if (toString(member).startsWith("static")) return;
         const lineText = toString(member);
-        if (lineText.startsWith("private")) return;
+        console.log("Member: " + lineText)
 
-        // @ts-ignore
-        let type = toString(member.type);
+        if (!lineText.startsWith("private") && !lineText.startsWith("static")) {
 
-        const name = member.name.text;
-        let aliasName = name;
-        if (member.decorators && member.decorators[0]?.name.text === "alias") {
-          if (member.decorators[0] && member.decorators[0].args![0]) {
-            aliasName = member.decorators[0].args![0].value;
-          }
-        }
-        this.currentClass.keys.push(name);
-        // @ts-ignore
-        this.currentClass.types.push(type);
-        // @ts-ignore
-        if (
-          [
-            "u8",
-            "i8",
-            "u16",
-            "i16",
-            "u32",
-            "i32",
-            "u64",
-            "i64",
-          ].includes(type.toLowerCase())
-        ) {
-          this.currentClass.encodeStmts.push(
-            `"${aliasName}":\${this.${name}.toString()},`
-          );
           // @ts-ignore
-          this.currentClass.setDataStmts.push(
-            `if (key.equals("${aliasName}")) {
-        this.${name} = __atoi_fast<${type}>(data, val_start << 1, val_end << 1);
-        return;
-      }
-      `
-          );
-          if (member.initializer) {
-            this.currentClass.initializeStmts.push(
-              `this.${name} = ${toString(member.initializer)}`
-            );
+          let type = toString(member.type);
+
+          const name = member.name.text;
+          let aliasName = name;
+
+          // @ts-ignore
+          if (member.decorators && member.decorators[0]?.name.text === "alias") {
+            if (member.decorators[0] && member.decorators[0].args![0]) {
+              // @ts-ignore
+              aliasName = member.decorators[0].args![0].value;
+            }
           }
-        } else // @ts-ignore
+          this.currentClass.keys.push(name);
+          // @ts-ignore
+          this.currentClass.types.push(type);
+          // @ts-ignore
           if (
             [
-              "f32",
-              "f64",
+              "u8",
+              "i8",
+              "u16",
+              "i16",
+              "u32",
+              "i32",
+              "u64",
+              "i64",
             ].includes(type.toLowerCase())
           ) {
             this.currentClass.encodeStmts.push(
-              `"${aliasName}":\${this.${name}.toString()},`
+              `${encodeKey(aliasName)}:\${this.${name}},`
             );
             // @ts-ignore
             this.currentClass.setDataStmts.push(
-              `if (key.equals("${aliasName}")) {
-        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
-        return;
-      }
-      `
+              `if (key.equals(${JSON.stringify(aliasName)})) {
+          this.${name} = __atoi_fast<${type}>(data, val_start << 1, val_end << 1);
+          return;
+        }`
             );
             if (member.initializer) {
               this.currentClass.initializeStmts.push(
                 `this.${name} = ${toString(member.initializer)}`
               );
             }
-          } else {
-            this.currentClass.encodeStmts.push(
-              `"${aliasName}":\${JSON.stringify<${type}>(this.${name})},`
-            );
-            // @ts-ignore
-            this.currentClass.setDataStmts.push(
-              `if (key.equals("${aliasName}")) {
-        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)}`
+          } else // @ts-ignore
+            if (
+              [
+                "f32",
+                "f64",
+              ].includes(type.toLowerCase())
+            ) {
+              this.currentClass.encodeStmts.push(
+                `${encodeKey(aliasName)}:\${this.${name}},`
+              );
+              // @ts-ignore
+              this.currentClass.setDataStmts.push(
+                `if (key.equals(${JSON.stringify(aliasName)})) {
+            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(
+                `${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);
+            return;
+          }`
               );
+              if (member.initializer) {
+                this.currentClass.initializeStmts.push(
+                  `this.${name} = ${toString(member.initializer)}`
+                );
+              }
             }
-          }
+        }
       }
     }
 
@@ -180,26 +185,19 @@ class AsJSONTransform extends BaseVisitor {
       this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
         stmt!.slice(0, stmt.length - 1);
       serializeFunc = `
-      @inline __JSON_Serialize(): string {
+      __JSON_Serialize(): string {
         return \`{${this.currentClass.encodeStmts.join("")}}\`;
-      }
-      `;
+      }`;
     } else {
       serializeFunc = `
-      @inline __JSON_Serialize(): string {
+      __JSON_Serialize(): string {
         return "{}";
-      }
-      `;
+      }`;
     }
 
-    // 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<__JSON_Key_Type>(key: __JSON_Key_Type, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
-        ${
-      // @ts-ignore
-      this.currentClass.setDataStmts.join("")
-      }
+      __JSON_Set_Key(key: __Virtual<string>, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
+        ${this.currentClass.setDataStmts.join("\n        ")}
       }
     `;
 
@@ -207,13 +205,13 @@ class AsJSONTransform extends BaseVisitor {
 
     if (this.currentClass.initializeStmts.length > 0) {
       initializeFunc = `
-      @inline __JSON_Initialize(): void {
+      __JSON_Initialize(): void {
       ${this.currentClass.initializeStmts.join(";\n")};
       }
       `;
     } else {
       initializeFunc = `
-      @inline __JSON_Initialize(): void {}
+      __JSON_Initialize(): void {}
       `;
     }
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
@@ -226,13 +224,45 @@ class AsJSONTransform extends BaseVisitor {
     node.members.push(initializeMethod);
 
     this.schemasList.push(this.currentClass);
-    //console.log(toString(node));
+    this.sources.add(node.name.range.source);
+
+    // Uncomment to see the generated code for debugging.
+    //console.log(serializeFunc);
+    //console.log(setKeyFunc);
+    //console.log(initializeFunc);
   }
+
   visitSource(node: Source): void {
     super.visitSource(node);
+
+    // Only add the import statement to sources that have JSON decorated classes.
+    if (!this.sources.has(node)) {
+      return;
+    }
+
+    // Note, the following one liner would be easier, but it fails with an assertion error
+    // because as-virtual's SimpleParser doesn't set the parser.currentSource correctly.
+    //
+    // 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)!;
+
+    // Add the import statement to the top of the source.
+    node.statements.unshift(stmt);
   }
 }
 
+function encodeKey(aliasName: string): string {
+  return JSON.stringify(aliasName)
+    .replace(/\\/g, "\\\\")
+    .replace(/\`/g, '\\`');
+}
+
 export default class Transformer extends Transform {
   // Trigger the transform after parse.
   afterParse(parser: Parser): void {