fix: memory problems

Author: JairusSW

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

assembly/serialize/simple/integer.ts

@@ -5,6 +5,7 @@ export function serializeInteger<T extends number>(data: T): void {
   bs.ensureSize(sizeof<T>() << 3);
   const bytesWritten = itoa_buffered(bs.offset, data) << 1;
   bs.offset += bytesWritten;
+  bs.growSize(bytesWritten);
 }
 
 // 32 {"x":,"y":,"z"}

assembly/serialize/simple/string.ts

@@ -23,7 +23,7 @@ export function serializeString(src: string): void {
     const code = load<u16>(srcPtr);
     if (code == 34 || code == 92 || code < 32) {
       const remBytes = srcPtr - lastPtr;
-      // memory.copy(bs.offset, lastPtr, remBytes);
+      memory.copy(bs.offset, lastPtr, remBytes);
       bs.offset += remBytes;
       const escaped = load<u32>(SERIALIZE_ESCAPE_TABLE + (code << 2));
       if ((escaped & 0xffff) != BACK_SLASH) {
@@ -41,7 +41,7 @@ export function serializeString(src: string): void {
     srcPtr += 2;
   }
   const remBytes = srcEnd - lastPtr;
-  // memory.copy(bs.offset, lastPtr, remBytes);
+  memory.copy(bs.offset, lastPtr, remBytes);
   bs.offset += remBytes;
   store<u16>(bs.offset, QUOTE);
   bs.offset += 2;

assembly/test.ts

@@ -1,8 +1,59 @@
 import { JSON } from ".";
-import { bs } from "../modules/as-bs/assembly";
 import { bytes } from "./util";
 
-// bs.ensureSize(1024);
+@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);
+// 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();

modules/as-bs/assembly/index.ts

@@ -16,14 +16,35 @@ export namespace bs {
   /** Proposed size of output */
   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
+  @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 {
-    console.log("Propose  " + (stackSize).toString() + " -> " + (stackSize + size).toString() + " (" + size.toString() + ") " + (((stackSize + size) > bufferSize) ? "+" : ""));
+    // console.log("Propose  " + (stackSize).toString() + " -> " + (stackSize + size).toString() + " (" + size.toString() + ") " + (((stackSize + size) > bufferSize) ? "+" : ""));
     if ((stackSize += size) > bufferSize) {
       const deltaBytes = nextPowerOf2(size);
       bufferSize += deltaBytes;
@@ -44,7 +65,7 @@ export namespace bs {
    */
   // @ts-ignore: decorator
   @inline export function growSize(size: u32): void {
-    console.log("Grow     " + (stackSize).toString() + " -> " + (stackSize + size).toString() + " (" + size.toString() + ") " + (((stackSize + size) > bufferSize) ? "+" : ""));
+    // console.log("Grow     " + (stackSize).toString() + " -> " + (stackSize + size).toString() + " (" + size.toString() + ") " + (((stackSize + size) > bufferSize) ? "+" : ""));
     if ((stackSize += size) > bufferSize) {
       const deltaBytes = nextPowerOf2(size + 64);
       bufferSize += deltaBytes;
@@ -53,7 +74,7 @@ export namespace bs {
         changetype<usize>(buffer),
         bufferSize
       ));
-      if (buffer != newPtr) console.log("  Old: " + changetype<usize>(buffer).toString() + "\n  New: " + changetype<usize>(newPtr).toString());
+      // 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;
     }