json-as 0.5.33 → 0.5.34

package/assembly/test.ts

@@ -2,20 +2,47 @@ 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: i32;
-  y: i32;
-  z: i32;
+  x!: f32;
+  y!: f32;
+  z!: f32;
 }
 
+@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,
   y: 1,
   z: 8
 }
 
+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);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.33",
+  "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

@@ -68,7 +68,7 @@ class AsJSONTransform extends BaseVisitor {
                 if (lineText.startsWith("private"))
                     return;
                 // @ts-ignore
-                const type = member.type.name.identifier.text;
+                let type = toString(member.type);
                 const name = member.name.text;
                 this.currentClass.keys.push(name);
                 // @ts-ignore

package/transform/package.json

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

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

@@ -71,7 +71,8 @@ class AsJSONTransform extends BaseVisitor {
         if (lineText.startsWith("private")) return;
 
         // @ts-ignore
-        const type = member.type.name.identifier.text;
+        let type = toString(member.type);
+        
         const name = member.name.text;
         this.currentClass.keys.push(name);
         // @ts-ignore