json-as 1.3.9 → 1.4.0

package/assembly/deserialize/naive/string.ts

@@ -33,8 +33,7 @@ import { DESERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
 // Strict RFC 8259 check for the char following a backslash, at [escPtr, srcEnd).
 // Legal escapes: " \ / b f n r t and \uXXXX (4 hex digits). Throws otherwise:
 // unknown escape letter, a trailing backslash, or a short / non-hex \u.
-// @ts-ignore: inline
-@inline function validateEscape(escPtr: usize, srcEnd: usize): void {
+function validateEscape(escPtr: usize, srcEnd: usize): void {
   if (escPtr >= srcEnd)
     throw new Error("Invalid JSON string: incomplete escape");
   const code = load<u16>(escPtr);
@@ -65,8 +64,7 @@ import { DESERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
     throw new Error("Invalid JSON string: illegal escape");
 }
 
-// @ts-ignore: inline
-@inline export function deserializeString_NAIVE(
+export function deserializeString_NAIVE(
   srcStart: usize,
   srcEnd: usize,
 ): string {
@@ -121,8 +119,7 @@ import { DESERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
 
 // Writes into the destination field, reusing or resizing the backing string.
 // Mirrors `writeStringToField` in ../swar/string.ts.
-// @ts-ignore: inline
-@inline function writeStringToField(
+function writeStringToField(
   dstFieldPtr: usize,
   srcStart: usize,
   byteLength: u32,
@@ -148,23 +145,26 @@ import { DESERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
   memory.copy(stringPtr, srcStart, byteLength);
 }
 
-// @ts-ignore: inline
-@inline export function deserializeStringField_NAIVE<T extends string | null>(
-  srcStart: usize,
+// Escape-bearing tail of the field parse: the clean prefix [payloadStart,
+// escPos) is bulk-copied into the scratch buffer, then escapes are decoded into
+// it, and the result is written to the field. Only reached when a backslash is
+// actually present — the common escape-free case never touches `bs`.
+function deserializeEscapedStringField_NAIVE(
+  payloadStart: usize,
+  escPos: usize,
   srcEnd: usize,
-  dstObj: usize,
-  dstOffset: usize = 0,
+  dstFieldPtr: usize,
 ): usize {
-  const dstFieldPtr = dstObj + dstOffset;
-  if (srcStart + 2 > srcEnd || load<u16>(srcStart) != QUOTE)
-    abort("Expected leading quote");
-
-  const payloadStart = srcStart + 2;
-  srcStart = payloadStart;
-
   bs.offset = bs.buffer;
   bs.ensureSize(<u32>(srcEnd - payloadStart));
 
+  const prefixLen = escPos - payloadStart;
+  if (prefixLen) {
+    memory.copy(bs.offset, payloadStart, prefixLen);
+    bs.offset += prefixLen;
+  }
+
+  let srcStart = escPos;
   while (srcStart < srcEnd) {
     const block = load<u16>(srcStart);
 
@@ -197,3 +197,50 @@ import { DESERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
   abort("Expected closing quote");
   return 0;
 }
+
+// NOT @inline: this is a loop-bearing scanner called per string field. As an
+// always-inline entry it gets inlined into every field call site inside the
+// @inline __DESERIALIZE_FAST, exploding binaryen's optimize phase on large
+// schemas (~118s on the `large` bench). Kept as a single shared function — one
+// call per field — matching the non-inline SWAR/SIMD field deserializers.
+export function deserializeStringField_NAIVE<T extends string | null>(
+  srcStart: usize,
+  srcEnd: usize,
+  dstObj: usize,
+  dstOffset: usize = 0,
+): usize {
+  const dstFieldPtr = dstObj + dstOffset;
+  if (srcStart + 2 > srcEnd || load<u16>(srcStart) != QUOTE)
+    abort("Expected leading quote");
+
+  const payloadStart = srcStart + 2;
+  srcStart = payloadStart;
+
+  // Scan for the closing quote without touching the scratch buffer. For the
+  // common escape-free case the bytes are a verbatim slice of the source, so we
+  // copy source -> field directly (mirrors the SWAR/SIMD field paths). Only a
+  // backslash diverts to the escape-decoding tail above.
+  while (srcStart < srcEnd) {
+    const block = load<u16>(srcStart);
+    if (block == QUOTE) {
+      writeStringToField(
+        dstFieldPtr,
+        payloadStart,
+        <u32>(srcStart - payloadStart),
+      );
+      return srcStart + 2;
+    }
+    if (block == BACK_SLASH) {
+      return deserializeEscapedStringField_NAIVE(
+        payloadStart,
+        srcStart,
+        srcEnd,
+        dstFieldPtr,
+      );
+    }
+    srcStart += 2;
+  }
+
+  abort("Expected closing quote");
+  return 0;
+}

package/assembly/deserialize/naive/typedarray.ts

@@ -2,8 +2,7 @@ import { COMMA, BRACKET_RIGHT } from "../../custom/chars";
 import { deserializeFloat_NAIVE } from "./float";
 import { atoi, isSpace } from "../../util";
 
-
-@inline function countTypedArrayElements(srcStart: usize, srcEnd: usize): i32 {
+function countTypedArrayElements(srcStart: usize, srcEnd: usize): i32 {
   let count = 0;
 
   while (srcStart < srcEnd) {

package/assembly/deserialize/naive/unsigned.ts

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

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

@@ -76,8 +76,7 @@ const ASCII_ZERO_4: u64 = 0x0030003000300030;
   }
 }
 
-// @ts-expect-error: decorators valid here
-@inline function tryParseEightDigitsSIMD(srcStart: usize, value: u64): u64 {
+function tryParseEightDigitsSIMD(srcStart: usize, value: u64): u64 {
   const block = load<v128>(srcStart);
   const digits = i16x8.sub(block, SPLAT_30);
   if (v128.any_true(i16x8.gt_u(digits, SPLAT_09))) return 0;
@@ -96,8 +95,7 @@ const ASCII_ZERO_4: u64 = 0x0030003000300030;
 // As in the SWAR variant: the parse helpers take a `slot` (`writePtr`) and
 // store directly. The dispatcher owns `out.length = maxElements` and the
 // per-element `writePtr` advance so `Array.push` is removed for every
-// @ts-expect-error: decorators valid here
-@inline function parseSignedIntegerSIMD<T extends number[]>(
+function parseSignedIntegerSIMD<T extends number[]>(
   srcStart: usize,
   srcEnd: usize,
   slot: usize,
@@ -135,8 +133,7 @@ const ASCII_ZERO_4: u64 = 0x0030003000300030;
   return srcStart;
 }
 
-// @ts-expect-error: decorators valid here
-@inline function parseUnsignedIntegerSIMD<T extends number[]>(
+function parseUnsignedIntegerSIMD<T extends number[]>(
   srcStart: usize,
   srcEnd: usize,
   slot: usize,

package/assembly/deserialize/simd/float.ts

@@ -48,11 +48,7 @@ const ASCII_E_LO: u16 = 101;
   }
 }
 
-// @ts-ignore: inline
-@inline export function deserializeFloat_SIMD<T>(
-  srcStart: usize,
-  srcEnd: usize,
-): T {
+export function deserializeFloat_SIMD<T>(srcStart: usize, srcEnd: usize): T {
   const origStart = srcStart;
   let p = srcStart;
   let negative = false;
@@ -168,8 +164,7 @@ const ASCII_E_LO: u16 = 101;
   return <T>(<f32>result);
 }
 
-// @ts-ignore: inline
-@inline export function deserializeFloatField_SIMD<T extends number>(
+export function deserializeFloatField_SIMD<T extends number>(
   srcStart: usize,
   srcEnd: usize,
   dstObj: usize,

package/assembly/deserialize/simd/integer.ts

@@ -88,8 +88,7 @@ const ASCII_ZERO: u16 = 48;
  * @param srcEnd   Pointer just past the last code unit.
  * @returns The parsed value, two's-complement truncated to `T`.
  */
-// @ts-expect-error: decorator valid here
-@inline export function deserializeInteger_SIMD<T extends number>(
+export function deserializeInteger_SIMD<T extends number>(
   srcStart: usize,
   srcEnd: usize,
 ): T {
@@ -130,8 +129,7 @@ const ASCII_ZERO: u16 = 48;
  * @param dstOffset Byte offset of the field within `dstObj`.
  * @returns The source position immediately after the last digit consumed.
  */
-// @ts-expect-error: @inline is a valid decorator
-@inline export function deserializeIntegerField_SIMD<T extends number>(
+export function deserializeIntegerField_SIMD<T extends number>(
   srcStart: usize,
   srcEnd: usize,
   dstObj: usize,
@@ -170,8 +168,7 @@ const ASCII_ZERO: u16 = 48;
  * @param srcEnd   Pointer just past the last code unit.
  * @returns The parsed value, truncated to `T`.
  */
-// @ts-expect-error: @inline is a valid decorator
-@inline export function deserializeUnsigned_SIMD<T extends number>(
+export function deserializeUnsigned_SIMD<T extends number>(
   srcStart: usize,
   srcEnd: usize,
 ): T {
@@ -207,8 +204,7 @@ const ASCII_ZERO: u16 = 48;
  * @param dstOffset Byte offset of the field within `dstObj`.
  * @returns The source position immediately after the last digit consumed.
  */
-// @ts-expect-error: @inline is a valid decorator
-@inline export function deserializeUnsignedField_SIMD<T extends number>(
+export function deserializeUnsignedField_SIMD<T extends number>(
   srcStart: usize,
   srcEnd: usize,
   dstObj: usize,

package/assembly/deserialize/simd/string.ts

@@ -75,8 +75,7 @@ import { hex4_to_u16_swar } from "../../util/swar";
   return changetype<string>(out);
 }
 
-// @ts-expect-error: @inline is a valid decorator
-@inline function writeStringToField_SIMD(
+function writeStringToField_SIMD(
   dstFieldPtr: usize,
   srcStart: usize,
   byteLength: u32,
@@ -233,16 +232,16 @@ export function deserializeString_SIMD(srcStart: usize, srcEnd: usize): string {
     }
 
     const laneIdx = usize(ctz(mask) << 1);
-    return inline.always(
-      deserializeEscapedString_SIMD(payloadStart, srcStart + laneIdx, srcEnd),
+    return deserializeEscapedString_SIMD(
+      payloadStart,
+      srcStart + laneIdx,
+      srcEnd,
     );
   }
 
   while (srcStart < srcEnd) {
     if (load<u16>(srcStart) == BACK_SLASH) {
-      return inline.always(
-        deserializeEscapedString_SIMD(payloadStart, srcStart, srcEnd),
-      );
+      return deserializeEscapedString_SIMD(payloadStart, srcStart, srcEnd);
     }
     srcStart += 2;
   }
@@ -427,13 +426,11 @@ export function deserializeStringField_SIMD<T extends string | null>(
       return srcIdx + 2;
     }
     // backslash → vectorized escaped scan (no more SWAR fallback)
-    return inline.always(
-      deserializeEscapedStringField_SIMD(
-        payloadStart,
-        srcIdx,
-        srcEnd,
-        dstFieldPtr,
-      ),
+    return deserializeEscapedStringField_SIMD(
+      payloadStart,
+      srcIdx,
+      srcEnd,
+      dstFieldPtr,
     );
   }
 
@@ -448,13 +445,11 @@ export function deserializeStringField_SIMD<T extends string | null>(
       return srcStart + 2;
     }
     if (char == BACK_SLASH) {
-      return inline.always(
-        deserializeEscapedStringField_SIMD(
-          payloadStart,
-          srcStart,
-          srcEnd,
-          dstFieldPtr,
-        ),
+      return deserializeEscapedStringField_SIMD(
+        payloadStart,
+        srcStart,
+        srcEnd,
+        dstFieldPtr,
       );
     }
     srcStart += 2;

package/assembly/deserialize/swar/array/array.ts

@@ -3,8 +3,7 @@ import { BRACKET_LEFT, BRACKET_RIGHT, COMMA } from "../../../custom/chars";
 import { deserializeFloatArrayBody } from "./float";
 import { ensureArrayField, scanValueEnd, skipWhitespace } from "./shared";
 
-
-@inline export function deserializeArrayArrayBody<T extends unknown[][]>(
+export function deserializeArrayArrayBody<T extends unknown[][]>(
   srcStart: usize,
   srcEnd: usize,
   out: T,

package/assembly/deserialize/swar/array/bool.ts

@@ -8,8 +8,7 @@ import {
 import { isSpace } from "../../../util";
 import { ensureArrayElementSlot, ensureArrayField } from "./shared";
 
-
-@inline function deserializeBooleanArrayBody<T extends boolean[]>(
+function deserializeBooleanArrayBody<T extends boolean[]>(
   srcStart: usize,
   srcEnd: usize,
   out: T,

package/assembly/deserialize/swar/array/float.ts

@@ -46,8 +46,7 @@ import { isSpace } from "../../../util";
  * digit, lone minus, malformed exponent suffix). Valid-but-out-of-range
  * numbers are handled inline.
  */
-// @ts-expect-error: decorators valid here
-@inline export function parseFloatElementSWAR<E>(
+export function parseFloatElementSWAR<E>(
   srcStart: usize,
   srcEnd: usize,
   slot: usize,
@@ -265,7 +264,7 @@ export function deserializeFloatArray_SWAR<T extends number[]>(
  * `[lon,lat]` would over-allocate megabytes of f64 capacity. Instead we
  * use `ensureArrayElementSlot`'s grow-or-reuse strategy.
  */
-@inline export function deserializeFloatArrayBody<T extends number[]>(
+export function deserializeFloatArrayBody<T extends number[]>(
   srcStart: usize,
   srcEnd: usize,
   out: T,

package/assembly/deserialize/swar/array/generic.ts

@@ -7,8 +7,7 @@ import {
   skipWhitespace,
 } from "./shared";
 
-
-@inline export function deserializeGenericArrayBody<T extends unknown[]>(
+export function deserializeGenericArrayBody<T extends unknown[]>(
   srcStart: usize,
   srcEnd: usize,
   out: T,

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

@@ -53,7 +53,7 @@ import { parse4Digits_PairMul } from "../../../util/swar-int";
 // Parsers are also E-parameterised so they're shareable with
 // `swar/typedarray.ts`. The body is byte-identical to the prior version
 // modulo s/valueof<T>/E/.
-@inline export function parseSignedIntegerScalar<E extends number>(
+export function parseSignedIntegerScalar<E extends number>(
   srcStart: usize,
   srcEnd: usize,
   slot: usize,
@@ -83,8 +83,7 @@ import { parse4Digits_PairMul } from "../../../util/swar-int";
   return srcStart;
 }
 
-
-@inline export function parseUnsignedIntegerScalar<E extends number>(
+export function parseUnsignedIntegerScalar<E extends number>(
   srcStart: usize,
   srcEnd: usize,
   slot: usize,
@@ -105,8 +104,7 @@ import { parse4Digits_PairMul } from "../../../util/swar-int";
   return srcStart;
 }
 
-
-@inline export function parseSignedIntegerSWAR<E extends number>(
+export function parseSignedIntegerSWAR<E extends number>(
   srcStart: usize,
   srcEnd: usize,
   slot: usize,
@@ -154,8 +152,7 @@ import { parse4Digits_PairMul } from "../../../util/swar-int";
   return srcStart;
 }
 
-
-@inline export function parseUnsignedIntegerSWAR<E extends number>(
+export function parseUnsignedIntegerSWAR<E extends number>(
   srcStart: usize,
   srcEnd: usize,
   slot: usize,
@@ -309,8 +306,7 @@ export function deserializeIntegerArray_SLOW<T extends number[]>(
   throw new Error("Failed to parse JSON!");
 }
 
-
-@inline function deserializeIntegerArrayImpl<T extends number[]>(
+function deserializeIntegerArrayImpl<T extends number[]>(
   srcStart: usize,
   srcEnd: usize,
   dst: usize,
@@ -644,8 +640,7 @@ function deserializeNarrowIntegerArray_SWAR<T extends number[]>(
   return out;
 }
 
-
-@inline function deserializeIntegerArrayBody<T extends number[]>(
+function deserializeIntegerArrayBody<T extends number[]>(
   srcStart: usize,
   srcEnd: usize,
   out: T,

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

@@ -7,8 +7,7 @@ import {
   skipWhitespace,
 } from "./shared";
 
-
-@inline function deserializeObjectArrayBody<T extends unknown[]>(
+function deserializeObjectArrayBody<T extends unknown[]>(
   srcStart: usize,
   srcEnd: usize,
   out: T,

package/assembly/deserialize/swar/array/shared.ts

@@ -77,16 +77,12 @@ import { isSpace } from "../../../util";
   return out.dataStart + <usize>index * sizeof<valueof<T>>();
 }
 
-
-@inline export function scanQuotedValueEnd_SWAR(
-  srcStart: usize,
-  srcEnd: usize,
-): usize {
+export function scanQuotedValueEnd_SWAR(srcStart: usize, srcEnd: usize): usize {
   srcStart += 2;
   const srcEnd8 = srcEnd >= 8 ? srcEnd - 8 : 0;
 
   while (srcStart <= srcEnd8) {
-    let mask = inline.always(backslashOrQuoteMask(load<u64>(srcStart)));
+    let mask = backslashOrQuoteMask(load<u64>(srcStart));
     if (mask === 0) {
       srcStart += 8;
       continue;
@@ -114,8 +110,7 @@ import { isSpace } from "../../../util";
   return 0;
 }
 
-
-@inline export function scanValueEnd(srcStart: usize, srcEnd: usize): usize {
+export function scanValueEnd<T = usize>(srcStart: usize, srcEnd: usize): usize {
   if (srcStart >= srcEnd) return 0;
   const first = load<u16>(srcStart);
 

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

@@ -17,8 +17,7 @@ import { deserializeStringField_SWAR } from "../string";
   return srcStart;
 }
 
-
-@inline function deserializeStringArrayBody<T extends string[]>(
+function deserializeStringArrayBody<T extends string[]>(
   srcStart: usize,
   srcEnd: usize,
   out: T,

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

@@ -26,7 +26,7 @@ import { ensureArrayElementSlot, ensureArrayField } from "./shared";
 //   - Whitespace is skipped at each separator boundary so struct-array
 //     fields tolerate the same `[ {...} , {...} ]` shape that top-level
 //     `JSON.parse` does.
-@inline function deserializeStructArrayBody<T extends unknown[]>(
+function deserializeStructArrayBody<T extends unknown[]>(
   srcStart: usize,
   srcEnd: usize,
   out: T,

package/assembly/deserialize/swar/float.ts

@@ -65,11 +65,7 @@ const ASCII_E_LO: u16 = 101;
   }
 }
 
-// @ts-ignore: inline
-@inline export function deserializeFloat_SWAR<T>(
-  srcStart: usize,
-  srcEnd: usize,
-): T {
+export function deserializeFloat_SWAR<T>(srcStart: usize, srcEnd: usize): T {
   const origStart = srcStart;
   let p = srcStart;
   let negative = false;
@@ -98,7 +94,7 @@ const ASCII_E_LO: u16 = 101;
   if (p < srcEnd && load<u16>(p) == ASCII_DOT) {
     p += 2;
     while (p + 6 < srcEnd) {
-      const parsed = inline.always(parse4Digits_PairMul(load<u64>(p)));
+      const parsed = parse4Digits_PairMul(load<u64>(p));
       if (parsed == U32.MAX_VALUE) break;
       mantissa = mantissa * 10_000 + <u64>parsed;
       fracDigits += 4;
@@ -181,8 +177,7 @@ const ASCII_E_LO: u16 = 101;
   return <T>(<f32>result);
 }
 
-// @ts-ignore: inline
-@inline export function deserializeFloatField_SWAR<T extends number>(
+export function deserializeFloatField_SWAR<T extends number>(
   srcStart: usize,
   srcEnd: usize,
   dstObj: usize,

package/assembly/deserialize/swar/integer.ts

@@ -90,8 +90,7 @@ const ASCII_ZERO: u16 = 48;
  * @param srcEnd   Pointer just past the last code unit.
  * @returns The parsed value, two's-complement truncated to `T`.
  */
-// @ts-expect-error: @inline is a valid decorator
-@inline export function deserializeInteger_SWAR<T extends number>(
+export function deserializeInteger_SWAR<T extends number>(
   srcStart: usize,
   srcEnd: usize,
 ): T {
@@ -137,8 +136,7 @@ const ASCII_ZERO: u16 = 48;
  * @param dstOffset Byte offset of the field within `dstObj`.
  * @returns The source position immediately after the last digit consumed.
  */
-// @ts-expect-error: @inline is a valid decorator
-@inline export function deserializeIntegerField_SWAR<T extends number>(
+export function deserializeIntegerField_SWAR<T extends number>(
   srcStart: usize,
   srcEnd: usize,
   dstObj: usize,
@@ -178,8 +176,7 @@ const ASCII_ZERO: u16 = 48;
  * @param srcEnd   Pointer just past the last code unit.
  * @returns The parsed value, truncated to `T`.
  */
-// @ts-expect-error: @inline is a valid decorator
-@inline export function deserializeUnsigned_SWAR<T extends number>(
+export function deserializeUnsigned_SWAR<T extends number>(
   srcStart: usize,
   srcEnd: usize,
 ): T {
@@ -217,8 +214,7 @@ const ASCII_ZERO: u16 = 48;
  * @param dstOffset Byte offset of the field within `dstObj`.
  * @returns The source position immediately after the last digit consumed.
  */
-// @ts-expect-error: @inline is a valid decorator
-@inline export function deserializeUnsignedField_SWAR<T extends number>(
+export function deserializeUnsignedField_SWAR<T extends number>(
   srcStart: usize,
   srcEnd: usize,
   dstObj: usize,