json-as 0.4.9 → 0.5.0

package/README.md

@@ -27,25 +27,17 @@ Or, add it to `asconfig.json`
 }
 ```
 
-## Support
-
-- ✅ Objects (Supported)
-- ✅ Arrays (Supported)
-- ✅ Numbers (Supported)
-- ✅ Integers (Supported)
-- ✅ Null (Supported)
-- ❌ Dynamic Variants (Not supported)
-
 ## Usage
 
 ```js
-import { JSON } from "json-as";
+import { JSON } from "json-as/assembly";
 
 @json
 class Vec2 {
   x: f32
   y: f32
 }
+
 @json
 class Player {
   firstName: string
@@ -69,46 +61,24 @@ const data: Player = {
 }
 
 const stringified = JSON.stringify<Player>(data);
-// {
-//  "firstName": "Emmet",
-//  "lastName": "West",
-//  "lastActive": [8, 27, 2022],
-//  "age": 23,
-//  "pos": {
-//    "x": -3.4000000953674318,
-//    "y": 1.2000000476837159
-//  },
-//  "isVerified": true
-// }
-console.log(`Stringified: ${stringified}`);
 
 const parsed = JSON.parse<Player>(stringified);
-// Player {
-//  firstName: "Emmet",
-//  lastName: "West",
-//  lastActive: [8, 27, 2022],
-//  age: 23,
-//  pos: {
-//    x: -3.4000000953674318,
-//    y: 1.2000000476837159
-//  },
-//  isVerified: true
-// }
-console.log(`Parsed: ${JSON.stringify(parsed)}`);
 ```
 
-## FAQ
-
-- Does it support the full JSON spec?
-  Yes, as-json supports the full JSON specification and trys to mimic the JSON API as much as possible
-- What are the differences between as-json and the JSON API?
-  The main difference between as-json and the JSON API is the ability to create new fields in objects during runtime. Since classes are static, Map ser/de support will be added soon allowing the user to parse and stringify dynamic objects and their properties
-- Does this support nested structures?
-  Yes, as-json supports nested structures
-- Does this support whitespace?
-  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
+## Performance
+
+**Serialize Object (Vec2):** ~7.29m ops/s
+
+**Deserialize Object (Vec2):** ~1.36m ops/s
+
+**Serialize Array (int[4]):** ~1.4m ops/s
+
+**Deserialize Array (int[4]):** ~2.8m ops/s
+
+**Serialize String (5):** ~5.2m ops/sw
+
+**Deserialize String (5):** ~1.36m ops/s
+
 ## Issues
 
 Please submit an issue to https://github.com/JairusSW/as-json/issues if you find anything wrong with this library

package/assembly/__benches__/as-json.ts

@@ -1,5 +1,4 @@
 import { JSON } from "..";
-import { rainbow } from "as-rainbow/assembly"
 
 @json
 class Vec2 {
@@ -12,8 +11,6 @@ const vec: Vec2 = blackbox<Vec2>({
   y: 0.0,
 });
 
-//console.log(rainbow.bgBlue("Running benchmark for as-json"));
-
 bench("Stringify Object (Vec2)", () => {
   blackbox(JSON.stringify(vec));
 });

package/assembly/index.ts

@@ -36,6 +36,8 @@ export class JSON {
       return parseArray<T>(data);
       // @ts-ignore
     } else if (isDefined(type.__JSON_Deserialize)) {
+      // @ts-ignore
+      if (isNullable<T>()) return null;
       return parseObject<T>(data);
     } else {
       // @ts-ignore
@@ -68,6 +70,8 @@ export class JSON {
     // Class-Based serialization
     // @ts-ignore
     else if (isDefined(data.__JSON_Serialize)) {
+      // @ts-ignore
+      if (isNullable<T>()) return null;
       // @ts-ignore
       return data.__JSON_Serialize();
     }
@@ -79,8 +83,7 @@ export class JSON {
       // @ts-ignore
       for (let i = 0; i < data.length - 1; i++) {
         // @ts-ignore
-        result.write(JSON.stringify(unchecked(data[i])));
-        result.write(",");
+        result.write(JSON.stringify(unchecked(data[i])) + ",");
       }
       // @ts-ignore
       result.write(JSON.stringify(unchecked(data[data.length - 1])));

package/assembly/test.ts

@@ -6,7 +6,10 @@ import {
 // @ts-ignore
 @json
 class Vec2 {
-  x: f32;
+  /**
+   * x > 4 && x < 100
+   */
+  private x: f32 = 0;
   y: f32;
 }
 
@@ -27,14 +30,12 @@ const player: Player = {
   lastActive: [8, 27, 2022],
   age: 23,
   pos: {
-    x: -3.4,
     y: 1.2,
   },
   isVerified: true,
 };
 
 const vec: Vec2 = {
-  x: 0.0,
   y: 0.0
 }
 const serializedPlayer = JSON.stringify<Player>(player);

package/package.json

@@ -1,51 +1,51 @@
-{
-  "name": "json-as",
-  "version": "0.4.9",
-  "description": "JSON encoder/decoder for AssemblyScript",
-  "types": "assembly/index.ts",
-  "author": "Jairus Tanaka",
-  "contributors": [
-    "DogWhich"
-  ],
-  "license": "MIT",
-  "scripts": {
-    "bench:astral": "astral",
-    "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",
-    "test:wasm3": "wasm3 ./build/test.wasm",
-    "prettier": "as-prettier -w ."
-  },
-  "devDependencies": {
-    "@as-pect/cli": "^7.0.7",
-    "@as-tral/cli": "^1.1.1",
-    "@serial-as/json": "^1.0.2",
-    "as-console": "^6.0.2",
-    "as-rainbow": "^0.1.0",
-    "assemblyscript": "^0.20.7",
-    "assemblyscript-prettier": "^1.0.2",
-    "typescript": "^4.7.2"
-  },
-  "dependencies": {
-    "as-string-sink": "^0.5.0",
-    "as-variant": "^0.4.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/JairusSW/as-json.git"
-  },
-  "keywords": [
-    "assemblyscript",
-    "json",
-    "serialize",
-    "deserialize",
-    "dynamic",
-    "serde"
-  ],
-  "bugs": {
-    "url": "https://github.com/JairusSW/as-json/issues"
-  },
-  "homepage": "https://github.com/JairusSW/as-json#readme",
-  "type": "module"
-}
+{
+  "name": "json-as",
+  "version": "0.5.0",
+  "description": "JSON encoder/decoder for AssemblyScript",
+  "types": "assembly/index.ts",
+  "author": "Jairus Tanaka",
+  "contributors": [
+    "DogWhich"
+  ],
+  "license": "MIT",
+  "scripts": {
+    "aspect": "asp",
+    "bench:astral": "astral",
+    "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",
+    "test:wasm3": "wasm3 ./build/test.wasm",
+    "prettier": "as-prettier -w ."
+  },
+  "devDependencies": {
+    "@as-pect/cli": "^7.0.7",
+    "@as-tral/cli": "^1.1.1",
+    "@assemblyscript/loader": "^0.21.3",
+    "@serial-as/json": "^2.0.0",
+    "assemblyscript": "^0.20.7",
+    "assemblyscript-prettier": "^1.0.2",
+    "typescript": "^4.7.2"
+  },
+  "dependencies": {
+    "as-string-sink": "^0.5.0",
+    "as-variant": "^0.4.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/JairusSW/as-json.git"
+  },
+  "keywords": [
+    "assemblyscript",
+    "json",
+    "serialize",
+    "deserialize",
+    "dynamic",
+    "serde"
+  ],
+  "bugs": {
+    "url": "https://github.com/JairusSW/as-json/issues"
+  },
+  "homepage": "https://github.com/JairusSW/as-json#readme",
+  "type": "module"
+}

package/transform/lib/index.js

@@ -1,5 +1,5 @@
 import { ClassDecorator, registerDecorator, } from "visitor-as/dist/decorator.js";
-import { getName } from "visitor-as/dist/utils.js";
+import { getName, toString } from "visitor-as/dist/utils.js";
 import { SimpleParser } from "visitor-as/dist/index.js";
 class AsJSONTransform extends ClassDecorator {
     constructor() {
@@ -10,6 +10,9 @@ class AsJSONTransform extends ClassDecorator {
     }
     visitMethodDeclaration() { }
     visitFieldDeclaration(node) {
+        const lineText = toString(node);
+        if (lineText.startsWith("private"))
+            return;
         const name = getName(node);
         if (!node.type) {
             throw new Error(`Field ${name} is missing a type declaration`);

package/transform/package.json

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

package/transform/src/index.ts

@@ -7,7 +7,7 @@ import {
   ClassDecorator,
   registerDecorator,
 } from "visitor-as/dist/decorator.js";
-import { getName } from "visitor-as/dist/utils.js";
+import { getName, toString } from "visitor-as/dist/utils.js";
 import { SimpleParser } from "visitor-as/dist/index.js";
 
 class AsJSONTransform extends ClassDecorator {
@@ -18,6 +18,8 @@ class AsJSONTransform extends ClassDecorator {
 
   visitMethodDeclaration(): void {}
   visitFieldDeclaration(node: FieldDeclaration): void {
+    const lineText = toString(node);
+    if (lineText.startsWith("private")) return;
     const name = getName(node);
     if (!node.type) {
       throw new Error(`Field ${name} is missing a type declaration`);