json-as 1.4.0 → 1.6.0

package/assembly/deserialize/naive/array/integer.ts

@@ -1,28 +1,28 @@
 import { atoi, isSpace } from "../../../util";
 import { COMMA, BRACKET_LEFT, BRACKET_RIGHT } from "../../../custom/chars";
+import { markProductionParseError } from "../../error";
 
 // Strict RFC 8259 integer-token check over [start, end): optional minus (signed
-// types only), then a lone `0` or [1-9] digits — no leading zeros, fraction,
-// exponent, or trailing garbage. Throws otherwise.
-function validateJSONInteger(start: usize, end: usize, signed: bool): void {
+// types only), then a lone `0` or [1-9] digits - no leading zeros, fraction,
+// exponent, or trailing garbage. Returns false otherwise.
+function validateJSONInteger(start: usize, end: usize, signed: bool): bool {
   let ptr = start;
   if (ptr < end && load<u16>(ptr) == 45) {
-    if (!signed) throw new Error("Invalid JSON number: minus on unsigned");
+    if (!signed) return false;
     ptr += 2;
   }
-  if (ptr >= end) throw new Error("Invalid JSON number: expected digit");
+  if (ptr >= end) return false;
   const first = load<u16>(ptr);
   if (first == 48) {
     ptr += 2;
-    if (ptr < end && <u32>(load<u16>(ptr) - 48) <= 9)
-      throw new Error("Invalid JSON number: leading zero");
+    if (ptr < end && <u32>(load<u16>(ptr) - 48) <= 9) return false;
   } else if (<u32>(first - 48) <= 9) {
     ptr += 2;
     while (ptr < end && <u32>(load<u16>(ptr) - 48) <= 9) ptr += 2;
   } else {
-    throw new Error("Invalid JSON number: expected digit");
+    return false;
   }
-  if (ptr != end) throw new Error("Invalid JSON number: not an integer");
+  return ptr == end;
 }
 
 /**
@@ -30,7 +30,8 @@ function validateJSONInteger(start: usize, end: usize, signed: bool): void {
  *
  * Enforces RFC 8259 array structure: `[`-framed, single-comma separated, no
  * leading / trailing / doubled commas, and each element must be a valid JSON
- * integer (no leading zeros, fraction, or exponent). Throws on any deviation.
+ * integer (no leading zeros, fraction, or exponent). Returns the shared failure
+ * sentinel on any deviation.
  */
 export function deserializeIntegerArray_NAIVE<T extends number[]>(
   srcStart: usize,
@@ -42,12 +43,15 @@ export function deserializeIntegerArray_NAIVE<T extends number[]>(
   );
   out.length = 0; // dst may arrive pre-sized; re-parse from empty via push
 
-  while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
   while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;
-  if (srcStart >= srcEnd || load<u16>(srcStart) != BRACKET_LEFT)
-    throw new Error("Invalid JSON array: expected '['");
-  if (load<u16>(srcEnd - 2) != BRACKET_RIGHT)
-    throw new Error("Invalid JSON array: expected ']'");
+  if (
+    srcStart >= srcEnd ||
+    load<u16>(srcStart) != BRACKET_LEFT ||
+    load<u16>(srcEnd - 2) != BRACKET_RIGHT
+  ) {
+    markProductionParseError();
+    return changetype<T>(0);
+  }
   srcStart += 2; // past '['
   srcEnd -= 2; // before ']'
 
@@ -62,19 +66,27 @@ export function deserializeIntegerArray_NAIVE<T extends number[]>(
       if (c == COMMA || isSpace(c)) break;
       srcStart += 2;
     }
-    if (srcStart == tokenStart)
-      throw new Error("Invalid JSON array: missing value");
-    validateJSONInteger(tokenStart, srcStart, signed);
+    if (
+      srcStart == tokenStart ||
+      !validateJSONInteger(tokenStart, srcStart, signed)
+    ) {
+      markProductionParseError();
+      return changetype<T>(0);
+    }
     out.push(atoi<valueof<T>>(tokenStart, srcStart));
 
     while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
     if (srcStart >= srcEnd) break;
-    if (load<u16>(srcStart) != COMMA)
-      throw new Error("Invalid JSON array: expected ',' or ']'");
+    if (load<u16>(srcStart) != COMMA) {
+      markProductionParseError();
+      return changetype<T>(0);
+    }
     srcStart += 2;
     while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
-    if (srcStart >= srcEnd)
-      throw new Error("Invalid JSON array: trailing comma");
+    if (srcStart >= srcEnd) {
+      markProductionParseError();
+      return changetype<T>(0);
+    }
   }
 
   return out;

package/assembly/deserialize/naive/array/map.ts

@@ -29,7 +29,7 @@ export function deserializeMapArray<T extends Map<any, any>[]>(
     );
 
   // Each `{...}` map element is parsed in a single pass via deserializeMapBody,
-  // which reports where it ended — no separate scan to find the closing brace.
+  // which reports where it ended - no separate scan to find the closing brace.
   while (srcStart < srcEnd) {
     if (load<u16>(srcStart) == BRACE_LEFT) {
       const m = instantiate<valueof<T>>();

package/assembly/deserialize/naive/array/object.ts

@@ -29,11 +29,12 @@ export function deserializeObjectArray<T extends unknown[]>(
     );
 
   // Each `{...}` element is parsed in a single pass via parseObjectBody, which
-  // reports where it ended — no separate scan to find the closing brace.
+  // reports where it ended - no separate scan to find the closing brace.
   while (srcStart < srcEnd) {
     if (load<u16>(srcStart) == BRACE_LEFT) {
       const obj = new JSON.Obj();
       srcStart = parseObjectBody(obj, srcStart + 2, srcEnd);
+      if (srcStart == 0) return changetype<T>(0);
       out.push(changetype<valueof<T>>(changetype<usize>(obj)));
     } else {
       srcStart += 2;

package/assembly/deserialize/naive/array/string.ts

@@ -1,4 +1,3 @@
-import { JSON } from "../../..";
 import {
   COMMA,
   BRACKET_LEFT,
@@ -7,6 +6,8 @@ import {
   QUOTE,
 } from "../../../custom/chars";
 import { isSpace, scanStringEnd } from "../../../util";
+import { markProductionParseError } from "../../error";
+import { deserializeString } from "../../index/string";
 
 /**
  * Strict string-array deserializer (`string[]` / `(string | null)[]`).
@@ -14,8 +15,8 @@ import { isSpace, scanStringEnd } from "../../../util";
  * Enforces RFC 8259 array structure: `[`-framed, single-comma separated, no
  * leading / trailing / doubled commas, and each element must be a quoted string
  * (or the literal `null` for a nullable element type). Element contents are
- * validated by `deserializeString_NAIVE` (via `JSON.__deserialize`). Throws on
- * any deviation.
+ * validated by the selected whole-string decoder. Returns the shared failure
+ * sentinel on any deviation so JSON.parse can throw at its public boundary.
  */
 export function deserializeStringArray_NAIVE(
   srcStart: usize,
@@ -27,12 +28,15 @@ export function deserializeStringArray_NAIVE(
   );
   out.length = 0; // dst may arrive pre-sized; re-parse from empty via push
 
-  while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
   while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;
-  if (srcStart >= srcEnd || load<u16>(srcStart) != BRACKET_LEFT)
-    throw new Error("Invalid JSON array: expected '['");
-  if (load<u16>(srcEnd - 2) != BRACKET_RIGHT)
-    throw new Error("Invalid JSON array: expected ']'");
+  if (
+    srcStart >= srcEnd ||
+    load<u16>(srcStart) != BRACKET_LEFT ||
+    load<u16>(srcEnd - 2) != BRACKET_RIGHT
+  ) {
+    markProductionParseError();
+    return changetype<string[]>(0);
+  }
   srcStart += 2; // past '['
   srcEnd -= 2; // before ']'
 
@@ -43,26 +47,35 @@ export function deserializeStringArray_NAIVE(
     const code = load<u16>(srcStart);
     if (code == QUOTE) {
       const closing = scanStringEnd(srcStart, srcEnd);
-      if (closing >= srcEnd)
-        throw new Error("Invalid JSON array: unterminated string");
-      out.push(JSON.__deserialize<string>(srcStart, closing + 2));
+      if (closing >= srcEnd) {
+        markProductionParseError();
+        return changetype<string[]>(0);
+      }
+      const value = deserializeString(srcStart, closing + 2);
+      if (changetype<usize>(value) == 0) return changetype<string[]>(0);
+      out.push(value);
       srcStart = closing + 2;
     } else if (srcStart + 8 <= srcEnd && load<u64>(srcStart) == NULL_WORD_U64) {
       // `(string | null)[]` element
       out.push(changetype<string>(0));
       srcStart += 8;
     } else {
-      throw new Error("Invalid JSON array: expected string");
+      markProductionParseError();
+      return changetype<string[]>(0);
     }
 
     while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
     if (srcStart >= srcEnd) break;
-    if (load<u16>(srcStart) != COMMA)
-      throw new Error("Invalid JSON array: expected ',' or ']'");
+    if (load<u16>(srcStart) != COMMA) {
+      markProductionParseError();
+      return changetype<string[]>(0);
+    }
     srcStart += 2;
     while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
-    if (srcStart >= srcEnd)
-      throw new Error("Invalid JSON array: trailing comma");
+    if (srcStart >= srcEnd) {
+      markProductionParseError();
+      return changetype<string[]>(0);
+    }
   }
 
   return out;

package/assembly/deserialize/naive/array/struct.ts

@@ -34,14 +34,32 @@ export function deserializeStructArray<T extends unknown[]>(
         (srcEnd - srcStart).toString(),
     );
 
+  // Reuse existing element slots when `dst` already holds elements (no per-call
+  // allocation on a reused array); fall back to push for fresh/extra slots and
+  // trim any leftovers from a previous, longer parse.
+  let index = 0;
   while (srcStart < srcEnd) {
     const code = load<u16>(srcStart);
     if (code == BRACE_LEFT && depth++ == 0) {
       lastIndex = srcStart;
     } else if (code == BRACE_RIGHT && --depth == 0) {
-      out.push(JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 2)));
+      const valueEnd = (srcStart += 2);
+      if (<usize>index < <usize>out.length) {
+        const slot = changetype<usize>(unchecked(out[index]));
+        if (slot != 0) {
+          JSON.__deserialize<valueof<T>>(lastIndex, valueEnd, slot);
+        } else {
+          unchecked(
+            (out[index] = JSON.__deserialize<valueof<T>>(lastIndex, valueEnd)),
+          );
+        }
+      } else {
+        out.push(JSON.__deserialize<valueof<T>>(lastIndex, valueEnd));
+      }
+      index++;
     }
     srcStart += 2;
   }
+  if (<usize>index < <usize>out.length) out.length = index;
   return out;
 }

package/assembly/deserialize/naive/bool.ts

@@ -1,11 +1,19 @@
-// @ts-ignore: inline
-@inline export function deserializeBoolean(
-  srcStart: usize,
-  srcEnd: usize,
-): boolean {
-  const block = load<u64>(srcStart);
-  if (block == 28429475166421108) return true;
-  else if (block == 32370086184550502 && load<u16>(srcStart, 8) == 101)
-    return false;
-  return false; //throw new Error(`Expected to find boolean, but found "${data.slice(0, 100)}" instead!`);
+// 0 = invalid, 1 = false, 2 = true. The status form lets public dispatchers
+// raise malformed-input errors at their catchable boundary without rescanning.
+export function deserializeBooleanCode(srcStart: usize, srcEnd: usize): u32 {
+  const length = srcEnd - srcStart;
+  if (length >= 8 && load<u64>(srcStart) == 28429475166421108) return 2;
+  if (
+    length >= 10 &&
+    load<u64>(srcStart) == 32370086184550502 &&
+    load<u16>(srcStart, 8) == 101
+  )
+    return 1;
+  return 0;
+}
+
+export function deserializeBoolean(srcStart: usize, srcEnd: usize): boolean {
+  const code = deserializeBooleanCode(srcStart, srcEnd);
+  if (code != 0) return code == 2;
+  throw new Error("Expected 'true' or 'false' in JSON");
 }

package/assembly/deserialize/naive/date.ts

@@ -1,7 +1,6 @@
 import { ptrToStr } from "../../util/ptrToStr";
 
-// @ts-ignore: inline
-@inline export function deserializeDate(srcStart: usize, srcEnd: usize): Date {
+export function deserializeDate(srcStart: usize, srcEnd: usize): Date {
   // Use AssemblyScript's date parser
   const d = Date.fromString(ptrToStr(srcStart + 2, srcEnd - 2));
 

package/assembly/deserialize/naive/float.ts

@@ -9,7 +9,6 @@ import { isSpace } from "../../util";
 // numbers like `0e`, `-01`, `1.`, `2.e3`, `0x42`.
 function validateJSONNumber(srcStart: usize, srcEnd: usize): void {
   let ptr = srcStart;
-  while (ptr < srcEnd && isSpace(load<u16>(ptr))) ptr += 2;
   let end = srcEnd;
   while (end > ptr && isSpace(load<u16>(end - 2))) end -= 2;
   if (ptr >= end) throw new Error("Invalid JSON number: empty");
@@ -61,12 +60,8 @@ function validateJSONNumber(srcStart: usize, srcEnd: usize): void {
   if (ptr != end) throw new Error("Invalid JSON number: trailing characters");
 }
 
-// @ts-ignore: inline
-@inline export function deserializeFloat_NAIVE<T>(
-  srcStart: usize,
-  srcEnd: usize,
-): T {
-  validateJSONNumber(srcStart, srcEnd);
+export function deserializeFloat_NAIVE<T>(srcStart: usize, srcEnd: usize): T {
+  if (JSON_STRICT) validateJSONNumber(srcStart, srcEnd);
   // @ts-ignore
   const type: T = 0;
   // @ts-ignore
@@ -113,8 +108,7 @@ function scanFloatEnd(srcStart: usize, srcEnd: usize): usize {
   return ptr;
 }
 
-// @ts-ignore: inline
-@inline export function deserializeFloatField_NAIVE<T extends number>(
+export function deserializeFloatField_NAIVE<T extends number>(
   srcStart: usize,
   srcEnd: usize,
   dstObj: usize,

package/assembly/deserialize/naive/integer.ts

@@ -1,7 +1,6 @@
 import { atoi } from "../../util/atoi";
 
-// @ts-ignore: inline
-@inline export function deserializeInteger_NAIVE<T extends number>(
+export function deserializeInteger_NAIVE<T extends number>(
   srcStart: usize,
   srcEnd: usize,
 ): T {