json-as 0.5.15 → 0.5.17

package/asconfig.json

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

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

@@ -45,7 +45,7 @@ describe("Ser/de Numbers", () => {
  //   canSerde<u128>(u128.from("100"))
    // canSerde<u128>(u128.from("101"))
 
-    canSerde<u128Safe>(u128Safe.from("0"))
+   /* canSerde<u128Safe>(u128Safe.from("0"))
     canSerde<u128Safe>(u128Safe.from("100"))
     canSerde<u128Safe>(u128Safe.from("101"))
     
@@ -66,7 +66,7 @@ describe("Ser/de Numbers", () => {
     canSerde<i128Safe>(i128Safe.from("101"))
     canSerde<i128Safe>(i128Safe.from("-100"))
     canSerde<i128Safe>(i128Safe.from("-101"))
-
+*/
     //canSerde<i256Safe>(new i256Safe(10, 11, 500, 501))
   });
 
@@ -102,7 +102,7 @@ describe("Ser/de Numbers", () => {
   });
 
   it("should ser/de BigInt objects", () => {
-    canSerde<i32>(0);
+  /*  canSerde<i32>(0);
 
     canSerde<u32>(100);
     canSerde<u64>(101);
@@ -113,7 +113,7 @@ describe("Ser/de Numbers", () => {
     canSerde<u128>(u128.from("101"))
     canSerde<u128>(u128.from("-100"))
     canSerde<u128>(u128.from("-101"))
-
+*/
   })
 });
 
@@ -175,6 +175,21 @@ describe("Ser/de Array", () => {
       ],
     ]);
   });
+
+  it("should ser/de object arrays", () => {
+    canSerde<Vec3[]>([{
+      x: 3.4,
+      y: 1.2,
+      z: 8.3
+    },
+    {
+      x: 3.4,
+      y: -2.1,
+      z: 9.3
+    }
+    ]);
+
+  })
 });
 
 describe("Ser/de Objects", () => {

package/assembly/src/json.ts

@@ -394,13 +394,16 @@ function parseArray<T extends unknown[]>(data: string): T {
         // @ts-ignore
         return parseArrayArray<T>(data);
         // @ts-ignore
-    }
-    const type = instantiate<T>();
-    // @ts-ignore
-    if (isDefined(type.__JSON_Set_Key)) {
+    } else if (isManaged<valueof<T>>() || isReference<valueof<T>>()) {
+        const type = changetype<nonnull<valueof<T>>>(__new(offsetof<nonnull<valueof<T>>>(), idof <nonnull<valueof<T>>>()));
         // @ts-ignore
-        return parseObjectArray<T>(data);
+        if (isDefined(type.__JSON_Set_Key)) {
+            // @ts-ignore
+            return parseObjectArray<T>(data);
+        }
+        return unreachable();
     }
+    return unreachable();
 }
 
 // @ts-ignore
@@ -508,29 +511,24 @@ function parseArrayArray<T extends unknown[][]>(data: string): T {
 }
 
 // @ts-ignore
-@inline
-function parseObjectArray<T extends unknown[][]>(data: string): T {
+export function parseObjectArray<T extends unknown[]>(data: string): T {
     const result = instantiate<T>();
     let char = 0;
-    let lastPos = 1;
-    let depth = 1;
-    let i = 1;
-    // Find start of bracket
-    //for (; unsafeCharCodeAt(data, i) !== leftBracketCode; i++) { }
-    //i++;
-    for (; i < data.length - 1; i++) {
-        char = unsafeCharCodeAt(data, i);
+    let lastPos: u32 = 1;
+    let depth: u32 = 0;
+    for (let pos: u32 = 0; pos < <u32>data.length; pos++) {
+        char = unsafeCharCodeAt(data, pos);
         if (char === leftBraceCode) {
-            if (depth === 1) {
-                lastPos = i;
+            if (depth === 0) {
+                lastPos = pos;
             }
-            // Shifting is 6% faster than incrementing
-            depth = depth << 1;
+            depth++;
         } else if (char === rightBraceCode) {
-            depth = depth >> 1;
-            if (depth === 1) {
-                i++;
-                result.push(JSON.parse<valueof<T>>(data.slice(lastPos, i)));
+            depth--;
+            if (depth === 0) {
+                pos++;
+                result.push(JSON.parse<valueof<T>>(data.slice(lastPos, pos)));
+                lastPos = pos + 2;
             }
         }
     }

package/assembly/src/util.ts

@@ -58,4 +58,23 @@ export function escapeChar(char: string): string {
     case 0x0B: return "\\u000b";
     default: return char; 
   }
+}
+
+/**
+ * A terrible function which finds the depth of a certain array.
+ * Suffers no overhead besides function calling and a if/else.
+ * @returns depth of array
+ */
+export function getArrayDepth<T>(depth: i32 = 1): i32 {
+  // @ts-ignore
+  if (isArray<T>()) {
+    return 0;
+    // @ts-ignore
+  } else if (isArray<valueof<T>>()) {
+    depth++;
+    // @ts-ignore
+    return getArrayDepth<valueof<T>>(depth);
+  } else {
+    return depth;
+  }
 }

package/assembly/test.ts

@@ -2,7 +2,31 @@ import { u128 } from "as-bignum/assembly";
 import {
   JSON
 } from ".";
+import { parseObjectArray } from "./src/json";
 
+@json
+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;
+  }
+}
+
+//console.log(JSON.stringify(candle));
+
+const parsedCandleArray: Candle[] = parseObjectArray<Candle[]>('{"timestamp":1620248400000,"high":573.3476371851107,"low":572.7653897862947,"open":573.3476371851107,"close":572.7653897862947},{"timestamp":1620249300000,"high":572.4966600947654,"low":572.3690847959957,"open":572.4966600947654,"close":572.3690847959957}');
+
+console.log(JSON.stringify(parsedCandleArray[0]));
+console.log(JSON.stringify(parsedCandleArray[1]));
+/*
 // @ts-ignore
 @JSON
 class Vec3 {
@@ -48,26 +72,4 @@ const player: Player = {
 const serializedPlayer = JSON.stringify<Player>(player);
 console.log("Serialized Player: " + serializedPlayer);
 const deserializedPlayer = JSON.parse<Player>(serializedPlayer);
-console.log("Deserialized Player: " + JSON.stringify(deserializedPlayer));/*
-
-@json
-class Vec2 {
-  x: f32;
-  y: f32;
-}
-
-const vec: Vec2 = {
-  x: 0.0,
-  y: 0.0,
-}
-
-let i = 5_000_000;
-while (i--) {
-  JSON.stringify<Vec2>(vec);
-}
-let start = Date.now();
-i = 10_000_000;
-while (i--) {
-  JSON.stringify<Vec2>(vec);
-}
-console.log(`Took: ${Date.now() - start}ms`)*/
+console.log("Deserialized Player: " + JSON.stringify(deserializedPlayer));*/

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "json-as",
-  "version": "0.5.15",
+  "version": "0.5.17",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
-    "contributors": [
-      "DogWhich",
-      "Joshua Tenner",
-      "Rom"
-    ],
+  "contributors": [
+    "DogWhich",
+    "Joshua Tenner",
+    "Rom"
+  ],
   "license": "MIT",
   "scripts": {
     "aspect": "asp",
@@ -23,18 +23,18 @@
   "devDependencies": {
     "@as-pect/cli": "^8.0.1",
     "@as-tral/cli": "^2.0.0",
-    "@assemblyscript/loader": "^0.25.0",
+    "@assemblyscript/loader": "^0.27.0",
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bignum": "^0.2.23",
-    "assemblyscript": "^0.25.0",
-    "assemblyscript-prettier": "^1.0.6",
-    "prettier": "^2.8.1",
-    "typescript": "^4.9.4",
+    "assemblyscript": "^0.27.0",
+    "assemblyscript-prettier": "^1.0.7",
+    "prettier": "^2.8.3",
+    "typescript": "^4.9.5",
     "visitor-as": "^0.11.4"
   },
   "dependencies": {
     "as-string-sink": "^0.5.0",
-    "as-variant": "^0.4.0"
+    "as-variant": "^0.4.1"
   },
   "repository": {
     "type": "git",

package/transform/package.json

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