json-as 0.5.32 → 0.5.34

package/asconfig.json

@@ -12,6 +12,9 @@
   "options": {
     "transform": [
       "./transform"
-    ]
-  }
+    ],
+    "bindings": "esm",
+    "exportStart": "_start"
+  },
+  "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
 }

package/assembly/__benches__/as-json.ts

@@ -1,6 +1,7 @@
 import { JSON } from "..";
 import { backSlashCode, quoteCode } from "../src/chars";
 import { atoi_fast, unsafeCharCodeAt } from "../src/util";
+import { HASH } from "util/hash";
 
 @json
 class Vec3 {
@@ -23,28 +24,28 @@ class Vec3 {
       if (inStr === false && char === quoteCode) {
         if (key != null) {
           if (unsafeCharCodeAt(key, 0) == 120) {
-            to.x = atoi_fast<i32>(data.slice(last, pos - 1))
+            to.x = atoi_fast<i32>(data.substring(last, pos - 1))
           } else if (unsafeCharCodeAt(key, 0) == 121) {
-            to.y = atoi_fast<i32>(data.slice(last, pos - 1))
+            to.y = atoi_fast<i32>(data.substring(last, pos - 1))
           } else if (unsafeCharCodeAt(key, 0) == 122) {
-            to.z = atoi_fast<i32>(data.slice(last, pos - 1))
+            to.z = atoi_fast<i32>(data.substring(last, pos - 1))
           }
         }
         last = ++pos;
         inStr = true;
       } else if (char === quoteCode && unsafeCharCodeAt(data, pos - 1) != backSlashCode) {
         inStr = false;
-        key = data.slice(last, pos);
+        key = data.substring(last, pos);
         last = pos += 2;
       }
     }
     if (key != null) {
       if (unsafeCharCodeAt(key, 0) == 120) {
-        to.x = atoi_fast<i32>(data.slice(last, pos - 1))
+        to.x = atoi_fast<i32>(data.substring(last, pos - 1))
       } else if (unsafeCharCodeAt(key, 0) == 121) {
-        to.y = atoi_fast<i32>(data.slice(last, pos - 1))
+        to.y = atoi_fast<i32>(data.substring(last, pos - 1))
       } else if (unsafeCharCodeAt(key, 0) == 122) {
-        to.z = atoi_fast<i32>(data.slice(last, pos - 1))
+        to.z = atoi_fast<i32>(data.substring(last, pos - 1))
       }
     }
     return to;
@@ -65,6 +66,9 @@ bench("Stringify Object (Vec3)", () => {
   blackbox<string>(vec.__JSON_Serialize(vec));
 });*/
 
+bench("HASH String", () => {
+  blackbox<number>(HASH("Hello"));
+})
 // TODO: Make this allocate without crashing
 bench("Parse Object (Vec3)", () => {
   blackbox<Vec3>(vec.__JSON_Deserialize('{"x":0,"y":0,"z":0}', vec));

package/assembly/test.ts

@@ -2,69 +2,52 @@ import { backSlashCode, quoteCode } from "./src/chars";
 import { JSON } from "./src/json";
 import { atoi_fast, unsafeCharCodeAt } from "./src/util";
 
-// @json or @serializable work here
 @json
 class Vec3 {
   x!: f32;
   y!: f32;
   z!: f32;
+}
 
-  @inline
-  __JSON_Serialize(): string {
-    return `{"x":${this.x.toString()},"y":${this.y.toString()},"z":${this.z.toString()}}`;
-  }
-
-  @inline
-  __JSON_Deserialize(data: string, to: Vec3): Vec3 {
-    let last = 1;
-    let char = 0;
-    let inStr = false;
-    let key: string | null = null;
-    let pos = 0;
-    for (; pos < data.length - 1; pos++) {
-      char = unsafeCharCodeAt(data, pos);
-      if (inStr === false && char === quoteCode) {
-        if (key != null) {
-          if (key == "x") {
-            to.x = f32.parse(data.slice(last, pos - 1))
-          } else if (key == "y") {
-            to.y = f32.parse(data.slice(last, pos - 1))
-          } else if (key == "z") {
-            to.z = f32.parse(data.slice(last, pos - 1))
-          }
-        }
-        last = ++pos;
-        inStr = true;
-      } else if (char === quoteCode && unsafeCharCodeAt(data, pos - 1) != backSlashCode) {
-        inStr = false;
-        key = data.slice(last, pos);
-        last = pos += 2;
-      }
-    }
-    if (key != null) {
-      if (key == "x") {
-        to.x = f32.parse(data.slice(last, pos - 1))
-      } else if (key == "y") {
-        to.y = f32.parse(data.slice(last, pos - 1))
-      } else if (key == "z") {
-        to.z = f32.parse(data.slice(last, pos - 1))
-      }
-    }
-    return to;
-  }
+@json
+class Player {
+  firstName!: string;
+  lastName!: string;
+  lastActive!: i32[];
+  age!: i32;
+  pos!: Vec3 | null;
+  isVerified!: boolean;
 }
 
+const player: Player = {
+  firstName: "Emmet",
+  lastName: "West",
+  lastActive: [8, 27, 2022],
+  age: 23,
+  pos: {
+    x: 3.4,
+    y: 1.2,
+    z: 8.3
+  },
+  isVerified: true
+};
+
 const vec: Vec3 = {
-  x: 3.4,
-  y: 1.2,
-  z: 8.3
+  x: 3,
+  y: 1,
+  z: 8
 }
 
-const serializedVec3 = vec.__JSON_Serialize();
+const serializedPlayer = JSON.stringify<Player>(player);
+console.log(serializedPlayer);
+const parsedPlayer = JSON.parse<Player>(serializedPlayer);
+console.log(JSON.stringify(parsedPlayer));
+
+const serializedVec3 = JSON.stringify(vec);
 console.log(serializedVec3);
 
-const parsedVec3 = vec.__JSON_Deserialize(serializedVec3, new Vec3());
-console.log(parsedVec3.__JSON_Serialize());
+const parsedVec3 = JSON.parse<Vec3>(serializedVec3);
+console.log(JSON.stringify(parsedVec3));
 
 console.log(`atoi_fast("429496729"): ${atoi_fast<i32>("429496729")}`);
 

package/package.json

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

package/transform/lib/hash.js

@@ -0,0 +1,74 @@
+// XXHash 32-bit as a starting point, see: https://cyan4973.github.io/xxHash
+// primes
+// @ts-ignore: decorator
+const XXH32_P1 = 2654435761;
+// @ts-ignore: decorator
+const XXH32_P2 = 2246822519;
+// @ts-ignore: decorator
+const XXH32_P3 = 3266489917;
+// @ts-ignore: decorator
+const XXH32_P4 = 668265263;
+// @ts-ignore: decorator
+const XXH32_P5 = 374761393;
+// @ts-ignore: decorator
+const XXH32_SEED = 0;
+function hash32(key, len = 4) {
+    let h = XXH32_SEED + XXH32_P5 + len;
+    h += key * XXH32_P3;
+    h = rotl(h, 17) * XXH32_P4;
+    h ^= h >> 15;
+    h *= XXH32_P2;
+    h ^= h >> 13;
+    h *= XXH32_P3;
+    h ^= h >> 16;
+    return h;
+}
+function rotl(x, r) {
+    return (x << r) | (x >>> (32 - r));
+}
+function mix(h, key) {
+    return rotl(h + key * XXH32_P2, 13) * XXH32_P1;
+}
+export function hashStr(key) {
+    if (key == null)
+        return XXH32_SEED;
+    let h = key.length;
+    let len = h;
+    let pos = 0;
+    if (len >= 16) {
+        let s1 = XXH32_SEED + XXH32_P1 + XXH32_P2;
+        let s2 = XXH32_SEED + XXH32_P2;
+        let s3 = XXH32_SEED;
+        let s4 = XXH32_SEED - XXH32_P1;
+        let end = len + pos - 16;
+        while (pos <= end) {
+            s1 = mix(s1, key.charCodeAt(pos));
+            s2 = mix(s2, key.charCodeAt(pos + 1));
+            s3 = mix(s3, key.charCodeAt(pos + 2));
+            s4 = mix(s4, load(pos, 12));
+            pos += 16;
+        }
+        h += rotl(s1, 1) + rotl(s2, 7) + rotl(s3, 12) + rotl(s4, 18);
+    }
+    else {
+        h += XXH32_SEED + XXH32_P5;
+    }
+    let end = changetype(key) + len - 4;
+    while (pos <= end) {
+        h += load(pos) * XXH32_P3;
+        h = rotl(h, 17) * XXH32_P4;
+        pos += 4;
+    }
+    end = changetype(key) + len;
+    while (pos < end) {
+        h += load(pos) * XXH32_P5;
+        h = rotl(h, 11) * XXH32_P1;
+        pos++;
+    }
+    h ^= h >> 15;
+    h *= XXH32_P2;
+    h ^= h >> 13;
+    h *= XXH32_P3;
+    h ^= h >> 16;
+    return h;
+}

package/transform/lib/index.js

@@ -1,4 +1,4 @@
-import { getName, toString, isStdlib } from "visitor-as/dist/utils.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";
 class SchemaData {
@@ -19,41 +19,6 @@ class AsJSONTransform extends BaseVisitor {
         this.sources = [];
     }
     visitMethodDeclaration() { }
-    visitFieldDeclaration(node) {
-        if (toString(node).startsWith("static"))
-            return;
-        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`);
-        }
-        let type = getName(node.type);
-        // @ts-ignore
-        if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
-            this.currentClass.encodeStmts.push(`"${name}":\${this.${name}.toString()},`);
-        }
-        else {
-            this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
-        }
-        this.currentClass.keys.push(name);
-        this.currentClass.types.push(type);
-        // @ts-ignore
-        //this.decodeStmts.push(
-        //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
-        //);
-        // @ts-ignore
-        this.currentClass.setDataStmts.push(`if (key == "${name}") {
-        this.${name} = JSON.parseObjectValue<${type}>(value);
-        return;
-      }
-      `);
-        // @ts-ignore
-        //this.checkDecodeStmts.push(
-        //  ' if (!values.has("${name}")) throw new Error("Key "${name}" was not found. Cannot instantiate object.");\n'
-        //);
-    }
     visitClassDeclaration(node) {
         var _c;
         const className = node.name.text;
@@ -67,7 +32,7 @@ class AsJSONTransform extends BaseVisitor {
         }
         if (!foundDecorator)
             return;
-        // Prevent from being triggered twice
+        // Prevent from being triggered twice.
         for (const member of node.members) {
             if (member.name.text == "__JSON_Serialize")
                 return;
@@ -94,7 +59,35 @@ class AsJSONTransform extends BaseVisitor {
         }
         const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
         const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])];
-        this.visit(members);
+        for (const mem of members) {
+            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;
+                this.currentClass.keys.push(name);
+                // @ts-ignore
+                this.currentClass.types.push(type);
+                // @ts-ignore
+                if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
+                    this.currentClass.encodeStmts.push(`"${name}":\${this.${name}.toString()},`);
+                }
+                else {
+                    this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
+                }
+                // @ts-ignore
+                this.currentClass.setDataStmts.push(`if (key == "${name}") {
+        this.${name} = JSON.parseObjectValue<${type}>(value);
+        return;
+      }
+      `);
+            }
+        }
         let serializeFunc = "";
         if (this.currentClass.encodeStmts.length > 0) {
             const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];

package/transform/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@json-as/transform",
-    "version": "0.5.32",
+    "version": "0.5.34",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",
@@ -10,7 +10,9 @@
         "Rom"
     ],
     "license": "MIT",
-    "devDependencies": {},
+    "devDependencies": {
+        "assemblyscript": "^0.27.1"
+    },
     "dependencies": {},
     "repository": {
         "type": "git",

package/transform/src/hash.ts

@@ -0,0 +1,83 @@
+// XXHash 32-bit as a starting point, see: https://cyan4973.github.io/xxHash
+
+// primes
+// @ts-ignore: decorator
+const XXH32_P1: number = 2654435761;
+// @ts-ignore: decorator
+const XXH32_P2: number = 2246822519;
+// @ts-ignore: decorator
+const XXH32_P3: number = 3266489917;
+// @ts-ignore: decorator
+const XXH32_P4: number = 668265263;
+// @ts-ignore: decorator
+const XXH32_P5: number = 374761393;
+// @ts-ignore: decorator
+const XXH32_SEED: number = 0;
+
+function hash32(key: number, len: number = 4): number {
+    let h: number = XXH32_SEED + XXH32_P5 + len;
+    h += key * XXH32_P3;
+    h = rotl(h, 17) * XXH32_P4;
+    h ^= h >> 15;
+    h *= XXH32_P2;
+    h ^= h >> 13;
+    h *= XXH32_P3;
+    h ^= h >> 16;
+    return h;
+}
+
+function rotl(x: number, r: number): number {
+    return (x << r) | (x >>> (32 - r));
+}
+
+function mix(h: number, key: number): number {
+    return rotl(h + key * XXH32_P2, 13) * XXH32_P1;
+}
+
+export function hashStr(key: string): number {
+    if (key == null) return XXH32_SEED;
+
+    let h: number = key.length;
+    let len: number = h;
+    let pos = 0;
+
+    if (len >= 16) {
+        let s1 = XXH32_SEED + XXH32_P1 + XXH32_P2;
+        let s2 = XXH32_SEED + XXH32_P2;
+        let s3 = XXH32_SEED;
+        let s4 = XXH32_SEED - XXH32_P1;
+
+        let end = len + pos - 16;
+        while (pos <= end) {
+            s1 = mix(s1, key.charCodeAt(pos));
+            s2 = mix(s2, key.charCodeAt(pos + 1));
+            s3 = mix(s3, key.charCodeAt(pos + 2));
+            s4 = mix(s4, load<number>(pos, 12));
+            pos += 16;
+        }
+        h += rotl(s1, 1) + rotl(s2, 7) + rotl(s3, 12) + rotl(s4, 18);
+    } else {
+        h += XXH32_SEED + XXH32_P5;
+    }
+
+    let end = changetype<number>(key) + len - 4;
+    while (pos <= end) {
+        h += load<number>(pos) * XXH32_P3;
+        h = rotl(h, 17) * XXH32_P4;
+        pos += 4;
+    }
+
+    end = changetype<number>(key) + len;
+    while (pos < end) {
+        h += <number>load<u8>(pos) * XXH32_P5;
+        h = rotl(h, 11) * XXH32_P1;
+        pos++;
+    }
+
+    h ^= h >> 15;
+    h *= XXH32_P2;
+    h ^= h >> 13;
+    h *= XXH32_P3;
+    h ^= h >> 16;
+    return h;
+}

package/transform/src/index.ts

@@ -4,7 +4,7 @@ import {
   Source,
   Parser
 } from "assemblyscript/dist/assemblyscript";
-import { getName, toString, isStdlib } from "visitor-as/dist/utils.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";
 
@@ -24,48 +24,6 @@ class AsJSONTransform extends BaseVisitor {
   public sources: Source[] = [];
 
   visitMethodDeclaration(): void { }
-  visitFieldDeclaration(node: FieldDeclaration): void {
-    if (toString(node).startsWith("static")) return;
-    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`);
-    }
-
-    let type = getName(node.type);
-    // @ts-ignore
-    if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
-      this.currentClass.encodeStmts.push(
-        `"${name}":\${this.${name}.toString()},`
-      );
-    } else {
-      this.currentClass.encodeStmts.push(
-        `"${name}":\${JSON.stringify<${type}>(this.${name})},`
-      );
-    }
-    
-    this.currentClass.keys.push(name);
-    this.currentClass.types.push(type);
-    // @ts-ignore
-    //this.decodeStmts.push(
-    //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
-    //);
-
-    // @ts-ignore
-    this.currentClass.setDataStmts.push(
-      `if (key == "${name}") {
-        this.${name} = JSON.parseObjectValue<${type}>(value);
-        return;
-      }
-      `
-    );
-
-    // @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 {
     const className = node.name.text;
     if (!node.decorators?.length) return;
@@ -76,7 +34,7 @@ class AsJSONTransform extends BaseVisitor {
     }
     if (!foundDecorator) return;
 
-    // Prevent from being triggered twice
+    // Prevent from being triggered twice.
     for (const member of node.members) {
       if (member.name.text == "__JSON_Serialize") return;
     }
@@ -104,7 +62,41 @@ class AsJSONTransform extends BaseVisitor {
 
     const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
     const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])]
-    this.visit(members);
+
+    for (const mem of members) {
+      if (mem.type && mem.type.name && mem.type.name.identifier.text) {
+        const member: FieldDeclaration = 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;
+        this.currentClass.keys.push(name);
+        // @ts-ignore
+        this.currentClass.types.push(type);
+        // @ts-ignore
+        if (["u8", "i8", "u16", "i16", "u32", "i32", "f32", "u64", "i64", "f64"].includes(type.toLowerCase())) {
+          this.currentClass.encodeStmts.push(
+            `"${name}":\${this.${name}.toString()},`
+          );
+        } else {
+          this.currentClass.encodeStmts.push(
+            `"${name}":\${JSON.stringify<${type}>(this.${name})},`
+          );
+        }
+        // @ts-ignore
+        this.currentClass.setDataStmts.push(
+          `if (key == "${name}") {
+        this.${name} = JSON.parseObjectValue<${type}>(value);
+        return;
+      }
+      `
+        );
+      }
+    }
 
     let serializeFunc = "";
 
@@ -138,7 +130,7 @@ class AsJSONTransform extends BaseVisitor {
       }
       }
     `
-    
+
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
     node.members.push(serializeMethod);
 
@@ -160,7 +152,7 @@ export default class Transformer extends Transform {
   afterParse(parser: Parser): void {
     // Create new transform
     const transformer = new AsJSONTransform();
-    
+
     // Sort the sources so that user scripts are visited last
     const sources = parser.sources.filter(source => !isStdlib(source)).sort((_a, _b) => {
       const a = _a.internalPath
@@ -173,7 +165,7 @@ export default class Transformer extends Transform {
         return 0;
       }
     })
-    
+
     // Loop over every source
     for (const source of sources) {
       // Ignore all lib and std. Visit everything else.