json-as 0.5.56 → 0.5.58

package/README.md

@@ -1,8 +1,5 @@
 # AS-JSON
 
-![AssemblyScript](https://img.shields.io/badge/AssemblyScript-blue)
-![WebAssembly](https://img.shields.io/badge/WebAssemby-purple)
-
 JSON for AssemblyScript focused on performance, low-overhead, and ease-of-use.
 
 ## Installation
@@ -21,6 +18,7 @@ Alternatively, add it to your `asconfig.json`
 
 ```
 {
+  // ...
   "options": {
     "transform": ["json-as/transform"]
   }
@@ -68,41 +66,59 @@ const stringified = JSON.stringify<Player>(player);
 const parsed = JSON.parse<Player>(stringified);
 ```
 
+If you use this project in your codebase, consider dropping a [star](https://github.com/JairusSW/as-json). I would really appreciate it!
 ## Performance
 
-Here are some benchmarks I took with `tinybench` (JavaScript) and `astral` (AssemblyScript).
-I took the benchmarks using the minimal runtime which doesn't call the Garbage Collector, so you may expect a 10% to 40% decrease from low to high throughput.
+Run or view the benchmarks [here](https://github.com/JairusSW/as-json/tree/master/bench)
+
+Below are benchmark results comparing JavaScript, WAVM (WebAssembly Virtual Machine), and Wasmtime environments.
+
+JavaScript Results
+
+```
+NodeJS v20.5.1 - TinyBench v2.5.0 (V8)
+┌───────────────────────────┬───────────────┐
+│         Task Name         │   ops / sec   │
+├───────────────────────────┼───────────────┤
+│ 'Stringify Object (Vec3)' │  '1,191,221'  │
+│   'Parse Object (Vec3)'   │  '897,759'    │
+│ 'Stringify Number Array'  │  '1,552,255'  │
+│   'Parse Number Array'    │  '1,225,325'  │
+│    'Stringify String'     │  '1,761,011'  │
+│      'Parse String'       │  '80,845'     │
+└───────────────────────────┴───────────────┘
+```
 
-Tests are run on Ubuntu/WSL2 with a AMD Ryzen 9 CPU
+AssemblyScript Results
 
-JavaScript Results (TinyBench/NodeJS 19)
 ```
-┌───────────────────────────┬─────────────┬────────────────────┬──────────┐
-│         Task Name         │  ops / sec  │  Average Time(ns)  │  Margin  │
-├───────────────────────────┼─────────────┼────────────────────┼──────────┤
-│ 'Stringify Object (Vec3)' │  '817,816'  │      1222.76       │ '±3.55%' │
-│   'Parse Object (Vec3)'   │  '726,115'  │      1377.19       │ '±3.21%' │
-│ 'Stringify Number Array'  │ '1,104,036' │      905.77        │ '±6.48%' │
-│   'Parse Number Array'    │ '1,114,053' │      897.62        │ '±2.58%' │
-│    'Stringify String'     │ '1,565,716' │      638.69        │ '±2.04%' │
-│      'Parse String'       │  '69,568'   │      14374.22      │ '±2.55%' │
-└───────────────────────────┴─────────────┴────────────────────┴──────────┘
+WAVM v0.0.0-prerelease - as-bench v0.0.0-alpha (LLVM)
+┌───────────────────────────┬───────────────┐
+│         Task Name         │   ops / sec   │
+├───────────────────────────┼───────────────┤
+│ 'Stringify Object (Vec3)' │  '6,270,322'  │
+│   'Parse Object (Vec3)'   │  '8,000,195'  |
+│ 'Stringify Number Array'  │  '6,664,937'  │
+│   'Parse Number Array'    │  '6,557,357'  │
+│    'Stringify String'     │  '6,946,947'  │
+│      'Parse String'       │  '10,952,502' │
+└───────────────────────────┴───────────────┘
 ```
 
-AssemblyScript Results (Runtime Minimal)
 ```
-┌───────────────────────────┬─────────────┬────────────────────┬──────────┐
-│         Task Name         │  ops / sec  │  Average Time(ns)  │   Diff   │
-├───────────────────────────┼─────────────┼────────────────────┼──────────┤
-│ 'Stringify Object (Vec3)' │ '2,091,000' │       417.22       │  -805ns  │
-│   'Parse Object (Vec3)'   │ '1,780,000' │       539.02       │  -838ns  |
-│ 'Stringify Number Array'  │ '1,920,000' │       445.43       │  -460ns  │
-│   'Parse Number Array'    │ '1,660,000' │       597.17       │  -300ns  │
-│    'Stringify String'     │ '1,280,000' │       736.27       │   +97ns  │
-│      'Parse String'       │ '4,230,000' │       239.21       │ -14135ns │
-└───────────────────────────┴─────────────┴────────────────────┴──────────┘
+Wasmtime v11.0.1 - as-bench v0.0.0-alpha (Cranelift)
+┌───────────────────────────┬───────────────┐
+│         Task Name         │   ops / sec   │
+├───────────────────────────┼───────────────┤
+│ 'Stringify Object (Vec3)' │  '2,038,684'  │
+│   'Parse Object (Vec3)'   │  '4,623,337'  |
+│ 'Stringify Number Array'  │  '2,500,947'  │
+│   'Parse Number Array'    │  '2,959,180'  │
+│    'Stringify String'     │  '3,236,896'  │
+│      'Parse String'       │  '5,634,594'  │
+└───────────────────────────┴───────────────┘
 ```
 
 ## Issues
 
-Please submit an issue to https://github.com/JairusSW/as-json/issues if you find anything wrong with this library
+Please submit an issue to https://github.com/JairusSW/as-json/issues if you find anything wrong with this library

package/assembly/__tests__/as-json.spec.ts

@@ -89,7 +89,7 @@ describe("Ser/de Array", () => {
   });
 
   it("should ser/de string arrays", () => {
-    canSerde<string[]>(['string \"with random spa\nces and \nnewlines\n\n\n']);
+    canSerde<string[]>(['string \"with random spa\nces and \nnewlines\n\n\n'], '["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]');
   });
 
   it("should ser/de nested integer arrays", () => {

package/assembly/src/json.ts

@@ -21,6 +21,7 @@ import {
   uCode,
   emptyArrayWord,
   falseWord,
+  newLineCode,
 } from "./chars";
 import { snip_fast, unsafeCharCodeAt } from "./util";
 import { Virtual } from "as-virtual/assembly";
@@ -219,7 +220,7 @@ export namespace JSON {
 }
 
 // @ts-ignore: Decorator
-@inline export function serializeString(data: string): string {
+@inline function serializeString(data: string): string {
   let result = new StringSink('"');
 
   let last: i32 = 0;
@@ -230,7 +231,6 @@ export namespace JSON {
       result.write(<string>data, last, i);
       result.writeCodePoint(backSlashCode);
       last = i;
-      //i++;
     } else if (char <= 13 && char >= 8) {
       result.write(<string>data, last, i);
       last = i + 1;
@@ -270,45 +270,45 @@ export namespace JSON {
 
 // @ts-ignore: Decorator
 @inline function parseString(data: string): string {
-  let result = "";
+  let result = new StringSink();
   let last = 1;
   for (let i = 1; i < data.length - 1; i++) {
     // \\"
     if (unsafeCharCodeAt(data, i) === backSlashCode) {
       const char = unsafeCharCodeAt(data, ++i);
-      result += data.slice(last, i - 1);
+      result.write(data, last, i - 1);
       if (char === 34) {
-        result += '"';
+        result.writeCodePoint(quoteCode);
         last = i + 1;
       } else if (char >= 92 && char <= 117) {
         switch (char) {
           case 92: {
-            result += "\\";
+            result.writeCodePoint(backSlashCode);
             last = i + 1;
             break;
           }
           case 98: {
-            result += "\b";
+            result.write("\b");
             last = i + 1;
             break;
           }
           case 102: {
-            result += "\f";
+            result.write("\f");
             last = i + 1;
             break;
           }
           case 110: {
-            result += "\n";
+            result.writeCodePoint(newLineCode);
             last = i + 1;
             break;
           }
           case 114: {
-            result += "\r";
+            result.write("\r");
             last = i + 1;
             break;
           }
           case 116: {
-            result += "\t";
+            result.write("\t");
             last = i + 1;
             break;
           }
@@ -318,7 +318,7 @@ export namespace JSON {
               load<u64>(changetype<usize>(data) + <usize>((i + 1) << 1)) ===
               27584753879220272
             ) {
-              result += "\u000b";
+              result.write("\u000b");
               i += 4;
               last = i + 1;
             }
@@ -328,8 +328,8 @@ export namespace JSON {
       }
     }
   }
-  result += data.slice(last, data.length - 1);
-  return result;
+  if ((data.length - 1) > last) result.write(data, last, data.length - 1);
+  return result.toString();
 }
 
 // @ts-ignore: Decorator
@@ -340,7 +340,7 @@ export namespace JSON {
 }
 
 // @ts-ignore: Decorator
-@inline export function parseNumber<T>(data: string): T {
+@inline function parseNumber<T>(data: string): T {
   if (isInteger<T>()) {
     // @ts-ignore
     return snip_fast<T>(data);
@@ -596,7 +596,7 @@ export namespace JSON {
 }
 
 // @ts-ignore: Decorator
-@inline export function parseObjectArray<T extends unknown[]>(data: string): T {
+@inline function parseObjectArray<T extends unknown[]>(data: string): T {
   const result = instantiate<T>();
   let lastPos: u32 = 1;
   let depth: u32 = 0;

package/assembly/test.ts

@@ -1,5 +1,5 @@
-import { bench, blackbox } from "../../../WebAssembly/benchmark-wasm/assembly/bench";
-import { JSON, serializeString } from "./src/json";
+import { bench, blackbox } from "as-bench/assembly/bench";
+import { JSON } from "./src/json";
 // @ts-ignore
 @json
 class Vec3 {
@@ -45,12 +45,6 @@ console.log("Implemented: " + JSON.stringify(JSON.parse<Vec3>('{"x":3.4,"y":1.2,
 console.log("Original: " + JSON.stringify(player));
 //console.log("Revised: " + vec.__JSON_Deserialize('{"x":3,"y":1,"z":8}').__JSON_Serialize());
 console.log("Implemented: " + JSON.stringify(JSON.parse<Player>('{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}')));
-
-console.log("Serialized String: " + serializeString('st"ring" w""ith quotes"'));
-
-bench("New Stringify String", () => {
-    blackbox<string>(serializeString(blackbox<string>('st"ring" w""ith quotes"')));
-});
 /*
 // 9,325,755
 bench("Stringify Object (Vec3)", () => {
@@ -58,7 +52,7 @@ bench("Stringify Object (Vec3)", () => {
 });
 
 // 17,747,531 -> 55,517,015
-/*bench("New Parse Object (Vec3)", () => {
+bench("New Parse Object (Vec3)", () => {
     blackbox<Vec3>(vec.__JSON_Deserialize(blackbox<string>('{"x":0,"y":0,"z":0}')));
 });
 

package/bench/bench-node.js

@@ -0,0 +1,17 @@
+import { readFileSync } from "fs";
+import { WASI } from "wasi";
+import { argv, env } from 'node:process';
+
+const wasm = readFileSync("./benchmark.wasm");
+
+const wasi = new WASI({
+    version: 'preview1',
+    args: argv,
+    env,
+    preopens: {},
+});
+
+const mod = new WebAssembly.Module(wasm);
+const instance = new WebAssembly.Instance(mod, wasi.getImportObject());
+
+wasi.start(instance);

package/bench/benchmark.ts

@@ -1,158 +1,12 @@
-import { bench, blackbox } from "../../../WebAssembly/benchmark-wasm/assembly/bench";
-import { __atoi_fast, snip_fast, unsafeCharCodeAt } from "../assembly/src/util";
+import { bench, blackbox } from "as-bench/assembly/bench";
+import { __atoi_fast } from "../assembly/src/util";
 import { JSON } from "../assembly";
-import { backSlashCode, commaCode, eCode, fCode, leftBraceCode, leftBracketCode, nCode, nullWord, quoteCode, rCode, rightBraceCode, rightBracketCode, tCode, trueWord, uCode } from "../assembly/src/chars";
-import { isSpace } from "util/string";
+
+@json
 class Vec3 {
     x: i32;
     y: i32;
     z: i32;
-    @inline
-    __JSON_Serialize(): string {
-        return `{"x":${this.x.toString()},"y":${this.y.toString()},"z":${this.z.toString()}}`;
-    }
-    @inline
-    __JSON_Set_Key(key: string, value: string): void {
-        if (key == "x") {
-            this.x = ____parseObjectValue<i32>(value);
-            return;
-        }
-        if (key == "y") {
-            this.y = ____parseObjectValue<i32>(value);
-            return;
-        }
-        if (key == "z") {
-            this.z = ____parseObjectValue<i32>(value);
-            return;
-        }
-    }
-    @inline
-    __JSON_Deserialize(data: string): Vec3 {
-        let schema: nonnull<Vec3> = changetype<nonnull<Vec3>>(
-            __new(offsetof<nonnull<Vec3>>(), idof<nonnull<Vec3>>())
-        );
-        let key = "";
-        let isKey = false;
-        let depth = 0;
-        let outerLoopIndex = 1;
-        for (; outerLoopIndex < data.length - 1; outerLoopIndex++) {
-            const char = unsafeCharCodeAt(data, outerLoopIndex);
-            if (char === leftBracketCode) {
-                for (
-                    let arrayValueIndex = outerLoopIndex;
-                    arrayValueIndex < data.length - 1;
-                    arrayValueIndex++
-                ) {
-                    const char = unsafeCharCodeAt(data, arrayValueIndex);
-                    if (char === leftBracketCode) {
-                        depth++;
-                    } else if (char === rightBracketCode) {
-                        depth--;
-                        if (depth === 0) {
-                            ++arrayValueIndex;
-                            // @ts-ignore
-                            schema.__JSON_Set_Key(
-                                key,
-                                data.slice(outerLoopIndex, arrayValueIndex)
-                            );
-                            outerLoopIndex = arrayValueIndex;
-                            isKey = false;
-                            break;
-                        }
-                    }
-                }
-            } else if (char === leftBraceCode) {
-                for (
-                    let objectValueIndex = outerLoopIndex;
-                    objectValueIndex < data.length - 1;
-                    objectValueIndex++
-                ) {
-                    const char = unsafeCharCodeAt(data, objectValueIndex);
-                    if (char === leftBraceCode) {
-                        depth++;
-                    } else if (char === rightBraceCode) {
-                        depth--;
-                        if (depth === 0) {
-                            ++objectValueIndex;
-                            // @ts-ignore
-                            schema.__JSON_Set_Key(
-                                key,
-                                data.slice(outerLoopIndex, objectValueIndex)
-                            );
-                            outerLoopIndex = objectValueIndex;
-                            isKey = false;
-                            break;
-                        }
-                    }
-                }
-            } else if (char === quoteCode) {
-                for (
-                    let stringValueIndex = ++outerLoopIndex;
-                    stringValueIndex < data.length - 1;
-                    stringValueIndex++
-                ) {
-                    const char = unsafeCharCodeAt(data, stringValueIndex);
-                    if (
-                        char === quoteCode &&
-                        unsafeCharCodeAt(data, stringValueIndex - 1) !== backSlashCode
-                    ) {
-                        if (isKey === false) {
-                            key = data.slice(outerLoopIndex, stringValueIndex);
-                            isKey = true;
-                        } else {
-                            // @ts-ignore
-                            schema.__JSON_Set_Key(
-                                key,
-                                data.slice(outerLoopIndex, stringValueIndex)
-                            );
-                            isKey = false;
-                        }
-                        outerLoopIndex = ++stringValueIndex;
-                        break;
-                    }
-                }
-            } else if (char == nCode) {
-                // @ts-ignore
-                schema.__JSON_Set_Key(key, nullWord);
-                isKey = false;
-            } else if (
-                char === tCode &&
-                unsafeCharCodeAt(data, ++outerLoopIndex) === rCode &&
-                unsafeCharCodeAt(data, ++outerLoopIndex) === uCode &&
-                unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
-            ) {
-                // @ts-ignore
-                schema.__JSON_Set_Key(key, trueWord);
-                isKey = false;
-            } else if (
-                char === fCode &&
-                unsafeCharCodeAt(data, ++outerLoopIndex) === "a".charCodeAt(0) &&
-                unsafeCharCodeAt(data, ++outerLoopIndex) === "l".charCodeAt(0) &&
-                unsafeCharCodeAt(data, ++outerLoopIndex) === "s".charCodeAt(0) &&
-                unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
-            ) {
-                // @ts-ignore
-                schema.__JSON_Set_Key(key, "false");
-                isKey = false;
-            } else if ((char >= 48 && char <= 57) || char === 45) {
-                let numberValueIndex = ++outerLoopIndex;
-                for (; numberValueIndex < data.length; numberValueIndex++) {
-                    const char = unsafeCharCodeAt(data, numberValueIndex);
-                    if (char === commaCode || char === rightBraceCode || isSpace(char)) {
-                        // @ts-ignore
-                        schema.__JSON_Set_Key(
-                            key,
-                            data.slice(outerLoopIndex - 1, numberValueIndex)
-                        );
-                        outerLoopIndex = numberValueIndex;
-                        isKey = false;
-                        break;
-                    }
-                }
-            }
-        }
-        return schema;
-    }
 }
 
 const vec: Vec3 = {
@@ -172,13 +26,13 @@ bench("Parse Number ATOI", () => {
 bench("Parse Number STDLIB", () => {
     blackbox<i32>(i32.parse("12345"));
 });
-
+*/
 bench("Stringify Object (Vec3)", () => {
-    blackbox<string>(vec.__JSON_Serialize());
-});*/
+    blackbox<string>(JSON.stringify(vec));
+});
 
 bench("Parse Object (Vec3)", () => {
-    blackbox<Vec3>(vec.__JSON_Deserialize('{"x":0,"y":0,"z":0}'));
+    blackbox<Vec3>(JSON.parse<Vec3>('{"x":0,"y":0,"z":0}'));
 });
 
 bench("Stringify Number Array", () => {
@@ -196,11 +50,11 @@ bench("Stringify String", () => {
 bench("Parse String", () => {
     blackbox<string>(JSON.parse<string>(blackbox('"Hello "World!"')));
 });
-
+/*
 bench("Stringify Boolean Array", () => {
     blackbox(JSON.stringify<boolean[]>([true, false, true]));
 });
 
 bench("Stringify String Array", () => {
     blackbox(JSON.stringify<string[]>(["a", "b", "c"]));
-});
+});*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.56",
+  "version": "0.5.58",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -31,6 +31,7 @@
     "@as-pect/cli": "^8.0.1",
     "@as-tral/cli": "^2.0.1",
     "@assemblyscript/wasi-shim": "^0.1.0",
+    "as-bench": "^0.0.0-alpha",
     "assemblyscript": "^0.27.9",
     "assemblyscript-prettier": "^2.0.2",
     "benchmark": "^2.1.4",
@@ -44,7 +45,7 @@
   "dependencies": {
     "as-string-sink": "^0.5.3",
     "as-variant": "^0.4.1",
-    "as-virtual": "^0.1.8"
+    "as-virtual": "^0.1.9"
   },
   "repository": {
     "type": "git",

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.5.54",
+  "version": "0.5.58",
   "description": "JSON encoder/decoder for AssemblyScript",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",

package/bench-results/INTEGER-PARSING.md

@@ -1,52 +0,0 @@
-# Comparison between integer parsing algorithms
-
-SNIP: 261M iterations over 5000ms
-ATOI: 285M iterations over 5000ms
-
-
-### Log
-
-```
-yarn run v1.22.19
-$ astral -Ospeed --noAssert --uncheckedBehavior always --runtime stub
-Compiling assembly/__benches__/as-json.ts
-
-Benchmarking Parse Number SNIP: Warming up for 3000ms
-Benchmarking Parse Number SNIP: Collecting 100 samples in estimated 5000ms (261M iterations)
-Benchmarking Parse Number SNIP: Analyzing
-Parse Number SNIP       time: [18.146ns 18.381ns 18.624ns]
-                        change: [-13.073% -10.614% -8.1347%] (p = 0.00 < 0.05)
-                        Performance has improved.
-Found 9 outliers among 100 measurements (9%)
-  8 (8%) high mild
-  1 (1%) high severe
-
-Benchmarking Parse Number ATOI: Warming up for 3000ms
-Benchmarking Parse Number ATOI: Collecting 100 samples in estimated 5000ms (285M iterations)
-Benchmarking Parse Number ATOI: Analyzing
-Parse Number ATOI       time: [16.962ns 17.219ns 17.501ns]
-                        change: [-3.5659% -0.8496% +2.0516%] (p = 0.00 < 0.05)
-                        Change within noise threshold.
-Found 7 outliers among 100 measurements (7%)
-  2 (2%) high mild
-  5 (5%) high severe
-
-Benchmarking Parse Number STDLIB: Warming up for 3000ms
-Benchmarking Parse Number STDLIB: Collecting 100 samples in estimated 5000ms (176M iterations)
-Benchmarking Parse Number STDLIB: Analyzing
-Parse Number STDLIB     time: [28.298ns 28.763ns 29.383ns]
-                        change: [-3.3724% -1.5367% +0.1796%] (p = 0.00 < 0.05)
-                        Change within noise threshold.
-Found 5 outliers among 100 measurements (5%)
-  3 (3%) high mild
-  2 (2%) high severe
-
-Benchmarking Parse Number OLD: Warming up for 3000ms
-Benchmarking Parse Number OLD: Collecting 100 samples in estimated 5000ms (171M iterations)
-Benchmarking Parse Number OLD: Analyzing
-Parse Number OLD        time: [28.888ns 29.341ns 29.804ns]
-                        change: [-2.123% -0.5458% +1.1939%] (p = 0.00 < 0.05)
-                        Change within noise threshold.
-Found 3 outliers among 100 measurements (3%)
-  3 (3%) high mild
-  ```