fix: 6-byte keys not deserializing

Author: JairusSW

README.md

@@ -74,10 +74,10 @@ class Player {
 }
 
 const player: Player = {
-  firstName: "Emmet",
-  lastName: "West",
-  lastActive: [8, 27, 2022],
-  age: 23,
+  firstName: "Jairus",
+  lastName: "Tanaka",
+  lastActive: [2, 7, 2025],
+  age: 18,
   pos: {
     x: 3.4,
     y: 1.2,
@@ -87,10 +87,10 @@ const player: Player = {
 };
 
 const serialized = JSON.stringify<Player>(player);
-const parsed = JSON.parse<Player>(stringified);
+const parsed = JSON.parse<Player>(serialized);
 
-console.log("Serialized: " + stringified);
-console.log("Parsed: " + parsed);
+console.log("Serialized: " + serialized);
+console.log("Parsed: " + JSON.stringify(parsed));
 ```
 
 ## Examples

assembly/deserialize/simple/object.ts

@@ -1,5 +1,7 @@
+import { JSON } from "../..";
 import { BACK_SLASH, COMMA, CHAR_F, BRACE_LEFT, BRACKET_LEFT, CHAR_N, QUOTE, BRACE_RIGHT, BRACKET_RIGHT, CHAR_T } from "../../custom/chars";
 import { isSpace } from "../../util";
+import { ptrToStr } from "../../util/ptrToStr";
 
 export function deserializeObject<T>(srcStart: usize, srcEnd: usize, dst: usize): T {
   const out = changetype<nonnull<T>>(dst || __new(offsetof<T>(), idof<T>()));
@@ -60,9 +62,9 @@ export function deserializeObject<T>(srcStart: usize, srcEnd: usize, dst: usize)
         while (srcStart < srcEnd) {
           const code = load<u16>(srcStart);
           if (code == COMMA || code == BRACE_RIGHT || isSpace(code)) {
+            console.log("Value (number): " + JSON.__deserialize<i32>(lastIndex, srcStart).toString());
             // @ts-ignore: exists
             out.__DESERIALIZE(keyStart, keyEnd, lastIndex, srcStart, dst);
-            // console.log("Value (number): " + ptrToStr(lastIndex, srcStart));
             // while (isSpace(load<u16>((srcStart += 2)))) {
             //   /* empty */
             // }

assembly/test.ts

@@ -1,5 +1,7 @@
 import { bs } from "../modules/as-bs/assembly";
 import { JSON } from "./";
+import { ptrToStr } from "./util/ptrToStr";
+
 @json
 class Vec3 {
   x: f32 = 0.0;
@@ -10,23 +12,22 @@ class Vec3 {
 @json
 class Player {
   @alias("first name")
-  firstName: string = "";
-  lastName: string = "";
-  lastActive: i32[] = [];
-  // // Drop in a code block, function, or expression that evaluates to a boolean
-  // // @omitif((self) => self.age < 18)
-  // // @omitif('this.age <= 0')
-  // age: i32 = 0;
-  // // @omitnull()
-  // pos: Vec3 | null = new Vec3();
-  // isVerified: boolean = false;
+  firstName!: string;
+  lastName!: string;
+  lastActive!: i32[];
+  // Drop in a code block, function, or expression that evaluates to a boolean
+  // @omitif((self: Player) => self.age < 18)
+  age!: i32;
+  // @omitnull()
+  // pos!: Vec3 | null;
+  // isVerified!: boolean;
 }
 
 const player: Player = {
-  firstName: "Emmet",
-  lastName: "West",
-  lastActive: [8, 27, 2022],
-  // age: 23,
+  firstName: "Jairus",
+  lastName: "Tanaka",
+  lastActive: [2, 7, 2025],
+  age: 18,
   // pos: {
   //   x: 3.4,
   //   y: 1.2,
@@ -35,8 +36,9 @@ const player: Player = {
   // isVerified: true
 };
 
-// bs.proposeSize(1024);
 const serialized = JSON.stringify<Player>(player);
+
 console.log("Serialized: " + serialized);
-// const parsed = JSON.parse<Player>(serialized);
-// console.log("Parsed: " + JSON.stringify(parsed));
+const parsed = JSON.parse<Player>(serialized);
+
+console.log("Parsed: " + JSON.stringify(parsed));

modules/as-bs/assembly/index.ts

@@ -31,15 +31,17 @@ export namespace bs {
    */
   // @ts-ignore: decorator
   @inline export function ensureSize(size: u32): void {
+    let grew = ""
     if (offset + size > bufferEnd) {
       bufferEnd += nextPowerOf2(size + 32);
       // @ts-ignore: exists
       const newPtr = __renew(buffer, bufferEnd - buffer);
       // I don't know if this is even needed. I'll need to take a look at the runtime
       // offset = offset - buffer + newPtr;
       // buffer = newPtr;
+      grew = "+";
     }
-    console.log("Ensure   " + (realSize - buffer).toString() + "  " + size.toString());
+    console.log("Ensure   " + (realSize - buffer).toString() + "  " + size.toString() + " " + grew);
   }
   /**
    * Proposes that the buffer size is should be greater than or equal to the proposed size.
@@ -48,6 +50,7 @@ export namespace bs {
    */
   // @ts-ignore: decorator
   @inline export function proposeSize(size: u32): void {
+    let grew = ""
     realSize = offset + size;
     if (realSize > bufferEnd) {
       bufferEnd += nextPowerOf2(size);
@@ -56,8 +59,9 @@ export namespace bs {
       // I don't know if this is even needed. I'll need to take a look at the runtime
       // offset = offset - buffer + newPtr;
       // buffer = newPtr;
+      grew = "+";
     }
-    console.log("Propose  " + (realSize - buffer).toString() + "  " + size.toString());
+    console.log("Propose  " + (realSize - buffer).toString() + "  " + size.toString() + " " + grew);
   }
 
   /**
@@ -67,14 +71,16 @@ export namespace bs {
    */
   // @ts-ignore: decorator
   @inline export function growSize(size: u32): void {
+    let grew = ""
     if ((realSize += size) > bufferEnd) {
       bufferEnd += nextPowerOf2(size + 32);
       // @ts-ignore
       const newPtr = __renew(buffer, bufferEnd);
       // offset = offset - buffer + newPtr;
       // buffer = newPtr;
+      grew = "+";
     }
-    console.log("Grow     " + (realSize - buffer).toString() + "  " + size.toString());
+    console.log("Grow     " + (realSize - buffer).toString() + "  " + size.toString() + " " + grew);
   }
 
   /**

transform/lib/index.js

@@ -278,7 +278,8 @@ class JSONTransform extends Visitor {
       indentInc();
       if (memberLen == 2) DESERIALIZE += `${indent}switch (load<u16>(keyStart)) {\n`;
       else if (memberLen == 4) DESERIALIZE += `${indent}switch (load<u32>(keyStart)) {\n`;
-      else if (memberLen == 6) DESERIALIZE += `${indent}let code = (<u64>load<u32>(keyStart) << 16) | <u64>load<u16>(keyStart, 4);\n`;
+      else if (memberLen == 6) DESERIALIZE += `${indent}let code = load<u64>(keyStart) & 0x0000FFFFFFFFFFFF;\n`;
+      else if (memberLen == 6) DESERIALIZE += `${indent}let code = load<u64>(keyStart);\n`;
       else DESERIALIZE += toMemCDecl(memberLen, indent);
       for (let i = 0; i < memberGroup.length; i++) {
         const member = memberGroup[i];
@@ -299,6 +300,12 @@ class JSONTransform extends Visitor {
           DESERIALIZE += `${indent}  store<${member.type}>(ptr, JSON.__deserialize<${member.type}>(valStart, valEnd), offsetof<this>(${JSON.stringify(member.name)}));\n`;
           DESERIALIZE += `${indent}  return;\n`;
           DESERIALIZE += `${indent}}${i < memberGroup.length - 1 ? " else " : "\n"}`;
+        } else if (memberLen == 8) {
+          DESERIALIZE += i == 0 ? indent : "";
+          DESERIALIZE += `if (code == ${toU64(memberName)}) { // ${memberName}\n`;
+          DESERIALIZE += `${indent}  store<${member.type}>(ptr, JSON.__deserialize<${member.type}>(valStart, valEnd), offsetof<this>(${JSON.stringify(member.name)}));\n`;
+          DESERIALIZE += `${indent}  return;\n`;
+          DESERIALIZE += `${indent}}${i < memberGroup.length - 1 ? " else " : "\n"}`;
         } else {
           DESERIALIZE += i == 0 ? indent : "";
           DESERIALIZE += `if (${toMemCCheck(memberName)}) { // ${memberName}\n`;