json-as 0.8.7 → 0.9.1

package/CHANGELOG

@@ -5,4 +5,5 @@ v0.8.5 - Fix #73. Support for nullable primatives with Box<T> from as-container
 v0.8.6 - Fix. Forgot to stash before publishing. Stash and push what should have been v0.8.5
 
 v0.9.0 - Large update. Refactor all the code, nullable primitives, rewrite the transform, allow extensibility with @omit keywords, and fix a plethora of bugs
-[UNRELEASED] v0.9.1 - Port JSON.Value from the `develop` branch to allow for union types, parsing of arbitrary data, and whatever the hell you want.
+v0.9.1 - Fix #71
+[UNRELEASED] v0.9.x - Port JSON.Value from the `develop` branch to allow for union types, parsing of arbitrary data, and whatever the hell you want.

package/README.md

@@ -7,7 +7,7 @@
 ██║  ██║███████║      ╚█████╔╝███████║╚██████╔╝██║ ╚████║
 ╚═╝  ╚═╝╚══════╝       ╚════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝
 
-v0.9.0
+v0.9.1
 </pre>
 </h3>
 
@@ -81,12 +81,50 @@ const stringified = JSON.stringify<Player>(player);
 const parsed = JSON.parse<Player>(stringified);
 ```
 
+Classes can even have inheritance. Here's a nasty example
+
+```js
+@json
+class Base {}
+
+@json
+class Vec1 extends Base {
+  x: f32 = 1.0;
+}
+@json
+class Vec2 extends Vec1 {
+  y: f32 = 2.0;
+}
+@json
+class Vec3 extends Vec2 {
+  z: f32 = 3.0;
+}
+
+const arr: Base[] = [
+  new Vec1(),
+  new Vec2(),
+  new Vec3()
+];
+
+const serialized = JSON.stringify(arr);
+// [{"x":1.0},{"x":1.0,"y":2.0},{"y":2.0,"x":1.0,"z":3.0}]
+const parsed = JSON.parse<Base[]>(serialized);
+```
+
 If you use this project in your codebase, consider dropping a [star](https://github.com/JairusSW/as-json). I would really appreciate it!
 
 ## Notes
 
 If you want a feature, drop an issue (and again, maybe a star). I'll likely add it in less than 7 days.
 
+## Contact
+
+Contact me at:
+
+Email: `me@jairus.dev`
+GitHub: `JairusSW`
+Discord: `jairussw`
+
 ## Performance
 
 Run or view the benchmarks [here](https://github.com/JairusSW/as-json/tree/master/bench)

package/assembly/test.ts

@@ -1,41 +1,24 @@
 import { JSON } from ".";
 
 @json
-class Vec3 {
-  x: f32 = 0.0;
-  y: f32 = 0.0;
-  z: f32 = 0.0;
+class Base {}
+@json
+class Vec1 extends Base {
+  x: f32 = 1.0;
 }
-
 @json
-class Player {
-  @alias("first name")
-  firstName!: string;
-  lastName!: string;
-  lastActive!: i32[];
-  @omitif("this.age < 18")
-  age!: i32;
-  @omitnull()
-  pos!: Vec3 | null;
-  isVerified!: boolean;
+class Vec2 extends Vec1 {
+  y: f32 = 2.0;
+}
+@json
+class Vec3 extends Vec2 {
+  z: f32 = 3.0;
 }
 
-const player: Player = {
-  firstName: "Emmet",
-  lastName: "West",
-  lastActive: [8, 27, 2022],
-  age: 13,
-  pos: {
-    x: 3.4,
-    y: 1.2,
-    z: 8.3
-  },
-  isVerified: true
-};
-
-const stringified = JSON.stringify<Player>(player);
-
-const parsed = JSON.parse<Player>(stringified);
+const arr: Base[] = [
+  new Vec1(),
+  new Vec2(),
+  new Vec3()
+];
 
-console.log("Stringified: " + stringified);
-console.log("Parsed: " + JSON.stringify(parsed));
+console.log(JSON.stringify(arr));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.8.7",
+  "version": "0.9.1",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/lib/index.js

@@ -1,4 +1,4 @@
-import { FieldDeclaration, } from "assemblyscript/dist/assemblyscript.js";
+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";
@@ -12,8 +12,6 @@ class JSONTransform extends BaseVisitor {
     visitClassDeclaration(node) {
         if (!node.decorators?.length)
             return;
-        if (!node.members?.length)
-            return;
         let found = false;
         for (const decorator of node.decorators) {
             const name = decorator.name.text;
@@ -28,7 +26,7 @@ class JSONTransform extends BaseVisitor {
         schema.node = node;
         schema.name = node.name.text;
         const members = [
-            ...node.members
+            ...node.members.filter(v => v instanceof FieldDeclaration)
         ];
         if (node.extendsType) {
             schema.parent = this.schemasList.find((v) => v.name == node.extendsType?.name.identifier.text);
@@ -40,6 +38,29 @@ class JSONTransform extends BaseVisitor {
                 }
             }
         }
+        if (!members.length) {
+            let SERIALIZE_RAW_EMPTY = "@inline __SERIALIZE(): string {\n  return \"{}\";\n}";
+            //let SERIALIZE_PRETTY_EMPTY = "@inline __SERIALIZE_PRETTY(): string {\n  return \"{}\";\n}";
+            let INITIALIZE_EMPTY = "@inline __INITIALIZE(): this {\n  return this;\n}";
+            let DESERIALIZE_EMPTY = "@inline __DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  return false;\n}";
+            if (process.env["JSON_DEBUG"]) {
+                console.log(SERIALIZE_RAW_EMPTY);
+                //console.log(SERIALIZE_PRETTY_EMPTY);
+                console.log(INITIALIZE_EMPTY);
+                console.log(DESERIALIZE_EMPTY);
+            }
+            const SERIALIZE_RAW_METHOD_EMPTY = SimpleParser.parseClassMember(SERIALIZE_RAW_EMPTY, node);
+            //const SERIALIZE_PRETTY_METHOD = SimpleParser.parseClassMember(SERIALIZE_PRETTY, node);
+            const INITIALIZE_METHOD_EMPTY = SimpleParser.parseClassMember(INITIALIZE_EMPTY, node);
+            const DESERIALIZE_METHOD_EMPTY = SimpleParser.parseClassMember(DESERIALIZE_EMPTY, node);
+            if (!node.members.find(v => v.name.text == "__SERIALIZE"))
+                node.members.push(SERIALIZE_RAW_METHOD_EMPTY);
+            if (!node.members.find(v => v.name.text == "__INITIALIZE"))
+                node.members.push(INITIALIZE_METHOD_EMPTY);
+            if (!node.members.find(v => v.name.text == "__DESERIALIZE"))
+                node.members.push(DESERIALIZE_METHOD_EMPTY);
+            this.schemasList.push(schema);
+        }
         for (const member of members) {
             if (!(member instanceof FieldDeclaration))
                 continue;

package/transform/package.json

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

package/transform/src/index.ts

@@ -5,9 +5,7 @@ import {
   NamedTypeNode,
   StringLiteralExpression,
   Parser,
-  Source,
-  SourceKind,
-  Tokenizer,
+  Source
 } from "assemblyscript/dist/assemblyscript.js";
 
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
@@ -23,7 +21,6 @@ class JSONTransform extends BaseVisitor {
   visitMethodDeclaration(): void { }
   visitClassDeclaration(node: ClassDeclaration): void {
     if (!node.decorators?.length) return;
-    if (!node.members?.length) return;
 
     let found = false;
     for (const decorator of node.decorators) {
@@ -40,7 +37,7 @@ class JSONTransform extends BaseVisitor {
     schema.name = node.name.text;
 
     const members = [
-      ...node.members
+      ...node.members.filter(v => v instanceof FieldDeclaration)
     ];
 
     if (node.extendsType) {
@@ -58,6 +55,33 @@ class JSONTransform extends BaseVisitor {
       }
     }
 
+    if (!members.length) {
+      let SERIALIZE_RAW_EMPTY = "@inline __SERIALIZE(): string {\n  return \"{}\";\n}";
+      //let SERIALIZE_PRETTY_EMPTY = "@inline __SERIALIZE_PRETTY(): string {\n  return \"{}\";\n}";
+
+      let INITIALIZE_EMPTY = "@inline __INITIALIZE(): this {\n  return this;\n}";
+
+      let DESERIALIZE_EMPTY = "@inline __DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  return false;\n}";
+
+      if (process.env["JSON_DEBUG"]) {
+        console.log(SERIALIZE_RAW_EMPTY);
+        //console.log(SERIALIZE_PRETTY_EMPTY);
+        console.log(INITIALIZE_EMPTY);
+        console.log(DESERIALIZE_EMPTY);
+      }
+
+      const SERIALIZE_RAW_METHOD_EMPTY = SimpleParser.parseClassMember(SERIALIZE_RAW_EMPTY, node);
+      //const SERIALIZE_PRETTY_METHOD = SimpleParser.parseClassMember(SERIALIZE_PRETTY, node);
+      const INITIALIZE_METHOD_EMPTY = SimpleParser.parseClassMember(INITIALIZE_EMPTY, node);
+      const DESERIALIZE_METHOD_EMPTY = SimpleParser.parseClassMember(DESERIALIZE_EMPTY, node);
+
+      if (!node.members.find(v => v.name.text == "__SERIALIZE")) node.members.push(SERIALIZE_RAW_METHOD_EMPTY);
+      if (!node.members.find(v => v.name.text == "__INITIALIZE")) node.members.push(INITIALIZE_METHOD_EMPTY);
+      if (!node.members.find(v => v.name.text == "__DESERIALIZE")) node.members.push(DESERIALIZE_METHOD_EMPTY);
+
+      this.schemasList.push(schema);
+    }
+
     for (const member of members) {
       if (!(member instanceof FieldDeclaration)) continue;
       const name = member.name;