json-as 0.5.39 → 0.5.42

package/asconfig.json

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

package/assembly/__tests__/as-json.spec.ts

@@ -33,13 +33,24 @@ class Player {
   isVerified: boolean;
 }
 
-class Nullable {}
+class Nullable { }
 type Null = Nullable | null;
 
 describe("Ser/de Nulls", () => {
   canSerde<Null>(null);
 });
 
+describe("Ser/de Strings", () => {
+  it("should ser/de strings", () => {
+    canSerde<string>("abcdefg");
+    canSerde<string>('st"ring" w""ith quotes"');
+    canSerde<string>('string \"with random spa\nces and \nnewlines\n\n\n');
+    canSerde<string>(
+      'string with colon : comma , brace [ ] bracket { } and quote " and other quote \\"'
+    );
+  });
+});
+
 describe("Ser/de Numbers", () => {
   it("should ser/de integers", () => {
     canSerde<i32>(0);
@@ -48,34 +59,6 @@ describe("Ser/de Numbers", () => {
     canSerde<u64>(101);
     canSerde<i32>(-100);
     canSerde<i64>(-101);
-
-    //  canSerde<u128>(u128.from("0"))
-    //   canSerde<u128>(u128.from("100"))
-    // canSerde<u128>(u128.from("101"))
-
-    /* canSerde<u128Safe>(u128Safe.from("0"))
-    canSerde<u128Safe>(u128Safe.from("100"))
-    canSerde<u128Safe>(u128Safe.from("101"))
-    
-    canSerde<u256>(u256.fromU128(u128.from("0")))
-    canSerde<u256>(u256.fromU128(u128.from("100")))
-    canSerde<u256>(u256.fromU128(u128.from("101")))
-
-    canSerde<u256Safe>(u256Safe.fromU128(u128.from("0")))
-    canSerde<u256Safe>(u256Safe.fromU128(u128.from("100")))
-    canSerde<u256Safe>(u256Safe.fromU128(u128.from("101")))
-
-    canSerde<i128>(i128.from("0"))
-    canSerde<i128>(i128.from("100"))
-    canSerde<i128>(i128.from("101"))
-
-    canSerde<i128Safe>(i128Safe.from("0"))
-    canSerde<i128Safe>(i128Safe.from("100"))
-    canSerde<i128Safe>(i128Safe.from("101"))
-    canSerde<i128Safe>(i128Safe.from("-100"))
-    canSerde<i128Safe>(i128Safe.from("-101"))
-*/
-    //canSerde<i256Safe>(new i256Safe(10, 11, 500, 501))
   });
 
   it("should ser/de floats", () => {
@@ -98,30 +81,13 @@ describe("Ser/de Numbers", () => {
     canSerde<boolean>(false);
   });
 
-  it("should ser/de strings", () => {
-    canSerde<string>("abcdefg");
-    canSerde<string>('st"ring" w""ith quotes"');
-    canSerde<string>(
-      'string \t\r\\"with ran\tdom spa\nces and \nnewlines\n\n\n'
-    );
-    canSerde<string>(
-      'string with colon : comma , brace [ ] bracket { } and quote " and other quote \\"'
-    );
-  });
-
   it("should ser/de BigInt objects", () => {
-    /*  canSerde<i32>(0);
+    canSerde<i32>(0);
 
     canSerde<u32>(100);
     canSerde<u64>(101);
     canSerde<i32>(-100);
     canSerde<i64>(-101);
-    canSerde<u128>(u128.from("0"))
-    canSerde<u128>(u128.from("100"))
-    canSerde<u128>(u128.from("101"))
-    canSerde<u128>(u128.from("-100"))
-    canSerde<u128>(u128.from("-101"))
-*/
   });
 });
 
@@ -144,13 +110,7 @@ describe("Ser/de Array", () => {
   });
 
   it("should ser/de string arrays", () => {
-    // ["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 \\""]
-    canSerde<string[]>([
-      "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 "',
-    ]);
+    canSerde<string[]>(['string \"with random spa\nces and \nnewlines\n\n\n']);
   });
 
   it("should ser/de nested integer arrays", () => {
@@ -174,17 +134,6 @@ describe("Ser/de Array", () => {
     canSerde<boolean[][]>([[true], [false]]);
   });
 
-  it("should ser/de string arrays", () => {
-    canSerde<string[][]>([
-      ["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 \\"',
-      ],
-    ]);
-  });
-
   it("should ser/de object arrays", () => {
     canSerde<Vec3[]>([
       {

package/assembly/src/json.ts

@@ -272,10 +272,10 @@ export namespace JSON {
     if (char === 34 || char === 92) {
       result += (<string>data).slice(last, i) + "\\";
       last = i;
-      i++;
+      //i++;
     } else if (char <= 13 && char >= 8) {
       result += (<string>data).slice(last, i);
-      last = ++i;
+      last = i + 1;
       switch (char) {
         case 8: {
           result += "\\b";
@@ -322,40 +322,37 @@ export namespace JSON {
       result += data.slice(last, i - 1);
       if (char === 34) {
         result += '"';
-        last = ++i;
-      } else if (char === 110) {
-        result += "\n";
-        last = ++i;
-        // 92 98 114 116 102 117
+        last = i + 1;
       } else if (char >= 92 && char <= 117) {
         switch (char) {
           case 92: {
             result += "\\";
-            last = ++i;
+            last = i + 1;
             break;
           }
           case 98: {
             result += "\b";
-            last = ++i;
+            last = i + 1;
             break;
           }
-          case 110: {
-            result += "\n";
-            last = ++i;
-          }
           case 102: {
             result += "\f";
-            last = ++i;
+            last = i + 1;
+            break;
+          }
+          case 110: {
+            result += "\n";
+            last = i + 1;
             break;
           }
           case 114: {
             result += "\r";
-            last = ++i;
+            last = i + 1;
             break;
           }
           case 116: {
             result += "\t";
-            last = ++i;
+            last = i + 1;
             break;
           }
           default: {
@@ -366,7 +363,7 @@ export namespace JSON {
             ) {
               result += "\u000b";
               i += 4;
-              last = ++i;
+              last = i + 1;
             }
             break;
           }
@@ -579,7 +576,7 @@ export namespace JSON {
         lastPos = i;
       } else if (unsafeCharCodeAt(data, i - 1) !== backSlashCode) {
         instr = false;
-        result.push(data.slice(lastPos + 1, i).replaceAll('\\"', '"'));
+        result.push(parseString(data.slice(lastPos, i)));
       }
     }
   }

package/assembly/src/util.ts

@@ -89,13 +89,28 @@ export function getArrayDepth<T>(depth: i32 = 1): i32 {
 export function atoi_fast<T extends number>(str: string, offset: i32 = 0): T {
   // @ts-ignore
   let val: T = 0;
-  for (; offset < str.length << 1; offset += 2) {
+  let firstChar = load<u16>(changetype<usize>(str) + <usize>offset);
+  if (firstChar === 45) {
+    offset += 2;
+    for (; offset < str.length << 1; offset += 2) {
+      // @ts-ignore
+      val =
+        (val << 1) +
+        (val << 3) +
+        (load<u16>(changetype<usize>(str) + <usize>offset) - 48);
+      // We use load because in this case, there is no need to have bounds-checking
+    }
     // @ts-ignore
-    val =
-      (val << 1) +
-      (val << 3) +
-      (load<u16>(changetype<usize>(str) + <usize>offset) - 48);
-    // We use load because in this case, there is no need to have bounds-checking
+    val = -val;
+  } else {
+    for (; offset < str.length << 1; offset += 2) {
+      // @ts-ignore
+      val =
+        (val << 1) +
+        (val << 3) +
+        (load<u16>(changetype<usize>(str) + <usize>offset) - 48);
+      // We use load because in this case, there is no need to have bounds-checking
+    }
   }
   return val;
 }
@@ -114,6 +129,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 +153,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 +163,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,8 @@
 import { JSON } from "./src/json";
 import { atoi_fast, parseSciInteger } from "./src/util";
 import * as a from "util/number";
+// "st\"ring\" w\"\"ith quotes\""
+
 @json
 class Vec3 {
   x!: f32;
@@ -53,8 +55,38 @@ console.log("123 - " + parseSciInteger<i32>("123").toString());
 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("12 - " + parseSciInteger<i32>("123e-1").toString());
+console.log(parseSciInteger<i32>("100").toString());
+console.log(parseSciInteger<i32>("-100").toString());
 
+console.log(JSON.stringify("abcdefg"));
+console.log('"abcdefg"')
+console.log(JSON.stringify('st"ring" w""ith quotes"'));
+console.log('"st\\"ring\\" w\\"\\"ith quotes\\""')
+console.log(JSON.stringify(['string "with random spa\nces and \nnewlines\n\n\n']));
+console.log(JSON.stringify(JSON.parse<string[]>(JSON.stringify(['string "with random spa\nces and \nnewlines\n\n\n']))));
+console.log('"string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"')
+console.log(JSON.stringify('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 "',
+]))));
+console.log('["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));
@@ -244,3 +276,4 @@ export function istr64<T extends number>(int: T): string {
 // 9 = 57
 
 console.log(JSON.stringify("h\\i from gray\bson"));
+*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.39",
+  "version": "0.5.42",
   "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,23 +19,48 @@ 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) {
-            if (
             // @ts-ignore
-            decorator.name.text.toLowerCase() == "json" ||
-                // @ts-ignore
-                decorator.name.text.toLowerCase() == "serializable")
+            if (decorator.name.text.toLowerCase() == "json" || decorator.name.text.toLowerCase() == "serializable")
                 foundDecorator = true;
         }
         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;
@@ -48,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);
@@ -57,64 +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) {
-            // @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;
-                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("")}}\`;
       }
@@ -122,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);
@@ -151,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)) {
@@ -175,4 +146,4 @@ export default class Transformer extends Transform {
             }
         }
     }
-}
+}

package/transform/package.json

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