json-as 0.4.3 → 0.4.4

package/README.md

@@ -102,7 +102,7 @@ console.log(`Parsed: ${JSON.stringify(parsed)}`);
 - Does this support nested structures?
   Yes, as-json supports nested structures
 - Does this support whitespace?
-  No, as-json does not support whitespace yet. That will come once we find a performant way to work around whitespace.
+  Yes, as-json supports whitespace although the current implementation is deathly slow
 - How fast is it?
   Really fast. For example, here are some benchmarks for ser/de a Vec2 with as-json
 ## Issues

package/assembly/index.ts

@@ -10,6 +10,7 @@ import {
   rightBraceCode,
   rightBracketCode
 } from "./chars";
+import { removeWhitespace } from "./util";
 
 /**
  * JSON Encoder/Decoder for AssemblyScript
@@ -77,6 +78,7 @@ export namespace JSON {
    * @returns T
    */
   export function parse<T = Variant>(data: string): T {
+    data = removeWhitespace(data);
     let type!: T;
     if (isString<T>()) {
       // @ts-ignore

package/assembly/test.ts

@@ -1,5 +1,6 @@
 import "wasi";
 import { JSON } from ".";
+import { removeWhitespace } from "./util";
 
 // @ts-ignore
 @json
@@ -41,9 +42,26 @@ const stringified = JSON.stringify<Player>(data);
 //  }
 // }
 console.log(`Stringified: ${stringified}`);
-data.age = 16
-console.log(`Stringified2: ${JSON.stringify<Player>(data)}`);
-const parsed = JSON.parse<Player>(stringified);
+console.log(`Whitespace: ${removeWhitespace(`{
+    "firstName": "Emmet",
+    "lastName": "West",
+   "lastActive": [8, 27, 2022],
+    "age": 23,
+    "pos": {
+      "x": -3.4000000953674318,
+      "y": 1.2000000476837159
+    }
+  }`)}`)
+const parsed = JSON.parse<Player>(`{
+    "firstName": "Emmet",
+    "lastName": "West",
+   "lastActive": [8, 27, 2022],
+    "age": 23,
+    "pos": {
+      "x": -3.4000000953674318,
+      "y": 1.2000000476837159
+    }
+  }`);
 // Player {
 //  firstName: "Emmet",
 //  lastName: "West",

package/assembly/util.ts

@@ -1,14 +1,21 @@
-export function isNumberCode(data: i32): boolean {
-    if (data == "0".charCodeAt(0)) return true;
-    else if (data == "1".charCodeAt(0)) return true;
-    else if (data == "2".charCodeAt(0)) return true;
-    else if (data == "3".charCodeAt(0)) return true;
-    else if (data == "4".charCodeAt(0)) return true;
-    else if (data == "5".charCodeAt(0)) return true;
-    else if (data == "6".charCodeAt(0)) return true;
-    else if (data == "7".charCodeAt(0)) return true;
-    else if (data == "8".charCodeAt(0)) return true;
-    else if (data == "9".charCodeAt(0)) return true;
-    else if (data == "-".charCodeAt(0)) return true;
-    else return false;
+import { StringSink } from "as-string-sink/assembly";
+import { isSpace } from "assemblyscript/std/assembly/util/string";
+import { backSlashCode, quoteCode } from "./chars";
+
+export function removeWhitespace(data: string): string {
+    const result = new StringSink()
+    let instr = false;
+    for (let i = 0; i < data.length; i++) {
+        const char = data.charCodeAt(i);
+        if (instr === false && char === quoteCode) instr = true
+        else if (instr === true && char === quoteCode && data.charCodeAt(i - 1) !== backSlashCode) instr = false;
+
+        if (instr === false) {
+            if (!isSpace(char)) result.write(data.charAt(i))
+        } else {
+            result.write(data.charAt(i))
+        }
+        
+    }
+    return result.toString()
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/lib/index.js

@@ -58,7 +58,7 @@ class AsJSONTransform extends ClassDecorator {
     `;
         this.encodeStmts = [];
         this.decodeStmts = [];
-        console.log(serializeFunc, deserializeFunc);
+        //console.log(serializeFunc, deserializeFunc)
         const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
         node.members.push(serializedProperty);
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);

package/transform/package.json

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

package/transform/src/index.ts

@@ -77,7 +77,7 @@ class AsJSONTransform extends ClassDecorator {
     `;
         this.encodeStmts = [];
         this.decodeStmts = [];
-        console.log(serializeFunc, deserializeFunc)
+        //console.log(serializeFunc, deserializeFunc)
         const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
         node.members.push(serializedProperty);