json-as 0.5.41 → 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;
 }

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,18 +55,25 @@ 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",
-    '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("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[]>(

package/package.json

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

package/transform/package.json

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