json-as 0.4.4 → 0.4.7

package/assembly/util.ts

@@ -1,21 +1,30 @@
-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()
-}
+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.4",
+  "version": "0.4.7",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -14,7 +14,8 @@
     "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",
@@ -37,7 +38,7 @@
     "json",
     "serialize",
     "deserialize",
-    "dynamic", 
+    "dynamic",
     "serde"
   ],
   "bugs": {

package/transform/lib/index.js

@@ -1,73 +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 = [];
-        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());
+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() { }
+    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.parseObjectValue<${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 @@
-{
+7{
     "name": "@json-as/transform",
-    "version": "0.4.4",
+    "version": "0.4.7",
     "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,95 +1,108 @@
-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());
+import {
+  ClassDeclaration,
+  FieldDeclaration,
+  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(): 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.parseObjectValue<${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/assembly/__tests__/example.spec.ts

@@ -1,40 +0,0 @@
-import { JSON } from "../"
-describe("JSON Stringify Test", () => {
-  it("Stringify String", () => {
-    expect<string>().toBe(42, "19 + 23 is 42");
-  });
-
-  it("should be the same reference", () => {
-    let ref = new Vec3();
-    expect<Vec3>(ref).toBe(ref, "Reference Equality");
-  });
-
-  it("should perform a memory comparison", () => {
-    let a = new Vec3(1, 2, 3);
-    let b = new Vec3(1, 2, 3);
-
-    expect<Vec3>(a).toStrictEqual(
-      b,
-      "a and b have the same values, (discluding child references)",
-    );
-  });
-
-  it("should compare strings", () => {
-    expect<string>("a=" + "200").toBe("a=200", "both strings are equal");
-  });
-
-  it("should compare values", () => {
-    expect<i32>(10).toBeLessThan(200);
-    expect<i32>(1000).toBeGreaterThan(200);
-    expect<i32>(1000).toBeGreaterThanOrEqual(1000);
-    expect<i32>(1000).toBeLessThanOrEqual(1000);
-  });
-
-  it("can log some values to the console", () => {
-    log<string>("Hello world!"); // strings!
-    log<f64>(3.1415); // floats!
-    log<u8>(244); // integers!
-    log<u64>(0xffffffff); // long values!
-    log<ArrayBuffer>(new ArrayBuffer(50)); // bytes!
-  });
-});