json-as 0.4.5 → 0.4.6

package/assembly/__benches__/benchmark.ts

@@ -1,4 +1,4 @@
-import { JSON, parseBooleanArray, parseObject, parseStringArray } from "..";
+import { JSON } from "..";
 
 @json
 class Vec2 {
@@ -11,6 +11,7 @@ const vec: Vec2 = blackbox<Vec2>({
   y: 0.0,
 });
 
+/*
 bench("Stringify String", () => {
   blackbox(JSON.stringify(blackbox("Hello")));
 });
@@ -46,9 +47,9 @@ bench("Parse Float", () => {
 bench("Stringify Object (Vec2)", () => {
   blackbox(JSON.stringify(vec));
 });
-
+*/
 bench("Parse Object (Vec2)", () => {
-  blackbox(parseObject<Vec2>(blackbox('{"x":0.0,"y":0.0}')));
+  const obj = JSON.parse<Vec2>(blackbox('{"x":0.0,"y":0.0}'));
 });
 
 bench("Stringify Array", () => {

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/index.ts

@@ -166,6 +166,8 @@ function parseNumber<T>(data: string): T {
     );
 }
 
+// @ts-ignore
+@inline
 export function parseObject<T>(data: string): T {
   let schema!: T;
   const result = new Map<string, string>();

package/assembly/test.ts

@@ -1,12 +1,7 @@
 import "wasi";
 import {
-  JSON,
-  parseArrayArray,
-  parseNumberArray,
-  parseObject,
-  parseObjectArray,
+  JSON
 } from ".";
-import { removeWhitespace } from "./util";
 
 // @ts-ignore
 @json
@@ -26,7 +21,7 @@ class Player {
   isVerified: boolean;
 }
 
-const data: Player = {
+const player: Player = {
   firstName: "Emmet",
   lastName: "West",
   lastActive: [8, 27, 2022],
@@ -38,48 +33,17 @@ const data: Player = {
   isVerified: true,
 };
 
-const serialized = JSON.stringify<Player>(data);
-console.log("Serialized: " + serialized);
-const deserialized = JSON.parse<Player>(serialized);
-console.log("Deserialized: " + JSON.stringify(deserialized));
-/*
-const parsed = JSON.parse<Player>(stringified);
-console.log("Vec2 Parse: " + JSON.stringify<Player>(parsed));
-console.log(
-  `Parsed String Array: ${JSON.stringify(
-    JSON.parse<string[]>(`\n[ "hello" ,  "world" ]  `)
-  )}`
-);
-
-console.log(
-  `Parsed Boolean Array: ${JSON.stringify(
-    JSON.parse<boolean[]>(`\n[ false ,  true ]  `)
-  )}`
-);
-
-console.log(
-  `Parsed Number Array: ${JSON.stringify(
-    JSON.parse<i32[]>(`[ 1 , 2\n ,3\n\t ]`)
-  )}`
-);
-
-console.log(
-  JSON.stringify<Vec2>(
-    load<Vec2>(changetype<usize>(data), offsetof<Player>("pos"))
-  )
-);
+const vec: Vec2 = {
+  x: 0.0,
+  y: 0.0
+}
+const serializedPlayer = JSON.stringify<Player>(player);
+console.log("Serialized Player: " + serializedPlayer);
+const deserializedPlayer = JSON.parse<Player>(serializedPlayer);
+console.log("Deserialized Player: " + JSON.stringify(deserializedPlayer));
 
-console.log(
-  JSON.stringify<string[][]>(
-    parseArrayArray<string[][]>('[["a","b","c"],["d","e","f"]]')
-  )
-);
+const serializedVec2 = JSON.stringify<Vec2>(vec);
+console.log("Serialized Vec2: " + serializedVec2);
+const deserializedVec2 = JSON.parse<Vec2>(serializedVec2);
 
-console.log(
-  JSON.stringify<Player[][]>(
-    parseObjectArray<Player[][]>(
-      '[{"firstName":"Emmet","lastName":"West","lastActive":[8,7],"age":23,"pos":{"x":-3.4000000953674318,"y":1.2000000476837159}}]'
-    )
-  )
-);
-*/
+console.log("Deserialized: " + JSON.stringify(deserializedVec2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/lib/index.js

@@ -8,7 +8,7 @@ class AsJSONTransform extends ClassDecorator {
         this.encodeStmts = [];
         this.decodeStmts = [];
     }
-    visitMethodDeclaration(node) { }
+    visitMethodDeclaration() { }
     visitFieldDeclaration(node) {
         const name = getName(node);
         if (!node.type) {
@@ -18,7 +18,7 @@ class AsJSONTransform extends ClassDecorator {
         // @ts-ignore
         this.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
         // @ts-ignore
-        this.decodeStmts.push(`${name}: JSON.parse<${type}>(values.get("${name}")),\n`);
+        this.decodeStmts.push(`${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`);
     }
     visitClassDeclaration(node) {
         if (!node.members) {

package/transform/package.json

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

package/transform/src/index.ts

@@ -1,7 +1,6 @@
 import {
   ClassDeclaration,
   FieldDeclaration,
-  MethodDeclaration,
   Source,
 } from "assemblyscript/dist/assemblyscript";
 import {
@@ -17,7 +16,7 @@ class AsJSONTransform extends ClassDecorator {
   public encodeStmts: string[] = [];
   public decodeStmts: string[] = [];
 
-  visitMethodDeclaration(node: MethodDeclaration): void {}
+  visitMethodDeclaration(): void {}
   visitFieldDeclaration(node: FieldDeclaration): void {
     const name = getName(node);
     if (!node.type) {
@@ -33,7 +32,7 @@ class AsJSONTransform extends ClassDecorator {
 
     // @ts-ignore
     this.decodeStmts.push(
-      `${name}: JSON.parse<${type}>(values.get("${name}")),\n`
+      `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
     );
   }
   visitClassDeclaration(node: ClassDeclaration): void {