json-as 0.5.20 → 0.5.21

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Jairus Tanaka <jairus.v.tanaka@outlook.com>
+Copyright (c) 2023 Jairus Tanaka <jairus.v.tanaka@outlook.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/asconfig.json

@@ -12,6 +12,9 @@
   "options": {
     "transform": [
       "./transform"
-    ]
-  }
+    ],
+    "bindings": "esm",
+    "exportStart": "_start"
+  },
+  "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
 }

package/assembly/src/json.ts

@@ -486,7 +486,7 @@ function parseArrayArray<T extends unknown[][]>(data: string): T {
     const result = instantiate<T>();
     let char = 0;
     let lastPos = 0;
-    let depth = 1;
+    let depth = 0;
     let i = 1;
     // Find start of bracket
     //for (; unsafeCharCodeAt(data, i) !== leftBracketCode; i++) {}
@@ -494,14 +494,14 @@ function parseArrayArray<T extends unknown[][]>(data: string): T {
     for (; i < data.length - 1; i++) {
         char = unsafeCharCodeAt(data, i);
         if (char === leftBracketCode) {
-            if (depth === 1) {
+            if (depth === 0) {
                 lastPos = i;
             }
             // Shifting is 6% faster than incrementing
-            depth = depth << 1;
+            depth++;
         } else if (char === rightBracketCode) {
-            depth = depth >> 1;
-            if (depth === 1) {
+            depth--;
+            if (depth === 0) {
                 i++;
                 result.push(JSON.parse<valueof<T>>(data.slice(lastPos, i)));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.20",
+  "version": "0.5.21",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -27,14 +27,14 @@
     "@assemblyscript/wasi-shim": "^0.1.0",
     "assemblyscript": "^0.27.0",
     "assemblyscript-prettier": "^1.0.7",
-    "prettier": "^2.8.3",
+    "prettier": "^2.8.4",
     "typescript": "^4.9.5",
     "visitor-as": "^0.11.4"
   },
   "dependencies": {
-    "as-string-sink": "^0.5.0",
-    "as-variant": "^0.4.1",
-    "as-bignum": "^0.2.23"
+    "as-bignum": "^0.2.23",
+    "as-string-sink": "^0.5.3",
+    "as-variant": "^0.4.1"
   },
   "repository": {
     "type": "git",

package/transform/lib/index.js

@@ -85,7 +85,9 @@ class AsJSONTransform extends BaseVisitor {
                 console.error("Class extends " + this.currentClass.parent + ", but parent class not found. Maybe add the @json decorator over parent class?");
             }
         }
-        this.visit(node.members);
+        const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
+        const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])];
+        this.visit(members);
         let serializeFunc = "";
         if (this.currentClass.encodeStmts.length > 0) {
             const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];

package/transform/package.json

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

package/transform/src/index.ts

@@ -94,7 +94,9 @@ class AsJSONTransform extends BaseVisitor {
       }
     }
 
-    this.visit(node.members);
+    const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
+    const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])]
+    this.visit(members);
 
     let serializeFunc = "";