json-as 0.5.38 → 0.5.39

package/assembly/test.ts

@@ -1,6 +1,6 @@
 import { JSON } from "./src/json";
 import { atoi_fast, parseSciInteger } from "./src/util";
-import * as a from "util/number"
+import * as a from "util/number";
 @json
 class Vec3 {
   x!: f32;
@@ -63,7 +63,9 @@ console.log("3 - " + istr8(3));
 
 console.log(Uint8Array.wrap(changetype<ArrayBuffer>(istr8(12))).join(" "));
 console.log(load<u32>(changetype<usize>(istr8(12))).toString());
-@inline function istr8<T extends number>(int: T): string {
+@inline function istr8<
+  T extends number
+>(int: T): string {
   if (int >= 100) {
     const str = changetype<string>(__new(6, idof<String>()));
     store<u16>(changetype<usize>(str), ((int / 100) % 10) + 48);
@@ -222,9 +224,11 @@ export function istr32<T extends number>(int: T): string {
 export function istr64<T extends number>(int: T): string {
   const val = new ArrayBuffer(6);
   store<u16>(changetype<usize>(val), (int % 10) + 48, 4);
-  if ((int = int / 10 as T) > 0) store<u16>(changetype<usize>(val), (int % 10) + 48, 2);
+  if ((int = (int / 10) as T) > 0)
+    store<u16>(changetype<usize>(val), (int % 10) + 48, 2);
   else return changetype<string>(val);
-  if ((int = int / 10 as T) > 0) store<u16>(changetype<usize>(val), (int % 10) + 48);
+  if ((int = (int / 10) as T) > 0)
+    store<u16>(changetype<usize>(val), (int % 10) + 48);
   return changetype<string>(val);
 }
 
@@ -239,4 +243,4 @@ export function istr64<T extends number>(int: T): string {
 // 8 = 56
 // 9 = 57
 
-console.log(JSON.stringify("h\\i from gray\bson"))
+console.log(JSON.stringify("h\\i from gray\bson"));

package/package.json

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

package/transform/lib/index.js

@@ -26,8 +26,11 @@ class AsJSONTransform extends BaseVisitor {
             return;
         let foundDecorator = false;
         for (const decorator of node.decorators) {
+            if (
             // @ts-ignore
-            if (decorator.name.text.toLowerCase() == "json" || decorator.name.text.toLowerCase() == "serializable")
+            decorator.name.text.toLowerCase() == "json" ||
+                // @ts-ignore
+                decorator.name.text.toLowerCase() == "serializable")
                 foundDecorator = true;
         }
         if (!foundDecorator)
@@ -65,6 +68,7 @@ class AsJSONTransform extends BaseVisitor {
             ...(parentSchema ? parentSchema.node.members : []),
         ];
         for (const mem of members) {
+            // @ts-ignore
             if (mem.type && mem.type.name && mem.type.name.identifier.text) {
                 const member = mem;
                 if (toString(member).startsWith("static"))

package/transform/package.json

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

package/transform/src/index.ts

@@ -23,14 +23,19 @@ class AsJSONTransform extends BaseVisitor {
   public currentClass!: SchemaData;
   public sources: Source[] = [];
 
-  visitMethodDeclaration(): void { }
+  visitMethodDeclaration(): void {}
   visitClassDeclaration(node: ClassDeclaration): void {
     const className = node.name.text;
     if (!node.decorators?.length) return;
     let foundDecorator = false;
     for (const decorator of node.decorators!) {
-      // @ts-ignore
-      if (decorator.name.text.toLowerCase() == "json" || decorator.name.text.toLowerCase() == "serializable") foundDecorator = true;
+      if (
+        // @ts-ignore
+        decorator.name.text.toLowerCase() == "json" ||
+        // @ts-ignore
+        decorator.name.text.toLowerCase() == "serializable"
+      )
+        foundDecorator = true;
     }
     if (!foundDecorator) return;
 
@@ -60,8 +65,8 @@ class AsJSONTransform extends BaseVisitor {
       } else {
         console.error(
           "Class extends " +
-          this.currentClass.parent +
-          ", but parent class not found. Maybe add the @json decorator over parent class?"
+            this.currentClass.parent +
+            ", but parent class not found. Maybe add the @json decorator over parent class?"
         );
       }
     }
@@ -75,8 +80,9 @@ class AsJSONTransform extends BaseVisitor {
     ];
 
     for (const mem of members) {
+      // @ts-ignore
       if (mem.type && mem.type.name && mem.type.name.identifier.text) {
-        const member: FieldDeclaration = mem;
+        const member = mem as FieldDeclaration;
         if (toString(member).startsWith("static")) return;
         const lineText = toString(member);
         if (lineText.startsWith("private")) return;
@@ -127,7 +133,7 @@ class AsJSONTransform extends BaseVisitor {
     if (this.currentClass.encodeStmts.length > 0) {
       const stmt =
         this.currentClass.encodeStmts[
-        this.currentClass.encodeStmts.length - 1
+          this.currentClass.encodeStmts.length - 1
         ]!;
       this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
         stmt!.slice(0, stmt.length - 1);
@@ -150,9 +156,9 @@ class AsJSONTransform extends BaseVisitor {
       @inline
       __JSON_Set_Key(key: string, value: string): void {
         ${
-      // @ts-ignore
-      this.currentClass.setDataStmts.join("")
-      }
+          // @ts-ignore
+          this.currentClass.setDataStmts.join("")
+        }
       }
     `;
 

package/transform/lib/hash.js

@@ -1,72 +0,0 @@
-// 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/types.js

@@ -1,15 +0,0 @@
-export var Types;
-(function (Types) {
-  Types[(Types["String"] = 0)] = "String";
-  Types[(Types["u8"] = 1)] = "u8";
-  Types[(Types["i8"] = 2)] = "i8";
-  Types[(Types["u16"] = 3)] = "u16";
-  Types[(Types["i16"] = 4)] = "i16";
-  Types[(Types["u32"] = 5)] = "u32";
-  Types[(Types["i32"] = 6)] = "i32";
-  Types[(Types["u64"] = 7)] = "u64";
-  Types[(Types["i64"] = 8)] = "i64";
-  Types[(Types["f32"] = 9)] = "f32";
-  Types[(Types["f64"] = 10)] = "f64";
-  Types[(Types["boolean"] = 11)] = "boolean";
-})(Types || (Types = {}));