json-as 0.5.38 → 0.5.41

package/assembly/src/util.ts

@@ -114,6 +114,10 @@ export function parseSciInteger<T extends number>(str: string): T {
   // @ts-ignore
   let val: T = 0;
   let offset = 0;
+  let firstChar = load<u16>(changetype<usize>(str) + <usize>offset);
+  if (firstChar === 45) {
+    offset = 2;
+  }
   for (; offset < str.length << 1; offset += 2) {
     const char = load<u16>(changetype<usize>(str) + <usize>offset);
     if (char === 101 || char === 69) {
@@ -134,6 +138,9 @@ export function parseSciInteger<T extends number>(str: string): T {
     val = (val << 1) + (val << 3) + (char - 48);
     // We use load because in this case, there is no need to have bounds-checking
   }
+  if (firstChar === 45) {
+    val = -val;
+  }
   return val;
 }
 
@@ -141,15 +148,16 @@ export function parseSciInteger<T extends number>(str: string): T {
 @inline
 function sciNote<T extends number>(num: T): T {
   let res = 1;
-  if (num > 0) {
-    for (let i = 0; i < num; i++) {
-      res *= 10;
-    }
-  } else {
-    for (let i = 0; i < num; i++) {
-      res /= 10;
+  // @ts-ignore
+    if (num > 0) {
+      for (let i: T = 0; i < num; i++) {
+        res *= 10;
+      }
+    } else {
+      for (let i: T = 0; i < num; i++) {
+        res /= 10;
+      }
     }
-  }
   // @ts-ignore
   return res;
-}
+}

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;
@@ -54,7 +54,30 @@ console.log("1230 - " + parseSciInteger<i32>("123e1").toString());
 console.log("12300 - " + parseSciInteger<i32>("123e2").toString());
 console.log("123000 - " + parseSciInteger<i32>("123e3").toString());
 console.log("32 - " + parseSciInteger<i32>("123e-1").toString());
+console.log(parseSciInteger<i32>("100").toString());
+console.log(parseSciInteger<i32>("-100").toString());
 
+console.log(
+  JSON.stringify([
+    "abcdefg",
+    'st"ring" w""ith quotes"',
+    'string \t\r"with ran\tdom spa\nces and \nnewlines\n\n\n',
+    'string with colon : comma , brace [ ] bracket { } and quote " and other quote "',
+  ])
+);/*
+console.log(
+  JSON.stringify(
+    JSON.parse<string[]>(
+      JSON.stringify([
+        "abcdefg",
+        'st"ring" w""ith quotes"',
+        'string \t\r"with ran\tdom spa\nces and \nnewlines\n\n\n',
+        'string with colon : comma , brace [ ] bracket { } and quote " and other quote "',
+      ])
+    )
+  )
+);
+/*
 const str = changetype<string>(new ArrayBuffer(6));
 console.log("istr:");
 console.log("123 - " + istr8(123));
@@ -63,7 +86,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 +247,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 +266,5 @@ 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.41",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/lib/index.js

@@ -1,4 +1,4 @@
-import { toString, isStdlib } from "visitor-as/dist/utils.js";
+import { getName, 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,10 +19,38 @@ 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
+        this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
+        // @ts-ignore
+        //this.decodeStmts.push(
+        //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
+        //);
+        // @ts-ignore
+        this.currentClass.setDataStmts.push(`if (key.length === ${name.length} && (memory.compare(changetype<usize>("${name}"), changetype<usize>(key), ${name.length}) == 0)) {
+        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;
+        var _a;
         const className = node.name.text;
-        if (!((_c = node.decorators) === null || _c === void 0 ? void 0 : _c.length))
+        if (!((_a = node.decorators) === null || _a === void 0 ? void 0 : _a.length))
             return;
         let foundDecorator = false;
         for (const decorator of node.decorators) {
@@ -32,7 +60,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;
@@ -45,7 +73,7 @@ class AsJSONTransform extends BaseVisitor {
             parent: node.extendsType ? toString(node.extendsType) : "",
             node: node,
             encodeStmts: [],
-            setDataStmts: [],
+            setDataStmts: []
         };
         if (this.currentClass.parent.length > 0) {
             const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
@@ -54,63 +82,17 @@ class AsJSONTransform extends BaseVisitor {
                 this.currentClass.encodeStmts.push(...parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts);
             }
             else {
-                console.error("Class extends " +
-                    this.currentClass.parent +
-                    ", but parent class not found. Maybe add the @json decorator over parent class?");
+                console.error("Class extends " + this.currentClass.parent + ", but parent class not found. Maybe add the @json decorator over parent class?");
             }
         }
         const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
-        const members = [
-            ...node.members,
-            ...(parentSchema ? parentSchema.node.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;
-      }
-      `);
-            }
-        }
+        const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])];
+        this.visit(members);
         let serializeFunc = "";
         if (this.currentClass.encodeStmts.length > 0) {
             const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];
-            this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
-                stmt.slice(0, stmt.length - 1);
+            this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] = stmt.slice(0, stmt.length - 1);
             serializeFunc = `
-      @inline
       __JSON_Serialize(): string {
         return \`{${this.currentClass.encodeStmts.join("")}}\`;
       }
@@ -118,18 +100,16 @@ class AsJSONTransform extends BaseVisitor {
         }
         else {
             serializeFunc = `
-      @inline
       __JSON_Serialize(): string {
         return "{}";
       }
       `;
         }
         const setKeyFunc = `
-      @inline
       __JSON_Set_Key(key: string, value: string): void {
         ${
-        // @ts-ignore
-        this.currentClass.setDataStmts.join("")}
+            // @ts-ignore
+            this.currentClass.setDataStmts.join("")}
       }
     `;
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
@@ -147,23 +127,18 @@ export default class Transformer extends Transform {
     afterParse(parser) {
         // 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;
-            const b = _b.internalPath;
+        // Loop over every source
+        const sources = parser.sources.filter(source => !isStdlib(source)).sort((_a, _b) => {
+            const a = _a.internalPath
+            const b = _b.internalPath
             if (a[0] === "~" && b[0] !== "~") {
                 return -1;
-            }
-            else if (a[0] !== "~" && b[0] === "~") {
+            } else if (a[0] !== "~" && b[0] === "~") {
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        });
-        // Loop over every source
+        })
         for (const source of sources) {
             // Ignore all lib and std. Visit everything else.
             if (!isStdlib(source)) {
@@ -171,4 +146,4 @@ export default class Transformer extends Transform {
             }
         }
     }
-}
+}

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.5.38",
+  "version": "0.5.41",
   "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 = {}));