json-as 0.5.7 → 0.5.9

package/README.md

@@ -1,10 +1,6 @@
 # AS-JSON
 ![AssemblyScript](https://img.shields.io/badge/AssemblyScript-blue)
 ![WebAssembly](https://img.shields.io/badge/WebAssemby-purple)
-
-## Features
-
-Full
 ## Installation
 
 ```bash
@@ -31,7 +27,7 @@ Or, add it to `asconfig.json`
 ```
 {
   "options": {
-    "transform": "json-as/transform"
+    "transform": ["json-as/transform"]
   }
 }
 ```
@@ -40,14 +36,7 @@ Or, add it to `asconfig.json`
 
 ```js
 import { JSON } from "json-as/assembly";
-import { u128 } from "as-bignum/assembly";
 
-// @ts-ignore
-@json
-class Stats {
-  wins: u128
-  loss: u128
-}
 // @ts-ignore
 @json
 class Vec3 {
@@ -65,7 +54,6 @@ class Player {
   age: i32;
   pos: Vec3 | null;
   isVerified: boolean;
-  stats: Stats
 }
 
 const player: Player = {
@@ -78,19 +66,36 @@ const player: Player = {
     y: 1.2,
     z: 8.3
   },
-  isVerified: true,
-  stats: {
-    wins: u128.fromString("443"),
-    loss: u128.fromString("693")
-  }
+  isVerified: true
 };
 
-const stringified = JSON.stringify<Player>(data);
+const stringified = JSON.stringify<Player>(player);
 
 const parsed = JSON.parse<Player>(stringified);
 ```
 
+# FAQ
+
+**Does it support the JSON specification?**
+
+Yes, it does. However, dynamic objects and arrays are not supported, but planned in the near future.
+
+**Is it fast?**
+
+Look below
+
+**How does it compare to other libs?**
+
+Its pretty much the same as the other libraries out there (near/assemblyscript-json and @serial-as/json), but it focuses highly on performance
+
+**Will it catch invalid JSON?**
+
+No, it does not check for invalid JSON, but gives its best shot at parsing instead. Will probably throw an error.
+
+**How does it compare performance-wise to other libraries?**
 
+In my testing, parsing a Vector 2 runs at 2.2m ops/s with as-json and around 10,000 ops/s with assemblyscript-json and @serial-as/json.
+Both are great libraries however.
 ## Performance
 
 **Serialize Object (Vec2):** ~7.20m ops/s

package/asconfig.json

@@ -12,7 +12,7 @@
   "options": {
     "transform": ["./transform"],
     "bindings": "esm",
-    "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
+    "exportStart": "_start"
   },
   "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
 }

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

@@ -44,7 +44,7 @@ describe("Ser/de Numbers", () => {
     canSerde<u128>(u128.from("0"))
     canSerde<u128>(u128.from("100"))
     canSerde<u128>(u128.from("101"))
-
+`
     canSerde<u128Safe>(u128Safe.from("0"))
     canSerde<u128Safe>(u128Safe.from("100"))
     canSerde<u128Safe>(u128Safe.from("101"))

package/assembly/src/json.ts

@@ -81,6 +81,8 @@ export namespace JSON {
         } else if ((isManaged<T>() || isReference<T>()) && isBigNum<T>()) {
             // @ts-ignore
             return data.toString();
+        } else if (data instanceof Date) {
+            return data.toISOString();
         } else {
             throw new Error(`Could not serialize data of type ${nameof<T>()}. Invalid data provided.`);
         }
@@ -116,6 +118,9 @@ export namespace JSON {
         } else if ((isManaged<T>() || isReference<T>()) && isBigNum<T>()) {
             // @ts-ignore
             return parseBigNum<T>(data);
+        } else if (type instanceof Date) {
+            // @ts-ignore
+            return Date.fromString(data);
         } else {
             // @ts-ignore
             throw new Error(`Could not deserialize data ${data} to type ${nameof<T>()}. Invalide data provided.`);
@@ -152,15 +157,11 @@ export namespace JSON {
             throw new Error(`Could not deserialize data ${data} to type ${nameof<T>()}. Invalide data provided.`)
         }
     }
-    /*export class Arr extends Array<Variant> {
-        public data: Variant[] = [];
-        push<T>(data: T): i32 {
-            return this.data.push(Variant.from<T>(data));
-        }
-        at<T>(index: i32): T {
-            return this.data.at(index).get<T>();
-        }
-    }*/
+    // @ts-ignore
+    @unsafe
+    export function createObjectUnsafe<T>(): T {
+        return changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()))
+    }
 }
 
 // @ts-ignore

package/assembly/test.ts

@@ -1,4 +1,4 @@
-import { wasi_console } from "@assemblyscript/wasi-shim/assembly/wasi_console"
+import { wasi_console } from "@assemblyscript/wasi-shim/assembly/wasi_console";
 import { u128 } from "as-bignum/assembly";
 import {
   JSON
@@ -7,33 +7,41 @@ import {
 // @ts-ignore
 @json
 class Stats {
-  wins: u128
-  loss: u128
+  wins!: u128
+  loss!: u128
 }
 // @ts-ignore
 @json
 class Vec3 {
-  x: f32;
-  y: f32;
-  z: f32;
+  x!: f32;
+  y!: f32;
+  z!: f32;
+}
+
+const vec: Vec3 = {
+  x: 3.4,
+  y: 1.2,
+  z: 8.3
 }
 
 // @ts-ignore
 @json
 class Player {
-  firstName: string;
-  lastName: string;
-  lastActive: i32[];
-  age: i32;
-  pos: Vec3 | null;
-  isVerified: boolean;
-  stats: Stats
+  firstName!: string;
+  lastName!: string;
+  lastActive!: i32[];
+  createdAt!: Date;
+  age!: i32;
+  pos!: Vec3 | null;
+  isVerified!: boolean;
+  stats!: Stats
 }
 
 const player: Player = {
   firstName: "Emmet",
   lastName: "West",
   lastActive: [8, 27, 2022],
+  createdAt: Date.fromString("2021-12-08T00:59:26.230Z"),
   age: 23,
   pos: {
     x: 3.4,

package/assembly/tsconfig.json

@@ -1,9 +1,6 @@
-{
-  "extends": "assemblyscript/std/assembly.json",
-  "compilerOptions": {
-    "experimentalDecorators": true
-  },
-  "include": [
-    "./**/*.ts"
-  ]
+{
+  "extends": "assemblyscript/std/assembly.json",
+  "include": [
+    "./**/*.ts"
+  ]
 }

package/build/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

package/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<script type="module">
+import { add } from "./build/release.js";
+document.body.innerText = add(1, 2);
+</script>
+</head>
+<body></body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -11,7 +11,7 @@
   "scripts": {
     "aspect": "asp",
     "bench:astral": "astral",
-    "build:test": "asc assembly/test.ts --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --transform \"./transform\" --exportStart _start -o ./build/test.wasm",
+    "build:test": "asc assembly/test.ts --target test",
     "build:transform": "tsc -p ./transform",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:lunatic": "lunatic ./build/test.wasm",
@@ -20,10 +20,10 @@
   },
   "devDependencies": {
     "@as-pect/cli": "^7.0.7",
-    "@as-tral/cli": "^1.1.1",
+    "@as-tral/cli": "^1.2.0",
     "@assemblyscript/loader": "^0.21.3",
     "@assemblyscript/wasi-shim": "^0.1.0",
-    "@serial-as/json": "^2.0.0",
+    "as-bignum": "^0.2.23",
     "assemblyscript": "^0.24.1",
     "assemblyscript-prettier": "^1.0.2",
     "prettier": "^2.7.1",

package/transform/lib/index.js

@@ -75,7 +75,7 @@ class AsJSONTransform extends ClassDecorator {
             }
         }
         this.visit(node.members);
-        const serializedProp = '__JSON_Serialized: string = "";';
+        // const serializedProp = '__JSON_Serialized: string = "";';
         let serializeFunc = "";
         if (this.currentClass.encodeStmts.length > 0) {
             const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];
@@ -101,8 +101,11 @@ class AsJSONTransform extends ClassDecorator {
       }
     `;
         //console.log(serializeFunc)
-        const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
-        node.members.push(serializedProperty);
+        //const serializedProperty = SimpleParser.parseClassMember(
+        //  serializedProp,
+        //  node
+        //);
+        //node.members.push(serializedProperty);
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
         node.members.push(serializeMethod);
         const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);

package/transform/package.json

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

package/transform/src/index.ts

@@ -91,7 +91,7 @@ class AsJSONTransform extends ClassDecorator {
 
     this.visit(node.members);
 
-    const serializedProp = '__JSON_Serialized: string = "";';
+   // const serializedProp = '__JSON_Serialized: string = "";';
 
     let serializeFunc = "";
 
@@ -123,11 +123,11 @@ class AsJSONTransform extends ClassDecorator {
       }
     `
     //console.log(serializeFunc)
-    const serializedProperty = SimpleParser.parseClassMember(
-      serializedProp,
-      node
-    );
-    node.members.push(serializedProperty);
+    //const serializedProperty = SimpleParser.parseClassMember(
+    //  serializedProp,
+    //  node
+    //);
+    //node.members.push(serializedProperty);
 
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
     node.members.push(serializeMethod);