json-as 1.0.7 → 1.0.9

package/assembly/index.ts

@@ -15,7 +15,6 @@ import { deserializeInteger } from "./deserialize/simple/integer";
 import { deserializeString } from "./deserialize/simple/string";
 import { serializeArbitrary } from "./serialize/simple/arbitrary";
 
-import { Sink } from "./custom/sink";
 import { NULL_WORD, QUOTE } from "./custom/chars";
 import { dtoa_buffered, itoa_buffered } from "util/number";
 import { serializeBool } from "./serialize/simple/bool";
@@ -29,8 +28,6 @@ import { serializeObject } from "./serialize/simple/object";
 import { deserializeObject } from "./deserialize/simple/object";
 import { serializeRaw } from "./serialize/simple/raw";
 import { deserializeRaw } from "./deserialize/simple/raw";
-import { isSpace } from "util/string";
-import { deserializeString_SIMD } from "./deserialize/simd/string";
 
 /**
  * Offset of the 'storage' property in the JSON.Value class.
@@ -116,12 +113,11 @@ export namespace JSON {
       //   bs.setBuffer(oldBuf);
       //   return changetype<string>(newBuf);
       // }
-      serializeString(changetype<string>(data));
-      return bs.out<string>();
-      // @ts-ignore: Supplied by transform
-    } else if (isDefined(data.__SERIALIZE_CUSTOM)) {
-      // @ts-ignore
-      inline.always(data.__SERIALIZE_CUSTOM());
+      // if (ASC_FEATURE_SIMD) {
+      //   serializeString_SIMD(data as string);
+      // } else {
+      serializeString(data as string);
+      // }
       return bs.out<string>();
       // @ts-ignore: Supplied by transform
     } else if (isDefined(data.__SERIALIZE)) {
@@ -145,7 +141,7 @@ export namespace JSON {
       inline.always(serializeMap(changetype<nonnull<T>>(data)));
       return bs.out<string>();
     } else if (data instanceof JSON.Raw) {
-      inline.always(serializeRaw(data));
+      serializeRaw(data);
       return bs.out<string>();
     } else if (data instanceof JSON.Value) {
       inline.always(serializeArbitrary(data));
@@ -196,19 +192,12 @@ export namespace JSON {
     } else {
       let type: nonnull<T> = changetype<nonnull<T>>(0);
       // @ts-ignore: Defined by transform
-      if (isDefined(type.__DESERIALIZE_CUSTOM)) {
-        const out = changetype<nonnull<T>>(0);
+      if (isDefined(type.__DESERIALIZE)) {
+        const out = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()));
         // @ts-ignore: Defined by transform
         if (isDefined(type.__INITIALIZE)) out.__INITIALIZE();
         // @ts-ignore
-        return out.__DESERIALIZE_CUSTOM(ptrToStr(dataPtr, dataPtr + dataSize));
-        // @ts-ignore: Defined by transform
-      } else 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
-        return inline.always(deserializeStruct<nonnull<T>>(dataPtr, dataPtr + dataSize, out));
+        return out.__DESERIALIZE(dataPtr, dataPtr + dataSize, out);
       } else if (type instanceof Map) {
         // @ts-ignore
         return inline.always(deserializeMap<nonnull<T>>(dataPtr, dataPtr + dataSize, 0));
@@ -404,18 +393,16 @@ export namespace JSON {
         case JSON.Types.Array: {
           const arr = this.get<JSON.Value[]>();
           if (!arr.length) return "[]";
-          const out = Sink.fromStringLiteral("[");
+          let out = "[";
           const end = arr.length - 1;
           for (let i = 0; i < end; i++) {
             const element = unchecked(arr[i]);
-            out.write(element.toString());
-            out.write(",");
+            out += element.toString() + ",";
           }
 
           const element = unchecked(arr[end]);
-          out.write(element.toString());
+          out += element.toString() + "]";
 
-          out.write("]");
           return out.toString();
         }
         case JSON.Types.Object: {
@@ -556,22 +543,22 @@ export namespace JSON {
       // @ts-ignore: Supplied by transform
     } else if (isDefined(src.__SERIALIZE)) {
       // @ts-ignore
-      inline.always(serializeStruct(changetype<nonnull<T>>(src)));
+      serializeStruct(changetype<nonnull<T>>(src));
     } else if (src instanceof Date) {
       // @ts-ignore
       inline.always(serializeDate(changetype<nonnull<T>>(src)));
     } else if (src instanceof Array) {
       // @ts-ignore
-      inline.always(serializeArray(changetype<nonnull<T>>(src)));
+      serializeArray(changetype<nonnull<T>>(src));
     } else if (src instanceof Map) {
       // @ts-ignore
-      inline.always(serializeMap(changetype<nonnull<T>>(src)));
+      serializeMap(changetype<nonnull<T>>(src));
     } else if (src instanceof JSON.Raw) {
       serializeRaw(src);
     } else if (src instanceof JSON.Value) {
-      inline.always(serializeArbitrary(src));
+      serializeArbitrary(src);
     } else if (src instanceof JSON.Obj) {
-      inline.always(serializeObject(src));
+      serializeObject(src);
     } else if (src instanceof JSON.Box) {
       __serialize(src.value);
     } else {
@@ -596,22 +583,17 @@ export namespace JSON {
       return null;
     } else if (isArray<T>()) {
       // @ts-ignore: type
-      return inline.always(deserializeArray<T>(srcStart, srcEnd, dst));
+      return deserializeArray<T>(srcStart, srcEnd, dst);
     } else {
       let type: nonnull<T> = changetype<nonnull<T>>(0);
       // @ts-ignore: Defined by transform
-      if (isDefined(type.__DESERIALIZE_CUSTOM)) {
-        const out = __new(offsetof<nonnull<T>>(), idof<nonnull<T>>());
+      if (isDefined(type.__DESERIALIZE)) {
+        const out = changetype<nonnull<T>>(dst || __new(offsetof<nonnull<T>>(), idof<nonnull<T>>()))
         // @ts-ignore: Defined by transform
-        if (isDefined(type.__INITIALIZE)) changetype<nonnull<T>>(out).__INITIALIZE();
-        // @ts-ignore
-        return changetype<nonnull<T>>(out).__DESERIALIZE_CUSTOM(ptrToStr(srcStart, srcEnd));
-        // @ts-ignore: Defined by transform
-      } else if (isDefined(type.__DESERIALIZE)) {
-        return inline.always(deserializeStruct<T>(srcStart, srcEnd, dst));
+        return out.__DESERIALIZE(srcStart, srcEnd, out);
       } else if (type instanceof Map) {
         // @ts-ignore: type
-        return inline.always(deserializeMap<T>(srcStart, srcEnd, dst));
+        return deserializeMap<T>(srcStart, srcEnd, dst);
       } else if (type instanceof Date) {
         // @ts-ignore: type
         return deserializeDate(srcStart, srcEnd);
@@ -620,7 +602,10 @@ export namespace JSON {
         return deserializeRaw(srcStart, srcEnd);
       } else if (type instanceof JSON.Value) {
         // @ts-ignore: type
-        return inline.always(deserializeArbitrary(srcStart, srcEnd, 0));
+        return deserializeArbitrary(srcStart, srcEnd, 0);
+      } else if (type instanceof JSON.Obj) {
+        // @ts-ignore: type
+        return deserializeObject(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));
@@ -628,6 +613,19 @@ export namespace JSON {
     }
     throw new Error(`Could not deserialize data '${ptrToStr(srcStart, srcEnd).slice(0, 100)}' to type. Make sure to add the correct decorators to classes.`);
   }
+  namespace Util {
+    // @ts-ignore: decorator
+    @inline export function isSpace(code: u16): boolean {
+      return code == 0x20 || code - 9 <= 4;
+    }
+    // @ts-ignore: decorator
+    @inline export function ptrToStr(start: usize, end: usize): string {
+      const size = end - start;
+      const out = __new(size, idof<string>());
+      memory.copy(out, start, size);
+      return changetype<string>(out);
+    }
+  }
 }
 
 // @ts-ignore: decorator

package/assembly/serialize/simd/string.ts

@@ -1,13 +1,7 @@
 import { bs } from "../../../lib/as-bs";
 import { BACK_SLASH } from "../../custom/chars";
 import { SERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
-import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
-
-const SPLAT_34 = i16x8.splat(34); /* " */
-const SPLAT_92 = i16x8.splat(92); /* \ */
-
-const SPLAT_32 = i16x8.splat(32); /* [ESC] */
-const SPLAT_0 = i16x8.splat(0); /* 0 */
+import { bytes } from "../../util";
 
 /**
  * Serializes strings into their JSON counterparts using SIMD operations
@@ -15,16 +9,23 @@ const SPLAT_0 = i16x8.splat(0); /* 0 */
  * @param srcEnd pointer to end serialization at
  */
 export function serializeString_SIMD(src: string): void {
-  const srcSize = changetype<OBJECT>(changetype<usize>(src) - TOTAL_OVERHEAD).rtSize;
+  const SPLAT_34 = i16x8.splat(34); /* " */
+  const SPLAT_92 = i16x8.splat(92); /* \ */
+
+  const SPLAT_32 = i16x8.splat(32); /* [ESC] */
+  const SPLAT_0 = i16x8.splat(0); /* 0 */
+
+  const srcSize = bytes(src);
   let srcStart = changetype<usize>(src);
   const srcEnd = srcStart + srcSize;
+  const srcEnd16 = srcEnd - 16;
+
   bs.proposeSize(srcSize + 4);
-  const srcEnd16 = srcEnd - 15;
 
   store<u8>(changetype<usize>(bs.offset), 34); /* " */
   bs.offset += 2;
 
-  while (srcStart < srcEnd16) {
+  while (srcStart <= srcEnd16) {
     const block = v128.load(srcStart);
     v128.store(bs.offset, block);
 
@@ -62,8 +63,7 @@ export function serializeString_SIMD(src: string): void {
     bs.offset += 16;
   }
 
-  let rem = srcEnd - srcStart;
-
+  const rem = srcEnd - srcStart;
   if (rem & 8) {
     const block = v128.load64_zero(srcStart);
     v128.store64_lane(bs.offset, block, 0);

package/assembly/test.ts

@@ -1,153 +1,66 @@
 import { JSON } from ".";
 import { bytes } from "./util";
-
-
 @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;
-}
+class GenericEnum<T> {
+  private tag: string = ""
+  private value: T | null = null
 
+  constructor() {
+    this.tag = ""
+    this.value = null
+  }
 
-@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;
-}
-
+  static create<T>(tag: string, value: T): GenericEnum<T> {
+    const item = new GenericEnum<T>()
+    item.tag = tag
+    item.value = value
+    return item
+  }
 
-@json
-class Point {
-  x: f64 = 0.0;
-  y: f64 = 0.0;
-  constructor(x: f64, y: f64) {
-    this.x = x;
-    this.y = y;
+  getTag(): string {
+    return this.tag
   }
 
+  getValue(): T | null {
+    return this.value
+  }
 
   @serializer
-  serializer(self: Point): string {
-    return `(${self.x},${self.y})`;
+  serialize(self: GenericEnum<T>): string {
+    const tagJson = JSON.stringify(self.tag)
+    const valueJson = JSON.stringify(self.value)
+    return `{"tag":${tagJson},"value":${valueJson}}`
   }
 
-
   @deserializer
-  deserializer(data: string): Point | null {
-    const dataSize = bytes(data);
-    if (dataSize <= 2) return null;
-
-    const c = data.indexOf(",");
-    const x = data.slice(1, c);
-    const y = data.slice(c + 1, data.length - 1);
+  deserialize(data: string): GenericEnum<T> {
+    const parsed = JSON.parse<Map<string, JSON.Raw>>(data);
+    const result = new GenericEnum<T>();
 
-    return new Point(f64.parse(x), f64.parse(y));
-  }
-}
+    if (parsed.has("tag")) {
+      result.tag = JSON.parse<string>(parsed.get("tag").data);
+    }
 
+    if (parsed.has("value")) {
+      result.value = JSON.parse<T>(parsed.get("value").data);
+    }
 
-@json
-class InnerObj<T> {
-  obj: T = instantiate<T>();
+    return result;
+  }
 }
 
-
-@json
-class ObjWithBracketString {
-  data: string = "";
+export function test(): void {
+  const myEnum = GenericEnum.create<string>("test_tag", "test_value");
+  // Serialize it
+  const serialized = JSON.stringify<GenericEnum<string>>(myEnum);
+  console.log("=== Serialized ===");
+  console.log(serialized);
+  console.log("=== Attempting to deserialize (this will crash) ===");
+
+  // This line crashes
+  const parsed = JSON.parse<GenericEnum<string>>(serialized);
+  console.log("=== Deserialized ===");
+  console.log(JSON.stringify(parsed))
 }
 
-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);
-
-const a9 = JSON.stringify<JSON.Raw>(JSON.Raw.from('"hello world"'));
-
-console.log("a9: " + a9);
-
-const m10 = new Map<string, JSON.Raw>();
-m10.set("hello", new JSON.Raw('"world"'));
-m10.set("pos", new JSON.Raw('{"x":1.0,"y":2.0,"z":3.0}'));
-
-const a10 = JSON.stringify(m10);
-
-console.log("a10: " + a10);
-
-const a11 = JSON.parse<JSON.Obj>('  {  "x"  :  3.4  ,  "y"   :   1.2    ,  "z"  :  8.3   }     ');
-
-console.log("a11: " + JSON.stringify(a11));
-
-const a12 = JSON.parse<InnerObj<ObjWithBracketString>>('{"obj":{"data":"hello} world"}}');
-
-console.log("a12: " + JSON.stringify(a12));
-
-const a13 = JSON.stringify<JSON.Obj>(new JSON.Obj());
-
-console.log("a13: " + a13);
+test();

package/assembly/util/idofd.ts

@@ -0,0 +1,6 @@
+import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
+
+// @ts-ignore: decorator
+@inline export function idofD<T>(value: T): usize {
+  return changetype<OBJECT>(changetype<usize>(value) - TOTAL_OVERHEAD).rtId;
+}

package/bench/abc.bench.ts

@@ -1,4 +1,4 @@
-import { bench } from "./lib/bench";
+import { bench } from "./lib/bench.js";
 
 const v1 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 const v2 = '"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"';

package/bench/large.bench.ts

@@ -1,4 +1,4 @@
-import { bench } from "./lib/bench";
+import { bench } from "./lib/bench.js";
 
 class Vec3 {
   public x!: number;
@@ -110,7 +110,7 @@ const v1: LargeJSON = {
 const v2 = `{"id":2,"name":"Medium Object","age":18,"email":"me@jairus.dev","street":"I don't want to say my street","city":"I don't want to say this either","state":"It really depends","zip":"I forget what it is","tags":["me","dogs","mountains","bar","foo"],"theme":"Hyper Term Black","notifications":true,"language":"en-US","movement":[{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3}]}`;
 
 bench(
-  "Serialize Medium Object",
+  "Serialize Large Object",
   () => {
     JSON.stringify(v1);
   },
@@ -118,7 +118,7 @@ bench(
 );
 
 bench(
-  "Deserialize Medium Object",
+  "Deserialize Large Object",
   () => {
     JSON.parse(v2);
   },

package/bench/lib/bench.ts

@@ -1,5 +1,17 @@
+if (typeof console === "undefined") {
+  console = {
+    log: print,
+    error: print,
+    warn: print,
+  };
+}
+
 export function bench(description: string, routine: () => void, ops: number = 1_000_000): void {
   console.log(" - Benchmarking " + description);
+  let warmup = ops / 10;
+  while (--warmup) {
+    routine();
+  }
   const start = Date.now();
   let count = ops;
   while (count !== 0) {

package/bench/medium.bench.ts

@@ -1,4 +1,4 @@
-import { bench } from "./lib/bench";
+import { bench } from "./lib/bench.js";
 
 class MediumJSON {
   public id!: number;

package/bench/runners/assemblyscript.js

@@ -0,0 +1,28 @@
+const bytes = readbuffer("./build/" + arguments[0]);
+const module = new WebAssembly.Module(bytes);
+let memory = null;
+const { exports } = new WebAssembly.Instance(module, {
+  env: {
+    abort: (msg, file, line) => {
+      console.log("abort: " + __liftString(msg) + " in " + __liftString(file) + ":" + __liftString(line));
+    },
+    "console.log": (ptr) => {
+      console.log(__liftString(ptr));
+    },
+    "Date.now": () => Date.now(),
+  },
+});
+
+memory = exports.memory;
+
+function __liftString(pointer) {
+  if (!pointer) return null;
+  const end = (pointer + new Uint32Array(memory.buffer)[(pointer - 4) >>> 2]) >>> 1,
+    memoryU16 = new Uint16Array(memory.buffer);
+  let start = pointer >>> 1,
+    string = "";
+  while (end - start > 1024) string += String.fromCharCode(...memoryU16.subarray(start, (start += 1024)));
+  return string + String.fromCharCode(...memoryU16.subarray(start, end));
+}
+
+exports.start();

package/bench/small.bench.ts

@@ -1,4 +1,4 @@
-import { bench } from "./lib/bench";
+import { bench } from "./lib/bench.js";
 
 class SmallJSON {
   public id!: number;

package/bench/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2020",
+    "moduleResolution": "Node",
+    "removeComments": true,
+    "types": ["node"],
+    "outDir": "../build",
+    "sourceMap": false
+  },
+  "include": ["./*.ts", "./lib/*.ts"]
+}

package/bench/vec3.bench.ts

@@ -1,4 +1,4 @@
-import { bench } from "./lib/bench";
+import { bench } from "./lib/bench.js";
 
 class Vec3 {
   public x!: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "author": "Jairus Tanaka",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
@@ -18,9 +18,8 @@
     "test": "bash ./run-tests.sh",
     "bench:as": "bash ./run-bench.as.sh",
     "bench:js": "bash ./run-bench.js.sh",
-    "build:time": "time npx asc ./assembly/__benches__/abc.bench.ts --transform ./transform -o ./build/abc.bench.wasm --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",
+    "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
+    "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 --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:wasmer": "wasmer ./build/test.wasm",
     "build:transform": "tsc -p ./transform",

package/run-bench.as.sh

@@ -1,27 +1,53 @@
 #!/bin/bash
+RUNTIMES=${RUNTIMES:-"minimal stub"}
+ENGINES=${ENGINES:-"liftoff ignition sparkplug turbofan llvm"}
+for file in ./assembly/__benches__/vec3.bench.ts; do
+    filename=$(basename -- "$file")
+    output_wasi=
+    for runtime in $RUNTIMES; do
+        output="./build/${filename%.ts}.${runtime}.wasm"
 
-mkdir -p ./build
+        npx asc "$file" --transform ./transform -o "${output}.1" -O3 --converge --noAssert --uncheckedBehavior always --runtime $runtime --enable simd --enable bulk-memory --exportStart start || {
+            echo "Build failed"
+            exit 1
+        }
 
-for file in ./assembly/__benches__/*.bench.ts; do
-  filename=$(basename -- "$file")
-  output="./build/${filename%.ts}.wasm"
+        wasm-opt -all -O4 "${output}.1" -o "$output"
+        rm "${output}.1"
 
-  start_time=$(date +%s%3N)
-  npx asc "$file" --transform ./transform -o "$output" --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub --enable simd --enable bulk-memory || { echo "Build failed"; exit 1; }
-  end_time=$(date +%s%3N)
+        npx asc "$file" --transform ./transform -o "${output}.2" -O3 --converge --noAssert --uncheckedBehavior always --runtime $runtime --enable simd --enable bulk-memory --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json || {
+            echo "Build failed"
+            exit 1
+        }
 
-  build_time=$((end_time - start_time))
+            wasm-opt -all -O4 "${output}.2" -o "${output%.wasm}.wasi.wasm"
+            rm "${output}.2"
 
-  if [ "$build_time" -ge 60000 ]; then
-    formatted_time="$(bc <<< "scale=2; $build_time/60000")m"
-  elif [ "$build_time" -ge 1000 ]; then
-    formatted_time="$(bc <<< "scale=2; $build_time/1000")s"
-  else
-    formatted_time="${build_time}ms"
-  fi
+        for engine in $ENGINES; do
+            echo -e "$filename (asc/$runtime/$engine)\n"
 
-  echo -e "$filename (built in $formatted_time)\n"
-  wasmer "$output" --llvm || { echo "Benchmarked failed."; exit 1; }
+            arg="${filename%.ts}.${runtime}.wasm"
+            if [[ "$engine" == "ignition" ]]; then
+                v8 --no-opt --module ./bench/runners/assemblyscript.js -- $arg
+            fi
+
+            if [[ "$engine" == "liftoff" ]]; then
+                v8 --liftoff-only --no-opt --module ./bench/runners/assemblyscript.js -- $arg
+            fi
+
+            if [[ "$engine" == "sparkplug" ]]; then
+                v8 --sparkplug --always-sparkplug --no-opt --module ./bench/runners/assemblyscript.js -- $arg
+            fi
+
+            if [[ "$engine" == "turbofan" ]]; then
+                v8 --no-liftoff --no-wasm-tier-up --module ./bench/runners/assemblyscript.js -- $arg
+            fi
+
+            if [[ "$engine" == "llvm" ]]; then
+                wasmer run "${output%.wasm}.wasi.wasm" --llvm --enable-simd --enable-bulk-memory --enable-relaxed-simd --enable-pass-params-opt
+            fi
+        done
+    done
 done
 
-echo "Finished benchmarks."
+echo "Finished benchmarks"