json-as 0.4.4 → 0.4.7

package/README.md

@@ -53,6 +53,7 @@ class Player {
   lastActive: i32[]
   age: i32
   pos: Vec2
+  isVerified: boolean
 }
 
 const data: Player = {
@@ -63,19 +64,21 @@ const data: Player = {
   pos: {
     x: -3.4,
     y: 1.2
-  }
+  },
+  isVerified: true
 }
 
 const stringified = JSON.stringify<Player>(data);
 // {
 //  "firstName": "Emmet",
 //  "lastName": "West",
-// "lastActive": [8, 27, 2022],
+//  "lastActive": [8, 27, 2022],
 //  "age": 23,
 //  "pos": {
 //    "x": -3.4000000953674318,
 //    "y": 1.2000000476837159
-//  }
+//  },
+//  "isVerified": true
 // }
 console.log(`Stringified: ${stringified}`);
 
@@ -88,7 +91,8 @@ const parsed = JSON.parse<Player>(stringified);
 //  pos: {
 //    x: -3.4000000953674318,
 //    y: 1.2000000476837159
-//  }
+//  },
+//  isVerified: true
 // }
 console.log(`Parsed: ${JSON.stringify(parsed)}`);
 ```
@@ -102,7 +106,7 @@ console.log(`Parsed: ${JSON.stringify(parsed)}`);
 - Does this support nested structures?
   Yes, as-json supports nested structures
 - Does this support whitespace?
-  Yes, as-json supports whitespace although the current implementation is deathly slow
+  Yes, as-json supports whitespace!
 - How fast is it?
   Really fast. For example, here are some benchmarks for ser/de a Vec2 with as-json
 ## Issues

package/as-pect.asconfig.json

@@ -1,24 +1,24 @@
-{
-  "targets": {
-    "coverage": {
-      "lib": ["./node_modules/@as-covers/assembly/index.ts"],
-      "transform": ["@as-covers/transform", "@as-pect/transform"]
-    },
-    "noCoverage": {
-      "transform": ["@as-pect/transform"]
-    }
-  },
-  "options": {
-    "exportMemory": true,
-    "outFile": "output.wasm",
-    "textFile": "output.wat",
-    "bindings": "raw",
-    "exportStart": "_start",
-    "exportRuntime": true,
-    "use": ["RTRACE=1"],
-    "debug": true,
-    "exportTable": true
-  },
-  "extends": "./asconfig.json",
-  "entries": ["./@as-pect/assembly/assembly/index.ts"]
+{
+  "targets": {
+    "coverage": {
+      "lib": ["./node_modules/@as-covers/assembly/index.ts"],
+      "transform": ["@as-covers/transform", "@as-pect/transform"]
+    },
+    "noCoverage": {
+      "transform": ["@as-pect/transform"]
+    }
+  },
+  "options": {
+    "exportMemory": true,
+    "outFile": "output.wasm",
+    "textFile": "output.wat",
+    "bindings": "raw",
+    "exportStart": "_start",
+    "exportRuntime": true,
+    "use": ["RTRACE=1"],
+    "debug": true,
+    "exportTable": true
+  },
+  "extends": "./asconfig.json",
+  "entries": ["./@as-pect/assembly/assembly/index.ts"]
 }

package/asconfig.json

@@ -1,23 +1,8 @@
 {
   "targets": {
-    "debug": {
-      "outFile": "build/debug.wasm",
-      "textFile": "build/debug.wat",
-      "sourceMap": true,
-      "debug": true
-    },
-    "release": {
-      "outFile": "build/release.wasm",
-      "textFile": "build/release.wat",
-      "sourceMap": true,
-      "optimizeLevel": 3,
-      "shrinkLevel": 0,
-      "converge": false,
-      "noAssert": false
-    },
     "test": {
       "outFile": "build/test.wasm",
-      "sourceMap": true,
+      "sourceMap": false,
       "optimizeLevel": 0,
       "shrinkLevel": 0,
       "converge": false,

package/assembly/__benches__/benchmark.ts

@@ -1,4 +1,5 @@
 import { JSON } from "..";
+
 @json
 class Vec2 {
   x: f32;
@@ -10,60 +11,65 @@ const vec: Vec2 = blackbox<Vec2>({
   y: 0.0,
 });
 
+/*
 bench("Stringify String", () => {
   blackbox(JSON.stringify(blackbox("Hello")));
 });
 
+bench("Parse String", () => {
+  blackbox(JSON.parse<string>(blackbox('"Hello"')));
+});
+
 bench("Stringify Boolean", () => {
   blackbox(JSON.stringify(blackbox(true)));
 });
 
+bench("Parse Boolean", () => {
+  blackbox(JSON.parse<boolean>(blackbox("true")));
+});
+
 bench("Stringify Integer", () => {
   blackbox(JSON.stringify(blackbox(314)));
 });
 
+bench("Parse Integer", () => {
+  blackbox(JSON.parse<i32>(blackbox("314")));
+});
+
 bench("Stringify Float", () => {
   blackbox(JSON.stringify(blackbox(3.14)));
 });
 
+bench("Parse Float", () => {
+  blackbox(JSON.parse<f32>(blackbox("3.14")));
+});
+
 bench("Stringify Object (Vec2)", () => {
   blackbox(JSON.stringify(vec));
 });
+*/
+bench("Parse Object (Vec2)", () => {
+  const obj = JSON.parse<Vec2>(blackbox('{"x":0.0,"y":0.0}'));
+});
 
 bench("Stringify Array", () => {
   blackbox(JSON.stringify(blackbox([1, 2, 3, 4, 5])));
 });
 
-bench("Parse String", () => {
-  blackbox(JSON.parse<string>(blackbox('"Hello"')));
-});
-
-bench("Parse Boolean", () => {
-  blackbox(JSON.parse<boolean>(blackbox("true")));
+bench("Parse Array", () => {
+  blackbox(JSON.parse<i32[]>(blackbox("[1,2,3,4]")));
 });
 
-bench("Parse Integer", () => {
-  blackbox(JSON.parse<i32>(blackbox("314")));
-});
-
-bench("Parse Float", () => {
-  blackbox(JSON.parse<f32>(blackbox("3.14")));
-});
-
-bench("Parse Object (Vec2)", () => {
-  blackbox(JSON.parse<Vec2>(blackbox('{"x":0.0,"y":0.0}')));
-});
-
-bench("Parse Boolean Array", () => {
+bench("Stringify Nested Array", () => {
   blackbox(
-    JSON.parse<boolean[]>(blackbox("[true,false,true,false,true]"))
+    JSON.stringify<string[][]>(
+      blackbox([
+        ["a", "b", "c"],
+        ["d", "e", "f"],
+      ])
+    )
   );
 });
-
-bench("Parse Integer Array", () => {
-  blackbox(JSON.parse<u32[]>(blackbox("[1,2,3,4,5]")));
-});
-
-bench("Parse Float Array", () => {
-  blackbox(JSON.parse<f32[]>(blackbox("[1.0,2.0,3.0,4.0,5.0]")));
+bench("Parse Nested Array", () => {
+  blackbox(JSON.parse<string[][]>(blackbox('[["a","b","c"],["d","e","f"]]')));
 });

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

@@ -0,0 +1,84 @@
+import { JSON } from ".."
+function canSerde<T>(data: T): void {
+    const serialized = JSON.stringify<T>(data);
+    const deserialized = JSON.stringify<T>(JSON.parse<T>(serialized));
+    expect(serialized).toStrictEqual(deserialized)
+}
+describe("Ser/de Numbers", () => {
+    it("should ser/de integers", () => {
+        canSerde<i32>(0)
+
+        canSerde<u32>(100)
+        canSerde<u64>(101)
+        canSerde<i32>(-100)
+        canSerde<i64>(-101)
+    });
+
+    it("should ser/de floats", () => {
+        canSerde<f64>(7.23)
+        canSerde<f64>(10e2)
+        canSerde<f64>(10E2)
+
+        canSerde<f64>(123456e-5)
+
+        canSerde<f64>(123456E-5)
+
+        canSerde<f64>(0.0)
+        canSerde<f64>(7.23)
+    });
+
+    it("should ser/de booleans", () => {
+        canSerde<bool>(true)
+        canSerde<bool>(false)
+        canSerde<boolean>(true)
+        canSerde<boolean>(false)
+    });
+
+    it("should ser/de strings", () => {
+        canSerde<string>('abcdefg')
+        canSerde<string>('st"ring" w""ith quotes"')
+        canSerde<string>('string \t\r\\"with ran\tdom spa\nces and \nnewlines\n\n\n')
+        canSerde<string>('string with colon : comma , brace [ ] bracket { } and quote " and other quote \\"')
+    });
+
+})
+
+describe("Ser/de Array", () => {
+    it("should ser/de integer arrays", () => {
+        canSerde<u32[]>([0, 100, 101])
+        canSerde<u64[]>([0, 100, 101])
+
+        canSerde<i32[]>([0, 100, 101, -100, -101])
+        canSerde<i64[]>([0, 100, 101, -100, -101])
+    });
+
+    it("should ser/de float arrays", () => {
+        canSerde<f64[]>([7.23, 10e2, 10E2, 123456e-5, 123456E-5, 0.0, 7.23])
+    })
+
+    it("should ser/de boolean arrays", () => {
+        canSerde<bool[]>([true, false])
+        canSerde<boolean[]>([true, false])
+    })
+
+    it("should ser/de string arrays", () => {
+        canSerde<string[]>(["abcdefg", "st\"ring\" w\"\"ith quotes\"", "string \t\r\\\"with ran\tdom spa\nces and \nnewlines\n\n\n", "string with colon : comma , brace [ ] bracket { } and quote \" and other quote \\\""])
+    });
+
+    it("should ser/de nested integer arrays", () => {
+        canSerde<i64[][]>([[100, 101], [-100, -101], [0]])
+    });
+
+    it("should ser/de float arrays", () => {
+        canSerde<f64[][]>([[7.23], [10e2], [10E2], [123456e-5], [123456E-5], [0.0], [7.23]])
+    })
+
+    it("should ser/de boolean arrays", () => {
+        canSerde<bool[][]>([[true], [false]])
+        canSerde<boolean[][]>([[true], [false]])
+    })
+
+    it("should ser/de string arrays", () => {
+        canSerde<string[][]>([["abcdefg"], ["st\"ring\" w\"\"ith quotes\""], ["string \t\r\\\"with ran\tdom spa\nces and \nnewlines\n\n\n"], ["string with colon : comma , brace [ ] bracket { } and quote \" and other quote \\\""]])
+    });
+});

package/assembly/chars.ts

@@ -1,6 +1,7 @@
 export const commaCode = ",".charCodeAt(0);
-export const quoteCode = "\"".charCodeAt(0);
+export const quoteCode = '"'.charCodeAt(0);
 export const backSlashCode = "\\".charCodeAt(0);
+export const forwardSlashCode = "/".charCodeAt(0);
 export const leftBraceCode = "{".charCodeAt(0);
 export const rightBraceCode = "}".charCodeAt(0);
 export const leftBracketCode = "[".charCodeAt(0);