json-as 1.3.9 → 1.5.0

package/assembly/deserialize/naive/map.ts

@@ -1,22 +1,17 @@
 import { JSON } from "../..";
 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 { isSpace, scanStringEnd } from "../../util";
 import { scanValueEnd } from "../../util/scanValueEnd";
+import { lastValueEnd, parseValue } from "./object";
 
-// @ts-ignore: Decorator is valid here
-@inline function deserializeMapKey<T>(start: usize, end: usize): T {
+function deserializeMapKey<T>(start: usize, end: usize): T {
+  // @ts-expect-error: exists
   const keyText = JSON.__deserialize<string>(start - 2, end + 2);
   if (isString<T>()) return changetype<T>(keyText);
   return JSON.parse<T>(keyText);
@@ -31,13 +26,7 @@ export function deserializeMap<T extends Map<any, any>>(
     dst || changetype<usize>(instantiate<T>()),
   );
 
-  let keyStart: usize = 0;
-  let keyEnd: usize = 0;
-  let isKey = false;
-  let depth = 0;
-  let lastIndex: usize = 0;
-
-  while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2; // would like to optimize this later
+  while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;
 
   if (srcStart - srcEnd == 0)
     throw new Error("Input string had zero length or was all whitespace");
@@ -52,190 +41,26 @@ export function deserializeMap<T extends Map<any, any>>(
         (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 && 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(),
-            );
-          isKey = false;
-        } else {
-          // console.log("Got key start");
-          isKey = true; // i don't like this
-          lastIndex = srcStart + 2;
-        }
-      }
-      // isKey = !isKey;
-      srcStart += 2;
-    } else {
-      if (code == QUOTE) {
-        lastIndex = srcStart;
-        srcStart = scanStringEnd(srcStart, srcEnd);
-        if (srcStart >= srcEnd)
-          throw new Error("Unterminated string in JSON object");
-        // @ts-ignore: type
-        out.set(
-          deserializeMapKey<indexof<T>>(keyStart, keyEnd),
-          JSON.__deserialize<valueof<T>>(lastIndex, srcStart + 2),
-        );
-        srcStart += 2;
-        keyStart = 0;
-        continue;
-      } else if (code - 48 <= 9 || code == 45) {
-        lastIndex = srcStart;
-        srcStart += 2;
-        while (srcStart < srcEnd) {
-          const code = load<u16>(srcStart);
-          if (code == COMMA || code == BRACE_RIGHT || isSpace(code)) {
-            // console.log("Value (number): " + ptrToStr(lastIndex, srcStart));
-            // @ts-ignore: type
-            out.set(
-              deserializeMapKey<indexof<T>>(keyStart, keyEnd),
-              JSON.__deserialize<valueof<T>>(lastIndex, srcStart),
-            );
-            // while (isSpace(load<u16>((srcStart += 2)))) {
-            //   /* empty */
-            // }
-            srcStart += 2;
-            // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
-            keyStart = 0;
-            break;
-          }
-          srcStart += 2;
-        }
-      } else if (code == BRACE_LEFT) {
-        lastIndex = srcStart;
-        depth++;
-        srcStart += 2;
-        while (srcStart < srcEnd) {
-          const code = load<u16>(srcStart);
-          if (code == QUOTE) {
-            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));
-              // @ts-ignore: type
-              out.set(
-                deserializeMapKey<indexof<T>>(keyStart, keyEnd),
-                JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 2)),
-              );
-              // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
-              keyStart = 0;
-              // while (isSpace(load<u16>(srcStart))) {
-              //   /* empty */
-              // }
-              break;
-            }
-          } else if (code == BRACE_LEFT) depth++;
-          srcStart += 2;
-        }
-      } else if (code == BRACKET_LEFT) {
-        lastIndex = srcStart;
-        depth++;
-        srcStart += 2;
-        while (srcStart < srcEnd) {
-          const code = load<u16>(srcStart);
-          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));
-              // @ts-ignore: type
-              out.set(
-                deserializeMapKey<indexof<T>>(keyStart, keyEnd),
-                JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 2)),
-              );
-              // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
-              keyStart = 0;
-              // while (isSpace(load<u16>((srcStart += 2)))) {
-              //   /* empty */
-              // }
-              break;
-            }
-          } else if (code == BRACKET_LEFT) depth++;
-          srcStart += 2;
-        }
-      } else if (code == CHAR_T) {
-        if (load<u64>(srcStart) == 28429475166421108) {
-          // console.log("Value (bool): " + ptrToStr(srcStart, srcStart + 8));
-          // @ts-ignore: type
-          out.set(
-            deserializeMapKey<indexof<T>>(keyStart, keyEnd),
-            JSON.__deserialize<valueof<T>>(srcStart, (srcStart += 8)),
-          );
-          // while (isSpace(load<u16>((srcStart += 2)))) {
-          //   /* empty */
-          // }
-          srcStart += 2;
-          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)) + "  " + (srcStart < srcEnd).toString());
-          keyStart = 0;
-        }
-      } else if (code == CHAR_F) {
-        if (load<u64>(srcStart, 2) == 28429466576093281) {
-          // console.log("Value (bool): " + ptrToStr(srcStart, srcStart + 10));
-          // @ts-ignore: type
-          out.set(
-            deserializeMapKey<indexof<T>>(keyStart, keyEnd),
-            JSON.__deserialize<valueof<T>>(srcStart, (srcStart += 10)),
-          );
-          // while (isSpace(load<u16>((srcStart += 2)))) {
-          //   /* empty */
-          // }
-          srcStart += 2;
-          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
-          keyStart = 0;
-        }
-      } else if (code == CHAR_N) {
-        if (load<u64>(srcStart) == 30399761348886638) {
-          // console.log("Value (null): " + ptrToStr(srcStart, srcStart + 8));
-          // @ts-ignore: type
-          out.set(
-            deserializeMapKey<indexof<T>>(keyStart, keyEnd),
-            JSON.__deserialize<valueof<T>>(srcStart, (srcStart += 8)),
-          );
-          // while (isSpace(load<u16>((srcStart += 2)))) {
-          /* empty */
-          // }
-          srcStart += 2;
-          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
-          keyStart = 0;
-        }
-      } else if (isSpace(code)) {
-        srcStart += 2;
-      } else {
-        throw new Error(
-          "Unexpected character in JSON object '" +
-            String.fromCharCode(code) +
-            "' at position " +
-            (srcEnd - srcStart).toString(),
-        );
-      }
-    }
-  }
-  return out;
+  deserializeMapBody<T>(srcStart, srcEnd, changetype<T>(out));
+  return changetype<T>(out);
 }
 
-
-@inline function deserializeMapBody<T extends Map<any, any>>(
+/**
+ * Shared single-pass map-body parser used by both the top-level and struct-field
+ * entry points. Dynamic `JSON.Value` values are parsed in one pass via
+ * {@link parseValue}; typed values are bounds-scanned with {@link scanValueEnd}
+ * because their generated deserializers take exact `(start, end)` bounds.
+ */
+export function deserializeMapBody<T extends Map<any, any>>(
   srcStart: usize,
   srcEnd: usize,
   out: T,
 ): usize {
-  changetype<nonnull<T>>(out).clear();
+  let arbitraryValue = false;
+  if (isManaged<valueof<T>>() || isReference<valueof<T>>()) {
+    // @ts-ignore: instanceof on the (reference) value type
+    arbitraryValue = changetype<nonnull<valueof<T>>>(0) instanceof JSON.Value;
+  }
 
   if (srcStart >= srcEnd || load<u16>(srcStart) != BRACE_LEFT)
     throw new Error("Failed to parse JSON!");
@@ -258,15 +83,24 @@ export function deserializeMap<T extends Map<any, any>>(
     srcStart += 2;
     while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
 
-    const valueEnd = scanValueEnd(srcStart, srcEnd);
-    if (!valueEnd || valueEnd <= srcStart) break;
-
-    // @ts-ignore: type
-    changetype<nonnull<T>>(out).set(
-      deserializeMapKey<indexof<T>>(keyStart, keyEnd),
-      JSON.__deserialize<valueof<T>>(srcStart, valueEnd),
-    );
-    srcStart = valueEnd;
+    if (isReference<valueof<T>>() && arbitraryValue) {
+      const val = parseValue(srcStart, srcEnd);
+      // @ts-ignore: type - valueof<T> is JSON.Value in this branch
+      changetype<nonnull<T>>(out).set(
+        deserializeMapKey<indexof<T>>(keyStart, keyEnd),
+        changetype<valueof<T>>(changetype<usize>(val)),
+      );
+      srcStart = lastValueEnd();
+    } else {
+      const valueEnd = scanValueEnd(srcStart, srcEnd);
+      if (!valueEnd || valueEnd <= srcStart) break;
+      // @ts-ignore: type
+      changetype<nonnull<T>>(out).set(
+        deserializeMapKey<indexof<T>>(keyStart, keyEnd),
+        JSON.__deserialize<valueof<T>>(srcStart, valueEnd),
+      );
+      srcStart = valueEnd;
+    }
 
     while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
     if (srcStart >= srcEnd) break;
@@ -283,8 +117,7 @@ export function deserializeMap<T extends Map<any, any>>(
   throw new Error("Failed to parse JSON!");
 }
 
-
-@inline export function deserializeMapField<T extends Map<any, any>>(
+export function deserializeMapField<T extends Map<any, any>>(
   srcStart: usize,
   srcEnd: usize,
   dstObj: usize,
@@ -295,6 +128,10 @@ export function deserializeMap<T extends Map<any, any>>(
   if (!changetype<usize>(out)) {
     out = changetype<T>(instantiate<T>());
     store<T>(fieldPtr, out);
+  } else {
+    // Reusing an existing field map - clear it before repopulating. Fresh maps
+    // (deserializeMap / deserializeMapArray) skip this.
+    changetype<nonnull<T>>(out).clear();
   }
   return deserializeMapBody<T>(srcStart, srcEnd, out);
 }