json-as 0.6.4 → 0.6.6

package/.github/workflows/nodejs.yml

@@ -22,4 +22,4 @@ jobs:
         run: yarn build:test
 
       - name: Perform tests
-        run: yarn run test:aspect
+        run: yarn run test

package/assembly/test.ts

@@ -1,7 +1,7 @@
 import { JSON } from "./src/json";
 
 // @ts-ignore
-@json
+
 class Vec3 {
     x: f64 = 3.4;
     y: f64 = 1.2;
@@ -10,7 +10,7 @@ class Vec3 {
 
 // @ts-ignore
 @json
-class Player {
+class Player extends Vec3 {
     firstName: string;
     lastName: string;
     lastActive: Date;
@@ -32,6 +32,9 @@ const player: Player = {
         z: 8.3,
     },
     isVerified: true,
+    x: 1,
+    y: 3,
+    z: 3
 }
 
 let out = "";
@@ -44,7 +47,7 @@ console.log("Implemented: " + JSON.stringify(JSON.parse<Vec3>('{}', true)));
 
 console.log("Original: " + JSON.stringify(player));
 //console.log("Revised: " + vec.__JSON_Deserialize('{"x":3,"y":1,"z":8}').__JSON_Serialize());
-console.log("Implemented: " + JSON.stringify(JSON.parse<Player>('{"firstName":"Emmet","lastName":"West","lastActive":"2023-11-16T04:06:35.108285303Z","age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}')));
+console.log("Implemented: " + JSON.stringify(JSON.parse<Player>('{"firstName":"Emmet","lastName":"West","lastActive":"2023-11-16T04:06:35.108285303Z","age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true,"x":5","y":4","z":3}')));
 
 @serializable
 class Wrapper<T> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -14,7 +14,7 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test:aspect": "asp",
+    "test": "asp",
     "bench:astral": "astral --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior never --runtime stub",
     "build:test": "asc assembly/test.ts -o build/test.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always --runtime stub",
     "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",

package/transform/lib/index.js

@@ -58,11 +58,6 @@ class AsJSONTransform extends BaseVisitor {
                 parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts.push((parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts.pop()) + ",");
                 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?");
-            }
         }
         const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
         const members = [
@@ -217,5 +212,14 @@ export default class Transformer extends Transform {
                 transformer.visit(source);
             }
         }
+        // Check that every parent and child class is hooked up correctly
+        const schemas = transformer.schemasList;
+        for (const schema of schemas) {
+            if (schema.parent) {
+                const parent = schemas.find((v) => v.name === schema.parent);
+                if (!parent)
+                    throw new Error(`Class ${schema.name} extends its parent class ${schema.parent}, but ${schema.parent} does not include a @json or @serializable decorator! Add the decorator and rebuild.`);
+            }
+        }
     }
 }

package/transform/package.json

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

package/transform/src/index.ts

@@ -65,12 +65,6 @@ class AsJSONTransform extends BaseVisitor {
       if (parentSchema?.encodeStmts) {
         parentSchema?.encodeStmts.push(parentSchema?.encodeStmts.pop() + ",");
         this.currentClass.encodeStmts.push(...parentSchema?.encodeStmts);
-      } else {
-        console.error(
-          "Class extends " +
-          this.currentClass.parent +
-          ", but parent class not found. Maybe add the @json decorator over parent class?"
-        );
       }
     }
 
@@ -261,5 +255,13 @@ export default class Transformer extends Transform {
         transformer.visit(source);
       }
     }
+    // Check that every parent and child class is hooked up correctly
+    const schemas = transformer.schemasList;
+    for (const schema of schemas) {
+      if (schema.parent) {
+        const parent = schemas.find((v) => v.name === schema.parent);
+        if (!parent) throw new Error(`Class ${schema.name} extends its parent class ${schema.parent}, but ${schema.parent} does not include a @json or @serializable decorator! Add the decorator and rebuild.`);
+      }
+    }
   }
 }