json-as 1.2.5 → 1.2.6

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

@@ -1,15 +1,33 @@
-import { BRACE_LEFT, BRACE_RIGHT, BRACKET_LEFT, BRACKET_RIGHT } from "../../../custom/chars";
+import {
+  BRACE_LEFT,
+  BRACE_RIGHT,
+  BRACKET_LEFT,
+  BRACKET_RIGHT,
+} from "../../../custom/chars";
 import { JSON } from "../../..";
 import { isSpace } from "util/string";
 
-export function deserializeStaticArrayStruct<T extends StaticArray<any>>(srcStart: usize, srcEnd: usize, dst: usize): T {
+export function deserializeStaticArrayStruct<T extends StaticArray<any>>(
+  srcStart: usize,
+  srcEnd: usize,
+  dst: usize,
+): T {
   while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
   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");
+  if (srcStart - srcEnd == 0)
+    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 object at position " + (srcEnd - srcStart).toString());
-  if (load<u16>(srcEnd - 2) != BRACKET_RIGHT) throw new Error("Expected ']' at end of object at position " + (srcEnd - srcStart).toString());
+  if (load<u16>(srcStart) != BRACKET_LEFT)
+    throw new Error(
+      "Expected '[' at start of object at position " +
+        (srcEnd - srcStart).toString(),
+    );
+  if (load<u16>(srcEnd - 2) != BRACKET_RIGHT)
+    throw new Error(
+      "Expected ']' at end of object at position " +
+        (srcEnd - srcStart).toString(),
+    );
 
   // First pass: count elements using same logic as Array deserializer
   let count: i32 = 0;
@@ -26,7 +44,7 @@ export function deserializeStaticArrayStruct<T extends StaticArray<any>>(srcStar
   }
 
   // Allocate StaticArray with correct size
-  const outSize = <usize>count << alignof<valueof<T>>();
+  const outSize = (<usize>count) << alignof<valueof<T>>();
   const out = changetype<nonnull<T>>(dst || __new(outSize, idof<T>()));
 
   // Second pass: populate values
@@ -38,7 +56,12 @@ export function deserializeStaticArrayStruct<T extends StaticArray<any>>(srcStar
     if (code == BRACE_LEFT && depth++ == 0) {
       lastIndex = srcStart;
     } else if (code == BRACE_RIGHT && --depth == 0) {
-      unchecked((out[index++] = JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 2))));
+      unchecked(
+        (out[index++] = JSON.__deserialize<valueof<T>>(
+          lastIndex,
+          (srcStart += 2),
+        )),
+      );
     }
     srcStart += 2;
   }

package/assembly/deserialize/simple/staticarray.ts

@@ -5,7 +5,11 @@ 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 {
+export function deserializeStaticArray<T extends StaticArray<any>>(
+  srcStart: usize,
+  srcEnd: usize,
+  dst: usize,
+): T {
   if (isString<valueof<T>>()) {
     return <T>deserializeStaticArrayString(srcStart, srcEnd, dst);
   } else if (isBoolean<valueof<T>>()) {
@@ -21,8 +25,12 @@ export function deserializeStaticArray<T extends StaticArray<any>>(srcStart: usi
     if (isDefined(type.__DESERIALIZE)) {
       return deserializeStaticArrayStruct<T>(srcStart, srcEnd, dst);
     }
-    throw new Error("Could not parse static array of type " + nameof<T>() + "!");
+    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,9 +1,15 @@
 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;
@@ -15,7 +21,7 @@ import { hex4_to_u16_swar } from "../../util/swar";
     srcStart += 2;
 
     // Early exit
-    if (block !== 0x5C) {
+    if (block !== 0x5c) {
       bs.offset += 2;
       continue;
     }

package/assembly/deserialize/simple/struct.ts

@@ -1,7 +1,23 @@
-import { BACK_SLASH, COMMA, CHAR_F, BRACE_LEFT, BRACKET_LEFT, CHAR_N, QUOTE, BRACE_RIGHT, BRACKET_RIGHT, CHAR_T, COLON } from "../../custom/chars";
+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";
 
-export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize): T {
+export function deserializeStruct<T>(
+  srcStart: usize,
+  srcEnd: usize,
+  dst: usize,
+): T {
   const out = changetype<nonnull<T>>(dst || __new(offsetof<T>(), idof<T>()));
 
   // @ts-ignore: supplied by transform
@@ -16,9 +32,18 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
   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) {
@@ -31,7 +56,11 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
           // 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");
@@ -50,7 +79,13 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
           if (code == QUOTE && load<u16>(srcStart - 2) !== BACK_SLASH) {
             // console.log("Value (string): " + ptrToStr(lastIndex, srcStart + 2));
             // @ts-ignore: exists
-            out.__DESERIALIZE(keyStart, keyEnd, lastIndex, srcStart + 2, changetype<usize>(out));
+            out.__DESERIALIZE(
+              keyStart,
+              keyEnd,
+              lastIndex,
+              srcStart + 2,
+              changetype<usize>(out),
+            );
             // while (isSpace(load<u16>(srcStart))) srcStart += 2;
             srcStart += 4;
             // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
@@ -67,7 +102,13 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
           if (code == COMMA || code == BRACE_RIGHT || isSpace(code)) {
             // console.log("Value (number): " + ptrToStr(lastIndex, srcStart));
             // @ts-ignore: exists
-            out.__DESERIALIZE(keyStart, keyEnd, lastIndex, srcStart, changetype<usize>(out));
+            out.__DESERIALIZE(
+              keyStart,
+              keyEnd,
+              lastIndex,
+              srcStart,
+              changetype<usize>(out),
+            );
             // while (isSpace(load<u16>((srcStart += 2)))) {
             //   /* empty */
             // }
@@ -86,12 +127,24 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
           const code = load<u16>(srcStart);
           if (code == QUOTE) {
             srcStart += 2;
-            while (!(load<u16>(srcStart) == QUOTE && load<u16>(srcStart - 2) != BACK_SLASH)) srcStart += 2;
+            while (
+              !(
+                load<u16>(srcStart) == QUOTE &&
+                load<u16>(srcStart - 2) != BACK_SLASH
+              )
+            )
+              srcStart += 2;
           } else if (code == BRACE_RIGHT) {
             if (--depth == 0) {
               // console.log("Value (object): " + ptrToStr(lastIndex, srcStart + 2));
               // @ts-ignore: exists
-              out.__DESERIALIZE(keyStart, keyEnd, lastIndex, (srcStart += 2), changetype<usize>(out));
+              out.__DESERIALIZE(
+                keyStart,
+                keyEnd,
+                lastIndex,
+                (srcStart += 2),
+                changetype<usize>(out),
+              );
               // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
               keyStart = 0;
               // while (isSpace(load<u16>(srcStart))) {
@@ -110,12 +163,24 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
           const code = load<u16>(srcStart);
           if (code == QUOTE) {
             srcStart += 2;
-            while (!(load<u16>(srcStart) == QUOTE && load<u16>(srcStart - 2) != BACK_SLASH)) srcStart += 2;
+            while (
+              !(
+                load<u16>(srcStart) == QUOTE &&
+                load<u16>(srcStart - 2) != BACK_SLASH
+              )
+            )
+              srcStart += 2;
           } else if (code == BRACKET_RIGHT) {
             if (--depth == 0) {
               // console.log("Value (array): " + ptrToStr(lastIndex, srcStart + 2));
               // @ts-ignore: exists
-              out.__DESERIALIZE(keyStart, keyEnd, lastIndex, (srcStart += 2), changetype<usize>(out));
+              out.__DESERIALIZE(
+                keyStart,
+                keyEnd,
+                lastIndex,
+                (srcStart += 2),
+                changetype<usize>(out),
+              );
               // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
               keyStart = 0;
               // while (isSpace(load<u16>((srcStart += 2)))) {
@@ -130,7 +195,13 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
         if (load<u64>(srcStart) == 28429475166421108) {
           // console.log("Value (bool): " + ptrToStr(srcStart, srcStart + 8));
           // @ts-ignore: exists
-          out.__DESERIALIZE(keyStart, keyEnd, srcStart, (srcStart += 8), changetype<usize>(out));
+          out.__DESERIALIZE(
+            keyStart,
+            keyEnd,
+            srcStart,
+            (srcStart += 8),
+            changetype<usize>(out),
+          );
           // while (isSpace(load<u16>((srcStart += 2)))) {
           //   /* empty */
           // }
@@ -142,7 +213,13 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
         if (load<u64>(srcStart, 2) == 28429466576093281) {
           // console.log("Value (bool): " + ptrToStr(srcStart, srcStart + 10));
           // @ts-ignore: exists
-          out.__DESERIALIZE(keyStart, keyEnd, srcStart, (srcStart += 10), changetype<usize>(out));
+          out.__DESERIALIZE(
+            keyStart,
+            keyEnd,
+            srcStart,
+            (srcStart += 10),
+            changetype<usize>(out),
+          );
           // while (isSpace(load<u16>((srcStart += 2)))) {
           //   /* empty */
           // }
@@ -154,7 +231,13 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
         if (load<u64>(srcStart) == 30399761348886638) {
           // console.log("Value (null): " + ptrToStr(srcStart, srcStart + 8));
           // @ts-ignore: exists
-          out.__DESERIALIZE(keyStart, keyEnd, srcStart, (srcStart += 8), changetype<usize>(out));
+          out.__DESERIALIZE(
+            keyStart,
+            keyEnd,
+            srcStart,
+            (srcStart += 8),
+            changetype<usize>(out),
+          );
           // while (isSpace(load<u16>((srcStart += 2)))) {
           /* empty */
           // }
@@ -165,7 +248,12 @@ export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize)
       } 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/swar/string.ts

@@ -67,13 +67,13 @@ export function deserializeString_SWAR(srcStart: usize, srcEnd: usize): string {
       const code = <u16>(header >> 16);
 
       // Detect false positive (code unit where low byte is 0x5C)
-      if ((header & 0xFFFF) !== 0x5C) continue;
+      if ((header & 0xffff) !== 0x5c) continue;
 
       // Hot path (negative bias)
       if (code !== 0x75) {
         // Short escapes (\n \t \" \\)
         const escaped = load<u16>(DESERIALIZE_ESCAPE_TABLE + code);
-        mask &= mask - usize(escaped === 0x5C);
+        mask &= mask - usize(escaped === 0x5c);
         store<u16>(dstIdx, escaped);
         store<u32>(dstIdx, load<u32>(srcIdx, 4), 2);
 
@@ -90,7 +90,6 @@ export function deserializeString_SWAR(srcStart: usize, srcEnd: usize): string {
       // store<u64>(dstIdx, load<u32>(srcIdx, 12), 2);
       srcStart += 4 + laneIdx;
       bs.offset -= 6 - laneIdx;
-
     } while (mask !== 0);
 
     bs.offset += 8;
@@ -103,7 +102,7 @@ export function deserializeString_SWAR(srcStart: usize, srcEnd: usize): string {
     srcStart += 2;
 
     // Early exit
-    if (block !== 0x5C) {
+    if (block !== 0x5c) {
       bs.offset += 2;
       continue;
     }
@@ -141,11 +140,14 @@ export function deserializeString_SWAR(srcStart: usize, srcEnd: usize): string {
  */
 // @ts-expect-error: @inline is a valid decorator
 @inline function backslash_mask(block: u64): u64 {
-  const b = block ^ 0x005C_005C_005C_005C;
-  const backslash_mask = (b - 0x0001_0001_0001_0001) & ~b & 0x0080_0080_0080_0080;
+  const b = block ^ 0x005c_005c_005c_005c;
+  const backslash_mask =
+    (b - 0x0001_0001_0001_0001) & ~b & 0x0080_0080_0080_0080;
   const high_byte_mask =
-    ~(((block - 0x0100_0100_0100_0100) & ~block & 0x8000_8000_8000_8000)
-      ^ 0x8000_8000_8000_8000) >> 8;
+    ~(
+      ((block - 0x0100_0100_0100_0100) & ~block & 0x8000_8000_8000_8000) ^
+      0x8000_8000_8000_8000
+    ) >> 8;
   return backslash_mask & high_byte_mask;
 }
 
@@ -160,7 +162,8 @@ export function deserializeString_SWAR(srcStart: usize, srcEnd: usize): string {
  */
 // @ts-expect-error: @inline is a valid decorator
 @inline function backslash_mask_unsafe(block: u64): u64 {
-  const b = block ^ 0x005C_005C_005C_005C;
-  const backslash_mask = (b - 0x0001_0001_0001_0001) & ~b & 0x0080_0080_0080_0080;
+  const b = block ^ 0x005c_005c_005c_005c;
+  const backslash_mask =
+    (b - 0x0001_0001_0001_0001) & ~b & 0x0080_0080_0080_0080;
   return backslash_mask;
 }

package/assembly/index.d.ts

@@ -24,7 +24,9 @@ declare function omit(..._): void;
 /**
  * Property decorator that allows a field to be omitted when equal to an Expression.
  */
-declare function omitif(condition: string | ((value: any) => boolean)): Function;
+declare function omitif(
+  condition: string | ((value: any) => boolean),
+): Function;
 
 /**
  * Property decorator that allows a field to be omitted when a property is null.
@@ -47,8 +49,8 @@ declare function deserializer(..._): any;
 declare enum JSONMode {
   SWAR = 0,
   SIMD = 1,
-  NAIVE = 2
+  NAIVE = 2,
 }
 
 declare const JSON_MODE: JSONMode;
-declare const JSON_CACHE: bool;
+declare const JSON_CACHE: bool;