json-as 1.2.6 → 1.3.0

package/assembly/deserialize/simple/object.ts

@@ -1,32 +1,16 @@
 import { JSON } from "../..";
 import { bs } from "../../../lib/as-bs";
-import {
-  BACK_SLASH,
-  COMMA,
-  CHAR_F,
-  BRACE_LEFT,
-  BRACKET_LEFT,
-  CHAR_N,
-  QUOTE,
-  BRACE_RIGHT,
-  BRACKET_RIGHT,
-  CHAR_T,
-  COLON,
-} from "../../custom/chars";
-import { isSpace } from "../../util";
+import { BACK_SLASH, COMMA, CHAR_F, BRACE_LEFT, BRACKET_LEFT, CHAR_N, QUOTE, BRACE_RIGHT, BRACKET_RIGHT, CHAR_T, COLON } from "../../custom/chars";
+import { isSpace, isUnescapedQuote, scanStringEnd } from "../../util";
 import { ptrToStr } from "../../util/ptrToStr";
 import { deserializeString_SWAR } from "../swar/string";
 import { deserializeArbitrary } from "./arbitrary";
 import { deserializeArray } from "./array";
 import { deserializeBoolean } from "./bool";
-import { deserializeFloat } from "./float";
+import { deserializeFloat } from "../float";
 import { deserializeString } from "./string";
 
-export function deserializeObject(
-  srcStart: usize,
-  srcEnd: usize,
-  dst: usize,
-): JSON.Obj {
+export function deserializeObject(srcStart: usize, srcEnd: usize, dst: usize): JSON.Obj {
   const out = changetype<JSON.Obj>(dst || changetype<usize>(new JSON.Obj()));
 
   let keyStart: usize = 0;
@@ -38,35 +22,22 @@ export function deserializeObject(
   while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
   while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2; // would like to optimize this later
 
-  if (srcStart - srcEnd == 0)
-    throw new Error("Input string had zero length or was all whitespace");
-  if (load<u16>(srcStart) != BRACE_LEFT)
-    throw new Error(
-      "Expected '{' at start of object at position " +
-        (srcEnd - srcStart).toString(),
-    );
-  if (load<u16>(srcEnd - 2) != BRACE_RIGHT)
-    throw new Error(
-      "Expected '}' at end of object at position " +
-        (srcEnd - srcStart).toString(),
-    );
+  if (srcStart - srcEnd == 0) throw new Error("Input string had zero length or was all whitespace");
+  if (load<u16>(srcStart) != BRACE_LEFT) throw new Error("Expected '{' at start of object at position " + (srcEnd - srcStart).toString());
+  if (load<u16>(srcEnd - 2) != BRACE_RIGHT) throw new Error("Expected '}' at end of object at position " + (srcEnd - srcStart).toString());
 
   srcStart += 2;
   while (srcStart < srcEnd) {
     let code = load<u16>(srcStart); // while (isSpace(code)) code = load<u16>(srcStart += 2);
     if (keyStart == 0) {
-      if (code == QUOTE && load<u16>(srcStart - 2) !== BACK_SLASH) {
+      if (code == QUOTE && isUnescapedQuote(srcStart)) {
         if (isKey) {
           keyStart = lastIndex;
           keyEnd = srcStart;
           // console.log("Key: " + ptrToStr(lastIndex, srcStart));
           // console.log("Next: " + String.fromCharCode(load<u16>(srcStart + 2)));
           while (isSpace((code = load<u16>((srcStart += 2))))) {}
-          if (code !== COLON)
-            throw new Error(
-              "Expected ':' after key at position " +
-                (srcEnd - srcStart).toString(),
-            );
+          if (code !== COLON) throw new Error("Expected ':' after key at position " + (srcEnd - srcStart).toString());
           isKey = false;
         } else {
           // console.log("Got key start");
@@ -79,23 +50,12 @@ export function deserializeObject(
     } else {
       if (code == QUOTE) {
         lastIndex = srcStart;
+        srcStart = scanStringEnd(srcStart, srcEnd);
+        if (srcStart >= srcEnd) throw new Error("Unterminated string in JSON object");
+        out.set(ptrToStr(keyStart, keyEnd), deserializeString(lastIndex, srcStart + 2));
         srcStart += 2;
-        while (srcStart < srcEnd) {
-          const code = load<u16>(srcStart);
-          if (code == QUOTE && load<u16>(srcStart - 2) !== BACK_SLASH) {
-            // console.log("Value (string):-" + deserializeString_SWAR(lastIndex, srcStart + 2, 0) + "-");
-            out.set(
-              ptrToStr(keyStart, keyEnd),
-              deserializeString(lastIndex, srcStart + 2),
-            );
-            // while (isSpace(load<u16>(srcStart))) srcStart += 2;
-            srcStart += 4;
-            // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
-            keyStart = 0;
-            break;
-          }
-          srcStart += 2;
-        }
+        keyStart = 0;
+        continue;
       } else if (code - 48 <= 9 || code == 45) {
         lastIndex = srcStart;
         srcStart += 2;
@@ -103,10 +63,7 @@ export function deserializeObject(
           const code = load<u16>(srcStart);
           if (code == COMMA || code == BRACE_RIGHT || isSpace(code)) {
             // console.log("Value (number): " + ptrToStr(lastIndex, srcStart));
-            out.set(
-              ptrToStr(keyStart, keyEnd),
-              deserializeFloat<f64>(lastIndex, srcStart),
-            );
+            out.set(ptrToStr(keyStart, keyEnd), deserializeFloat<f64>(lastIndex, srcStart));
             // while (isSpace(load<u16>((srcStart += 2)))) {
             //   /* empty */
             // }
@@ -124,21 +81,12 @@ export function deserializeObject(
         while (srcStart < srcEnd) {
           const code = load<u16>(srcStart);
           if (code == QUOTE) {
-            srcStart += 2;
-            while (
-              !(
-                load<u16>(srcStart) == QUOTE &&
-                load<u16>(srcStart - 2) != BACK_SLASH
-              )
-            )
-              srcStart += 2;
+            srcStart = scanStringEnd(srcStart, srcEnd);
+            if (srcStart >= srcEnd) throw new Error("Unterminated string in JSON object");
           } else if (code == BRACE_RIGHT) {
             if (--depth == 0) {
               // console.log("Value (object): " + ptrToStr(lastIndex, srcStart + 2));
-              out.set(
-                ptrToStr(keyStart, keyEnd),
-                deserializeObject(lastIndex, (srcStart += 2), 0),
-              );
+              out.set(ptrToStr(keyStart, keyEnd), deserializeObject(lastIndex, (srcStart += 2), 0));
               // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
               keyStart = 0;
               // while (isSpace(load<u16>(srcStart))) {
@@ -155,13 +103,13 @@ export function deserializeObject(
         srcStart += 2;
         while (srcStart < srcEnd) {
           const code = load<u16>(srcStart);
-          if (code == BRACKET_RIGHT) {
+          if (code == QUOTE) {
+            srcStart = scanStringEnd(srcStart, srcEnd);
+            if (srcStart >= srcEnd) throw new Error("Unterminated string in JSON object");
+          } else if (code == BRACKET_RIGHT) {
             if (--depth == 0) {
               // console.log("Value (array): " + ptrToStr(lastIndex, srcStart + 2));
-              out.set(
-                ptrToStr(keyStart, keyEnd),
-                deserializeArray<JSON.Value[]>(lastIndex, (srcStart += 2), 0),
-              );
+              out.set(ptrToStr(keyStart, keyEnd), deserializeArray<JSON.Value[]>(lastIndex, (srcStart += 2), 0));
               // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
               keyStart = 0;
               // while (isSpace(load<u16>((srcStart += 2)))) {
@@ -211,12 +159,7 @@ export function deserializeObject(
       } else if (isSpace(code)) {
         srcStart += 2;
       } else {
-        throw new Error(
-          "Unexpected character in JSON object '" +
-            String.fromCharCode(code) +
-            "' at position " +
-            (srcEnd - srcStart).toString(),
-        );
+        throw new Error("Unexpected character in JSON object '" + String.fromCharCode(code) + "' at position " + (srcEnd - srcStart).toString());
       }
     }
   }

package/assembly/deserialize/simple/raw.ts

@@ -2,9 +2,6 @@ import { JSON } from "../..";
 import { ptrToStr } from "../../util/ptrToStr";
 
 // @ts-ignore: inline
-@inline export function deserializeRaw(
-  srcStart: usize,
-  srcEnd: usize,
-): JSON.Raw {
+@inline export function deserializeRaw(srcStart: usize, srcEnd: usize): JSON.Raw {
   return JSON.Raw.from(ptrToStr(srcStart, srcEnd));
 }

package/assembly/deserialize/simple/set.ts

@@ -1,36 +1,16 @@
 import { JSON } from "../..";
-import {
-  BACK_SLASH,
-  BRACKET_LEFT,
-  BRACKET_RIGHT,
-  BRACE_LEFT,
-  BRACE_RIGHT,
-  CHAR_F,
-  CHAR_N,
-  CHAR_T,
-  COMMA,
-  QUOTE,
-} from "../../custom/chars";
-import { isSpace, atoi } from "../../util";
+import { BACK_SLASH, BRACKET_LEFT, BRACKET_RIGHT, BRACE_LEFT, BRACE_RIGHT, CHAR_F, CHAR_N, CHAR_T, COMMA, QUOTE } from "../../custom/chars";
+import { isSpace, atoi, isUnescapedQuote, scanStringEnd } from "../../util";
 
-export function deserializeSet<T extends Set<any>>(
-  srcStart: usize,
-  srcEnd: usize,
-  dst: usize,
-): T {
-  const out = changetype<nonnull<T>>(
-    dst || changetype<usize>(instantiate<T>()),
-  );
+export function deserializeSet<T extends Set<any>>(srcStart: usize, srcEnd: usize, dst: usize): T {
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
 
   while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
   while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;
 
-  if (srcStart >= srcEnd)
-    throw new Error("Input string had zero length or was all whitespace");
-  if (load<u16>(srcStart) != BRACKET_LEFT)
-    throw new Error("Expected '[' at start of set");
-  if (load<u16>(srcEnd - 2) != BRACKET_RIGHT)
-    throw new Error("Expected ']' at end of set");
+  if (srcStart >= srcEnd) throw new Error("Input string had zero length or was all whitespace");
+  if (load<u16>(srcStart) != BRACKET_LEFT) throw new Error("Expected '[' at start of set");
+  if (load<u16>(srcEnd - 2) != BRACKET_RIGHT) throw new Error("Expected ']' at end of set");
 
   srcStart += 2;
 
@@ -45,7 +25,7 @@ export function deserializeSet<T extends Set<any>>(
         srcStart += 2;
         while (srcStart < srcEnd) {
           const c = load<u16>(srcStart);
-          if (c == QUOTE && load<u16>(srcStart - 2) != BACK_SLASH) {
+          if (c == QUOTE && isUnescapedQuote(srcStart)) {
             // @ts-ignore: type
             out.add(JSON.__deserialize<indexof<T>>(lastIndex, srcStart + 2));
             srcStart += 2;
@@ -107,14 +87,8 @@ export function deserializeSet<T extends Set<any>>(
         while (srcStart < srcEnd) {
           const c = load<u16>(srcStart);
           if (c == QUOTE) {
-            srcStart += 2;
-            while (
-              !(
-                load<u16>(srcStart) == QUOTE &&
-                load<u16>(srcStart - 2) != BACK_SLASH
-              )
-            )
-              srcStart += 2;
+            srcStart = scanStringEnd(srcStart, srcEnd);
+            if (srcStart >= srcEnd) throw new Error("Unterminated string in JSON set");
           } else if (c == BRACE_RIGHT) {
             if (--depth == 0) {
               srcStart += 2;
@@ -153,7 +127,7 @@ export function deserializeSet<T extends Set<any>>(
           srcStart += 2;
           while (srcStart < srcEnd) {
             const c = load<u16>(srcStart);
-            if (c == QUOTE && load<u16>(srcStart - 2) != BACK_SLASH) {
+            if (c == QUOTE && isUnescapedQuote(srcStart)) {
               // @ts-ignore: type
               out.add(JSON.__deserialize<indexof<T>>(lastIndex, srcStart + 2));
               srcStart += 2;

package/assembly/deserialize/simple/staticarray/array.ts

@@ -19,7 +19,7 @@ export function deserializeStaticArrayArray<T extends StaticArray<any>>(
     ptr += 2;
   }
 
-  const outSize = (<usize>count) << alignof<valueof<T>>();
+  const outSize = count << (alignof<valueof<T>>());
   const out = changetype<nonnull<T>>(dst || __new(outSize, idof<T>()));
 
   // Second pass: populate values

package/assembly/deserialize/simple/staticarray/bool.ts

@@ -20,7 +20,7 @@ export function deserializeStaticArrayBoolean<T extends StaticArray<any>>(
   }
 
   // Allocate StaticArray with correct size
-  const outSize = (<usize>count) << alignof<valueof<T>>();
+  const outSize = count << (alignof<valueof<T>>());
   const out = changetype<nonnull<T>>(dst || __new(outSize, idof<T>()));
 
   // Second pass: populate values

package/assembly/deserialize/simple/staticarray/float.ts

@@ -23,7 +23,7 @@ export function deserializeStaticArrayFloat<T extends StaticArray<any>>(
     ptr += 2;
   }
 
-  const outSize = (<usize>count) << alignof<valueof<T>>();
+  const outSize = count << (alignof<valueof<T>>());
   const out = changetype<nonnull<T>>(dst || __new(outSize, idof<T>()));
 
   let index = 0;

package/assembly/deserialize/simple/staticarray/integer.ts

@@ -22,7 +22,7 @@ export function deserializeStaticArrayInteger<T extends StaticArray<any>>(
     ptr += 2;
   }
 
-  const outSize = (<usize>count) << alignof<valueof<T>>();
+  const outSize = count << (alignof<valueof<T>>());
   const out = changetype<nonnull<T>>(dst || __new(outSize, idof<T>()));
 
   // Second pass: populate values

package/assembly/deserialize/simple/staticarray/string.ts

@@ -1,11 +1,8 @@
 import { JSON } from "../../..";
-import { BACK_SLASH, QUOTE } from "../../../custom/chars";
+import { QUOTE } from "../../../custom/chars";
+import { isUnescapedQuote } from "../../../util";
 
-export function deserializeStaticArrayString(
-  srcStart: usize,
-  srcEnd: usize,
-  dst: usize,
-): StaticArray<string> {
+export function deserializeStaticArrayString(srcStart: usize, srcEnd: usize, dst: usize): StaticArray<string> {
   // First pass: count elements using same logic as Array deserializer
   let count: i32 = 0;
   let ptr = srcStart;
@@ -15,7 +12,7 @@ export function deserializeStaticArrayString(
     if (code == QUOTE) {
       if (!inString) {
         inString = true;
-      } else if (load<u16>(ptr - 2) != BACK_SLASH) {
+      } else if (isUnescapedQuote(ptr)) {
         count++;
         inString = false;
       }
@@ -25,9 +22,7 @@ export function deserializeStaticArrayString(
 
   // Allocate StaticArray with correct size
   const outSize = (<usize>count) << alignof<string>();
-  const out = changetype<StaticArray<string>>(
-    dst || __new(outSize, idof<StaticArray<string>>()),
-  );
+  const out = changetype<StaticArray<string>>(dst || __new(outSize, idof<StaticArray<string>>()));
 
   // Second pass: populate values
   let index = 0;
@@ -39,10 +34,8 @@ export function deserializeStaticArrayString(
       if (!inString) {
         inString = true;
         lastPos = srcStart;
-      } else if (load<u16>(srcStart - 2) != BACK_SLASH) {
-        unchecked(
-          (out[index++] = JSON.__deserialize<string>(lastPos, srcStart + 2)),
-        );
+      } else if (isUnescapedQuote(srcStart)) {
+        unchecked((out[index++] = JSON.__deserialize<string>(lastPos, srcStart + 2)));
         inString = false;
       }
     }

package/assembly/deserialize/simple/staticarray/struct.ts

@@ -44,7 +44,7 @@ export function deserializeStaticArrayStruct<T extends StaticArray<any>>(
   }
 
   // Allocate StaticArray with correct size
-  const outSize = (<usize>count) << alignof<valueof<T>>();
+  const outSize = count << (alignof<valueof<T>>());
   const out = changetype<nonnull<T>>(dst || __new(outSize, idof<T>()));
 
   // Second pass: populate values

package/assembly/deserialize/simple/staticarray.ts

@@ -1,36 +1,72 @@
-import { deserializeStaticArrayInteger } from "./staticarray/integer";
-import { deserializeStaticArrayFloat } from "./staticarray/float";
+import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
+import { JSON } from "../..";
+import { deserializeArbitraryArray } from "./array/arbitrary";
+import { deserializeArrayArray } from "./array/array";
+import { deserializeBooleanArray } from "./array/bool";
+import { deserializeBoxArray } from "./array/box";
+import { deserializeFloatArray } from "./array/float";
+import { deserializeIntegerArray } from "./array/integer";
+import { deserializeMapArray } from "./array/map";
+import { deserializeObjectArray } from "./array/object";
+import { deserializeRawArray } from "./array/raw";
+import { deserializeStructArray } from "./array/struct";
+import { deserializeStringArray } from "./array/string";
 import { deserializeStaticArrayBoolean } from "./staticarray/bool";
+import { deserializeStaticArrayFloat } from "./staticarray/float";
+import { deserializeStaticArrayInteger } from "./staticarray/integer";
 import { deserializeStaticArrayString } from "./staticarray/string";
-import { deserializeStaticArrayArray } from "./staticarray/array";
-import { deserializeStaticArrayStruct } from "./staticarray/struct";
 
-export function deserializeStaticArray<T extends StaticArray<any>>(
-  srcStart: usize,
-  srcEnd: usize,
-  dst: usize,
-): T {
+
+@inline function materializeStaticArray<T extends StaticArray<any>>(src: valueof<T>[], dst: usize): T {
+  const byteLength = <usize>src.length * sizeof<valueof<T>>();
+  let out = dst;
+
+  if (!out) {
+    out = __new(byteLength, idof<T>());
+  } else if (changetype<OBJECT>(out - TOTAL_OVERHEAD).rtSize != byteLength) {
+    out = __renew(out, byteLength);
+  }
+
+  const typed = changetype<T>(out);
+  for (let i = 0; i < src.length; i++) {
+    unchecked((typed[i] = unchecked(src[i])));
+  }
+  return typed;
+}
+
+export function deserializeStaticArray<T extends StaticArray<any>>(srcStart: usize, srcEnd: usize, dst: usize): T {
   if (isString<valueof<T>>()) {
-    return <T>deserializeStaticArrayString(srcStart, srcEnd, dst);
+    return changetype<T>(deserializeStaticArrayString(srcStart, srcEnd, dst));
   } else if (isBoolean<valueof<T>>()) {
     return deserializeStaticArrayBoolean<T>(srcStart, srcEnd, dst);
   } else if (isInteger<valueof<T>>()) {
     return deserializeStaticArrayInteger<T>(srcStart, srcEnd, dst);
   } else if (isFloat<valueof<T>>()) {
     return deserializeStaticArrayFloat<T>(srcStart, srcEnd, dst);
-  } else if (isArrayLike<valueof<T>>()) {
-    return deserializeStaticArrayArray<T>(srcStart, srcEnd, dst);
+  } else if (isArray<valueof<T>>()) {
+    return materializeStaticArray<T>(deserializeArrayArray<valueof<T>[]>(srcStart, srcEnd, 0), dst);
   } else if (isManaged<valueof<T>>() || isReference<valueof<T>>()) {
     const type = changetype<nonnull<valueof<T>>>(0);
-    if (isDefined(type.__DESERIALIZE)) {
-      return deserializeStaticArrayStruct<T>(srcStart, srcEnd, dst);
+    if (type instanceof StaticArray) {
+      return materializeStaticArray<T>(deserializeArrayArray<valueof<T>[]>(srcStart, srcEnd, 0), dst);
+    } else if (type instanceof JSON.Value) {
+      return materializeStaticArray<T>(changetype<valueof<T>[]>(deserializeArbitraryArray(srcStart, srcEnd, 0)), dst);
+    } else if (type instanceof JSON.Box) {
+      return materializeStaticArray<T>(changetype<valueof<T>[]>(deserializeBoxArray<valueof<T>[]>(srcStart, srcEnd, 0)), dst);
+    } else if (type instanceof JSON.Obj) {
+      return materializeStaticArray<T>(deserializeObjectArray<valueof<T>[]>(srcStart, srcEnd, 0), dst);
+    } else if (type instanceof JSON.Raw) {
+      return materializeStaticArray<T>(changetype<valueof<T>[]>(deserializeRawArray(srcStart, srcEnd, 0)), dst);
+    } else if (type instanceof Map) {
+      return materializeStaticArray<T>(deserializeMapArray<valueof<T>[]>(srcStart, srcEnd, 0), dst);
+      // @ts-ignore: supplied by transform
+    } else if (isDefined(type.__DESERIALIZE_CUSTOM)) {
+      return materializeStaticArray<T>(deserializeStructArray<valueof<T>[]>(srcStart, srcEnd, 0), dst);
+      // @ts-ignore: supplied by transform
+    } else if (isDefined(type.__DESERIALIZE)) {
+      return materializeStaticArray<T>(deserializeStructArray<valueof<T>[]>(srcStart, srcEnd, 0), dst);
     }
-    throw new Error(
-      "Could not parse static array of type " + nameof<T>() + "!",
-    );
-  } else {
-    throw new Error(
-      "Could not parse static array of type " + nameof<T>() + "!",
-    );
   }
+
+  throw new Error("Could not parse static array of type " + nameof<T>() + "!");
 }

package/assembly/deserialize/simple/string.ts

@@ -1,15 +1,9 @@
 import { bs } from "../../../lib/as-bs";
-import {
-  DESERIALIZE_ESCAPE_TABLE,
-  ESCAPE_HEX_TABLE,
-} from "../../globals/tables";
+import { DESERIALIZE_ESCAPE_TABLE, ESCAPE_HEX_TABLE } from "../../globals/tables";
 import { hex4_to_u16_swar } from "../../util/swar";
 
 // @ts-ignore: inline
-@inline export function deserializeString(
-  srcStart: usize,
-  srcEnd: usize,
-): string {
+@inline export function deserializeString(srcStart: usize, srcEnd: usize): string {
   // Strip quotes
   srcStart += 2;
   srcEnd -= 2;