json-as 0.4.2 → 0.4.5

package/assembly/test.ts

@@ -1,18 +1,29 @@
 import "wasi";
-import { JSON } from ".";
+import {
+  JSON,
+  parseArrayArray,
+  parseNumberArray,
+  parseObject,
+  parseObjectArray,
+} from ".";
+import { removeWhitespace } from "./util";
 
+// @ts-ignore
 @json
 class Vec2 {
-  x: f32
-  y: f32
+  x: f32;
+  y: f32;
 }
+
+// @ts-ignore
 @json
 class Player {
-  firstName: string
-  lastName: string
-  lastActive: i32[]
-  age: i32
-  pos: Vec2
+  firstName: string;
+  lastName: string;
+  lastActive: i32[];
+  age: i32;
+  pos: Vec2;
+  isVerified: boolean;
 }
 
 const data: Player = {
@@ -22,14 +33,53 @@ const data: Player = {
   age: 23,
   pos: {
     x: -3.4,
-    y: 1.2
-  }
-}
+    y: 1.2,
+  },
+  isVerified: true,
+};
+
+const serialized = JSON.stringify<Player>(data);
+console.log("Serialized: " + serialized);
+const deserialized = JSON.parse<Player>(serialized);
+console.log("Deserialized: " + JSON.stringify(deserialized));
+/*
+const parsed = JSON.parse<Player>(stringified);
+console.log("Vec2 Parse: " + JSON.stringify<Player>(parsed));
+console.log(
+  `Parsed String Array: ${JSON.stringify(
+    JSON.parse<string[]>(`\n[ "hello" ,  "world" ]  `)
+  )}`
+);
+
+console.log(
+  `Parsed Boolean Array: ${JSON.stringify(
+    JSON.parse<boolean[]>(`\n[ false ,  true ]  `)
+  )}`
+);
+
+console.log(
+  `Parsed Number Array: ${JSON.stringify(
+    JSON.parse<i32[]>(`[ 1 , 2\n ,3\n\t ]`)
+  )}`
+);
+
+console.log(
+  JSON.stringify<Vec2>(
+    load<Vec2>(changetype<usize>(data), offsetof<Player>("pos"))
+  )
+);
 
-const stringified = JSON.stringify<Player>(data);
-// '{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23}'
-console.log(`Stringified: ${stringified}`);
+console.log(
+  JSON.stringify<string[][]>(
+    parseArrayArray<string[][]>('[["a","b","c"],["d","e","f"]]')
+  )
+);
 
-const parsed = JSON.parse<Player>(stringified)
-// { firstName: "Emmet", lastName: "West", "lastActive": [8,27,2022], age: 23 }
-console.log(`Parsed: ${JSON.stringify(parsed)}`)
+console.log(
+  JSON.stringify<Player[][]>(
+    parseObjectArray<Player[][]>(
+      '[{"firstName":"Emmet","lastName":"West","lastActive":[8,7],"age":23,"pos":{"x":-3.4000000953674318,"y":1.2000000476837159}}]'
+    )
+  )
+);
+*/

package/assembly/util.ts

@@ -0,0 +1,30 @@
+import { StringSink } from "as-string-sink/assembly";
+import { isSpace } from "assemblyscript/std/assembly/util/string";
+import { backSlashCode, quoteCode } from "./chars";
+// @ts-ignore
+@inline
+export function unsafeCharCodeAt(data: string, pos: i32): i32 {
+  return load<u16>(changetype<usize>(data) + ((<usize>pos) << 1));
+}
+
+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/index.ts

@@ -1 +0,0 @@
-export { JSON } from "./assembly/index";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.4.2",
+  "version": "0.4.5",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -14,20 +14,20 @@
     "build:transform": "tsc -p ./transform",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:lunatic": "lunatic ./build/test.wasm",
-    "test:wasm3": "wasm3 ./build/test.wasm"
+    "test:wasm3": "wasm3 ./build/test.wasm",
+    "prettier": "as-prettier -w ."
   },
   "devDependencies": {
+    "@as-pect/cli": "^7.0.7",
     "@as-tral/cli": "^1.1.1",
     "as-console": "^6.0.2",
     "assemblyscript": "^0.20.7",
     "assemblyscript-prettier": "^1.0.2",
-    "benchmark": "^2.1.4",
-    "microtime": "^3.0.0",
     "typescript": "^4.7.2"
   },
   "dependencies": {
     "as-string-sink": "^0.5.0",
-    "as-variant": "^0.3.0"
+    "as-variant": "^0.4.0"
   },
   "repository": {
     "type": "git",
@@ -38,7 +38,8 @@
     "json",
     "serialize",
     "deserialize",
-    "dynamic"
+    "dynamic",
+    "serde"
   ],
   "bugs": {
     "url": "https://github.com/JairusSW/as-json/issues"

package/transform/lib/index.js

@@ -1,78 +1,74 @@
-import { ClassDecorator, registerDecorator } from "visitor-as/dist/decorator.js";
-import { getName } from "visitor-as/dist/utils.js";
-import { SimpleParser } from "visitor-as/dist/index.js";
-class AsJSONTransform extends ClassDecorator {
-    constructor() {
-        super(...arguments);
-        this.sources = [];
-        this.encodeStmts = new Map();
-        this.decodeCode = new Map();
-    }
-    visitMethodDeclaration(node) { }
-    visitFieldDeclaration(node) {
-        const name = getName(node);
-        if (!node.type) {
-            throw new Error(`Field ${name} is missing a type declaration`);
-        }
-        const type = getName(node.type);
-        const className = this.currentClass.name.text;
-        if (!this.encodeStmts.has(className))
-            this.encodeStmts.set(className, []);
-        if (!this.decodeCode.has(className))
-            this.decodeCode.set(className, []);
-        // @ts-ignore
-        this.encodeStmts.get(className).push(`this.__JSON_Serialized += '' + '"' + '${name}' + '"' + ':' + JSON.stringify<${type}>(this.${name}) + ',';`);
-        // @ts-ignore
-        this.decodeCode.get(className).push(`${name}: JSON.parse<${type}>(values.get("${name}")),\n`);
-    }
-    visitClassDeclaration(node) {
-        if (!node.members) {
-            return;
-        }
-        this.currentClass = node;
-        const name = getName(node);
-        this.encodeStmts.delete(name);
-        this.decodeCode.delete(name);
-        this.visit(node.members);
-        const serializedProp = `__JSON_Serialized: string = "";`;
-        let serializeFunc = ``;
-        if (this.encodeStmts.has(name) && this.encodeStmts.get(name)) {
-            serializeFunc = `
-      __JSON_Serialize(): string {
-        if (!this.__JSON_Serialized) {
-          ${ // @ts-ignore
-            this.encodeStmts.get(name).join("\n")};
-          this.__JSON_Serialized = "{" + this.__JSON_Serialized.slice(0, this.__JSON_Serialized.length - 1) + "}";
-        }
-        return this.__JSON_Serialized;
-      }
-      `;
-        }
-        else {
-            serializeFunc = `
-      __JSON_Serialize(): string {
-        return "{}";
-      }
-      `;
-        }
-        const deserializeFunc = `
-    __JSON_Deserialize(values: Map<string, string>): ${name} {
-        return {
-          ${ // @ts-ignore
-        this.decodeCode.get(name) ? this.decodeCode.get(name).join("") : ""}
-        }
-    }
-    `;
-        //console.log(serializedProp, serializeFunc, deserializeFunc)
-        const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
-        node.members.push(serializedProperty);
-        const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
-        node.members.push(serializeMethod);
-        const deserializeMethod = SimpleParser.parseClassMember(deserializeFunc, node);
-        node.members.push(deserializeMethod);
-    }
-    get name() {
-        return "json";
-    }
-}
-export default registerDecorator(new AsJSONTransform());
+import { ClassDecorator, registerDecorator, } from "visitor-as/dist/decorator.js";
+import { getName } from "visitor-as/dist/utils.js";
+import { SimpleParser } from "visitor-as/dist/index.js";
+class AsJSONTransform extends ClassDecorator {
+    constructor() {
+        super(...arguments);
+        this.sources = [];
+        this.encodeStmts = [];
+        this.decodeStmts = [];
+    }
+    visitMethodDeclaration(node) { }
+    visitFieldDeclaration(node) {
+        const name = getName(node);
+        if (!node.type) {
+            throw new Error(`Field ${name} is missing a type declaration`);
+        }
+        const type = getName(node.type);
+        // @ts-ignore
+        this.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
+        // @ts-ignore
+        this.decodeStmts.push(`${name}: JSON.parse<${type}>(values.get("${name}")),\n`);
+    }
+    visitClassDeclaration(node) {
+        if (!node.members) {
+            return;
+        }
+        this.currentClass = node;
+        const name = getName(node);
+        this.visit(node.members);
+        const serializedProp = `__JSON_Serialized: string = "";`;
+        let serializeFunc = ``;
+        if (this.encodeStmts.length > 0) {
+            const stmt = this.encodeStmts[this.encodeStmts.length - 1];
+            this.encodeStmts[this.encodeStmts.length - 1] = stmt.slice(0, stmt.length - 1);
+            serializeFunc = `
+      @inline
+      __JSON_Serialize(): string {
+        return \`{${this.encodeStmts.join("")}}\`;
+      }
+      `;
+        }
+        else {
+            serializeFunc = `
+      @inline
+      __JSON_Serialize(): string {
+        return "{}";
+      }
+      `;
+        }
+        const deserializeFunc = `
+    @inline
+    __JSON_Deserialize(values: Map<string, string>): ${name} {
+        return {
+          ${
+        // @ts-ignore
+        this.decodeStmts.join("")}
+        }
+    }
+    `;
+        this.encodeStmts = [];
+        this.decodeStmts = [];
+        //console.log(serializeFunc, deserializeFunc)
+        const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
+        node.members.push(serializedProperty);
+        const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
+        node.members.push(serializeMethod);
+        const deserializeMethod = SimpleParser.parseClassMember(deserializeFunc, node);
+        node.members.push(deserializeMethod);
+    }
+    get name() {
+        return "json";
+    }
+}
+export default registerDecorator(new AsJSONTransform());

package/transform/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@json-as/transform",
-    "version": "0.4.2",
+    "version": "0.4.5",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",
@@ -8,7 +8,6 @@
         "DogWhich"
     ],
     "license": "MIT",
-    "scripts": {},
     "devDependencies": {},
     "dependencies": {
         "visitor-as": "^0.10.2"

package/transform/src/index.ts

@@ -1,98 +1,109 @@
-import {
-    ClassDeclaration,
-    FieldDeclaration,
-    MethodDeclaration,
-    Source
-} from "assemblyscript/dist/assemblyscript";
-import { ClassDecorator, registerDecorator } from "visitor-as/dist/decorator.js";
-import { getName } from "visitor-as/dist/utils.js";
-import { SimpleParser } from "visitor-as/dist/index.js";
-
-class AsJSONTransform extends ClassDecorator {
-    public currentClass!: ClassDeclaration;
-    public sources: Source[] = [];
-    public encodeStmts = new Map<string, string[]>();
-    public decodeCode = new Map<string, string[]>();
-
-    visitMethodDeclaration(node: MethodDeclaration): void {}
-    visitFieldDeclaration(node: FieldDeclaration): void {
-        const name = getName(node);
-        if (!node.type) {
-            throw new Error(`Field ${name} is missing a type declaration`);
-        }
-
-        const type = getName(node.type);
-
-        const className = this.currentClass!.name.text
-        if (!this.encodeStmts.has(className)) this.encodeStmts.set(className, [])
-        if (!this.decodeCode.has(className)) this.decodeCode.set(className, [])
-        // @ts-ignore
-        this.encodeStmts.get(className).push(
-            `this.__JSON_Serialized += '' + '"' + '${name}' + '"' + ':' + JSON.stringify<${type}>(this.${name}) + ',';`
-        );
-
-        // @ts-ignore
-        this.decodeCode.get(className).push(
-            `${name}: JSON.parse<${type}>(values.get("${name}")),\n`
-        );
-    }
-    visitClassDeclaration(node: ClassDeclaration): void {
-        if (!node.members) {
-            return;
-        }
-
-        this.currentClass = node;
-
-        const name = getName(node);
-
-        this.encodeStmts.delete(name);
-        this.decodeCode.delete(name);
-        this.visit(node.members);
-
-        const serializedProp = `__JSON_Serialized: string = "";`
-
-        let serializeFunc = ``
-
-        if (this.encodeStmts.has(name) && this.encodeStmts.get(name)) {
-            serializeFunc = `
-      __JSON_Serialize(): string {
-        if (!this.__JSON_Serialized) {
-          ${// @ts-ignore
-                this.encodeStmts.get(name).join("\n")};
-          this.__JSON_Serialized = "{" + this.__JSON_Serialized.slice(0, this.__JSON_Serialized.length - 1) + "}";
-        }
-        return this.__JSON_Serialized;
-      }
-      `
-        } else {
-            serializeFunc = `
-      __JSON_Serialize(): string {
-        return "{}";
-      }
-      `
-        }
-
-        const deserializeFunc = `
-    __JSON_Deserialize(values: Map<string, string>): ${name} {
-        return {
-          ${// @ts-ignore
-            this.decodeCode.get(name) ? this.decodeCode.get(name).join("") : ""}
-        }
-    }
-    `;
-        //console.log(serializedProp, serializeFunc, deserializeFunc)
-        const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
-        node.members.push(serializedProperty);
-
-        const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
-        node.members.push(serializeMethod);
-
-        const deserializeMethod = SimpleParser.parseClassMember(deserializeFunc, node);
-        node.members.push(deserializeMethod);
-    }
-    get name(): string {
-        return "json";
-    }
-}
-
-export default registerDecorator(new AsJSONTransform());
+import {
+  ClassDeclaration,
+  FieldDeclaration,
+  MethodDeclaration,
+  Source,
+} from "assemblyscript/dist/assemblyscript";
+import {
+  ClassDecorator,
+  registerDecorator,
+} from "visitor-as/dist/decorator.js";
+import { getName } from "visitor-as/dist/utils.js";
+import { SimpleParser } from "visitor-as/dist/index.js";
+
+class AsJSONTransform extends ClassDecorator {
+  public currentClass!: ClassDeclaration;
+  public sources: Source[] = [];
+  public encodeStmts: string[] = [];
+  public decodeStmts: string[] = [];
+
+  visitMethodDeclaration(node: MethodDeclaration): void {}
+  visitFieldDeclaration(node: FieldDeclaration): void {
+    const name = getName(node);
+    if (!node.type) {
+      throw new Error(`Field ${name} is missing a type declaration`);
+    }
+
+    const type = getName(node.type);
+
+    // @ts-ignore
+    this.encodeStmts.push(
+      `"${name}":\${JSON.stringify<${type}>(this.${name})},`
+    );
+
+    // @ts-ignore
+    this.decodeStmts.push(
+      `${name}: JSON.parse<${type}>(values.get("${name}")),\n`
+    );
+  }
+  visitClassDeclaration(node: ClassDeclaration): void {
+    if (!node.members) {
+      return;
+    }
+
+    this.currentClass = node;
+
+    const name = getName(node);
+
+    this.visit(node.members);
+
+    const serializedProp = `__JSON_Serialized: string = "";`;
+
+    let serializeFunc = ``;
+
+    if (this.encodeStmts.length > 0) {
+      const stmt = this.encodeStmts[this.encodeStmts.length - 1]!;
+      this.encodeStmts[this.encodeStmts.length - 1] = stmt!.slice(
+        0,
+        stmt.length - 1
+      );
+      serializeFunc = `
+      @inline
+      __JSON_Serialize(): string {
+        return \`{${this.encodeStmts.join("")}}\`;
+      }
+      `;
+    } else {
+      serializeFunc = `
+      @inline
+      __JSON_Serialize(): string {
+        return "{}";
+      }
+      `;
+    }
+
+    const deserializeFunc = `
+    @inline
+    __JSON_Deserialize(values: Map<string, string>): ${name} {
+        return {
+          ${
+            // @ts-ignore
+            this.decodeStmts.join("")
+          }
+        }
+    }
+    `;
+    this.encodeStmts = [];
+    this.decodeStmts = [];
+    //console.log(serializeFunc, deserializeFunc)
+    const serializedProperty = SimpleParser.parseClassMember(
+      serializedProp,
+      node
+    );
+    node.members.push(serializedProperty);
+
+    const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
+    node.members.push(serializeMethod);
+
+    const deserializeMethod = SimpleParser.parseClassMember(
+      deserializeFunc,
+      node
+    );
+    node.members.push(deserializeMethod);
+  }
+  get name(): string {
+    return "json";
+  }
+}
+
+export default registerDecorator(new AsJSONTransform());

package/transform/tsconfig.json

@@ -14,7 +14,7 @@
     // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
     "sourceMap": false /* Generates corresponding '.map' file. */,
     // "outFile": "./",                             /* Concatenate and emit output to single file. */
-    "outDir": "./lib/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+    "outDir": "./lib" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
     // "composite": true,                           /* Enable project compilation */
     // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
     // "removeComments": true,                      /* Do not emit comments to output. */