json-as 0.8.7 → 0.8.8

package/assembly/test.ts

@@ -1,41 +1,30 @@
-import { JSON } from ".";
+import { Box } from "as-container";
+import { JSON } from "./src/json";
 
 @json
-class Vec3 {
-  x: f32 = 0.0;
-  y: f32 = 0.0;
-  z: f32 = 0.0;
+class Foo {
+  @omitnull
+  optionalNumber: Box<i32> | null = null;
+  @omitif("this.tristateValue!.unwrap() == false")
+  tristateValue: Box<bool> | null = null;
 }
 
 @json
-class Player {
-  @alias("first name")
-  firstName!: string;
-  lastName!: string;
-  lastActive!: i32[];
-  @omitif("this.age < 18")
-  age!: i32;
-  @omitnull()
-  pos!: Vec3 | null;
-  isVerified!: boolean;
+class TestBody {
+  a!: string;
+  b!: u8;
 }
 
-const player: Player = {
-  firstName: "Emmet",
-  lastName: "West",
-  lastActive: [8, 27, 2022],
-  age: 13,
-  pos: {
-    x: 3.4,
-    y: 1.2,
-    z: 8.3
-  },
-  isVerified: true
-};
-
-const stringified = JSON.stringify<Player>(player);
-
-const parsed = JSON.parse<Player>(stringified);
+const foo: Foo = {
+  optionalNumber: null,
+  tristateValue: Box.from(true)
+}
+console.log(JSON.stringify(JSON.parse<TestBody[]>('[{"a":"hi","b":5},{"a":"bye","b":6}]')))
+console.log(JSON.stringify([foo, foo]))
+console.log(JSON.stringify(foo));
 
-console.log("Stringified: " + stringified);
-console.log("Parsed: " + JSON.stringify(parsed));
+const p1 = JSON.parse<Box<i32> | null>("null");
+console.log(JSON.stringify<Box<i32> | null>(p1));
+console.log(changetype<usize>(p1).toString())
+const p2 = JSON.parse<Foo>("{\"optionalNumber\":null,\"tristateValue\":false}");
+console.log(JSON.stringify(p2));

package/bench/benchmark.ts

@@ -26,14 +26,14 @@ bench("Parse Number ATOI", () => {
 bench("Parse Number STDLIB", () => {
     blackbox<i32>(i32.parse("12345"));
 });
-
+*/
 bench("Stringify Object (Vec3)", () => {
     blackbox<string>(JSON.stringify(vec));
-});*/
+});
 
 bench("Parse Object (Vec3)", () => {
     blackbox<Vec3>(JSON.parse<Vec3>('{"x":0,"y":0,"z":0}'));
-});/*
+});
 
 bench("Stringify Number Array", () => {
     blackbox<string>(JSON.stringify<i32[]>([1, 2, 3]));
@@ -47,10 +47,6 @@ bench("Stringify String", () => {
     blackbox<string>(JSON.stringify(blackbox('Hello "World!')));
 });
 
-bench("Parse Number ATOI", () => {
-    blackbox<i32>(__atoi_fast<i32>("12345"));
-})
-
 bench("Parse String", () => {
     blackbox<string>(JSON.parse<string>(blackbox('"Hello "World!"')));
 });

package/bench.js

@@ -34,18 +34,7 @@ const vec = {
 let data;
 
 const bench = new Bench({ time: 1000 })
-    /*.add("stringify float", () => {
-        data = JSON.stringify(1.2345)
-    })
-    .add("parse float", () => {
-        data = JSON.parse("1.2345")
-    })
-    .add("stringify iny", () => {
-        data = JSON.stringify(12345)
-    })
-    .add("parse int", () => {
-        data = JSON.parse("12345")
-    })
+
     .add("Stringify Object (Vec3)", () => {
         data = JSON.stringify(vec);
     })
@@ -65,9 +54,9 @@ const bench = new Bench({ time: 1000 })
     .add("Stringify String", () => {
         data = JSON.stringify('Hello "World!');
     })
-*/
+
     .add("Parse String", () => {
-        data = JSON.parse('[[],[[]],[[],[[]]]]');
+        data = JSON.parse('"Hello "World!"');
     })
     .todo("unimplemented .add");
 

package/index.ts

@@ -1 +1 @@
-export { JSON } from "./assembly/index";
+export { JSON } from "./assembly/src/json";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -15,12 +15,12 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "wasmtime build/serialize.spec.wasm && wasmtime build/deserialize.spec.wasm",
-    "tests:build": "asc assembly/__tests__/serialize.spec.ts -o build/serialize.spec.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always & asc assembly/__tests__/deserialize.spec.ts -o build/deserialize.spec.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
-    "build:test": "asc assembly/test.ts -o build/test.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
+    "test": "asp",
+    "bench:astral": "astral --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior never --runtime stub",
+    "build:test": "asc assembly/test.ts -o build/test.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always --runtime stub",
     "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",
     "bench:wasmtime": "wasmtime ./bench/benchmark.wasm",
-    "bench:wazmer": "wasmer --llvm ./bench/benchmark.wasm",
+    "bench:wavm": "wavm run ./bench/benchmark.wasm",
     "build:transform": "tsc -p ./transform",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:wavm": "wavm run ./build/test.wasm",
@@ -29,12 +29,14 @@
     "prettier": "as-prettier -w ."
   },
   "devDependencies": {
+    "@as-pect/cli": "^8.1.0",
+    "@as-tral/cli": "^3.0.2",
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bench": "^0.0.0-alpha",
-    "as-test": "JairusSW/as-test",
     "assemblyscript": "^0.27.22",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
+    "kati": "^0.6.2",
     "microtime": "^3.1.1",
     "prettier": "^3.1.1",
     "tinybench": "^2.5.1",