json-as 0.5.54 → 0.5.56

package/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/asconfig.json

@@ -0,0 +1,15 @@
+{
+  "targets": {
+    "test": {
+      "outFile": "build/test.wasm",
+      "sourceMap": false,
+      "optimizeLevel": 0,
+      "shrinkLevel": 0,
+      "converge": false,
+      "noAssert": false
+    }
+  },
+  "options": {
+    "transform": ["./transform"]
+  }
+}

package/assembly/__benches__/as-json.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { snip_fast } from "../src/util";
+import { __atoi_fast, snip_fast } from "../src/util";
 @json
 class Vec3 {
   x: i32;
@@ -12,13 +12,13 @@ const vec: Vec3 = {
   y: 1,
   z: 8,
 }
-
+/*
 bench("Parse Number SNIP", () => {
   blackbox<i32>(snip_fast<i32>("12345"));
 });
-/*
+
 bench("Parse Number ATOI", () => {
-  blackbox<i32>(atoi_fast<i32>("12345"));
+  blackbox<i32>(__atoi_fast<i32>("12345"));
 })
 
 bench("Parse Number STDLIB", () => {
@@ -28,16 +28,16 @@ bench("Parse Number STDLIB", () => {
 bench("Parse Number OLD", () => {
   blackbox<i32>(parseSciInteger<i32>("12345"));
 });
-*/
+
 bench("Stringify Object (Vec3)", () => {
   blackbox<string>(vec.__JSON_Serialize());
-});
+});*/
 
 // TODO: Make this allocate without crashing
-//bench("Parse Object (Vec3)", () => {
-//  blackbox<Vec3>(vec.__JSON_Deserialize('{"x":0,"y":0,"z":0}', vec));
-//});
-
+bench("Parse Object (Vec3)", () => {
+  blackbox<Vec3>(JSON.parse<Vec3>('{"x":0,"y":0,"z":0}'));
+});
+/*
 bench("Stringify Number Array", () => {
   blackbox(JSON.stringify<i32[]>([1, 2, 3]));
 });

package/assembly/src/chars.ts

@@ -1,29 +1,55 @@
 // Characters
-export const commaCode = ",".charCodeAt(0);
-export const quoteCode = '"'.charCodeAt(0);
-export const backSlashCode = "\\".charCodeAt(0);
-export const forwardSlashCode = "/".charCodeAt(0);
-export const leftBraceCode = "{".charCodeAt(0);
-export const rightBraceCode = "}".charCodeAt(0);
-export const leftBracketCode = "[".charCodeAt(0);
-export const rightBracketCode = "]".charCodeAt(0);
-export const colonCode = ":".charCodeAt(0);
-export const tCode = "t".charCodeAt(0);
-export const rCode = "r".charCodeAt(0);
-export const uCode = "u".charCodeAt(0);
-export const eCode = "e".charCodeAt(0);
-export const fCode = "f".charCodeAt(0);
-export const aCode = "a".charCodeAt(0);
-export const lCode = "l".charCodeAt(0);
-export const sCode = "s".charCodeAt(0);
-export const nCode = "n".charCodeAt(0);
+// @ts-ignore = Decorator is valid here
+@inline export const commaCode = 44;
+// @ts-ignore = Decorator is valid here
+@inline export const quoteCode = 34;
+// @ts-ignore = Decorator is valid here
+@inline export const backSlashCode = 92;
+// @ts-ignore: Decorator is valid here
+@inline export const forwardSlashCode = 47;
+// @ts-ignore: Decorator is valid here
+@inline export const leftBraceCode = 123;
+// @ts-ignore: Decorator is valid here
+@inline export const rightBraceCode = 125;
+// @ts-ignore: Decorator is valid here
+@inline export const leftBracketCode = 91;
+// @ts-ignore: Decorator is valid here
+@inline export const rightBracketCode = 93;
+// @ts-ignore: Decorator is valid here
+@inline export const colonCode = 58;
+// @ts-ignore: Decorator is valid here
+@inline export const tCode = 116;
+// @ts-ignore: Decorator is valid here
+@inline export const rCode = 114;
+// @ts-ignore: Decorator is valid here
+@inline export const uCode = 117;
+// @ts-ignore: Decorator is valid here
+@inline export const eCode = 101;
+// @ts-ignore: Decorator is valid here
+@inline export const fCode = 102;
+// @ts-ignore: Decorator is valid here
+@inline export const aCode = 97;
+// @ts-ignore: Decorator is valid here
+@inline export const lCode = 108;
+// @ts-ignore: Decorator is valid here
+@inline export const sCode = 115;
+// @ts-ignore = Decorator is valid here
+@inline export const nCode = 110;
 // Strings
-export const trueWord = "true";
-export const falseWord = "false";
-export const nullWord = "null";
-export const leftBracketWord = "[";
-export const emptyArrayWord = "[]";
-export const commaWord = ",";
-export const rightBracketWord = "]";
+// @ts-ignore: Decorator is valid here
+@inline export const trueWord = "true";
+// @ts-ignore: Decorator is valid here
+@inline export const falseWord = "false";
+// @ts-ignore: Decorator is valid here
+@inline export const nullWord = "null";
+// @ts-ignore: Decorator is valid here
+@inline export const leftBracketWord = "[";
+// @ts-ignore: Decorator is valid here
+@inline export const emptyArrayWord = "[]";
+// @ts-ignore: Decorator is valid here
+@inline export const commaWord = ",";
+// @ts-ignore: Decorator is valid here
+@inline export const rightBracketWord = "]";
 // Escape Codes
-export const newLineCode = "\n".charCodeAt(0);
+// @ts-ignore: Decorator is valid here
+@inline export const newLineCode = 10;

package/assembly/src/json.ts

@@ -20,8 +20,10 @@ import {
   trueWord,
   uCode,
   emptyArrayWord,
+  falseWord,
 } from "./chars";
 import { snip_fast, unsafeCharCodeAt } from "./util";
+import { Virtual } from "as-virtual/assembly";
 
 /**
  * JSON Encoder/Decoder for AssemblyScript
@@ -138,165 +140,132 @@ export namespace JSON {
       );
     }
   }
-  // @ts-ignore: Decorator
-  @inline function parseObjectValue<T>(data: string): T {
-    let type: T;
-    if (isString<T>()) {
-      // @ts-ignore
-      let result = "";
-      let last = 0;
-      for (let i = 0; i < data.length; i++) {
-        // \\"
-        if (unsafeCharCodeAt(data, i) === backSlashCode) {
-          const char = unsafeCharCodeAt(data, ++i);
-          result += data.slice(last, i - 1);
-          if (char === 34) {
-            result += '"';
+}
+
+// @ts-ignore: Decorator
+@global @inline function __parseObjectValue<T>(data: string): T {
+  let type: T;
+  if (isString<T>()) {
+    // @ts-ignore
+    let result = "";
+    let last = 0;
+    for (let i = 0; i < data.length; i++) {
+      // \\"
+      if (unsafeCharCodeAt(data, i) === backSlashCode) {
+        const char = unsafeCharCodeAt(data, ++i);
+        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
+        } else if (char >= 92 && char <= 117) {
+          if (char === 92) {
+            result += "\\";
             last = ++i;
-          } else if (char === 110) {
-            result += "\n";
+          } else if (char === 98) {
+            result += "\b";
+            last = ++i;
+          } else if (char === 102) {
+            result += "\f";
+            last = ++i;
+          } else if (char === 114) {
+            result += "\r";
+            last = ++i;
+          } else if (char === 116) {
+            result += "\t";
+            last = ++i;
+          } else if (
+            char === 117 &&
+            load<u64>(changetype<usize>(data) + <usize>((i + 1) << 1)) ===
+            27584753879220272
+          ) {
+            result += "\u000b";
+            i += 4;
             last = ++i;
-            // 92 98 114 116 102 117
-          } else if (char >= 92 && char <= 117) {
-            if (char === 92) {
-              result += "\\";
-              last = ++i;
-            } else if (char === 98) {
-              result += "\b";
-              last = ++i;
-            } else if (char === 102) {
-              result += "\f";
-              last = ++i;
-            } else if (char === 114) {
-              result += "\r";
-              last = ++i;
-            } else if (char === 116) {
-              result += "\t";
-              last = ++i;
-            } else if (
-              char === 117 &&
-              load<u64>(changetype<usize>(data) + <usize>((i + 1) << 1)) ===
-              27584753879220272
-            ) {
-              result += "\u000b";
-              i += 4;
-              last = ++i;
-            }
           }
         }
       }
-      result += data.slice(last);
-      // @ts-ignore
-      return result;
-    } else if (isBoolean<T>()) {
-      // @ts-ignore
-      return parseBoolean<T>(data);
-    } else if (isFloat<T>() || isInteger<T>()) {
-      return parseNumber<T>(data);
-    } else if (isArrayLike<T>()) {
-      // @ts-ignore
-      return parseArray<T>(data);
-      // @ts-ignore
-    } else if (isNullable<T>() && data == "null") {
-      // @ts-ignore
-      return null;
-      // @ts-ignore
-    } else if (isDefined(type.__JSON_Set_Key)) {
-      return parseObject<T>(data.trimStart());
-    } else if (idof<nonnull<T>>() == idof<Date>()) {
-      // @ts-ignore
-      return Date.fromString(data);
-    } else {
-      // @ts-ignore
-      throw new Error(
-        `Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
-      );
     }
+    result += data.slice(last);
+    // @ts-ignore
+    return result;
+  } else if (isBoolean<T>()) {
+    // @ts-ignore
+    return parseBoolean<T>(data);
+  } else if (isFloat<T>() || isInteger<T>()) {
+    return parseNumber<T>(data);
+  } else if (isArrayLike<T>()) {
+    // @ts-ignore
+    return parseArray<T>(data);
+    // @ts-ignore
+  } else if (isNullable<T>() && data == "null") {
+    // @ts-ignore
+    return null;
+    // @ts-ignore
+  } else if (isDefined(type.__JSON_Set_Key)) {
+    return parseObject<T>(data.trimStart());
+  } else if (idof<nonnull<T>>() == idof<Date>()) {
+    // @ts-ignore
+    return Date.fromString(data);
+  } else {
+    // @ts-ignore
+    throw new Error(
+      `Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
+    );
   }
 }
 
 // @ts-ignore: Decorator
-@inline function serializeString(data: string): string {
-  // @ts-ignore
-  //if (data.length === 0) return "\"\"";
-  /*
-       let char: i32 = 0;
-       if (data.length === 1) {
-           char = unsafeCharCodeAt(data, 0);
-           if (char === 34) {
-               return "\\\"";
-           } else if (char === 92) {
-               return "\\n";
-           } else if (char <= 13 && char >= 8) {
-               switch (char) {
-                   case 0x5C: {
-                       return "\\\\";
-                   }
-                   case 0x08: {
-                       return "\\b";
-                   }
-                   case 0x0D: {
-                       return "\\r";
-                   }
-                   case 0x09: {
-                       return "\\t";
-                   }
-                   case 0x0C: {
-                       return "\\f";
-                   }
-                   case 0x0B: {
-                       return "\\u000b";
-                   }
-               }
-           } else {
-               return data;
-           }
-       }*/
-
-  let result = '"';
+@inline export function serializeString(data: string): string {
+  let result = new StringSink('"');
 
   let last: i32 = 0;
   // @ts-ignore
   for (let i = 0; i < data.length; i++) {
     const char = unsafeCharCodeAt(<string>data, i);
     if (char === 34 || char === 92) {
-      result += (<string>data).slice(last, i) + "\\";
+      result.write(<string>data, last, i);
+      result.writeCodePoint(backSlashCode);
       last = i;
       //i++;
     } else if (char <= 13 && char >= 8) {
-      result += (<string>data).slice(last, i);
+      result.write(<string>data, last, i);
       last = i + 1;
       switch (char) {
         case 8: {
-          result += "\\b";
+          result.write("\\b");
           break;
         }
         case 9: {
-          result += "\\t";
+          result.write("\\t");
           break;
         }
         case 10: {
-          result += "\\n";
+          result.write("\\n");
           break;
         }
         case 11: {
-          result += "\\x0B"; // \\u000b
+          result.write("\\x0B"); // \\u000b
           break;
         }
         case 12: {
-          result += "\\f";
+          result.write("\\f");
           break;
         }
         case 13: {
-          result += "\\r";
+          result.write("\\r");
           break;
         }
       }
     }
   }
   if (result.length === 1) return '"' + data + '"';
-  else result += (<string>data).slice(last);
-  return result + '"';
+  else result.write(<string>data, last);
+  result.write("\"");
+  return result.toString();
 }
 
 // @ts-ignore: Decorator
@@ -389,7 +358,7 @@ export namespace JSON {
   let schema: nonnull<T> = changetype<nonnull<T>>(
     __new(offsetof<nonnull<T>>(), idof<nonnull<T>>())
   );
-  let key = "";
+  let key = Virtual.createEmpty<string>();
   let isKey = false;
   let depth = 0;
   let outerLoopIndex = 1;
@@ -409,10 +378,7 @@ export namespace JSON {
           if (depth === 0) {
             ++arrayValueIndex;
             // @ts-ignore
-            schema.__JSON_Set_Key(
-              key,
-              data.slice(outerLoopIndex, arrayValueIndex)
-            );
+            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, arrayValueIndex);
             outerLoopIndex = arrayValueIndex;
             isKey = false;
             break;
@@ -433,10 +399,7 @@ export namespace JSON {
           if (depth === 0) {
             ++objectValueIndex;
             // @ts-ignore
-            schema.__JSON_Set_Key(
-              key,
-              data.slice(outerLoopIndex, objectValueIndex)
-            );
+            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, objectValueIndex);
             outerLoopIndex = objectValueIndex;
             isKey = false;
             break;
@@ -455,14 +418,11 @@ export namespace JSON {
           unsafeCharCodeAt(data, stringValueIndex - 1) !== backSlashCode
         ) {
           if (isKey === false) {
-            key = data.slice(outerLoopIndex, stringValueIndex);
+            key.reinst(data, outerLoopIndex, stringValueIndex);
             isKey = true;
           } else {
             // @ts-ignore
-            schema.__JSON_Set_Key(
-              key,
-              data.slice(outerLoopIndex, stringValueIndex)
-            );
+            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, stringValueIndex);
             isKey = false;
           }
           outerLoopIndex = ++stringValueIndex;
@@ -471,7 +431,7 @@ export namespace JSON {
       }
     } else if (char == nCode) {
       // @ts-ignore
-      schema.__JSON_Set_Key(key, nullWord);
+      schema.__JSON_Set_Key<Virtual<string>>(key, nullWord, 0, 4);
       isKey = false;
     } else if (
       char === tCode &&
@@ -480,7 +440,7 @@ export namespace JSON {
       unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
     ) {
       // @ts-ignore
-      schema.__JSON_Set_Key(key, trueWord);
+      schema.__JSON_Set_Key<Virtual<string>>(key, trueWord, 0, 4);
       isKey = false;
     } else if (
       char === fCode &&
@@ -490,7 +450,7 @@ export namespace JSON {
       unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
     ) {
       // @ts-ignore
-      schema.__JSON_Set_Key(key, "false");
+      schema.__JSON_Set_Key<Virtual<string>>(key, falseWord, 0, 5);
       isKey = false;
     } else if ((char >= 48 && char <= 57) || char === 45) {
       let numberValueIndex = ++outerLoopIndex;
@@ -498,10 +458,7 @@ export namespace JSON {
         const char = unsafeCharCodeAt(data, numberValueIndex);
         if (char === commaCode || char === rightBraceCode || isSpace(char)) {
           // @ts-ignore
-          schema.__JSON_Set_Key(
-            key,
-            data.slice(outerLoopIndex - 1, numberValueIndex)
-          );
+          schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex - 1, numberValueIndex);
           outerLoopIndex = numberValueIndex;
           isKey = false;
           break;