json-as 0.9.9 → 0.9.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -17,7 +17,7 @@
   "scripts": {
     "test": "wasmtime build/test.spec.wasm",
     "pretest": "asc assembly/__tests__/test.spec.ts --target test",
-    "build:test": "JSON_DEBUG=true asc assembly/test.ts --target debug",
+    "build:test": "JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm",
     "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",
     "bench:wasmtime": "wasmtime ./bench/benchmark.wasm",
     "bench:wasmer": "wasmer --llvm ./bench/benchmark.wasm",
@@ -35,7 +35,6 @@
     "assemblyscript": "^0.27.28",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
-    "json-as": "link:json-as",
     "microtime": "^3.1.1",
     "prettier": "^3.3.2",
     "tinybench": "^2.8.0",

package/transform/lib/index.js

@@ -1,4 +1,3 @@
-import { FieldDeclaration } from "assemblyscript/dist/assemblyscript.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";
@@ -26,7 +25,7 @@ class JSONTransform extends BaseVisitor {
         schema.node = node;
         schema.name = node.name.text;
         const members = [
-            ...node.members.filter(v => v instanceof FieldDeclaration)
+            ...node.members.filter(v => v.kind === 54 /* NodeKind.FieldDeclaration */)
         ];
         if (node.extendsType) {
             schema.parent = this.schemasList.find((v) => v.name == node.extendsType?.name.identifier.text);
@@ -63,8 +62,6 @@ class JSONTransform extends BaseVisitor {
             this.schemasList.push(schema);
         }
         for (const member of members) {
-            if (!(member instanceof FieldDeclaration))
-                continue;
             const name = member.name;
             if (!member.type) {
                 throw new Error("Fields must be strongly typed! Found " + toString(member) + " at " + node.range.source.normalizedPath);
@@ -159,8 +156,22 @@ class JSONTransform extends BaseVisitor {
             else if (t === "Array") {
                 mem.initialize = "this." + name.text + " = instantiate<" + mem.type + ">()";
             }
-            else {
-                console.log(t);
+            else if (t === "bool" || t === "boolean") {
+                mem.initialize = "this." + name.text + " = false";
+            }
+            else if (t === "u8" ||
+                t === "u16" ||
+                t === "u32" ||
+                t === "u64" ||
+                t === "i8" ||
+                t === "i16" ||
+                t === "i32" ||
+                t === "i64") {
+                mem.initialize = "this." + name.text + " = 0";
+            }
+            else if (t === "f32" ||
+                t === "f64") {
+                mem.initialize = "this." + name.text + " = 0.0";
             }
             schema.members.push(mem);
         }

package/transform/package.json

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

package/transform/src/index.ts

@@ -5,14 +5,14 @@ import {
   NamedTypeNode,
   StringLiteralExpression,
   Parser,
-  Source
+  Source,
+  NodeKind
 } from "assemblyscript/dist/assemblyscript.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";
 import { CommonFlags } from "types:assemblyscript/src/common";
-import { DecoratorNode } from "types:assemblyscript/src/ast";
 
 class JSONTransform extends BaseVisitor {
   public schemasList: SchemaData[] = [];
@@ -38,7 +38,7 @@ class JSONTransform extends BaseVisitor {
     schema.name = node.name.text;
 
     const members = [
-      ...node.members.filter(v => v instanceof FieldDeclaration)
+      ...node.members.filter(v => v.kind === NodeKind.FieldDeclaration)
     ];
 
     if (node.extendsType) {
@@ -86,7 +86,6 @@ class JSONTransform extends BaseVisitor {
     }
 
     for (const member of members) {
-      if (!(member instanceof FieldDeclaration)) continue;
       const name = member.name;
       if (!member.type) {
         throw new Error("Fields must be strongly typed! Found " + toString(member) + " at " + node.range.source.normalizedPath);
@@ -170,8 +169,24 @@ class JSONTransform extends BaseVisitor {
         mem.initialize = "this." + name.text + " = \"\"";
       } else if (t === "Array") {
         mem.initialize = "this." + name.text + " = instantiate<" + mem.type + ">()";
-      } else {
-        console.log(t)
+      } else if (t === "bool" || t === "boolean") {
+        mem.initialize = "this." + name.text + " = false";
+      } else if (
+        t === "u8" ||
+        t === "u16" ||
+        t === "u32" ||
+        t === "u64" ||
+        t === "i8" ||
+        t === "i16" ||
+        t === "i32" ||
+        t === "i64"
+      ) {
+        mem.initialize = "this." + name.text + " = 0";
+      } else if (
+        t === "f32" ||
+        t === "f64"
+      ) {
+        mem.initialize = "this." + name.text + " = 0.0";
       }
 
       schema.members.push(mem);