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

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
+    // @ts-ignore: exists
     const newPtr = __renew(buffer, newSize);
-    byteLength = newSize;
+    bufferSize = newSize;
     buffer = newPtr;
     offset = newPtr + newSize;
-    realSize = newPtr;
+    stackSize = newPtr;
   }
 
   /**
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "author": "Jairus Tanaka",
   "repository": {
     "type": "git",
@@ -9,12 +9,12 @@
   "main": "transform/lib/index.js",
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
-    "@types/node": "latest",
+    "@types/node": "^22.13.1",
     "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"