json-as 0.9.9 → 0.9.11

package/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [JairusSW]

package/.github/workflows/nodejs.yml

@@ -16,7 +16,7 @@ jobs:
 
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
-
+        
       - name: Install Dependencies
         run: bun install
       

package/CHANGELOG

@@ -15,10 +15,16 @@ v0.9.7 - Update testing framework and readme logo
 v0.9.8 - Update dependencies
 v0.9.8a - Fix #80 - Empty Maps were not serialized to {}, instead, threw memory out of bounds
 v0.9.8b - Fix #81 - Revert transform
-[UNRELEASED] v0.9.9
+v0.9.9 - Fix #82 - Initialize maps
+v0.9.9a - Remove extraneous logs from transform
+v0.9.11 - Fix transform type checks. switch to nodekind checks
+v0.9.11 - Remove MpZ--implement custom serializers and deserializers in the works
+
+[UNRELEASED] v1.0.0
  - Allow nullable primitives
  - Port over JSON.Value
  - Performance improvements
+ - Add SIMD support
  - Introduce options
  - Custom serializers
  - Support arbitrary-length integers (@hypercubed/as-mpz)

package/README.md

@@ -3,7 +3,7 @@
  __|  ||   __||     ||   | | ___ |  _  ||   __|
 |  |  ||__   ||  |  || | | ||___||     ||__   |
 |_____||_____||_____||_|___|     |__|__||_____|
-v0.9.9
+v0.9.11
 </pre>
 </h5>
 
@@ -187,6 +187,7 @@ Below are benchmark results comparing JavaScript's built-in JSON implementation
 
 My library beats JSON (written in C++) on all counts *and*, I see many places where I can pull at least a 60% uplift in performance if I implement it.
 
+Note: SIMD is in-development and only available on the `v1` branch on GitHub
 
 Serialization Benchmarks:
 

package/as-test.config.json

@@ -0,0 +1,24 @@
+{
+  "input": [
+    "./assembly/__tests__/*.spec.ts"
+  ],
+  "outDir": "./build",
+  "config": "./asconfig.json",
+  "suites": [],
+  "coverage": {
+    "enabled": true,
+    "show": false
+  },
+  "buildOptions": {
+    "args": [],
+    "wasi": true,
+    "parallel": true,
+    "verbose": true
+  },
+  "runOptions": {
+    "runtime": {
+      "name": "wasmtime",
+      "run": "wasmtime <file>"
+    }
+  }
+}

package/assembly/__tests__/test.spec.ts

@@ -5,7 +5,6 @@ import {
   run
 } from "as-test/assembly";
 import { DerivedObject, Null, ObjWithStrangeKey, ObjectWithFloat, OmitIf, Player, Vec3 } from "./types";
-import { MpZ } from "@hypercubed/as-mpz";
 
 describe("Should serialize strings", () => {
 
@@ -51,18 +50,6 @@ describe("Should serialize integers", () => {
 
 });
 
-describe("Should serialize MpZ (Big Int)", () => {
-
-  expect(
-    JSON.stringify<MpZ>(MpZ.from(0))
-  ).toBe("0");
-
-  expect(
-    JSON.stringify<MpZ>(MpZ.from(2).pow(512))
-  ).toBe("13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084096");
-
-});
-
 describe("Should serialize floats", () => {
 
   expect(
@@ -370,18 +357,6 @@ describe("Should deserialize integers", () => {
 
 });
 
-describe("Should deserialize MpZ (Big Int)", () => {
-
-  expect(
-    JSON.parse<MpZ>("0").toString()
-  ).toBe("0");
-
-  expect(
-    JSON.parse<MpZ>("13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084096").toString()
-  ).toBe("13407807929942597099574024998205846127479365820592393377723561443721764030073546976801874298166903427690031858186486050853753882811946569946433649006084096");
-
-});
-
 describe("Should deserialize floats", () => {
 
   expect(
@@ -559,6 +534,5 @@ describe("Should deserialize Objects", () => {
 });
 
 run({
-  log: true,
-  coverage: true
+  log: true
 });

package/assembly/deserialize/array.ts

@@ -31,8 +31,8 @@ export function deserializeArray<T extends unknown[]>(data: string): T {
         if (isDefined(type.__DESERIALIZE)) {
             return deserializeObjectArray<T>(data);
         }
-        ERROR("Could not parse array of type " + nameof<T>() + "! Make sure to add the @json decorator over classes!");
+        throw new Error("Could not parse array of type " + nameof<T>() + "! Make sure to add the @json decorator over classes!");
     } else {
-        ERROR("Could not parse array of type " + nameof<T>() + "!");
+        throw new Error("Could not parse array of type " + nameof<T>() + "!");
     }
 }

package/assembly/deserialize/map.ts

@@ -72,6 +72,8 @@ import { deserializeFloat } from "./float";
                     depth--;
                     if (depth === 0) {
                         ++objectValueIndex;
+                        console.log("Index: " + nameof<indexof<T>>());
+                        console.log("Value: " + nameof<valueof<T>>());
                         map.set(deserializeMapKey<indexof<T>>(key), JSON.parse<valueof<T>>(data.slice(outerLoopIndex, objectValueIndex)));
                         outerLoopIndex = objectValueIndex;
                         isKey = false;

package/assembly/index.ts

@@ -13,198 +13,14 @@ import { deserializeFloat } from "./deserialize/float";
 import { deserializeObject } from "./deserialize/object";
 import { deserializeMap } from "./deserialize/map";
 import { deserializeDate } from "./deserialize/date";
-import { FALSE_WORD, NULL_WORD, TRUE_WORD } from "./chars";
+import { NULL_WORD } from "./chars";
 import { deserializeInteger } from "./deserialize/integer";
 import { deserializeString } from "./deserialize/string";
-import { Sink } from "./sink";
-import { Variant } from "as-variant/assembly";
-import { MpZ } from "@hypercubed/as-mpz";
-import { serializeMpZ } from "./serialize/mpz";
-import { deserializeMpZ } from "./deserialize/mpz";
-
-/**
- * Offset of the 'storage' property in the JSON.Value class.
- */
-// @ts-ignore: Decorator valid here
-const STORAGE = offsetof<JSON.Value>("storage");
 
 /**
  * JSON Encoder/Decoder for AssemblyScript
  */
 export namespace JSON {
-  /**
- * Enum representing the different types supported by JSON.
- */
-  export enum Types {
-    U8,
-    U16,
-    U32,
-    U64,
-    F32,
-    F64,
-    Bool,
-    String,
-    ManagedString,
-    Struct,
-    ManagedStruct,
-    Array,
-    ManagedArray
-  }
-
-  export class Value {
-    public type: i32;
-    // @ts-ignore: storage is set directly through memory
-    private storage: u64;
-
-    private constructor() { unreachable(); }
-
-    /**
-     * Creates an JSON.Value instance from a given value.
-     * @param value - The value to be encapsulated.
-     * @returns An instance of JSON.Value.
-     */
-    static from<T>(value: T): JSON.Value {
-      if (value instanceof Variant) {
-        // Handle
-      } else if (value instanceof JSON.Value) {
-        return value;
-      }
-      const out = changetype<JSON.Value>(__new(offsetof<JSON.Value>(), idof<JSON.Value>()));
-      out.set<T>(value);
-      return out;
-    }
-
-    /**
-     * Sets the value of the JSON.Value instance.
-     * @param value - The value to be set.
-     */
-    set<T>(value: T): void {
-      if (isBoolean<T>()) {
-        this.type = JSON.Types.Bool;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (value instanceof u8 || value instanceof i8) {
-        this.type = JSON.Types.U8;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (value instanceof u16 || value instanceof i16) {
-        this.type = JSON.Types.U16;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (value instanceof u32 || value instanceof i32) {
-        this.type = JSON.Types.U32;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (value instanceof u64 || value instanceof i64) {
-        this.type = JSON.Types.U64;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (value instanceof f32) {
-        this.type = JSON.Types.F64;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (value instanceof f64) {
-        this.type = JSON.Types.F64;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (isString<T>()) {
-        this.type = JSON.Types.String;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (value instanceof Map) {
-        if (idof<T>() !== idof<Map<string, JSON.Value>>()) {
-          throw new Error("Maps must be of type Map<string, JSON.Value>!");
-        }
-        this.type = JSON.Types.Struct;
-        store<T>(changetype<usize>(this), value, STORAGE);
-        // @ts-ignore: __SERIALIZE is implemented by the transform
-      } else if (isDefined(value.__SERIALIZE)) {
-        this.type = JSON.Types.Struct;
-        store<T>(changetype<usize>(this), value, STORAGE);
-      } else if (isArray<T>()) {
-        // @ts-ignore: T satisfies constraints of any[]
-        this.type = JSON.Types.Array + getArrayDepth<T>(0);
-        store<T>(changetype<usize>(this), value, STORAGE);
-      }
-    }
-
-    /**
-     * Gets the value of the JSON.Value instance.
-     * @returns The encapsulated value.
-     */
-    unwrap<T>(): T {
-      if (isManaged<T>()) {
-        if (this.type !== JSON.Types.Struct) throw new Error("Type mismatch");
-        if (idof<T>() !== load<u32>(changetype<usize>(this.storage), -8)) throw new Error("Type mismatch");
-      }
-      return load<T>(changetype<usize>(this), STORAGE);
-    }
-
-    /**
-     * Gets the value of the JSON.Value instance.
-     * @returns The encapsulated value.
-     */
-    unwrapUnsafe<T>(): T {
-      return load<T>(changetype<usize>(this), STORAGE);
-    }
-
-    /**
-     * Gets the value of the JSON.Value instance.
-     * @returns The encapsulated value.
-     */
-    get<T>(): T {
-      return load<T>(changetype<usize>(this), STORAGE);
-    }
-
-    /**
-     * Gets the value of the JSON.Value instance.
-     * @returns The encapsulated value.
-     */
-    getUnsafe<T>(): T {
-      return load<T>(changetype<usize>(this), STORAGE);
-    }
-
-    /**
-     * Gets the value of the JSON.Value instance.
-     * @returns The encapsulated value.
-     */
-    is<T>(): T {
-      return load<T>(changetype<usize>(this), STORAGE);
-    }
-
-    /**
-     * Gets the value of the JSON.Value instance.
-     * @returns The encapsulated value.
-     */
-    clone<T>(): T {
-      return load<T>(changetype<usize>(this), STORAGE);
-    }
-
-    /**
-     * Converts the JSON.Value to a string representation.
-     * @param useString - If true, treats Buffer as a string.
-     * @returns The string representation of the JSON.Value.
-     */
-    toString(useString: boolean = false): string {
-      switch (this.type) {
-        case JSON.Types.U8: return this.get<u8>().toString();
-        case JSON.Types.U16: return this.get<u16>().toString();
-        case JSON.Types.U32: return this.get<u32>().toString();
-        case JSON.Types.U64: return this.get<u64>().toString();
-        case JSON.Types.String: return "\"" + this.get<string>() + "\"";
-        case JSON.Types.Bool: return this.get<boolean>() ? TRUE_WORD : FALSE_WORD;
-        default: {
-          const arr = this.get<JSON.Value[]>();
-          if (!arr.length) return "[]";
-          const out = Sink.fromString("[");
-          for (let i = 0; i < arr.length - 1; i++) {
-            const element = unchecked(arr[i]);
-            out.write(element.toString(useString));
-            out.write(",");
-          }
-
-          const element = unchecked(arr[arr.length - 1]);
-          out.write(element.toString(useString));
-
-          out.write("]");
-          return out.toString();
-        }
-      }
-    }
-  }
-
   export class Box<T> {
     constructor(public value: T) {}
     @inline static from<T>(value: T): Box<T> {
@@ -236,6 +52,7 @@ export namespace JSON {
       // @ts-ignore
     } else if (isString<nonnull<T>>()) {
       return serializeString(changetype<string>(data));
+      // @ts-ignore: Supplied by trasnform
     } else if (isDefined(data.__SERIALIZE)) {
       // @ts-ignore
       return serializeObject(changetype<nonnull<T>>(data));
@@ -248,8 +65,6 @@ export namespace JSON {
     } else if (data instanceof Map) {
       // @ts-ignore
       return serializeMap(changetype<nonnull<T>>(data));
-    } else if (data instanceof MpZ) {
-      return serializeMpZ(data);
     } else {
       throw new Error(
         `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
@@ -284,16 +99,14 @@ export namespace JSON {
       return deserializeArray<nonnull<T>>(data);
     }
     let type: nonnull<T> = changetype<nonnull<T>>(0);
+    // @ts-ignore: Defined by trasnform
     if (isDefined(type.__DESERIALIZE)) {
       // @ts-ignore
       return deserializeObject<nonnull<T>>(data.trimStart());
     } else if (type instanceof Map) {
       // @ts-ignore
       return deserializeMap<nonnull<T>>(data.trimStart());
-    } else if (type instanceof MpZ) {
-      // @ts-ignore
-      return deserializeMpZ(data);
-    }else if (type instanceof Date) {
+    } else if (type instanceof Date) {
       // @ts-ignore
       return deserializeDate(data);
     } else {

package/assembly/serialize/array.ts

@@ -12,9 +12,7 @@ import { serializeString } from "./string";
 
 // @ts-ignore: Decorator valid here
 @inline export function serializeArray<T extends any[]>(data: T): string {
-    if (changetype<usize>(data) == <usize>0) return EMPTY_BRACKET_WORD;
-    // @ts-ignore
-    else if (data.length == 0) {
+    if (data.length == 0) {
         return EMPTY_BRACKET_WORD;
         // @ts-ignore
     } else if (isString<valueof<T>>()) {

package/assembly/serialize/map.ts

@@ -4,7 +4,6 @@ import { Sink } from "../sink";
 
 // @ts-ignore: Decorator valid here
 @inline export function serializeMap<T extends Map<any, any>>(data: T): string {
-    if (changetype<usize>(data) == <usize>0) return "{}";
     let result = Sink.fromString(BRACE_LEFT_WORD);
     if (!data.size) return "{}";
     let keys = data.keys();

package/assembly/test.ts

@@ -1,41 +1,38 @@
 import { JSON } from ".";
-
 @json
-class TokenMetaData {
-  id: u64;
-  name: string;
-  uri: string;
-
-  constructor(id: u64, name: string, uri: string) {
-    this.id = id;
-    this.name = name;
-    this.uri = uri;
-  }
+class Vec3 {
+  x: f32 = 0.0;
+  y: f32 = 0.0;
+  z: f32 = 0.0;
 }
 
 @json
-class NonFungibleToken {
-  owner: string;
-  counter: u64;
-  tokens: Map<u64, TokenMetaData>;
-  owners: Map<u64, string>;
-  balances: Map<string, u64[]>;
-  constructor() {
-    this.owner = "";
-    this.counter = 0;
-    this.tokens = new Map<u64, TokenMetaData>();
-    this.owners = new Map<u64, string>();
-    this.balances = new Map<string, u64[]>();
-  }
+class Player {
+  @alias("first name")
+  firstName!: string;
+  lastName!: string;
+  lastActive!: i32[];
+  // Drop in a code block, function, or expression that evaluates to a boolean
+  @omitif("this.age < 18")
+  age!: i32;
+  @omitnull()
+  pos!: Vec3 | null;
+  isVerified!: boolean;
 }
 
+const player: Player = {
+  firstName: "Emmet",
+  lastName: "West",
+  lastActive: [8, 27, 2022],
+  age: 23,
+  pos: {
+    x: 3.4,
+    y: 1.2,
+    z: 8.3
+  },
+  isVerified: true
+};
 
-let state = JSON.parse<NonFungibleToken>(
-  '"{"owner":"","counter":0,"tokens":{},"owners":{},"balances":{}}"'
-);
-// let state = new NonFungibleToken();
+const stringified = JSON.stringify<Player>(player);
 
-if (!state.balances.has("bhavya")) {
-  state.balances.set("bhavya", []);
-}
-console.log(JSON.stringify(state))
+const parsed = JSON.parse<Player>(stringified);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.9",
+  "version": "0.9.11",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -15,9 +15,9 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "wasmtime build/test.spec.wasm",
-    "pretest": "asc assembly/__tests__/test.spec.ts --target test",
-    "build:test": "JSON_DEBUG=true asc assembly/test.ts --target debug",
+    "test": "ast test",
+    "pretest": "rm -rf ./build/ && ast build",
+    "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm",
     "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",
     "bench:wasmtime": "wasmtime ./bench/benchmark.wasm",
     "bench:wasmer": "wasmer --llvm ./bench/benchmark.wasm",
@@ -32,22 +32,17 @@
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bench": "^0.0.0-alpha",
     "as-console": "^7.0.0",
+    "as-test": "0.1.7",
     "assemblyscript": "^0.27.28",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
-    "json-as": "link:json-as",
     "microtime": "^3.1.1",
     "prettier": "^3.3.2",
     "tinybench": "^2.8.0",
     "typescript": "^5.5.3",
     "visitor-as": "^0.11.4"
   },
-  "dependencies": {
-    "@hypercubed/as-mpz": "^2.2.0",
-    "as-string-sink": "^0.5.3",
-    "as-test": "^0.1.4",
-    "as-virtual": "^0.2.0"
-  },
+  "dependencies": { "as-virtual": "^0.2.0" },
   "overrides": {
     "assemblyscript": "$assemblyscript"
   },
@@ -61,7 +56,11 @@
     "serialize",
     "deserialize",
     "dynamic",
-    "serde"
+    "serde",
+    "SIMD",
+    "optimized",
+    "fast",
+    "algorithm"
   ],
   "bugs": {
     "url": "https://github.com/JairusSW/as-json/issues"

package/transform/lib/index.js

@@ -1,4 +1,3 @@
-import { FieldDeclaration } from "assemblyscript/dist/assemblyscript.js";
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
@@ -26,7 +25,7 @@ class JSONTransform extends BaseVisitor {
         schema.node = node;
         schema.name = node.name.text;
         const members = [
-            ...node.members.filter(v => v instanceof FieldDeclaration)
+            ...node.members.filter(v => v.kind === 54 /* NodeKind.FieldDeclaration */)
         ];
         if (node.extendsType) {
             schema.parent = this.schemasList.find((v) => v.name == node.extendsType?.name.identifier.text);
@@ -63,8 +62,6 @@ class JSONTransform extends BaseVisitor {
             this.schemasList.push(schema);
         }
         for (const member of members) {
-            if (!(member instanceof FieldDeclaration))
-                continue;
             const name = member.name;
             if (!member.type) {
                 throw new Error("Fields must be strongly typed! Found " + toString(member) + " at " + node.range.source.normalizedPath);
@@ -159,8 +156,22 @@ class JSONTransform extends BaseVisitor {
             else if (t === "Array") {
                 mem.initialize = "this." + name.text + " = instantiate<" + mem.type + ">()";
             }
-            else {
-                console.log(t);
+            else if (t === "bool" || t === "boolean") {
+                mem.initialize = "this." + name.text + " = false";
+            }
+            else if (t === "u8" ||
+                t === "u16" ||
+                t === "u32" ||
+                t === "u64" ||
+                t === "i8" ||
+                t === "i16" ||
+                t === "i32" ||
+                t === "i64") {
+                mem.initialize = "this." + name.text + " = 0";
+            }
+            else if (t === "f32" ||
+                t === "f64") {
+                mem.initialize = "this." + name.text + " = 0.0";
             }
             schema.members.push(mem);
         }

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.9.9",
+  "version": "0.9.11",
   "description": "JSON encoder/decoder for AssemblyScript",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",
@@ -12,9 +12,7 @@
     "lekiano"
   ],
   "license": "MIT",
-  "devDependencies": {
-    "assemblyscript": "^0.27.1"
-  },
+  "devDependencies": {},
   "dependencies": {},
   "repository": {
     "type": "git",

package/transform/src/index.ts

@@ -5,7 +5,8 @@ import {
   NamedTypeNode,
   StringLiteralExpression,
   Parser,
-  Source
+  Source,
+  NodeKind
 } from "assemblyscript/dist/assemblyscript.js";
 
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
@@ -38,7 +39,7 @@ class JSONTransform extends BaseVisitor {
     schema.name = node.name.text;
 
     const members = [
-      ...node.members.filter(v => v instanceof FieldDeclaration)
+      ...node.members.filter(v => v.kind === NodeKind.FieldDeclaration)
     ];
 
     if (node.extendsType) {
@@ -86,7 +87,6 @@ class JSONTransform extends BaseVisitor {
     }
 
     for (const member of members) {
-      if (!(member instanceof FieldDeclaration)) continue;
       const name = member.name;
       if (!member.type) {
         throw new Error("Fields must be strongly typed! Found " + toString(member) + " at " + node.range.source.normalizedPath);
@@ -170,8 +170,24 @@ class JSONTransform extends BaseVisitor {
         mem.initialize = "this." + name.text + " = \"\"";
       } else if (t === "Array") {
         mem.initialize = "this." + name.text + " = instantiate<" + mem.type + ">()";
-      } else {
-        console.log(t)
+      } else if (t === "bool" || t === "boolean") {
+        mem.initialize = "this." + name.text + " = false";
+      } else if (
+        t === "u8" ||
+        t === "u16" ||
+        t === "u32" ||
+        t === "u64" ||
+        t === "i8" ||
+        t === "i16" ||
+        t === "i32" ||
+        t === "i64"
+      ) {
+        mem.initialize = "this." + name.text + " = 0";
+      } else if (
+        t === "f32" ||
+        t === "f64"
+      ) {
+        mem.initialize = "this." + name.text + " = 0.0";
       }
 
       schema.members.push(mem);

package/assembly/deserialize/mpz.ts

@@ -1,12 +0,0 @@
-import { MpZ } from "@hypercubed/as-mpz";
-
-/**
- * Deserialize a string to type MpZ
- * @param data data to parse
- * @returns MpZ
- */
-// @ts-ignore: Decorator valid here
-@inline export function deserializeMpZ(data: string, start: i32 = 0, end: i32 = 0): MpZ {
-    if (!end) end = data.length;
-    return MpZ.from(data.slice(start, end));
-}

package/assembly/serialize/mpz.ts

@@ -1,6 +0,0 @@
-import { MpZ } from "@hypercubed/as-mpz";
-
-// @ts-ignore: Decorator valid here
-@inline export function serializeMpZ(data: MpZ): string {
-  return data.toString();
-}