json-as 0.9.16 → 0.9.17

package/CHANGELOG

@@ -24,6 +24,7 @@ v0.9.13 - Fix empty strings not indexing correctly
 v0.9.14 - Ignore properties of type Function
 v0.9.15 - Support JSON.Raw blocks
 v0.9.16 - JSON.Raw should be completely untouched
+v0.9.17 - A schema's parent's fields should be included properly
 
 [UNRELEASED] v1.0.0
  - Allow nullable primitives

package/README.md

@@ -3,7 +3,7 @@
  __|  ||   __||     ||   | | ___ |  _  ||   __|
 |  |  ||__   ||  |  || | | ||___||     ||__   |
 |_____||_____||_____||_|___|     |__|__||_____|
-v0.9.16
+v0.9.17
 </pre>
 </h5>
 

package/assembly/test.ts

@@ -1,33 +1,28 @@
 // import { JSON } from ".";
 import { JSON } from ".";
 @json
-class Vec3 {
-  x: f32 = 0.0;
-  y: f32 = 0.0;
-  z: f32 = 0.0;
+class Message {
+  constructor(role: string, content: string) {
+    this._role = role;
+    this.content = content;
+  }
+
+
+  @alias("role")
+  protected _role: string;
+
+  get role(): string {
+    return this._role;
+  }
+
+  content: string;
 }
 
 @json
-class Player {
-  firstName!: string;
-  lastName!: string;
-  lastActive!: i32[];
-  age!: i32;
-  pos!: JSON.Raw;
-  isVerified!: boolean;
+class UserMessage extends Message {
+  constructor(content: string) {
+    super("user", content);
+  }
 }
-
-const player: Player = {
-  firstName: "Emmet",
-  lastName: "West",
-  lastActive: [8, 27, 2022],
-  age: 23,
-  pos: "{\"x\":3.4,\"y\":1.2,\"z\":8.3}",
-  isVerified: true
-};
-
-const stringified = JSON.stringify<Player>(player);
-console.log(stringified);
-console.log(idof<JSON.Raw>().toString());
-console.log(idof<string>().toString())
-// const parsed = JSON.parse<Player>(stringified);
+console.log(JSON.stringify(new Message("user", "foo")))
+console.log(JSON.stringify(new UserMessage("foo")));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.16",
+  "version": "0.9.17",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/lib/index.js

@@ -31,10 +31,11 @@ class JSONTransform extends BaseVisitor {
         if (node.extendsType) {
             schema.parent = this.schemasList.find((v) => v.name == node.extendsType?.name.identifier.text);
             if (schema.parent?.members) {
-                for (let i = 0; i < schema.parent.members.length; i++) {
+                for (let i = schema.parent.members.length - 1; i >= 0; i--) {
                     const replace = schema.members.find((v) => v.name == schema.parent?.members[i]?.name);
                     if (!replace) {
-                        schema.members.unshift(schema.parent.members[i]);
+                        //schema.members.unshift(schema.parent?.members[i]!);
+                        members.unshift(schema.parent?.members[i].node);
                     }
                 }
             }

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.9.16",
+  "version": "0.9.17",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",

package/transform/src/index.ts

@@ -48,12 +48,13 @@ class JSONTransform extends BaseVisitor {
       ) as SchemaData | null;
 
       if (schema.parent?.members) {
-        for (let i = 0; i < schema.parent.members.length; i++) {
+        for (let i = schema.parent.members.length - 1; i >= 0; i--) {
           const replace = schema.members.find(
             (v) => v.name == schema.parent?.members[i]?.name
           );
           if (!replace) {
-            schema.members.unshift(schema.parent.members[i]!);
+            //schema.members.unshift(schema.parent?.members[i]!);
+            members.unshift(schema.parent?.members[i]!.node);
           }
         }
       }