json-as 0.5.19 → 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/README.md

@@ -73,28 +73,10 @@ const stringified = JSON.stringify<Player>(player);
 const parsed = JSON.parse<Player>(stringified);
 ```
 
-# FAQ
+# Notes
 
-**Does it support the JSON specification?**
+Performance is nearly equal to the JavaScript JSON implementation which is in C++.
 
-Yes, it does. However, dynamic objects and arrays are not supported, but planned in the near future.
-
-**Is it fast?**
-
-Look below
-
-**How does it compare to other libs?**
-
-Its pretty much the same as the other libraries out there (near/assemblyscript-json and @serial-as/json), but it focuses highly on performance
-
-**Will it catch invalid JSON?**
-
-No, it does not check for invalid JSON, but gives its best shot at parsing instead. Will probably throw an error.
-
-**How does it compare performance-wise to other libraries?**
-
-In my testing, parsing a Vector 2 runs at 2.2m ops/s with as-json and around 10,000 ops/s with assemblyscript-json and @serial-as/json.
-Both are great libraries however.
 ## Performance
 
 **Serialize Object (Vec2):** ~7.20m ops/s

package/assembly/__tests__/as-json.spec.ts

@@ -9,9 +9,9 @@ function canSerde<T>(data: T): void {
 // @ts-ignore
 @json
 class Vec3 {
-  x: f32;
-  y: f32;
-  z: f32;
+  x: f64;
+  y: f64;
+  z: f64;
 }
 
 // @ts-ignore
@@ -136,6 +136,7 @@ describe("Ser/de Array", () => {
   });
 
   it("should ser/de string arrays", () => {
+    // ["abcdefg","st\\"ring\\" w\\"\\"ith quotes\\"","string \\t\\r\\"with ran\\tdom spa\\nces and \\nnewlines\\n\\n\\n","string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\""]
     canSerde<string[]>([
       "abcdefg",
       'st"ring" w""ith quotes"',

package/assembly/src/json.ts

@@ -241,7 +241,7 @@ export function parseNumber<T>(data: string): T {
     // @ts-ignore
     const type: T = 0;
     // @ts-ignore
-    if (type instanceof f64) return f32.parse(data);
+    if (type instanceof f64) return f64.parse(data);
     // @ts-ignore
     else if (type instanceof f32) return f32.parse(data);
     // @ts-ignore
@@ -268,7 +268,7 @@ function parseObject<T>(data: string): T {
     let schema: nonnull<T> = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()));
     let key = "";
     let isKey = false;
-    let depth = 1;
+    let depth = 0;
     let char = 0;
     let outerLoopIndex = 1;
     for (; outerLoopIndex < data.length - 1; outerLoopIndex++) {
@@ -281,10 +281,10 @@ function parseObject<T>(data: string): T {
             ) {
                 char = unsafeCharCodeAt(data, arrayValueIndex);
                 if (char === leftBracketCode) {
-                    depth = depth << 1;
+                    depth++;
                 } else if (char === rightBracketCode) {
-                    depth = depth >> 1;
-                    if (depth === 1) {
+                    depth--;
+                    if (depth === 0) {
                         ++arrayValueIndex;
                         // @ts-ignore
                         schema.__JSON_Set_Key(key, data.slice(outerLoopIndex, arrayValueIndex));
@@ -302,10 +302,10 @@ function parseObject<T>(data: string): T {
             ) {
                 char = unsafeCharCodeAt(data, objectValueIndex);
                 if (char === leftBraceCode) {
-                    depth = depth << 1;
+                    depth++;
                 } else if (char === rightBraceCode) {
-                    depth = depth >> 1;
-                    if (depth === 1) {
+                    depth--;
+                    if (depth === 0) {
                         ++objectValueIndex;
                         // @ts-ignore
                         schema.__JSON_Set_Key(key, data.slice(outerLoopIndex, objectValueIndex));
@@ -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/assembly/test.ts

@@ -1,9 +1,17 @@
 import { u128 } from "as-bignum/assembly";
-import { Candle } from "./Candle";
 import {
   JSON
 } from ".";
 
+const exp = `["abcdefg","st\\"ring\\" w\\"\\"ith quotes\\"","string \\t\\r\\"with ran\\tdom spa\\nces and \\nnewlines\\n\\n\\n","string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\""]`;
+
+console.log(exp);
+console.log(JSON.stringify([
+  "abcdefg",
+  'st"ring" w""ith quotes"',
+  'string \t\r"with ran\tdom spa\nces and \nnewlines\n\n\n',
+  'string with colon : comma , brace [ ] bracket { } and quote " and other quote "',
+]))
 // @ts-ignore
 @JSON
 class Vec3 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.19",
+  "version": "0.5.21",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -25,15 +25,15 @@
     "@as-tral/cli": "^2.0.0",
     "@assemblyscript/loader": "^0.27.0",
     "@assemblyscript/wasi-shim": "^0.1.0",
-    "as-bignum": "^0.2.23",
     "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-bignum": "^0.2.23",
+    "as-string-sink": "^0.5.3",
     "as-variant": "^0.4.1"
   },
   "repository": {

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.19",
+    "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 = "";
 

package/assembly/Candle.ts

@@ -1,18 +0,0 @@
-import {
-    JSON
-} from ".";
-@json
-export class Candle {
-    timestamp!: i64;
-    high!: f64;
-    low!: f64;
-    open!: f64;
-    close!: f64;
-    constructor(timestamp: i64, high: f64, low: f64, open: f64, close: f64) {
-        this.timestamp = timestamp;
-        this.high = high;
-        this.low = low;
-        this.open = open;
-        this.close = close;
-    }
-}