json-as 0.5.51 → 0.5.54

package/bench.js

@@ -1,7 +1,5 @@
 import { Bench } from "tinybench";
 // Trying a new benchmarking lib.
-// It seems to not warmup long at all, so its probably bad.
-// benchmark will probably be best here
 
 // JavaScript Results
 // ┌─────────┬───────────────────────────┬─────────────┬────────────────────┬──────────┬─────────┐
@@ -35,7 +33,7 @@ const vec = {
 
 let data;
 
-const bench = new Bench({ time: 100 })
+const bench = new Bench({ time: 1000 })
 
     .add("Stringify Object (Vec3)", () => {
         data = JSON.stringify(vec);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.51",
+  "version": "0.5.54",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -13,9 +13,9 @@
   ],
   "license": "MIT",
   "scripts": {
-    "aspect": "asp",
-    "bench:astral": "astral -Ospeed --noAssert --uncheckedBehavior always --runtime minimal",
-    "build:test": "asc assembly/test.ts --target test --runtime stub",
+    "test:aspect": "asp",
+    "bench:astral": "astral --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior never --runtime stub",
+    "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",
@@ -26,11 +26,14 @@
     "@as-pect/cli": "^8.0.1",
     "@as-tral/cli": "^2.0.0",
     "@assemblyscript/wasi-shim": "^0.1.0",
-    "assemblyscript": "^0.27.1",
-    "assemblyscript-prettier": "^1.0.7",
-    "prettier": "^2.8.4",
+    "assemblyscript": "^0.27.8",
+    "assemblyscript-prettier": "^2.0.2",
+    "benchmark": "^2.1.4",
+    "kati": "^0.6.2",
+    "microtime": "^3.1.1",
+    "prettier": "^3.0.1",
     "tinybench": "^2.5.0",
-    "typescript": "^4.9.5",
+    "typescript": "^5.1.6",
     "visitor-as": "^0.11.4"
   },
   "dependencies": {

package/transform/lib/index.js

@@ -1,4 +1,4 @@
-import { getName, toString, isStdlib } from "visitor-as/dist/utils.js";
+import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
 class SchemaData {
@@ -19,48 +19,23 @@ class AsJSONTransform extends BaseVisitor {
         this.sources = [];
     }
     visitMethodDeclaration() { }
-    visitFieldDeclaration(node) {
-        if (toString(node).startsWith("static"))
-            return;
-        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`);
-        }
-        let type = getName(node.type);
-        // @ts-ignore
-        this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
-        // @ts-ignore
-        //this.decodeStmts.push(
-        //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
-        //);
-        // @ts-ignore
-        this.currentClass.setDataStmts.push(`if (key.length === ${name.length} && (memory.compare(changetype<usize>("${name}"), changetype<usize>(key), ${name.length}) == 0)) {
-        this.${name} = JSON.parseObjectValue<${type}>(value);
-        return;
-      }
-      `);
-        // @ts-ignore
-        //this.checkDecodeStmts.push(
-        //  ' if (!values.has("${name}")) throw new Error("Key "${name}" was not found. Cannot instantiate object.");\n'
-        //);
-    }
     visitClassDeclaration(node) {
-        var _a;
+        var _c;
         const className = node.name.text;
-        if (!((_a = node.decorators) === null || _a === void 0 ? void 0 : _a.length))
+        if (!((_c = node.decorators) === null || _c === void 0 ? void 0 : _c.length))
             return;
         let foundDecorator = false;
         for (const decorator of node.decorators) {
+            if (
             // @ts-ignore
-            if (decorator.name.text.toLowerCase() == "json" || decorator.name.text.toLowerCase() == "serializable")
+            decorator.name.text.toLowerCase() == "json" ||
+                // @ts-ignore
+                decorator.name.text.toLowerCase() == "serializable")
                 foundDecorator = true;
         }
         if (!foundDecorator)
             return;
-        // Prevent from being triggered twice
+        // Prevent from being triggered twice.
         for (const member of node.members) {
             if (member.name.text == "__JSON_Serialize")
                 return;
@@ -73,7 +48,7 @@ class AsJSONTransform extends BaseVisitor {
             parent: node.extendsType ? toString(node.extendsType) : "",
             node: node,
             encodeStmts: [],
-            setDataStmts: []
+            setDataStmts: [],
         };
         if (this.currentClass.parent.length > 0) {
             const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
@@ -82,17 +57,64 @@ class AsJSONTransform extends BaseVisitor {
                 this.currentClass.encodeStmts.push(...parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts);
             }
             else {
-                console.error("Class extends " + this.currentClass.parent + ", but parent class not found. Maybe add the @json decorator over parent class?");
+                console.error("Class extends " +
+                    this.currentClass.parent +
+                    ", but parent class not found. Maybe add the @json decorator over parent class?");
             }
         }
         const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
-        const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])];
-        this.visit(members);
+        const members = [
+            ...node.members,
+            ...(parentSchema ? parentSchema.node.members : []),
+        ];
+        for (const mem of members) {
+            // @ts-ignore
+            if (mem.type && mem.type.name && mem.type.name.identifier.text) {
+                const member = mem;
+                if (toString(member).startsWith("static"))
+                    return;
+                const lineText = toString(member);
+                if (lineText.startsWith("private"))
+                    return;
+                // @ts-ignore
+                let type = toString(member.type);
+                const name = member.name.text;
+                this.currentClass.keys.push(name);
+                // @ts-ignore
+                this.currentClass.types.push(type);
+                // @ts-ignore
+                if ([
+                    "u8",
+                    "i8",
+                    "u16",
+                    "i16",
+                    "u32",
+                    "i32",
+                    "f32",
+                    "u64",
+                    "i64",
+                    "f64",
+                ].includes(type.toLowerCase())) {
+                    this.currentClass.encodeStmts.push(`"${name}":\${this.${name}.toString()},`);
+                }
+                else {
+                    this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
+                }
+                // @ts-ignore
+                this.currentClass.setDataStmts.push(`if (key == "${name}") {
+        this.${name} = JSON.parseObjectValue<${type}>(value);
+        return;
+      }
+      `);
+            }
+        }
         let serializeFunc = "";
         if (this.currentClass.encodeStmts.length > 0) {
             const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];
-            this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] = stmt.slice(0, stmt.length - 1);
+            this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
+                stmt.slice(0, stmt.length - 1);
             serializeFunc = `
+      @inline
       __JSON_Serialize(): string {
         return \`{${this.currentClass.encodeStmts.join("")}}\`;
       }
@@ -100,16 +122,18 @@ class AsJSONTransform extends BaseVisitor {
         }
         else {
             serializeFunc = `
+      @inline
       __JSON_Serialize(): string {
         return "{}";
       }
       `;
         }
         const setKeyFunc = `
+      @inline
       __JSON_Set_Key(key: string, value: string): void {
         ${
-            // @ts-ignore
-            this.currentClass.setDataStmts.join("")}
+        // @ts-ignore
+        this.currentClass.setDataStmts.join("")}
       }
     `;
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
@@ -127,18 +151,23 @@ export default class Transformer extends Transform {
     afterParse(parser) {
         // Create new transform
         const transformer = new AsJSONTransform();
-        // Loop over every source
-        const sources = parser.sources.filter(source => !isStdlib(source)).sort((_a, _b) => {
-            const a = _a.internalPath
-            const b = _b.internalPath
+        // Sort the sources so that user scripts are visited last
+        const sources = parser.sources
+            .filter((source) => !isStdlib(source))
+            .sort((_a, _b) => {
+            const a = _a.internalPath;
+            const b = _b.internalPath;
             if (a[0] === "~" && b[0] !== "~") {
                 return -1;
-            } else if (a[0] !== "~" && b[0] === "~") {
+            }
+            else if (a[0] !== "~" && b[0] === "~") {
                 return 1;
-            } else {
+            }
+            else {
                 return 0;
             }
-        })
+        });
+        // Loop over every source
         for (const source of sources) {
             // Ignore all lib and std. Visit everything else.
             if (!isStdlib(source)) {
@@ -146,4 +175,4 @@ export default class Transformer extends Transform {
             }
         }
     }
-}
+}

package/transform/package.json

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

package/asconfig.json

@@ -1,15 +0,0 @@
-{
-  "targets": {
-    "test": {
-      "outFile": "build/test.wasm",
-      "sourceMap": false,
-      "optimizeLevel": 0,
-      "shrinkLevel": 0,
-      "converge": false,
-      "noAssert": false
-    }
-  },
-  "options": {
-    "transform": ["./transform"],
-    "bindings": "esm"}
-}