json-as 1.3.2 → 1.3.3

package/README.md

@@ -542,13 +542,13 @@ The following charts compare JSON-AS (both SWAR and SIMD variants) against JavaS
 Instead of using flags for setting options, `json-as` is configured by environmental variables.
 Here's a short list:
 
-**JSON_CACHE** (default: 0) - Enables caching costly strings based on hit frequency. May boost string serialization in excess of 22 GB/s.
+**JSON_CACHE** (default: 0) - Enables and sizes string cache. Supports `true|false`, raw bytes (`JSON_CACHE=1048576`), bits (`JSON_CACHE=512kb`, `2mb`, `1gb`), and bytes (`JSON_CACHE=64KB`, `2MB`, `1GB`). May boost string serialization in excess of 22 GB/s.
 
 **JSON_DEBUG** (default: 0) - Sets the debug level. May be within range `0-3`
 
 **JSON_MODE** (default: SWAR) - Selects which mode should be used. Can be `NAIVE,SWAR,SIMD`. Note that `--enable simd` may be required.
 
-**JSON_USE_FAST_PATH** (default: 0) - When set to `1`, the transform emits the fast `__DESERIALIZE` implementation for generated structs. When unset or `0`, it emits only the slow path. See [FAST_PATH_DESERIALIZE.md](./FAST_PATH_DESERIALIZE.md) for the current support matrix, known gaps, and dedicated test command.
+**JSON_USE_FAST_PATH** (default: 1) - The transform emits the fast `__DESERIALIZE` implementation for generated structs by default. Set to `0`, `false`, `off`, or `no` to force slow-path-only output. See [FAST_PATH_DESERIALIZE.md](./FAST_PATH_DESERIALIZE.md) for the current support matrix, known gaps, and dedicated test command.
 
 **JSON_WRITE** (default: "") - Select a series of files to output after transform and optimization passes have completed for easy inspection. Usage: `JSON_WRITE=.path-to-file-a.ts,./path-to-file-b.ts`
 
@@ -629,6 +629,7 @@ A few companies and open-source projects use json-as!
 | [Klave](https://klave.com) | Privacy-first platform |
 | [Bifrost](https://github.com/maximhq/bifrost) | Open source project by Maxim HQ |
 | [Massa Labs](https://github.com/massalabs) | Massa blockchain tooling |
+| [Seda Protocol](https://github.com/sedaprotocl) | Wasm-based blockchain VM |
 
 ## License
 

package/assembly/deserialize/simple/map.ts

@@ -170,6 +170,7 @@ export function deserializeMap<T extends Map<any, any>>(srcStart: usize, srcEnd:
   return out;
 }
 
+
 @inline export function deserializeMapInto<T extends Map<any, any>>(srcStart: usize, srcEnd: usize, out: T): usize {
   changetype<nonnull<T>>(out).clear();
 
@@ -209,6 +210,7 @@ export function deserializeMap<T extends Map<any, any>>(srcStart: usize, srcEnd:
   throw new Error("Failed to parse JSON!");
 }
 
+
 @inline export function deserializeMapField<T extends Map<any, any>>(srcStart: usize, srcEnd: usize, dstObj: usize, dstOffset: usize = 0): usize {
   let out = load<T>(dstObj, dstOffset);
   if (!changetype<usize>(out)) {

package/assembly/deserialize/simple/staticarray.ts

@@ -72,6 +72,7 @@ export function deserializeStaticArray<T extends StaticArray<any>>(srcStart: usi
   throw new Error("Could not parse static array of type " + nameof<T>() + "!");
 }
 
+
 @inline export function deserializeStaticArrayField<T extends StaticArray<any>>(srcStart: usize, srcEnd: usize, dstObj: usize, dstOffset: usize = 0): usize {
   const valueEnd = scanValueEnd(srcStart, srcEnd);
   if (!valueEnd) throw new Error("Failed to parse JSON!");

package/assembly/deserialize/simple/struct.ts

@@ -7,9 +7,11 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
   if (isDefined(out.__DESERIALIZE_FAST)) {
     // @ts-ignore: supplied by transform
     out.__DESERIALIZE_FAST(srcStart, srcEnd, out);
-  } else {
+  } else if (isDefined(out.__DESERIALIZE_SLOW)) {
     // @ts-ignore: supplied by transform
     out.__DESERIALIZE_SLOW(srcStart, srcEnd, out);
+  } else {
+    throw new Error("Missing __DESERIALIZE_FAST/__DESERIALIZE_SLOW");
   }
   return out;
 }

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

@@ -45,6 +45,7 @@ import { ensureArrayElementSlot, ensureArrayField } from "./shared";
   throw new Error("Failed to parse JSON!");
 }
 
+
 @inline export function deserializeBooleanArrayField<T extends boolean[]>(srcStart: usize, srcEnd: usize, fieldPtr: usize): usize {
   return deserializeBooleanArrayInto<T>(srcStart, srcEnd, ensureArrayField<T>(fieldPtr));
 }

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

@@ -2,8 +2,8 @@ import { JSON } from "../../..";
 import { BRACKET_LEFT, BRACKET_RIGHT, COMMA } from "../../../custom/chars";
 import { ensureArrayElementSlot, ensureArrayField, scanValueEnd } from "./shared";
 
-@inline export function deserializeGenericArrayInto<T extends unknown[]>(srcStart: usize, srcEnd: usize, out: T): usize {
 
+@inline export function deserializeGenericArrayInto<T extends unknown[]>(srcStart: usize, srcEnd: usize, out: T): usize {
   if (srcStart >= srcEnd || load<u16>(srcStart) != BRACKET_LEFT) throw new Error("Failed to parse JSON!");
   srcStart += 2;
   if (srcStart >= srcEnd) throw new Error("Failed to parse JSON!");
@@ -35,6 +35,7 @@ import { ensureArrayElementSlot, ensureArrayField, scanValueEnd } from "./shared
   throw new Error("Failed to parse JSON!");
 }
 
+
 @inline export function deserializeGenericArrayField<T extends unknown[]>(srcStart: usize, srcEnd: usize, fieldPtr: usize): usize {
   return deserializeGenericArrayInto<T>(srcStart, srcEnd, ensureArrayField<T>(fieldPtr));
 }

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

@@ -459,6 +459,7 @@ export function deserializeIntegerArray_SWAR<T extends number[]>(srcStart: usize
   throw new Error("Failed to parse JSON!");
 }
 
+
 @inline export function deserializeIntegerArrayField<T extends number[]>(srcStart: usize, srcEnd: usize, fieldPtr: usize): usize {
   return deserializeIntegerArrayInto<T>(srcStart, srcEnd, ensureArrayField<T>(fieldPtr));
 }

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

@@ -55,6 +55,7 @@ import { ensureArrayElementSlot, ensureArrayField } from "./shared";
   throw new Error("Failed to parse JSON!");
 }
 
+
 @inline export function deserializeObjectArrayField<T extends unknown[]>(srcStart: usize, srcEnd: usize, fieldPtr: usize): usize {
   return deserializeObjectArrayInto<T>(srcStart, srcEnd, ensureArrayField<T>(fieldPtr));
 }

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

@@ -10,6 +10,7 @@ import { BACK_SLASH, BRACE_LEFT, BRACE_RIGHT, BRACKET_LEFT, BRACKET_RIGHT, COMMA
   return out;
 }
 
+
 @inline export function ensureArrayFieldAt<T extends Array<any>>(dstObj: usize, dstOffset: usize): T {
   let out = load<T>(dstObj, dstOffset);
   if (!changetype<usize>(out)) {

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

@@ -37,6 +37,7 @@ import { deserializeStringField_SWAR } from "../string";
   throw new Error("Failed to parse JSON!");
 }
 
+
 @inline export function deserializeStringArrayField<T extends string[]>(srcStart: usize, srcEnd: usize, fieldPtr: usize): usize {
   return deserializeStringArrayInto<T>(srcStart, srcEnd, ensureArrayField<T>(fieldPtr));
 }

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

@@ -55,6 +55,7 @@ import { ensureArrayElementSlot, ensureArrayField } from "./shared";
   throw new Error("Failed to parse JSON!");
 }
 
+
 @inline export function deserializeStructArrayField<T extends unknown[]>(srcStart: usize, srcEnd: usize, fieldPtr: usize): usize {
   return deserializeStructArrayInto<T>(srcStart, srcEnd, ensureArrayField<T>(fieldPtr));
 }

package/assembly/deserialize/swar/array.ts

@@ -62,6 +62,7 @@ import { deserializeStructArrayInto } from "./array/struct";
   }
 }
 
+
 @inline export function deserializeArrayInto_SWAR<T extends unknown[]>(srcStart: usize, srcEnd: usize, out: T): usize {
   if (isString<valueof<T>>()) {
     return deserializeStringArrayInto<T>(srcStart, srcEnd, out);

package/assembly/deserialize/swar/string.ts

@@ -209,7 +209,6 @@ export function deserializeString_SWAR(srcStart: usize, srcEnd: usize): string {
   memory.copy(stringPtr, srcStart, byteLength);
 }
 
-
 // @ts-expect-error: @inline is a valid decorator
 @inline function deserializeEscapedStringContinuation_SWAR(lastPtr: usize, srcStart: usize, srcEnd: usize, dstFieldPtr: usize, outStart: usize): usize {
   const srcEnd8 = srcEnd - 8;
@@ -630,7 +629,6 @@ export function deserializeStringField_SWAR<T extends string | null>(srcStart: u
   return srcStart;
 }
 
-
 /**
  * Computes a per-byte mask identifying ASCII backslash or quote bytes.
  *

package/assembly/index.d.ts

@@ -52,3 +52,4 @@ declare enum JSONMode {
 
 declare const JSON_MODE: JSONMode;
 declare const JSON_CACHE: bool;
+declare const JSON_CACHE_SIZE: usize;

package/assembly/index.ts

@@ -17,18 +17,7 @@ import { serializeSet } from "./serialize/index/set";
 import { deserializeSet } from "./deserialize/index/set";
 import { serializeStaticArray } from "./serialize/index/staticarray";
 import { deserializeStaticArray } from "./deserialize/index/staticarray";
-import {
-  BRACE_LEFT,
-  BRACE_RIGHT,
-  BRACKET_LEFT,
-  BRACKET_RIGHT,
-  COMMA,
-  NULL_WORD,
-  QUOTE,
-  NULL_WORD_U64,
-  TRUE_WORD_U64,
-  FALSE_WORD_U64,
-} from "./custom/chars";
+import { BRACE_LEFT, BRACE_RIGHT, BRACKET_LEFT, BRACKET_RIGHT, COMMA, NULL_WORD, QUOTE, NULL_WORD_U64, TRUE_WORD_U64, FALSE_WORD_U64 } from "./custom/chars";
 import { itoa_buffered } from "util/number";
 import { serializeBool } from "./serialize/index/bool";
 import { serializeInteger } from "./serialize/index/integer";
@@ -244,14 +233,19 @@ export namespace JSON {
       } else if (isDefined(type.__DESERIALIZE_SLOW) || isDefined(type.__DESERIALIZE_FAST)) {
         const out = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()));
         // @ts-expect-error: Defined by transform
-        if (isDefined(type.__INITIALIZE)) out.__INITIALIZE();
-        // @ts-expect-error: Defined by transform
         if (isDefined(type.__DESERIALIZE_FAST)) {
           // @ts-expect-error: Defined by transform
-          out.__DESERIALIZE_FAST(dataPtr, dataPtr + dataSize, out);
+          if (out.__DESERIALIZE_FAST(dataPtr, dataPtr + dataSize, out) == dataPtr + dataSize) return out;
           // @ts-expect-error: Defined by transform
-        } else out.__DESERIALIZE_SLOW(dataPtr, dataPtr + dataSize, out);
-        return out;
+        }
+        if (isDefined(type.__INITIALIZE)) out.__INITIALIZE();
+        // @ts-expect-error: Defined by transform
+        if (isDefined(type.__DESERIALIZE_SLOW)) {
+          // @ts-expect-error: Defined by transform
+          out.__DESERIALIZE_SLOW(dataPtr, dataPtr + dataSize, out);
+          return out;
+        }
+        throw new Error(`No deserialize method defined for type ${type}`);
       }
       if (type instanceof StaticArray) {
         // @ts-expect-error
@@ -956,12 +950,19 @@ export namespace JSON {
       } else if (isDefined(type.__DESERIALIZE_SLOW) || isDefined(type.__DESERIALIZE_FAST)) {
         const out = changetype<nonnull<T>>(dst || __new(offsetof<nonnull<T>>(), idof<nonnull<T>>()));
         // @ts-expect-error: Defined by transform
-        if (isDefined(type.__INITIALIZE)) out.__INITIALIZE();
+        if (isDefined(type.__DESERIALIZE_FAST)) {
+          // @ts-expect-error: Defined by transform
+          if (out.__DESERIALIZE_FAST(srcStart, srcEnd, out) == srcEnd) return out;
+        }
         // @ts-expect-error: Defined by transform
-        if (isDefined(type.__DESERIALIZE_FAST)) out.__DESERIALIZE_FAST(srcStart, srcEnd, out);
+        if (isDefined(type.__INITIALIZE)) out.__INITIALIZE();
         // @ts-expect-error: Defined by transform
-        else out.__DESERIALIZE_SLOW(srcStart, srcEnd, out);
-        return out;
+        if (isDefined(type.__DESERIALIZE_SLOW)) {
+          // @ts-expect-error: Defined by transform
+          out.__DESERIALIZE_SLOW(srcStart, srcEnd, out);
+          return out;
+        }
+        throw new Error(`No deserialize method defined for type ${type}`);
       }
       if (type instanceof StaticArray) {
         // @ts-expect-error: type

package/assembly/serialize/simple/array.ts

@@ -3,6 +3,7 @@ import { COMMA, BRACKET_RIGHT, BRACKET_LEFT } from "../../custom/chars";
 import { JSON } from "../..";
 import { serializeFloat32, serializeFloat64 } from "./float";
 
+
 @inline
 function serializeArrayElement<T>(value: T): void {
   if (isFloat<T>()) {

package/assembly/serialize/simple/float.ts

@@ -1,6 +1,7 @@
 import { bs } from "../../../lib/as-bs";
 import { dragonbox_f32_buffered, dragonbox_f64_buffered } from "../../util/dragonbox";
 
+
 @inline
 export function serializeFloat32(data: f32): void {
   bs.ensureSize(64);
@@ -9,6 +10,7 @@ export function serializeFloat32(data: f32): void {
   bs.offset += size;
 }
 
+
 @inline
 export function serializeFloat64(data: f64): void {
   bs.ensureSize(64);

package/assembly/serialize/simple/typedarray.ts

@@ -48,7 +48,7 @@ export function serializeArrayBufferUnsafe(srcStart: usize, byteLength: i32): vo
     bs.offset += 4;
     return;
   }
-  bs.proposeSize(4 + <u32>(end) * 2);
+  bs.proposeSize(4 + <u32>end * 2);
 
   store<u16>(bs.offset, BRACKET_LEFT);
   bs.offset += 2;

package/assembly/tsconfig.json

@@ -19,6 +19,6 @@
     "noUnusedParameters": false,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "noUncheckedIndexedAccess": false,
-  },
+    "noUncheckedIndexedAccess": false
+  }
 }