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

package/assembly/deserialize/simple/struct.ts

@@ -0,0 +1,158 @@
+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";
+
+export function deserializeStruct<T>(srcStart: usize, srcEnd: usize, dst: usize): T {
+  const out = changetype<nonnull<T>>(dst || __new(offsetof<T>(), idof<T>()));
+
+  let keyStart: usize = 0;
+  let keyEnd: usize = 0;
+  let isKey = false;
+  let depth = 0;
+  let lastIndex: usize = 0;
+
+  // while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
+  // while (srcEnd > srcStart && isSpace(load<u16>(srcEnd))) srcEnd -= 2;
+  srcStart += 2;
+  while (srcStart < srcEnd) {
+    let code = load<u16>(srcStart); // while (isSpace(code)) code = load<u16>(srcStart += 2);
+    if (keyStart == 0) {
+      if (code == QUOTE && load<u16>(srcStart - 2) !== BACK_SLASH) {
+        if (isKey) {
+          keyStart = lastIndex;
+          keyEnd = srcStart;
+          // console.log("Key: " + ptrToStr(lastIndex, srcStart));
+          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart + 2)));
+          srcStart += 2;
+          // while (isSpace((code = load<u16>((srcStart += 2))))) {
+          //   /* empty */
+          // }
+          // if (code !== COLON) throw new Error("Expected ':' after key at position " + (srcStart - srcPtr).toString());
+          isKey = false;
+        } else {
+          // console.log("Got key start");
+          isKey = true; // i don't like this
+          lastIndex = srcStart + 2;
+        }
+      }
+      // isKey = !isKey;
+      srcStart += 2;
+    } else {
+      if (code == QUOTE) {
+        lastIndex = srcStart;
+        srcStart += 2;
+        while (srcStart < srcEnd) {
+          const code = load<u16>(srcStart);
+          if (code == QUOTE && load<u16>(srcStart - 2) !== BACK_SLASH) {
+            // console.log("Value (string): " + ptrToStr(lastIndex, srcStart + 2));
+            // @ts-ignore: exists
+            out.__DESERIALIZE(keyStart, keyEnd, lastIndex, srcStart + 2, dst);
+            // while (isSpace(load<u16>(srcStart))) srcStart += 2;
+            srcStart += 4;
+            // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+            keyStart = 0;
+            break;
+          }
+          srcStart += 2;
+        }
+      } else if (code - 48 <= 9 || code == 45) {
+        lastIndex = srcStart;
+        srcStart += 2;
+        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);
+            // while (isSpace(load<u16>((srcStart += 2)))) {
+            //   /* empty */
+            // }
+            srcStart += 2;
+            // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+            keyStart = 0;
+            break;
+          }
+          srcStart += 2;
+        }
+      } else if (code == BRACE_LEFT) {
+        lastIndex = srcStart;
+        depth++;
+        srcStart += 2;
+        while (srcStart < srcEnd) {
+          const code = load<u16>(srcStart);
+          if (code == BRACE_RIGHT) {
+            if (--depth == 0) {
+              // console.log("Value (object): " + ptrToStr(lastIndex, srcStart + 2));
+              // @ts-ignore: exists
+              out.__DESERIALIZE(keyStart, keyEnd, lastIndex, (srcStart += 2), dst);
+              // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+              keyStart = 0;
+              // while (isSpace(load<u16>(srcStart))) {
+              //   /* empty */
+              // }
+              break;
+            }
+          } else if (code == BRACE_LEFT) depth++;
+          srcStart += 2;
+        }
+      } else if (code == BRACKET_LEFT) {
+        lastIndex = srcStart;
+        depth++;
+        srcStart += 2;
+        while (srcStart < srcEnd) {
+          const code = load<u16>(srcStart);
+          if (code == BRACKET_RIGHT) {
+            if (--depth == 0) {
+              // console.log("Value (array): " + ptrToStr(lastIndex, srcStart + 2));
+              // @ts-ignore: exists
+              out.__DESERIALIZE(keyStart, keyEnd, lastIndex, (srcStart += 2), dst);
+              // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+              keyStart = 0;
+              // while (isSpace(load<u16>((srcStart += 2)))) {
+              //   /* empty */
+              // }
+              break;
+            }
+          } else if (code == BRACKET_LEFT) depth++;
+          srcStart += 2;
+        }
+      } else if (code == CHAR_T) {
+        if (load<u64>(srcStart) == 28429475166421108) {
+          // console.log("Value (bool): " + ptrToStr(srcStart, srcStart + 8));
+          // @ts-ignore: exists
+          out.__DESERIALIZE(keyStart, keyEnd, srcStart, (srcStart += 8), dst);
+          // while (isSpace(load<u16>((srcStart += 2)))) {
+          //   /* empty */
+          // }
+          srcStart += 2;
+          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)) + "  " + (srcStart < srcEnd).toString());
+          keyStart = 0;
+        }
+      } else if (code == CHAR_F) {
+        if (load<u64>(srcStart, 2) == 28429466576093281) {
+          // console.log("Value (bool): " + ptrToStr(srcStart, srcStart + 10));
+          // @ts-ignore: exists
+          out.__DESERIALIZE(keyStart, keyEnd, srcStart, (srcStart += 10), dst);
+          // while (isSpace(load<u16>((srcStart += 2)))) {
+          //   /* empty */
+          // }
+          srcStart += 2;
+          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+          keyStart = 0;
+        }
+      } else if (code == CHAR_N) {
+        if (load<u64>(srcStart) == 30399761348886638) {
+          // console.log("Value (null): " + ptrToStr(srcStart, srcStart + 8));
+          // @ts-ignore: exists
+          out.__DESERIALIZE(keyStart, keyEnd, srcStart, (srcStart += 8), dst);
+          // while (isSpace(load<u16>((srcStart += 2)))) {
+          /* empty */
+          // }
+          srcStart += 2;
+          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+          keyStart = 0;
+        }
+      }
+    }
+  }
+  return out;
+}

package/assembly/index.ts

@@ -7,7 +7,7 @@ import { serializeMap } from "./serialize/simple/map";
 import { deserializeBoolean } from "./deserialize/simple/bool";
 import { deserializeArray } from "./deserialize/simple/array";
 import { deserializeFloat } from "./deserialize/simple/float";
-import { deserializeObject } from "./deserialize/simple/object";
+import { deserializeStruct } from "./deserialize/simple/struct";
 import { deserializeMap } from "./deserialize/simple/map";
 import { deserializeDate } from "./deserialize/simple/date";
 import { deserializeInteger } from "./deserialize/simple/integer";
@@ -20,9 +20,13 @@ import { dtoa_buffered, itoa_buffered } from "util/number";
 import { serializeBool } from "./serialize/simple/bool";
 import { serializeInteger } from "./serialize/simple/integer";
 import { serializeFloat } from "./serialize/simple/float";
-import { serializeObject } from "./serialize/simple/object";
+import { serializeStruct } from "./serialize/simple/struct";
 import { ptrToStr } from "./util/ptrToStr";
-import { bytes } from "./util";
+import { atoi, bytes } from "./util";
+import { deserializeArbitrary } from "./deserialize/simple/arbitrary";
+import { SERIALIZE_ESCAPE_TABLE } from "./globals/tables";
+import { serializeObject } from "./serialize/simple/object";
+import { deserializeObject } from "./deserialize/simple/object";
 
 export type Raw = string;
 
@@ -49,7 +53,8 @@ export namespace JSON {
    * @param data T
    * @returns string
    */
-  export function stringify<T>(data: T, out: string | null = null): string {
+  // @ts-ignore: inline
+  @inline export function stringify<T>(data: T, out: string | null = null): string {
     if (isBoolean<T>()) {
       if (out) {
         if (<bool>data == true) {
@@ -135,6 +140,9 @@ export namespace JSON {
     } else if (data instanceof JSON.Value) {
       serializeArbitrary(data);
       return bs.out<string>();
+    } else if (data instanceof JSON.Obj) {
+      serializeObject(data);
+      return bs.out<string>();
     } else if (data instanceof JSON.Box) {
       return JSON.stringify(data.value);
     } else {
@@ -150,7 +158,8 @@ export namespace JSON {
    * @param data string
    * @returns T
    */
-  export function parse<T>(data: string): T {
+  // @ts-ignore: inline
+  @inline export function parse<T>(data: string): T {
     const dataSize = bytes(data);
     const dataPtr = changetype<usize>(data);
     if (isBoolean<T>()) {
@@ -171,18 +180,24 @@ export namespace JSON {
     }
     let type: nonnull<T> = changetype<nonnull<T>>(0);
     // @ts-ignore: Defined by transform
-    if (isDefined(type.__DESERIALIZE) && isDefined(type.__INITIALIZE)) {
+    if (isDefined(type.__DESERIALIZE)) {
       const out = __new(offsetof<nonnull<T>>(), idof<nonnull<T>>());
+      // @ts-ignore: Defined by transform
+      if (isDefined(type.__INITIALIZE)) changetype<nonnull<T>>(out).__INITIALIZE();
       // @ts-ignore
-      changetype<nonnull<T>>(out).__INITIALIZE();
-      // @ts-ignore
-      return deserializeObject<nonnull<T>>(dataPtr, dataPtr + dataSize, out);
+      return deserializeStruct<nonnull<T>>(dataPtr, dataPtr + dataSize, out);
     } else if (type instanceof Map) {
       // @ts-ignore
       return deserializeMap<nonnull<T>>(dataPtr, dataPtr + dataSize);
     } else if (type instanceof Date) {
       // @ts-ignore
       return deserializeDate(dataPtr, dataPtr + dataSize);
+    } else if (type instanceof JSON.Value) {
+      // @ts-ignore
+      return deserializeArbitrary(dataPtr, dataPtr + dataSize, 0);
+    } else if (type instanceof JSON.Obj) {
+      // @ts-ignore
+      return deserializeObject(dataPtr, dataPtr + dataSize, 0);
     } else if (type instanceof JSON.Box) {
       // @ts-ignore
       return new JSON.Box(parseBox(data, changetype<nonnull<T>>(0).value));
@@ -257,7 +272,7 @@ export namespace JSON {
         this.type = JSON.Types.U64;
         store<T>(changetype<usize>(this), value, STORAGE);
       } else if (value instanceof f32) {
-        this.type = JSON.Types.F64;
+        this.type = JSON.Types.F32;
         store<T>(changetype<usize>(this), value, STORAGE);
       } else if (value instanceof f64) {
         this.type = JSON.Types.F64;
@@ -277,6 +292,9 @@ export namespace JSON {
         // @ts-ignore
         if (!JSON.Value.METHODS.has(idof<T>())) JSON.Value.METHODS.set(idof<T>(), value.__SERIALIZE.index);
         // @ts-ignore
+        store<usize>(changetype<usize>(this), changetype<usize>(value), STORAGE);
+      } else if (value instanceof JSON.Obj) {
+        this.type = JSON.Types.Object;
         store<T>(changetype<usize>(this), value, STORAGE);
         // @ts-ignore
       } else if (isArray<T>() && idof<valueof<T>>() == idof<JSON.Value>()) {
@@ -308,6 +326,10 @@ export namespace JSON {
           return this.get<u32>().toString();
         case JSON.Types.U64:
           return this.get<u64>().toString();
+        case JSON.Types.F32:
+          return this.get<f32>().toString();
+        case JSON.Types.F64:
+          return this.get<f64>().toString();
         case JSON.Types.String:
           return '"' + this.get<string>() + '"';
         case JSON.Types.Bool:
@@ -329,15 +351,81 @@ export namespace JSON {
           out.write("]");
           return out.toString();
         }
+        case JSON.Types.Object: {
+          return JSON.stringify(this.get<JSON.Obj>());
+        }
         default: {
           const fn = JSON.Value.METHODS.get(this.type - JSON.Types.Struct);
           const value = this.get<usize>();
-          return call_indirect<string>(fn, 0, value);
+          call_indirect<void>(fn, 0, value);
+          return bs.out<string>();
         }
       }
     }
   }
 
+  export class Obj {
+    // When accessing stackSize, subtract 2
+    // @ts-ignore: type
+    private stackSize: u32 = 6;
+    // @ts-ignore: type
+    private storage: Map<string, JSON.Value> = new Map<string, JSON.Value>();
+
+    constructor() { }
+
+    // @ts-ignore: decorator
+    @inline get size(): i32 {
+      return this.storage.size;
+    }
+
+    // @ts-ignore: decorator
+    @inline set<T>(key: string, value: T): void {
+      if (!this.storage.has(key)) this.stackSize += bytes(key) + 8;
+      this.storage.set(key, JSON.Value.from<T>(value));
+    }
+
+    // @ts-ignore: decorator
+    @inline get(key: string): JSON.Value | null {
+      if (!this.storage.has(key)) return null;
+      return this.storage.get(key);
+    }
+
+    // @ts-ignore: decorator
+    @inline has(key: string): bool {
+      return this.storage.has(key);
+    }
+
+    // @ts-ignore: decorator
+    @inline delete(key: string): bool {
+      return this.storage.delete(key);
+    }
+
+    // @ts-ignore: decorator
+    @inline keys(): string[] {
+      return this.storage.keys();
+    }
+
+    // @ts-ignore: decorator
+    @inline values(): JSON.Value[] {
+      return this.storage.values();
+    }
+
+    // @ts-ignore: decorator
+    @inline toString(): string {
+      return JSON.stringify(this);
+    }
+
+    // @ts-ignore: decorator
+    @inline static from<T>(value: T): JSON.Obj {
+      if (value instanceof JSON.Obj) return value;
+      const out = changetype<JSON.Obj>(__new(offsetof<JSON.Obj>(), idof<JSON.Obj>()));
+
+      if (value instanceof Map) {
+
+      }
+      return out;
+    }
+  }
   /**
    * Box for primitive types
    */
@@ -366,7 +454,8 @@ export namespace JSON {
     }
   }
 
-  export function __serialize<T>(src: T): void {
+  // @ts-ignore: inline
+  @inline export function __serialize<T>(src: T): void {
     if (isBoolean<T>()) {
       serializeBool(src as bool);
     } else if (isInteger<T>() && nameof<T>() == "usize" && src == 0) {
@@ -389,7 +478,7 @@ export namespace JSON {
       // @ts-ignore: Supplied by transform
     } else if (isDefined(src.__SERIALIZE)) {
       // @ts-ignore
-      serializeObject(changetype<nonnull<T>>(src));
+      serializeStruct(changetype<nonnull<T>>(src));
     } else if (src instanceof Date) {
       // @ts-ignore
       serializeDate(changetype<nonnull<T>>(src));
@@ -401,18 +490,22 @@ export namespace JSON {
       serializeMap(changetype<nonnull<T>>(src));
     } else if (src instanceof JSON.Value) {
       serializeArbitrary(src);
+    } else if (src instanceof JSON.Obj) {
+      serializeObject(src);
     } else if (src instanceof JSON.Box) {
       __serialize(src.value);
     } else {
       throw new Error(`Could not serialize provided data. Make sure to add the correct decorators to classes.`);
     }
   }
-  export function __deserialize<T>(srcStart: usize, srcEnd: usize, dst: usize = 0): T {
+  
+  // @ts-ignore: inline
+  @inline export function __deserialize<T>(srcStart: usize, srcEnd: usize, dst: usize = 0): T {
     if (isBoolean<T>()) {
       // @ts-ignore: type
       return deserializeBoolean(srcStart, srcEnd);
     } else if (isInteger<T>()) {
-      return deserializeInteger<T>(srcStart, srcEnd);
+      return atoi<T>(srcStart, srcEnd);
     } else if (isFloat<T>()) {
       return deserializeFloat<T>(srcStart, srcEnd);
     } else if (isString<T>()) {
@@ -425,13 +518,16 @@ export namespace JSON {
       let type: nonnull<T> = changetype<nonnull<T>>(0);
       // @ts-ignore: declared by transform
       if (isDefined(type.__DESERIALIZE)) {
-        return deserializeObject<T>(srcStart, srcEnd, dst);
+        return deserializeStruct<T>(srcStart, srcEnd, dst);
       } else if (type instanceof Map) {
         // @ts-ignore: type
         return deserializeMap<T>(srcStart, srcEnd, dst);
       } else if (type instanceof Date) {
         // @ts-ignore: type
         return deserializeDate(srcStart, srcEnd);
+      } else if (type instanceof JSON.Value) {
+        // @ts-ignore: type
+        return deserializeArbitrary(srcStart, srcEnd, 0);
       } else if (type instanceof JSON.Box) {
         // @ts-ignore: type
         return new JSON.Box(deserializeBox(srcStart, srcEnd, dst, changetype<nonnull<T>>(0).value));

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/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,4 +1,7 @@
 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";
 
 @json
@@ -22,8 +25,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;
@@ -56,4 +58,28 @@ const a3 = JSON.stringify(player);
 // console.log("Bytes    " + bytes(a3).toString());
 console.log("a3: " + a3);
 
-JSON.Memory.shrink();
+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/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

@@ -87,11 +87,11 @@ export namespace bs {
   // @ts-ignore: Decorator valid here
   @inline export function resize(newSize: u32): void {
     // @ts-ignore: exists
-    const newPtr = __renew(buffer, newSize);
+    const newPtr = changetype<ArrayBuffer>(__renew(changetype<usize>(buffer), newSize));
     bufferSize = newSize;
+    offset = changetype<usize>(newPtr);
     buffer = newPtr;
-    offset = newPtr + newSize;
-    stackSize = newPtr;
+    stackSize = 0;
   }
 
   /**

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.4",
+  "version": "1.0.0-beta.1",
   "author": "Jairus Tanaka",
   "repository": {
     "type": "git",
@@ -10,6 +10,7 @@
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
     "@types/node": "^22.13.1",
+    "as-bench": "JairusSW/as-bench",
     "as-console": "^7.0.0",
     "assemblyscript": "^0.27.34",
     "assemblyscript-prettier": "^3.0.1",
@@ -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",