json-as 1.0.0-alpha.3 → 1.0.0-alpha.4

package/CHANGELOG

@@ -1,5 +1,19 @@
 # Change Log
 
+## 2025-02-13 - 1.0.0-alpha.4
+
+- feat: reintroduce support for `Box<T>`-wrapped primitive types
+- tests: add extensive tests to all supported types
+- fix: 6-byte keys being recognized on deserialize
+- perf: take advantage of aligned memory to use a single 64-bit load on 6-byte keys
+- fix: `bs.proposeSize()` should increment `stackSize` by `size` instead of setting it
+- fix: allow runtime to manage `bs.buffer`
+- fix: memory leaks in `bs` module
+- fix: add (possibly temporary) `JSON.Memory.shrink()` to shrink memory in `bs`
+- perf: prefer growing memory by `nextPowerOf2(size + 64)` for less reallocations
+- tests: add boolean tests to `Box<T>`
+- fix: serialization of non-growable data types should grow `bs.stackSize`
+
 ## 2025-01-31 - 1.0.0-alpha.3
 
 - fix: write to proper offset when deserializing string with \u0000-type escapes

package/README.md

@@ -6,10 +6,21 @@
 ██   ██      ██ ██    ██ ██  ██ ██       ██   ██      ██
  █████  ███████  ██████  ██   ████       ██   ██ ███████
  </span>
-    AssemblyScript - v1.0.0-alpha.3
+    AssemblyScript - v1.0.0-alpha.4
   </pre>
 </h5>
 
+## Contents
+ - [About](#about)
+ - [Installation](#installation)
+ - [Usage](#usage)
+ - [Examples](#examples)
+ - [Performance](#performance)
+ - [License](#license)
+ - [Contact](#contact)
+
+## About
+
 ## Installation
 
 ```bash
@@ -40,7 +51,6 @@ If you'd like to see the code that the transform generates, run with `JSON_DEBUG
 ```js
 import { JSON } from "json-as";
 
-// @json or @serializable work here
 @json
 class Vec3 {
   x: f32 = 0.0;
@@ -55,8 +65,7 @@ class Player {
   lastName!: string;
   lastActive!: i32[];
   // Drop in a code block, function, or expression that evaluates to a boolean
-  @omitif((age) => age < 18)
-  @omitif('this.age <= 0')
+  @omitif((self: Player) => self.age < 18)
   age!: i32;
   @omitnull()
   pos!: Vec3 | null;
@@ -64,10 +73,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,
@@ -76,11 +85,15 @@ const player: Player = {
   isVerified: true
 };
 
-const stringified = JSON.stringify<Player>(player);
+const serialized = JSON.stringify<Player>(player);
+const parsed = JSON.parse<Player>(serialized);
 
-const parsed = JSON.parse<Player>(stringified);
+console.log("Serialized: " + serialized);
+console.log("Parsed: " + JSON.stringify(parsed));
 ```
 
+## Examples
+
 Classes can even have inheritance. Here's a nasty example
 
 ```js
@@ -124,16 +137,15 @@ You can also add it to your `asconfig.json`
 
 If you use this project in your codebase, consider dropping a [star](https://github.com/JairusSW/as-json). I would really appreciate it!
 
-## Notes
-
-If you want a feature, drop an issue (and again, maybe a star). I'll likely add it in less than 7 days.
+## 📃 License
 
-## Contact
+This project is distributed under an open source license. You can view the full license using the following link: [License](./LICENSE)
 
-- [Email](mailto:me@jairus.dev)
-- [GitHub](https://github.com/JairusSW)
-- [Discord](discord.com/users/600700584038760448)
+## 📫 Contact
 
-## Issues
+Please send all issues to [GitHub Issues](https://github.com/JairusSW/as-json/issues) and to converse, please send me an email at [me@jairus.dev](mailto:me@jairus.dev)
 
-Please submit an issue to https://github.com/JairusSW/as-json/issues if you find anything wrong with this library
+- **Email:** Send me inquiries, questions, or requests at [me@jairus.dev](mailto:me@jairus.dev)
+- **GitHub:** Visit the official GitHub repository [Here](https://github.com/JairusSW/as-json)
+- **Website:** Visit my official website at [jairus.dev](https://jairus.dev/)
+- **Discord:** Converse with me on [My Discord](discord.com/users/600700584038760448) or on the [AssemblyScript Discord Server](https://discord.gg/assemblyscript/)

package/assembly/__tests__/box.spec.ts

@@ -0,0 +1,37 @@
+import { JSON } from "..";
+import { describe, expect } from "../../modules/test/assembly";
+
+describe("Should serialize JSON.Box<T>", () => {
+  expect(JSON.stringify<JSON.Box<i32> | null>(null))
+    .toBe("null");
+
+  expect(JSON.stringify<JSON.Box<i32> | null>(new JSON.Box<i32>(0)))
+    .toBe("0");
+
+  expect(JSON.stringify<JSON.Box<i32> | null>(new JSON.Box<i32>(1)))
+    .toBe("1");
+
+  expect(JSON.stringify<JSON.Box<boolean> | null>(new JSON.Box<boolean>(false)))
+    .toBe("false");
+
+  expect(JSON.stringify<JSON.Box<boolean> | null>(new JSON.Box<boolean>(true)))
+    .toBe("true");
+});
+
+// This is somewhat clumsy to use. Perhaps I can redesign it or use some transform to make it more transparent.
+describe("Should deserialize JSON.Box<T>", () => {
+  expect((JSON.parse<JSON.Box<i32> | null>("null") == null).toString())
+    .toBe("true");
+
+  expect(JSON.parse<JSON.Box<i32> | null>("0")!.value.toString())
+    .toBe("0");
+
+  expect(JSON.parse<JSON.Box<i32> | null>("1")!.value.toString())
+    .toBe("1");
+
+  expect(JSON.parse<JSON.Box<boolean> | null>("false")!.value.toString())
+    .toBe("false");
+
+  expect(JSON.parse<JSON.Box<boolean> | null>("true")!.value.toString())
+    .toBe("true");
+});

package/assembly/__tests__/date.spec.ts

@@ -0,0 +1,38 @@
+import { JSON } from "..";
+import { describe, expect } from "../../modules/test/assembly";
+
+describe("Should serialize Date", () => {
+  expect(JSON.stringify<Date>(new Date(0)))
+    .toBe('"1970-01-01T00:00:00.000Z"');
+  expect(JSON.stringify<Date>(new Date(1738618120525)))
+    .toBe('"2025-02-03T21:28:40.525Z"');
+});
+
+describe("Should deserialize booleans", () => {
+  // const date = JSON.parse<Date>('"2025-02-03T21:28:40.525Z"');
+  // console.log("Year: " + date.getUTCFullYear().toString());
+  // console.log("Month: " + date.getUTCMonth().toString());
+  // console.log("Day: " + date.getUTCDay().toString());
+  // console.log("Hours: " + date.getUTCHours().toString());
+  // console.log("Minutes: " + date.getUTCMinutes().toString());
+  // console.log("Seconds: " + date.getUTCSeconds().toString());
+  // console.log("Milliseconds: " + date.getUTCMilliseconds().toString());
+    
+  const date1 = JSON.parse<Date>('"1970-01-01T00:00:00.000Z"');
+  expect(date1.getUTCFullYear().toString()).toBe("1970");
+  expect(date1.getUTCMonth().toString()).toBe("0");
+  expect(date1.getUTCDay().toString()).toBe("4");
+  expect(date1.getUTCHours().toString()).toBe("0");
+  expect(date1.getUTCMinutes().toString()).toBe("0");
+  expect(date1.getUTCSeconds().toString()).toBe("0");
+  expect(date1.getUTCMilliseconds().toString()).toBe("0");
+
+  const date2 = JSON.parse<Date>('"2025-02-03T21:28:40.525Z"');
+  expect(date2.getUTCFullYear().toString()).toBe("2025");
+  expect(date2.getUTCMonth().toString()).toBe("1");
+  expect(date2.getUTCDay().toString()).toBe("1");
+  expect(date2.getUTCHours().toString()).toBe("21");
+  expect(date2.getUTCMinutes().toString()).toBe("28");
+  expect(date2.getUTCSeconds().toString()).toBe("40");
+  expect(date2.getUTCMilliseconds().toString()).toBe("525");  
+});

package/assembly/deserialize/simple/bool.ts

@@ -1,9 +1,6 @@
-import { CHAR_F, CHAR_T } from "../../custom/chars";
-
 export function deserializeBoolean(srcStart: usize, srcEnd: usize): boolean {
-  const srcSize = srcEnd - srcStart;
-  const firstChar = load<u16>(srcStart);
-  if (firstChar == CHAR_T && load<u64>(srcStart) == 28429475166421108) return true;
-  else if (firstChar == CHAR_F && load<u64>(srcSize, 2) == 28429466576093281) return false;
+  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!`);
-}
+}

package/assembly/deserialize/simple/date.ts

@@ -2,10 +2,10 @@ import { ptrToStr } from "../../util/ptrToStr";
 
 export function deserializeDate(srcStart: usize, srcEnd: usize): Date {
   // Use AssemblyScript's date parser
-  const d = Date.fromString(ptrToStr(srcStart, srcEnd));
+  const d = Date.fromString(ptrToStr(srcStart + 2, srcEnd - 2));
 
   // Return a new object instead of the one that the parser returned.
-  // This may seem redundant, but addreses the issue when Date
+  // This may seem redundant, but it addresses the issue when Date
   // is globally aliased to wasi_Date (or some other superclass).
   return new Date(d.getTime());
 }

package/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): " + ptrToStr(lastIndex, srcStart));
             // @ts-ignore: exists
             out.__DESERIALIZE(keyStart, keyEnd, lastIndex, srcStart, dst);
-            // console.log("Value (number): " + ptrToStr(lastIndex, srcStart));
             // while (isSpace(load<u16>((srcStart += 2)))) {
             //   /* empty */
             // }

package/assembly/index.ts

@@ -36,6 +36,11 @@ export type Raw = string;
  * JSON Encoder/Decoder for AssemblyScript
  */
 export namespace JSON {
+  export namespace Memory {
+    export function shrink(): void {
+      bs.resize(64);
+    }
+  }
   /**
    * Serializes valid JSON data
    * ```js
@@ -107,9 +112,7 @@ export namespace JSON {
       serializeString(changetype<string>(data));
       return bs.out<string>();
       // @ts-ignore: Supplied by transform
-    } else if (isDefined(data.__SERIALIZE) && isDefined(data.__ALLOCATE)) {
-      // @ts-ignore
-      // data.__ALLOCATE();
+    } else if (isDefined(data.__SERIALIZE)) {
       // @ts-ignore
       data.__SERIALIZE(changetype<usize>(data));
       return bs.out<string>();
@@ -119,8 +122,8 @@ export namespace JSON {
 
       store<u16>(changetype<usize>(out), QUOTE);
       memory.copy(changetype<usize>(out) + 2, changetype<usize>(data.toISOString()), 48);
-      store<u16>(changetype<usize>(out), 50);
-      return out;
+      store<u16>(changetype<usize>(out), QUOTE, 50);
+      return changetype<string>(out);
     } else if (data instanceof Array) {
       // @ts-ignore
       serializeArray(changetype<nonnull<T>>(data));
@@ -156,7 +159,7 @@ export namespace JSON {
       return deserializeInteger<T>(dataPtr, dataPtr + dataSize);
     } else if (isFloat<T>()) {
       return deserializeFloat<T>(dataPtr, dataPtr + dataSize);
-    } else if (isNullable<T>() && data.length == 4 && data == "null") {
+    } else if (isNullable<T>() && dataSize == 8 && load<u64>(dataPtr) == 30399761348886638) {
       // @ts-ignore
       return null;
     } else if (isString<T>()) {
@@ -182,7 +185,7 @@ export namespace JSON {
       return deserializeDate(dataPtr, dataPtr + dataSize);
     } else if (type instanceof JSON.Box) {
       // @ts-ignore
-      return new JSON.Box(JSON.parse<indexof<T>>(data));
+      return new JSON.Box(parseBox(data, changetype<nonnull<T>>(0).value));
     } else {
       throw new Error(`Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`);
     }
@@ -339,7 +342,9 @@ export namespace JSON {
    * Box for primitive types
    */
   export class Box<T> {
-    constructor(public value: T) {}
+    constructor(public value: T) {
+      if (!isInteger<T>() && !isFloat<T>()) ERROR("JSON.Box should only hold primitive types!");
+    }
     /**
      * Creates a reference to a primitive type
      * This means that it can create a nullable primitive
@@ -353,6 +358,12 @@ export namespace JSON {
     @inline static from<T>(value: T): Box<T> {
       return new Box(value);
     }
+    toString(): string {
+      if (isNullable<this>() && changetype<usize>(this) == null) return "null";
+      // @ts-ignore: type
+      if (isDefined(this.value.toString)) return this.value.toString();
+      return "null";
+    }
   }
 
   export function __serialize<T>(src: T): void {
@@ -421,8 +432,20 @@ export namespace JSON {
       } else if (type instanceof Date) {
         // @ts-ignore: type
         return deserializeDate(srcStart, srcEnd);
+      } else if (type instanceof JSON.Box) {
+        // @ts-ignore: type
+        return new JSON.Box(deserializeBox(srcStart, srcEnd, dst, changetype<nonnull<T>>(0).value));
       }
     }
     throw new Error(`Could not deserialize data '${ptrToStr(srcStart, srcEnd).slice(0, 100)}' to type. Make sure to add the correct decorators to classes.`);
   }
 }
+
+// @ts-ignore: decorator
+@inline function parseBox<T>(data: string, ty: T): T {
+  return JSON.parse<T>(data);
+}
+
+function deserializeBox<T>(srcStart: usize, srcEnd: usize, dst: usize, ty: T): T {
+  return JSON.__deserialize<T>(srcStart, srcEnd, dst);
+}

package/assembly/serialize/simd/string.ts

@@ -18,7 +18,7 @@ export function serializeString_SIMD(src: string): void {
   const srcSize = changetype<OBJECT>(changetype<usize>(src) - TOTAL_OVERHEAD).rtSize;
   let srcStart = changetype<usize>(src);
   const srcEnd = srcStart + srcSize;
-  bs.ensureSize(srcSize + 4);
+  bs.proposeSize(srcSize + 4);
   const srcEnd16 = srcEnd - 15;
 
   store<u8>(changetype<usize>(bs.offset), 34); /* " */
@@ -45,13 +45,13 @@ export function serializeString_SIMD(src: string): void {
       mask &= mask - 1;
 
       if ((escaped & 0xffff) != BACK_SLASH) {
-        bs.addSize(10);
+        bs.growSize(10);
         store<u64>(dst_offset, 13511005048209500);
         store<u32>(dst_offset, escaped, 8);
         v128.store(dst_offset, v128.load(src_offset, 2), 12);
         bs.offset += 10;
       } else {
-        bs.addSize(2);
+        bs.growSize(2);
         store<u32>(dst_offset, escaped);
         v128.store(dst_offset, v128.load(src_offset, 2), 4);
         bs.offset += 2;
@@ -84,7 +84,7 @@ export function serializeString_SIMD(src: string): void {
       mask &= mask - 1;
 
       if ((escaped & 0xffff) != BACK_SLASH) {
-        bs.addSize(10);
+        bs.growSize(10);
         store<u64>(dst_offset, 13511005048209500);
         store<u32>(dst_offset, escaped, 8);
         while (lane_index < 6) {
@@ -93,7 +93,7 @@ export function serializeString_SIMD(src: string): void {
         }
         bs.offset += 10;
       } else {
-        bs.addSize(2);
+        bs.growSize(2);
         store<u32>(dst_offset, escaped);
 
         while (lane_index < 6) {
@@ -116,12 +116,12 @@ export function serializeString_SIMD(src: string): void {
       const escaped = load<u32>(SERIALIZE_ESCAPE_TABLE + (codeA << 2));
 
       if ((escaped & 0xffff) != BACK_SLASH) {
-        bs.addSize(10);
+        bs.growSize(10);
         store<u64>(bs.offset, 13511005048209500);
         store<u32>(bs.offset, escaped, 8);
         bs.offset += 12;
       } else {
-        bs.addSize(2);
+        bs.growSize(2);
         store<u32>(bs.offset, escaped);
         bs.offset += 4;
       }
@@ -134,12 +134,12 @@ export function serializeString_SIMD(src: string): void {
       const escaped = load<u32>(SERIALIZE_ESCAPE_TABLE + (codeB << 2));
 
       if ((escaped & 0xffff) != BACK_SLASH) {
-        bs.addSize(10);
+        bs.growSize(10);
         store<u64>(bs.offset, 13511005048209500);
         store<u32>(bs.offset, escaped, 8);
         bs.offset += 12;
       } else {
-        bs.addSize(2);
+        bs.growSize(2);
         store<u32>(bs.offset, escaped);
         bs.offset += 4;
       }
@@ -156,12 +156,12 @@ export function serializeString_SIMD(src: string): void {
       const escaped = load<u32>(SERIALIZE_ESCAPE_TABLE + (code << 2));
 
       if ((escaped & 0xffff) != BACK_SLASH) {
-        bs.addSize(10);
+        bs.growSize(10);
         store<u64>(bs.offset, 13511005048209500);
         store<u32>(bs.offset, escaped, 8);
         bs.offset += 12;
       } else {
-        bs.addSize(2);
+        bs.growSize(2);
         store<u32>(bs.offset, escaped);
         bs.offset += 4;
       }

package/assembly/serialize/simple/array.ts

@@ -3,15 +3,16 @@ import { COMMA, BRACKET_RIGHT, BRACKET_LEFT } from "../../custom/chars";
 import { JSON } from "../..";
 
 export function serializeArray<T extends any[]>(src: T): void {
+  bs.proposeSize(4);
   const end = src.length - 1;
   let i = 0;
   if (end == -1) {
-    bs.proposeSize(4);
     store<u32>(bs.offset, 6094939);
     bs.offset += 4;
     return;
   }
-  bs.proposeSize(end << 3);
+  // {} = 4
+  // xi, = n << 1
 
   store<u16>(bs.offset, BRACKET_LEFT);
   bs.offset += 2;
@@ -26,7 +27,7 @@ export function serializeArray<T extends any[]>(src: T): void {
 
   const lastBlock = unchecked(src[end]);
   JSON.__serialize<valueof<T>>(lastBlock);
-  bs.proposeSize(2);
+  bs.growSize(2);
   store<u16>(bs.offset, BRACKET_RIGHT);
   bs.offset += 2;
 }

package/assembly/serialize/simple/float.ts

@@ -2,6 +2,6 @@ import { dtoa_buffered } from "util/number";
 import { bs } from "../../../modules/as-bs";
 
 export function serializeFloat<T extends number>(data: T): void {
-  bs.proposeSize(64);
+  bs.ensureSize(64);
   bs.offset += dtoa_buffered(bs.offset, data) << 1;
 }

package/assembly/serialize/simple/integer.ts

@@ -2,6 +2,11 @@ import { itoa_buffered } from "util/number";
 import { bs } from "../../../modules/as-bs";
 
 export function serializeInteger<T extends number>(data: T): void {
-  bs.proposeSize(sizeof<T>() << 3);
-  bs.offset += itoa_buffered(bs.offset, data) << 1;
+  bs.ensureSize(sizeof<T>() << 3);
+  const bytesWritten = itoa_buffered(bs.offset, data) << 1;
+  bs.offset += bytesWritten;
+  bs.growSize(bytesWritten);
 }
+
+// 32 {"x":,"y":,"z"}
+// 18 3.41.28.3

package/assembly/test.ts

@@ -1,5 +1,59 @@
-import { JSON } from "./";
-import { describe, expect } from "../modules/test/assembly";
+import { JSON } from ".";
+import { bytes } from "./util";
 
-console.log(JSON.stringify(JSON.parse<string>('"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f\\u000f\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f"')));
-console.log('"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f\\u000f\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f"');
+@json
+class Obj {
+  public a: string = "hello";
+  public b: string = "world";
+  public c: string = "\"\t\f\u0000\u0001";
+}
+
+@json
+class Vec3 {
+  x: f32 = 0.0;
+  y: f32 = 0.0;
+  z: f32 = 0.0;
+}
+
+@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((age) => age < 18)
+  @omitif('this.age <= 0')
+  age!: i32;
+  @omitnull()
+  pos!: Vec3 | null;
+  isVerified!: boolean;
+}
+
+const player: Player = {
+  firstName: "Jairus",
+  lastName: "Tanaka",
+  lastActive: [2, 7, 2025],
+  age: 18,
+  pos: {
+    x: 3.4,
+    y: 1.2,
+    z: 8.3
+  },
+  isVerified: true
+};
+
+const a1 = JSON.stringify("\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000a\u000b\u000c\u000d\u000e\u000f\u000f\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f");
+// console.log("Bytes    " + bytes(a1).toString());
+console.log("a1: " + a1);
+
+const obj = new Obj();
+const a2 = JSON.stringify(obj);
+// console.log("Bytes    " + bytes(a2).toString());
+console.log("a2: " + a2);
+
+const a3 = JSON.stringify(player);
+// console.log("Bytes    " + bytes(a3).toString());
+console.log("a3: " + a3);
+
+JSON.Memory.shrink();

package/assembly/util/snp.ts

@@ -7,7 +7,7 @@ import { POW_TEN_TABLE_32, POW_TEN_TABLE_64 } from "../globals/tables";
 import { atoi } from "./atoi";
 
 // @ts-ignore: Decorator valid here
-@inline function snp<T extends number>(srcStart: usize, srcEnd: usize): T {
+@inline export function snp<T extends number>(srcStart: usize, srcEnd: usize): T {
   // @ts-ignore: type
   let val: T = 0;
   let char = load<u16>(srcStart) - 48;
@@ -46,7 +46,7 @@ import { atoi } from "./atoi";
           char = load<u16>(srcStart);
           if (char == 45) {
             // @ts-ignore: type
-            return val / pow10(atoi(srcStart + 2, srcEnd));
+            return val / pow10(atoi<u8>(srcStart + 2, srcEnd));
           } else {
             // @ts-ignore: type
             return val * pow10(atoi(srcStart, srcEnd));