json-as 0.5.10 → 0.5.12

package/asconfig.json

@@ -10,7 +10,10 @@
     }
   },
   "options": {
-    "transform": ["./transform"],
+    "transform": [
+      "./transform",
+      "./transform"
+    ],
     "bindings": "esm",
     "exportStart": "_start"
   },

package/assembly/__benches__/as-json.ts

@@ -1,7 +1,4 @@
-bench("1+1", () => {
-  blackbox("1+1".split("+w"))
-})
-/*import { JSON } from "..";
+import { JSON } from "..";
 
 @json
 class Vec2 {
@@ -34,15 +31,14 @@ bench("Stringify Nested Array", () => {
   blackbox(
     JSON.stringify<string[][]>(
       blackbox([
-        ["a", "b", "c"],
-        ["d", "e", "f"],
+        ["a", "b", "c"]
       ])
     )
   );
 });
 
 bench("Parse Nested Array", () => {
-  blackbox(JSON.parse<string[][]>(blackbox('[["a","b","c"],["d","e","f"]]')));
+  blackbox(JSON.parse<string[][]>(blackbox('[["a","b","c"]]')));
 });
 
 bench("Stringify String", () => {
@@ -52,7 +48,7 @@ bench("Stringify String", () => {
 bench("Parse String", () => {
   blackbox(JSON.parse<string>(blackbox('"Hello"')));
 });
-
+/*
 bench("Stringify Boolean", () => {
   blackbox(JSON.stringify(blackbox(true)));
 });
@@ -75,5 +71,4 @@ bench("Stringify Float", () => {
 
 bench("Parse Float", () => {
   blackbox(JSON.parse<f32>(blackbox("3.14")));
-});
-*/
+});*/

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

@@ -31,7 +31,7 @@ type Null = Nullable | null;
 describe("Ser/de Nulls", () => {
   canSerde<Null>(null);
 });
-/*
+
 describe("Ser/de Numbers", () => {
   it("should ser/de integers", () => {
     canSerde<i32>(0);
@@ -41,10 +41,10 @@ describe("Ser/de Numbers", () => {
     canSerde<i32>(-100);
     canSerde<i64>(-101);
 
-    canSerde<u128>(u128.from("0"))
-    canSerde<u128>(u128.from("100"))
-    canSerde<u128>(u128.from("101"))
-`
+  //  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"))
@@ -199,4 +199,4 @@ describe("Ser/de Objects", () => {
       isVerified: true,
     });
   });
-});*/
+});

package/assembly/src/util.ts

@@ -1,5 +1,5 @@
 import { StringSink } from "as-string-sink/assembly";
-import { isSpace } from "assemblyscript/std/assembly/util/string";
+import { isSpace } from "util/string";
 import { backSlashCode, quoteCode } from "./chars";
 import { u128, u128Safe, u256, u256Safe, i128, i128Safe, i256Safe } from "as-bignum/assembly";
 
@@ -56,6 +56,6 @@ export function escapeChar(char: string): string {
     case 0x09: return "\\t";
     case 0x0C: return "\\f";
     case 0x0B: return "\\u000b";
-    default: return char;
+    default: return char; 
   }
 }

package/assembly/test.ts

@@ -3,48 +3,41 @@ import {
   JSON
 } from ".";
 
-// @ts-ignore
-@json
-class Stats {
-  wins!: u128
-  loss!: u128
-}
 // @ts-ignore
 @json
 class Vec3 {
-  x!: f32;
-  y!: f32;
-  z!: f32;
+  x: f32 = 3.4;
+  y: f32 = 1.2;
+  z: f32 = 8.3;
 }
 
-const vec: Vec3 = {
-  x: 3.4,
-  y: 1.2,
-  z: 8.3
+// @ts-ignore
+@json
+class Stats extends Vec3 {
+  wins: u128
+  loss: u128
 }
 
 // @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[];
+  age: i32;
+  isVerified: boolean;
+  stats: Stats
 }
 
 const player: Player = {
   firstName: "Emmet",
   lastName: "West",
-  lastActive: [8, 27, 2022],
+  lastActive: [
+    8,
+    27,
+    2022
+  ],
   age: 23,
-  pos: {
-    x: 3.4,
-    y: 1.2,
-    z: 8.3
-  },
   isVerified: true,
   stats: {
     wins: u128.fromString("443"),
@@ -55,4 +48,26 @@ const player: Player = {
 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("Deserialized Player: " + JSON.stringify(deserializedPlayer));/*
+
+@json
+class Vec2 {
+  x: f32;
+  y: f32;
+}
+
+const vec: Vec2 = {
+  x: 0.0,
+  y: 0.0,
+}
+
+let i = 5_000_000;
+while (i--) {
+  JSON.stringify<Vec2>(vec);
+}
+let start = Date.now();
+i = 10_000_000;
+while (i--) {
+  JSON.stringify<Vec2>(vec);
+}
+console.log(`Took: ${Date.now() - start}ms`)*/

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "json-as",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
-  "contributors": [
-    "DogWhich"
-  ],
+    "contributors": [
+      "DogWhich",
+      "Joshua Tenner",
+      "Rom"
+    ],
   "license": "MIT",
   "scripts": {
     "aspect": "asp",
     "bench:astral": "astral",
-    "build:test": "asc assembly/test.ts --target test",
+    "build:test": "asc assembly/test.ts --target test --runtime stub",
     "build:transform": "tsc -p ./transform",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:lunatic": "lunatic ./build/test.wasm",
@@ -19,15 +21,16 @@
     "prettier": "as-prettier -w ."
   },
   "devDependencies": {
-    "@as-pect/cli": "^8.0.0",
-    "@as-tral/cli": "^1.2.0",
+    "@as-pect/cli": "^8.0.1",
+    "@as-tral/cli": "^2.0.0",
     "@assemblyscript/loader": "^0.25.0",
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bignum": "^0.2.23",
     "assemblyscript": "^0.25.0",
     "assemblyscript-prettier": "^1.0.6",
     "prettier": "^2.8.1",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.4",
+    "visitor-as": "^0.11.4"
   },
   "dependencies": {
     "as-string-sink": "^0.5.0",

package/transform/lib/index.js

@@ -100,12 +100,7 @@ class AsJSONTransform extends ClassDecorator {
         this.currentClass.setDataStmts.join("")}
       }
     `;
-        //console.log(serializeFunc)
-        //const serializedProperty = SimpleParser.parseClassMember(
-        //  serializedProp,
-        //  node
-        //);
-        //node.members.push(serializedProperty);
+        //console.log(serializeFunc, setKeyFunc)
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
         node.members.push(serializeMethod);
         const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);

package/transform/package.json

@@ -1,19 +1,17 @@
 {
     "name": "@json-as/transform",
-    "version": "0.5.10",
+    "version": "0.5.12",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",
     "contributors": [
         "DogWhich",
-        "Josh Tenner",
+        "Joshua Tenner",
         "Rom"
     ],
     "license": "MIT",
     "devDependencies": {},
-    "dependencies": {
-        "visitor-as": "^0.11.3"
-    },
+    "dependencies": {},
     "repository": {
         "type": "git",
         "url": "git+https://github.com/JairusSW/as-json.git"

package/transform/src/index.ts

@@ -9,6 +9,7 @@ import {
 } from "visitor-as/dist/decorator.js";
 import { getName, toString } from "visitor-as/dist/utils.js";
 import { SimpleParser } from "visitor-as/dist/index.js";
+import { NodeKind } from "types:assemblyscript/src/ast";
 
 class SchemaData {
   public keys: string[] = [];
@@ -27,6 +28,7 @@ class AsJSONTransform extends ClassDecorator {
 
   visitMethodDeclaration(): void { }
   visitFieldDeclaration(node: FieldDeclaration): void {
+    if (toString(node).startsWith("static")) return;
     const lineText = toString(node);
     if (lineText.startsWith("private")) return;
     const name = getName(node);
@@ -64,6 +66,11 @@ class AsJSONTransform extends ClassDecorator {
       return;
     }
 
+    // Prevent from being triggered twice
+    for (const member of node.members) {
+      if (member.name.text == "__JSON_Serialize") return;
+    }
+
     this.currentClass = {
       name: toString(node.name),
       keys: [],
@@ -81,7 +88,7 @@ class AsJSONTransform extends ClassDecorator {
           return v;
         }
       });
-      if (parentSchema.length > 0) {
+      if (parentSchema.length > 0 && parentSchema[0]?.encodeStmts) {
         parentSchema[0]?.encodeStmts.push(parentSchema[0]?.encodeStmts.pop() + ",")
         this.currentClass.encodeStmts.push(...parentSchema[0]?.encodeStmts)
       } else {
@@ -122,12 +129,8 @@ class AsJSONTransform extends ClassDecorator {
       }
       }
     `
-    //console.log(serializeFunc)
-    //const serializedProperty = SimpleParser.parseClassMember(
-    //  serializedProp,
-    //  node
-    //);
-    //node.members.push(serializedProperty);
+
+    //console.log(serializeFunc, setKeyFunc)
 
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
     node.members.push(serializeMethod);

package/index.html

@@ -1,10 +0,0 @@
-<!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>