json-as 1.0.0-alpha.3 → 1.0.0-beta.1

package/assembly/serialize/simple/arbitrary.ts

@@ -1,7 +1,9 @@
 import { JSON } from "../..";
 import { serializeArray } from "./array";
 import { serializeBool } from "./bool";
+import { serializeFloat } from "./float";
 import { serializeInteger } from "./integer";
+import { serializeObject } from "./object";
 import { serializeString } from "./string";
 
 export function serializeArbitrary(src: JSON.Value): void {
@@ -18,19 +20,30 @@ export function serializeArbitrary(src: JSON.Value): void {
     case JSON.Types.U64:
       serializeInteger<u64>(src.get<u64>());
       break;
+    case JSON.Types.F32:
+      serializeFloat<f32>(src.get<f32>());
+      break;
+    case JSON.Types.F64:
+      serializeFloat<f64>(src.get<f64>());
+      break;
     case JSON.Types.String:
       serializeString(src.get<string>());
       break;
     case JSON.Types.Bool:
       serializeBool(src.get<bool>());
+      break;
     case JSON.Types.Array: {
       serializeArray(src.get<JSON.Value[]>());
       break;
     }
+    case JSON.Types.Object: {
+      serializeObject(src.get<JSON.Obj>());
+      break;
+    }
     default: {
       const fn = JSON.Value.METHODS.get(src.type - JSON.Types.Struct);
-      const value = src.get<usize>();
-      call_indirect<string>(fn, 0, value);
+      const ptr = src.get<usize>();
+      call_indirect<void>(fn, 0, ptr);
     }
   }
 }

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/serialize/simple/object.ts

@@ -1,7 +1,44 @@
-interface GeneratedInterface {
-  __SERIALIZE(ptr: usize): string;
-}
+import { JSON } from "../..";
+import { bs } from "../../../modules/as-bs/assembly";
+import { BRACE_LEFT, BRACE_RIGHT, QUOTE } from "../../custom/chars";
+import { bytes } from "../../util";
 
-export function serializeObject<T extends GeneratedInterface>(data: T): void {
-  changetype<nonnull<T>>(data).__SERIALIZE(changetype<usize>(data));
-}
+export function serializeObject(data: JSON.Obj): void {
+  if (!data.size) {
+    store<u32>(bs.offset, 0);
+    bs.offset += 4;
+    return;
+  }
+
+  // This grabs `JSON.Obj.stackSize` which is private
+  bs.ensureSize(load<u32>(changetype<usize>(data), offsetof<JSON.Obj>("stackSize")) - 2);
+  const keys = data.keys();
+  const values = data.values();
+
+  // console.log(" Keys    " + keys.join(" "));
+  // console.log(" Values  " + values.map<string>(v => v.toString()).join(" "))
+
+  store<u16>(bs.offset, BRACE_LEFT);
+  bs.offset += 2;
+
+  const firstKey = unchecked(keys[0]);
+  const keySize = bytes(firstKey);
+  store<u16>(bs.offset, QUOTE);
+  memory.copy(bs.offset + 2, changetype<usize>(firstKey), keySize);
+  store<u32>(bs.offset += keySize + 2, 3801122); // ":
+  bs.offset += 4;
+  JSON.__serialize(unchecked(values[0]));
+
+  for (let i = 1; i < keys.length; i++) {
+    const key = unchecked(keys[i]);
+    const keySize = bytes(key);
+    store<u32>(bs.offset, 2228268); // ,"
+    memory.copy(bs.offset + 4, changetype<usize>(key), keySize);
+    store<u32>(bs.offset += keySize + 4, 3801122); // ":
+    bs.offset += 4;
+    JSON.__serialize(unchecked(values[i]));
+  }
+
+  store<u16>(bs.offset, BRACE_RIGHT);
+  bs.offset += 2;
+}

package/assembly/serialize/simple/struct.ts

@@ -0,0 +1,7 @@
+interface GeneratedInterface {
+  __SERIALIZE(ptr: usize): string;
+}
+
+export function serializeStruct<T extends GeneratedInterface>(data: T): void {
+  changetype<nonnull<T>>(data).__SERIALIZE(changetype<usize>(data));
+}

package/assembly/test.ts

@@ -1,5 +1,85 @@
-import { JSON } from "./";
-import { describe, expect } from "../modules/test/assembly";
+import { JSON } from ".";
+import { bs } from "../modules/as-bs/assembly";
+import { deserializeArbitraryArray } from "./deserialize/simple/array/arbitrary";
+import { serializeObject } from "./serialize/simple/object";
+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((self: Player) => self.age < 18)
+  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);
+
+const a4 = new JSON.Obj();
+
+a4.set("x", 1.5);
+a4.set("y", 5.4);
+a4.set("z", 9.8);
+a4.set("obj", obj)
+a4.set<boolean>("bool", false);
+
+console.log("a4: " + JSON.stringify(a4));
+
+const a5 = JSON.parse<JSON.Obj>('{"foo":"bar"}');
+
+console.log("a5: " + JSON.stringify(a5));
+
+const a6 = JSON.parse<JSON.Obj>('{"x":1.5,"y":5.4,"z":9.8,"obj":{"foo":"bar"}}');
+
+console.log("a6: " + JSON.stringify(a6));
+
+const a7 = JSON.parse<JSON.Value[]>('["string",true,3.14,{"x":1.0,"y":2.0,"z":3.0},[1,2,3,true]]');
+
+console.log("a7: " + JSON.stringify(a7));
+
+const a8 = JSON.stringify(["hello", JSON.stringify("world"),"working?"]);
+
+console.log("a8: " + a8);

package/assembly/util/atoi.ts

@@ -3,7 +3,7 @@
  * @param str
  * @returns
  */
-// @ts-ignore: Decorator valid here
+// @ts-ignore: inline
 @inline export function atoi<T>(srcStart: usize, srcEnd: usize): T {
   // @ts-ignore: type
   let val: T = 0;

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));

package/bench.js

@@ -34,8 +34,17 @@ const vec = {
 let data;
 
 const bench = new Bench({ time: 1000 })
-  .add("stringify float", () => {
-    data = JSON.stringify('h\\ello wor"ld');
+  .add("serialize vec3", () =>
+    data = JSON.stringify(vec)
+  )
+  .add("deserialize vec3", () => {
+    data = JSON.parse('{"x":3,"y":1,"z":8}');
+  })
+  .add("serialize alphabet string", () => {
+    data = JSON.stringify("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~`!@#$%^&*()-_=+{[}]|\\:;\"'?/>.<,'\"}");
+  })
+  .add("deserialize alphabet string", () => {
+    data = JSON.parse('"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~`!@#$%^&*()-_=+{[}]|\\\\:;\\"\'?/>.<,\'\\"}"')
   }) /*
     .add("parse float", () => {
         data = JSON.parse("1.2345")

package/modules/as-bs/assembly/index.ts

@@ -5,46 +5,77 @@ import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
  */
 export namespace bs {
   /** Current buffer pointer. */ // @ts-ignore
-  export let buffer: usize = __new(32, idof<ArrayBuffer>());
+  export let buffer: ArrayBuffer = new ArrayBuffer(32);//__new(32, idof<ArrayBuffer>());
 
   /** Current offset within the buffer. */
-  export let offset: usize = buffer;
+  export let offset: usize = changetype<usize>(buffer);
 
   /** Byte length of the buffer. */
-  export let byteLength: usize = 32;
+  let bufferSize: usize = 32;
 
   /** Proposed size of output */
-  export let realSize: usize = offset;
+  export let stackSize: usize = 0;
 
   /**
    * Proposes that the buffer size is should be greater than or equal to the proposed size.
    * If necessary, reallocates the buffer to the exact new size.
    * @param size - The size to propose.
    */
-  // @ts-ignore: Decorator valid here
+  // @ts-ignore: decorator
+  @inline export function ensureSize(size: u32): void {
+    // console.log("Ensure   " + (stackSize).toString() + " -> " + (stackSize + size).toString() + " (" + size.toString() + ") " + (((stackSize + size) > bufferSize) ? "+" : ""));
+    if (offset + size > bufferSize + changetype<usize>(buffer)) {
+      const deltaBytes = nextPowerOf2(size + 64);
+      bufferSize += deltaBytes;
+      // @ts-ignore: exists
+      const newPtr = changetype<ArrayBuffer>(__renew(
+        changetype<usize>(buffer),
+        bufferSize
+      ));
+      offset = offset + changetype<usize>(newPtr) - changetype<usize>(buffer);
+      buffer = newPtr;
+    }
+  }
+
+  /**
+   * Proposes that the buffer size is should be greater than or equal to the proposed size.
+   * If necessary, reallocates the buffer to the exact new size.
+   * @param size - The size to propose.
+   */
+  // @ts-ignore: decorator
   @inline export function proposeSize(size: u32): void {
-    if ((realSize = size) > byteLength) {
-      byteLength = nextPowerOf2(size);
-      // @ts-ignore
-      const newPtr = __renew(buffer, byteLength);
-      offset = offset - buffer + newPtr;
+    // console.log("Propose  " + (stackSize).toString() + " -> " + (stackSize + size).toString() + " (" + size.toString() + ") " + (((stackSize + size) > bufferSize) ? "+" : ""));
+    if ((stackSize += size) > bufferSize) {
+      const deltaBytes = nextPowerOf2(size);
+      bufferSize += deltaBytes;
+      // @ts-ignore: exists
+      const newPtr = changetype<ArrayBuffer>(__renew(
+        changetype<usize>(buffer),
+        bufferSize
+      ));
+      offset = offset + changetype<usize>(newPtr) - changetype<usize>(buffer);
       buffer = newPtr;
     }
   }
 
   /**
-   * Increases the proposed size by nextPowerOf2(n + 8) if necessary.
+   * Increases the proposed size by nextPowerOf2(n + 64) if necessary.
    * If necessary, reallocates the buffer to the exact new size.
    * @param size - The size to grow by.
    */
-  // @ts-ignore: Decorator valid here
+  // @ts-ignore: decorator
   @inline export function growSize(size: u32): void {
-    realSize += size;
-    if (realSize > byteLength) {
-      byteLength += nextPowerOf2(size + 8);
+    // console.log("Grow     " + (stackSize).toString() + " -> " + (stackSize + size).toString() + " (" + size.toString() + ") " + (((stackSize + size) > bufferSize) ? "+" : ""));
+    if ((stackSize += size) > bufferSize) {
+      const deltaBytes = nextPowerOf2(size + 64);
+      bufferSize += deltaBytes;
       // @ts-ignore
-      const newPtr = __renew(buffer, byteLength);
-      offset = offset - buffer + newPtr;
+      const newPtr = changetype<ArrayBuffer>(__renew(
+        changetype<usize>(buffer),
+        bufferSize
+      ));
+      // if (buffer != newPtr) console.log("  Old: " + changetype<usize>(buffer).toString() + "\n  New: " + changetype<usize>(newPtr).toString());
+      offset = offset + changetype<usize>(newPtr) - changetype<usize>(buffer);
       buffer = newPtr;
     }
   }
@@ -55,12 +86,12 @@ export namespace bs {
    */
   // @ts-ignore: Decorator valid here
   @inline export function resize(newSize: u32): void {
-    // @ts-ignore
-    const newPtr = __renew(buffer, newSize);
-    byteLength = newSize;
+    // @ts-ignore: exists
+    const newPtr = changetype<ArrayBuffer>(__renew(changetype<usize>(buffer), newSize));
+    bufferSize = newSize;
+    offset = changetype<usize>(newPtr);
     buffer = newPtr;
-    offset = newPtr + newSize;
-    realSize = newPtr;
+    stackSize = 0;
   }
 
   /**
@@ -69,13 +100,13 @@ export namespace bs {
    */
   // @ts-ignore: Decorator valid here
   @inline export function out<T>(): T {
-    const len = offset - buffer;
-    // @ts-ignore
+    const len = offset - changetype<usize>(buffer);
+    // @ts-ignore: exists
     const _out = __new(len, idof<T>());
-    memory.copy(_out, buffer, len);
+    memory.copy(_out, changetype<usize>(buffer), len);
 
-    offset = buffer;
-    realSize = buffer;
+    offset = changetype<usize>(buffer);
+    stackSize = 0;
     return changetype<T>(_out);
   }
 
@@ -88,13 +119,13 @@ export namespace bs {
    */
   // @ts-ignore: Decorator valid here
   @inline export function outTo<T>(dst: usize): T {
-    const len = offset - buffer;
-    // @ts-ignore
+    const len = offset - changetype<usize>(buffer);
+    // @ts-ignore: exists
     if (len != changetype<OBJECT>(dst - TOTAL_OVERHEAD).rtSize) __renew(len, idof<T>());
-    memory.copy(dst, buffer, len);
+    memory.copy(dst, changetype<usize>(buffer), len);
 
-    offset = buffer;
-    realSize = buffer;
+    offset = changetype<usize>(buffer);
+    stackSize = 0;
     return changetype<T>(dst);
   }
 }

package/modules/as-bs/assembly/state.ts

@@ -0,0 +1,8 @@
+export class SinkState {
+  public offset: usize;
+  public bufferSize: usize;
+  public stackSize: usize;
+  constructor() {
+    
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-beta.1",
   "author": "Jairus Tanaka",
   "repository": {
     "type": "git",
@@ -9,12 +9,13 @@
   "main": "transform/lib/index.js",
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
-    "@types/node": "latest",
+    "@types/node": "^22.13.1",
+    "as-bench": "JairusSW/as-bench",
     "as-console": "^7.0.0",
-    "assemblyscript": "^0.27.31",
+    "assemblyscript": "^0.27.34",
     "assemblyscript-prettier": "^3.0.1",
-    "prettier": "^3.4.2",
-    "typescript": "latest"
+    "prettier": "^3.5.0",
+    "typescript": "^5.7.3"
   },
   "bugs": {
     "url": "https://github.com/JairusSW/as-json/issues"
@@ -52,7 +53,7 @@
   },
   "scripts": {
     "test": "bash ./run-tests.sh",
-    "build:bench": "rm -rf ./build/ && asc assembly/__benches__/misc.bench.ts -o ./build/bench.wasm --textFile ./build/bench.wat --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime incremental --enable simd --enable bulk-memory",
+    "build:bench": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/__benches__/misc.bench.ts -o ./build/bench.wasm --textFile ./build/bench.wat --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub --enable simd --enable bulk-memory",
     "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0",
     "build:test:simd": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0 --enable simd",
     "test:wasmtime": "wasmtime ./build/test.wasm",