json-as 0.9.20 → 0.9.21

package/CHANGELOG

@@ -28,6 +28,7 @@ v0.9.17 - A schema's parent's fields should be included properly
 v0.9.18 - Should be able to use @alias and @omit*** or JSON.Raw
 v0.9.19 - Fix arguments in @omitif declarations not working properly
 v0.9.20 - Strings were being received with quotes attached via the toString functionality. Removed that.
+v0.9.21 - Fix #89
 
 [UNRELEASED] v1.0.0
  - Allow nullable primitives

package/README.md

@@ -3,7 +3,7 @@
  __|  ||   __||     ||   | | ___ |  _  ||   __|
 |  |  ||__   ||  |  || | | ||___||     ||__   |
 |_____||_____||_____||_|___|     |__|__||_____|
-v0.9.20
+v0.9.21
 </pre>
 </h5>
 
@@ -107,25 +107,16 @@ const serialized = JSON.stringify(arr);
 const parsed = JSON.parse<Base[]>(serialized);
 ```
 
-Classes can even have inheritance. Here's a nasty example
-
-```js
-@json
-class Base {}
-
-const serialized = JSON.stringify(arr);
-// [{"x":1.0},{"x":1.0,"y":2.0},{"y":2.0,"x":1.0,"z":3.0}]
-const parsed = JSON.parse<Base[]>(serialized);
-```
-
 You can also add it to your `asconfig.json`
 
+```json
 {
-// ...
-"options": {
-"transform": ["json-as/transform"]
-}
+  // ...
+  "options": {
+    "transform": ["json-as/transform"]
+  }
 }
+````
 
 If you use this project in your codebase, consider dropping a [star](https://github.com/JairusSW/as-json). I would really appreciate it!
 

package/assembly/__tests__/bool.spec.ts

@@ -0,0 +1,20 @@
+import { JSON } from "json-as";
+import { describe, expect, run } from "as-test/assembly";
+
+describe("Should serialize booleans", () => {
+    expect(JSON.stringify<bool>(true)).toBe("true");
+
+    expect(JSON.stringify<bool>(false)).toBe("false");
+
+    expect(JSON.stringify<boolean>(true)).toBe("true");
+
+    expect(JSON.stringify<boolean>(false)).toBe("false");
+});
+
+describe("Should deserialize booleans", () => {
+    expect(JSON.parse<boolean>("true")).toBe(true);
+
+    expect(JSON.parse<boolean>("false")).toBe(false);
+});
+
+run();

package/assembly/__tests__/float.spec.ts

@@ -0,0 +1,52 @@
+import { JSON } from "json-as";
+import { describe, expect, run } from "as-test/assembly";
+
+describe("Should serialize floats", () => {
+    expect(JSON.stringify<f64>(7.23)).toBe("7.23");
+
+    expect(JSON.stringify<f64>(10e2)).toBe("1000.0");
+
+    expect(JSON.stringify<f64>(123456e-5)).toBe("1.23456");
+
+    expect(JSON.stringify<f64>(0.0)).toBe("0.0");
+
+    expect(JSON.stringify<f64>(-7.23)).toBe("-7.23");
+
+    expect(JSON.stringify<f64>(1e-6)).toBe("0.000001");
+
+    expect(JSON.stringify<f64>(1e-7)).toBe("1e-7");
+
+    expect(JSON.parse<f64>("1E-7")).toBe(1e-7);
+
+    expect(JSON.stringify<f64>(1e20)).toBe("100000000000000000000.0");
+
+    expect(JSON.stringify<f64>(1e21)).toBe("1e+21");
+
+    expect(JSON.parse<f64>("1E+21")).toBe(1e21);
+
+    expect(JSON.parse<f64>("1e21")).toBe(1e21);
+
+    expect(JSON.parse<f64>("1E21")).toBe(1e21);
+});
+
+describe("Should deserialize floats", () => {
+    expect(JSON.parse<f64>("7.23")).toBe(7.23);
+
+    expect(JSON.parse<f64>("1000.0")).toBe(1000.0);
+
+    expect(JSON.parse<f64>("1.23456")).toBe(1.23456);
+
+    expect(JSON.parse<f64>("0.0")).toBe(0.0);
+
+    expect(JSON.parse<f64>("-7.23")).toBe(-7.23);
+
+    expect(JSON.parse<f64>("0.000001")).toBe(0.000001);
+
+    expect(JSON.parse<f64>("1e-7")).toBe(1e-7);
+
+    expect(JSON.parse<f64>("100000000000000000000.0")).toBe(1e20);
+
+    expect(JSON.parse<f64>("1e+21")).toBe(1e21);
+});
+
+run();

package/assembly/__tests__/integer.spec.ts

@@ -0,0 +1,28 @@
+import { JSON } from "json-as";
+import { describe, expect, run } from "as-test/assembly";
+
+describe("Should serialize integers", () => {
+    expect(JSON.stringify(0)).toBe("0");
+
+    expect(JSON.stringify<u32>(100)).toBe("100");
+
+    expect(JSON.stringify<u64>(101)).toBe("101");
+
+    expect(JSON.stringify<i32>(-100)).toBe("-100");
+
+    expect(JSON.stringify<i64>(-101)).toBe("-101");
+});
+
+describe("Should deserialize integers", () => {
+    expect(JSON.parse<i32>("0")).toBe(<i32>0);
+
+    expect(JSON.parse<u32>("100")).toBe(<u32>100);
+
+    expect(JSON.parse<u64>("101")).toBe(<u64>101);
+
+    expect(JSON.parse<i32>("-100")).toBe(<i32>-100);
+
+    expect(JSON.parse<i64>("-101")).toBe(<i64>-101);
+});
+
+run();

package/assembly/__tests__/obj.spec.ts

@@ -0,0 +1,5 @@
+import { JSON } from "json-as";
+import { describe, expect, run } from "as-test/assembly";
+
+
+run();

package/assembly/__tests__/string.spec.ts

@@ -0,0 +1,48 @@
+import { JSON } from "json-as";
+import { describe, expect, run } from "as-test/assembly";
+
+describe("Should serialize strings", () => {
+    expect(JSON.stringify("abcdefg")).toBe('"abcdefg"');
+
+    expect(JSON.stringify('st"ring" w""ith quotes"')).toBe(
+        '"st\\"ring\\" w\\"\\"ith quotes\\""',
+    );
+
+    expect(
+        JSON.stringify('string "with random spa\nces and \nnewlines\n\n\n'),
+    ).toBe('"string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"');
+
+    expect(
+        JSON.stringify(
+            'string with colon : comma , brace [ ] bracket { } and quote " and other quote \\"',
+        ),
+    ).toBe(
+        '"string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\\\\\""',
+    );
+});
+
+describe("Should deserialize strings", () => {
+    expect(JSON.parse<string>('"abcdefg"')).toBe("abcdefg");
+  
+    expect(
+      JSON.parse<string>(
+        '"\\"st\\\\\\"ring\\\\\\" w\\\\\\"\\\\\\"ith quotes\\\\\\"\\""',
+      ),
+    ).toBe('"st\\"ring\\" w\\"\\"ith quotes\\""');
+  
+    expect(
+      JSON.parse<string>(
+        '"\\"string \\\\\\"with random spa\\\\nces and \\\\nnewlines\\\\n\\\\n\\\\n\\""',
+      ),
+    ).toBe('"string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"');
+  
+    expect(
+      JSON.parse<string>(
+        '"\\"string with colon : comma , brace [ ] bracket { } and quote \\\\\\" and other quote \\\\\\\\\\"\\""',
+      ),
+    ).toBe(
+      '"string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\\\""',
+    );
+  });
+
+run();

package/assembly/__tests__/test.spec.ts

@@ -10,76 +10,6 @@ import {
   Vec3,
 } from "./types";
 
-describe("Should serialize strings", () => {
-  expect(JSON.stringify("abcdefg")).toBe('"abcdefg"');
-
-  expect(JSON.stringify('st"ring" w""ith quotes"')).toBe(
-    '"st\\"ring\\" w\\"\\"ith quotes\\""',
-  );
-
-  expect(
-    JSON.stringify('string "with random spa\nces and \nnewlines\n\n\n'),
-  ).toBe('"string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"');
-
-  expect(
-    JSON.stringify(
-      'string with colon : comma , brace [ ] bracket { } and quote " and other quote \\"',
-    ),
-  ).toBe(
-    '"string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\\\\\""',
-  );
-});
-
-describe("Should serialize integers", () => {
-  expect(JSON.stringify(0)).toBe("0");
-
-  expect(JSON.stringify<u32>(100)).toBe("100");
-
-  expect(JSON.stringify<u64>(101)).toBe("101");
-
-  expect(JSON.stringify<i32>(-100)).toBe("-100");
-
-  expect(JSON.stringify<i64>(-101)).toBe("-101");
-});
-
-describe("Should serialize floats", () => {
-  expect(JSON.stringify<f64>(7.23)).toBe("7.23");
-
-  expect(JSON.stringify<f64>(10e2)).toBe("1000.0");
-
-  expect(JSON.stringify<f64>(123456e-5)).toBe("1.23456");
-
-  expect(JSON.stringify<f64>(0.0)).toBe("0.0");
-
-  expect(JSON.stringify<f64>(-7.23)).toBe("-7.23");
-
-  expect(JSON.stringify<f64>(1e-6)).toBe("0.000001");
-
-  expect(JSON.stringify<f64>(1e-7)).toBe("1e-7");
-
-  expect(JSON.parse<f64>("1E-7")).toBe(1e-7);
-
-  expect(JSON.stringify<f64>(1e20)).toBe("100000000000000000000.0");
-
-  expect(JSON.stringify<f64>(1e21)).toBe("1e+21");
-
-  expect(JSON.parse<f64>("1E+21")).toBe(1e21);
-
-  expect(JSON.parse<f64>("1e21")).toBe(1e21);
-
-  expect(JSON.parse<f64>("1E21")).toBe(1e21);
-});
-
-describe("Should serialize booleans", () => {
-  expect(JSON.stringify<bool>(true)).toBe("true");
-
-  expect(JSON.stringify<bool>(false)).toBe("false");
-
-  expect(JSON.stringify<boolean>(true)).toBe("true");
-
-  expect(JSON.stringify<boolean>(false)).toBe("false");
-});
-
 describe("Should serialize class inheritance", () => {
   const obj = new DerivedObject("1", "2");
 
@@ -225,69 +155,6 @@ describe("Should serialize @omit'ed objects", () => {
     }),
   ).toBe('{"x":1,"y":1,"z":1}');
 });
-
-describe("Should deserialize strings", () => {
-  expect(JSON.parse<string>('"abcdefg"')).toBe("abcdefg");
-
-  expect(
-    JSON.parse<string>(
-      '"\\"st\\\\\\"ring\\\\\\" w\\\\\\"\\\\\\"ith quotes\\\\\\"\\""',
-    ),
-  ).toBe('"st\\"ring\\" w\\"\\"ith quotes\\""');
-
-  expect(
-    JSON.parse<string>(
-      '"\\"string \\\\\\"with random spa\\\\nces and \\\\nnewlines\\\\n\\\\n\\\\n\\""',
-    ),
-  ).toBe('"string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"');
-
-  expect(
-    JSON.parse<string>(
-      '"\\"string with colon : comma , brace [ ] bracket { } and quote \\\\\\" and other quote \\\\\\\\\\"\\""',
-    ),
-  ).toBe(
-    '"string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\\\""',
-  );
-});
-
-describe("Should deserialize integers", () => {
-  expect(JSON.parse<i32>("0")).toBe(<i32>0);
-
-  expect(JSON.parse<u32>("100")).toBe(<u32>100);
-
-  expect(JSON.parse<u64>("101")).toBe(<u64>101);
-
-  expect(JSON.parse<i32>("-100")).toBe(<i32>-100);
-
-  expect(JSON.parse<i64>("-101")).toBe(<i64>-101);
-});
-
-describe("Should deserialize floats", () => {
-  expect(JSON.parse<f64>("7.23")).toBe(7.23);
-
-  expect(JSON.parse<f64>("1000.0")).toBe(1000.0);
-
-  expect(JSON.parse<f64>("1.23456")).toBe(1.23456);
-
-  expect(JSON.parse<f64>("0.0")).toBe(0.0);
-
-  expect(JSON.parse<f64>("-7.23")).toBe(-7.23);
-
-  expect(JSON.parse<f64>("0.000001")).toBe(0.000001);
-
-  expect(JSON.parse<f64>("1e-7")).toBe(1e-7);
-
-  expect(JSON.parse<f64>("100000000000000000000.0")).toBe(1e20);
-
-  expect(JSON.parse<f64>("1e+21")).toBe(1e21);
-});
-
-describe("Should deserialize booleans", () => {
-  expect(JSON.parse<boolean>("true")).toBe(true);
-
-  expect(JSON.parse<boolean>("false")).toBe(false);
-});
-
 describe("Should deserialize class inheritance", () => {
   const jsonStr = '{"a":"1","b":"2"}';
   const obj = JSON.parse<DerivedObject>(jsonStr);

package/assembly/index.ts

@@ -156,6 +156,179 @@ export namespace JSON {
     @inline static from<T>(value: T): Box<T> {
       return new Box(value);
     }
+    @inline
+    @operator("==")
+    eq(other: this): bool {
+      if (isNullable<T>() && changetype<usize>(this) == <usize>0) {
+        if (changetype<usize>(other) == <usize>0) return true;
+      }
+      return this.value == other.value;
+    }
+
+    @inline
+    @operator("!=")
+    notEq(other: this): bool {
+      if (isNullable<T>() && changetype<usize>(this) == <usize>0) {
+        if (changetype<usize>(this) == changetype<usize>(other)) return true;
+      }
+      return this.value != other.value;
+    }
+
+    @inline
+    @operator(">")
+    gt(other: this): bool {
+      return this._val > other._val;
+    }
+
+    @inline
+    @operator(">=")
+    ge(other: this): bool {
+      return this._val >= other._val;
+    }
+
+    @inline
+    @operator("<")
+    lt(other: this): bool {
+      return this._val < other._val;
+    }
+
+    @inline
+    @operator("<=")
+    le(other: this): bool {
+      return this._val <= other._val;
+    }
+
+    @inline
+    @operator(">>")
+    shr(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val >> other._val);
+    }
+
+    @inline
+    @operator(">>>")
+    shr_u(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val >>> other._val);
+    }
+
+    @inline
+    @operator("<<")
+    shl(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val << other._val);
+    }
+
+    @inline
+    @operator("&")
+    and(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val & other._val);
+    }
+
+    @inline
+    @operator("|")
+    or(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val | other._val);
+    }
+
+    @inline
+    @operator("^")
+    xor(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val ^ other._val);
+    }
+
+    @inline
+    @operator("+")
+    add(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val + other._val);
+    }
+
+    @inline
+    @operator("-")
+    sub(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val - other._val);
+    }
+
+    @inline
+    @operator("*")
+    mul(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val * other._val);
+    }
+
+    @inline
+    @operator("/")
+    div(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val / other._val);
+    }
+
+    @inline
+    @operator("**")
+    pow(other: this): this {
+      // @ts-ignore
+      return instantiate<this>((this._val ** other._val) as T);
+    }
+
+    @inline
+    @operator("%")
+    rem(other: this): this {
+      // @ts-ignore
+      return instantiate<this>(this._val % other._val);
+    }
+
+    @inline
+    @operator.prefix("!")
+    isEmpty(): bool {
+      return !this._val;
+    }
+
+    @inline
+    @operator.prefix("~")
+    not(): this {
+      return instantiate<this>(~this._val);
+    }
+
+    @inline
+    @operator.prefix("+")
+    pos(): this {
+      return instantiate<this>(+this._val);
+    }
+
+    @inline
+    @operator.prefix("-")
+    neg(): this {
+      return instantiate<this>(-this._val);
+    }
+
+    @operator.prefix("++")
+    preInc(): this {
+      // @ts-ignore
+      ++this._val;
+      return this;
+    }
+
+    @operator.prefix("--")
+    preDec(): this {
+      // @ts-ignore
+      --this._val;
+      return this;
+    }
+
+    @operator.postfix("++")
+    postInc(): this {
+      return this.clone().preInc();
+    }
+
+    @operator.postfix("--")
+    postDec(): this {
+      return this.clone().preDec();
+    }
   }
 
   /**

package/assembly/test.ts

@@ -1,29 +1,14 @@
 // import { JSON } from ".";
 import { JSON } from ".";
-@json
-class Message {
-  @alias("raw_foo")
-  public raw: JSON.Raw = "[1,2,3]";
-  constructor(role: string, content: string) {
-    this._role = role;
-    this.content = content;
-  }
-
-  @alias("role")
-  protected _role: string;
-
-  get role(): string {
-    return this._role;
-  }
 
-  content: string;
+@json
+class ContentBlock {
+  @omitnull()
+  input: JSON.Raw | null = null;
 }
 
-@json
-class UserMessage extends Message {
-  constructor(content: string) {
-    super("user", content);
-  }
+const foo: ContentBlock = {
+  input: "123"
 }
-console.log(JSON.stringify(new Message("user", "foo")));
-console.log(JSON.stringify(new UserMessage("foo")));
+
+console.log(JSON.stringify(foo))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.20",
+  "version": "0.9.21",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/lib/index.js

@@ -87,9 +87,12 @@ class JSONTransform extends BaseVisitor {
             mem.type = type;
             mem.value = value;
             mem.node = member;
-            if (type == "JSON.Raw") {
+            if (type.includes("JSON.Raw")) {
                 mem.flags.set(PropertyFlags.JSON_Raw, []);
             }
+            if (member.type.isNullable) {
+                mem.flags.set(PropertyFlags.Null, []);
+            }
             if (member.decorators) {
                 for (const decorator of member.decorators) {
                     const decoratorName = decorator.name.text;
@@ -214,32 +217,31 @@ class JSONTransform extends BaseVisitor {
                 "`;\n  store<u32>(changetype<usize>(out) + ((out.length - 2) << 1), 8192010);\n  return out;\n}";
         }
         else {
-            SERIALIZE_RAW += "`;\n};";
-            SERIALIZE_PRETTY += "`;\n};";
+            SERIALIZE_RAW += "}`;\n  return out;\n}";
+            SERIALIZE_PRETTY += "}`;\n  return out;\n}";
         }
         INITIALIZE += "  return this;\n}";
         const sortedMembers = [];
-        const _sorted = schema.members.sort((a, b) => a.name.length - b.name.length);
-        let len = 0;
-        let offset = 0;
-        sortedMembers.push([_sorted[0]]);
-        len = _sorted[0]?.name.length;
-        for (let i = 1; i < _sorted.length; i++) {
+        const _sorted = schema.members.sort((a, b) => (a.alias?.length || a.name.length) - (b.alias?.length || b.name.length));
+        let len = -1;
+        let offset = -1;
+        for (let i = 0; i < _sorted.length; i++) {
             const member = _sorted[i];
-            if (member.alias?.length || member.name.length > len) {
-                sortedMembers.push([member]);
-                len = member.alias?.length || member.name.length;
-                offset++;
+            const _name = member.alias || member.name;
+            if (_name.length === len) {
+                sortedMembers[offset]?.push(member);
             }
             else {
-                sortedMembers[offset].push(member);
+                sortedMembers.push([member]);
+                len = _name.length;
+                offset++;
             }
         }
         let first = true;
         for (const memberSet of sortedMembers) {
             const firstMember = memberSet[0];
-            const name = encodeKey(firstMember.alias || firstMember.name);
-            if (name.length === 1) {
+            const _name = encodeKey(firstMember.alias || firstMember.name);
+            if (_name.length === 1) {
                 if (first) {
                     DESERIALIZE +=
                         "  if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
@@ -250,7 +252,7 @@ class JSONTransform extends BaseVisitor {
                         "else if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
                 }
             }
-            else if (name.length === 2) {
+            else if (_name.length === 2) {
                 if (first) {
                     DESERIALIZE +=
                         "  if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
@@ -261,7 +263,7 @@ class JSONTransform extends BaseVisitor {
                         "else if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
                 }
             }
-            else if (name.length === 4) {
+            else if (_name.length === 4) {
                 if (first) {
                     DESERIALIZE +=
                         "  if (4 === len) {\n    const code = load<u64>(changetype<usize>(data) + (key_start << 1));\n";
@@ -274,11 +276,11 @@ class JSONTransform extends BaseVisitor {
             }
             else {
                 if (first) {
-                    DESERIALIZE += "  if (" + name.length + " === len) {\n";
+                    DESERIALIZE += "  if (" + _name.length + " === len) {\n";
                     first = false;
                 }
                 else {
-                    DESERIALIZE += "else if (" + name.length + " === len) {\n";
+                    DESERIALIZE += "else if (" + _name.length + " === len) {\n";
                 }
             }
             let f = true;
@@ -286,40 +288,40 @@ class JSONTransform extends BaseVisitor {
                 const member = memberSet[i];
                 if (!member.deserialize)
                     continue;
-                const name = encodeKey(member.alias || member.name);
-                if (name.length === 1) {
-                    DESERIALIZE += `      case ${name.charCodeAt(0)}: {\n        ${member.deserialize}\n        return true;\n      }\n`;
+                const _name = encodeKey(member.alias || member.name);
+                if (_name.length === 1) {
+                    DESERIALIZE += `      case ${_name.charCodeAt(0)}: { /* ${_name} */\n        ${member.deserialize}\n        return true;\n      }\n`;
                 }
-                else if (name.length === 2) {
-                    DESERIALIZE += `      case ${charCodeAt32(name, 0)}: {\n        ${member.deserialize}\n        return true;\n      }\n`;
+                else if (_name.length === 2) {
+                    DESERIALIZE += `      case ${charCodeAt32(_name, 0)}: { /* ${_name} */\n        ${member.deserialize}\n        return true;\n      }\n`;
                 }
-                else if (name.length === 4) {
+                else if (_name.length === 4) {
                     if (f) {
                         f = false;
-                        DESERIALIZE += `    if (${charCodeAt64(name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+                        DESERIALIZE += `    if (${charCodeAt64(_name, 0)} === code) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
                     }
                     else {
                         DESERIALIZE =
                             DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
-                                `else if (${charCodeAt64(name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+                                `else if (${charCodeAt64(_name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
                     }
                 }
                 else {
                     if (f) {
                         f = false;
-                        DESERIALIZE += `    if (0 == memory.compare(changetype<usize>("${escapeQuote(escapeSlash(name))}"), changetype<usize>(data) + (key_start << 1), ${name.length << 1})) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+                        DESERIALIZE += `    if (0 === memory.compare(changetype<usize>("${escapeQuote(escapeSlash(_name))}"), changetype<usize>(data) + (key_start << 1), ${_name.length << 1})) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
                     }
                     else {
                         DESERIALIZE =
                             DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
-                                ` else if (0 == memory.compare(changetype<usize>("${escapeQuote(escapeSlash(name))}"), changetype<usize>(data) + (key_start << 1), ${name.length << 1})) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+                                ` else if (0 === memory.compare(changetype<usize>("${escapeQuote(escapeSlash(_name))}"), changetype<usize>(data) + (key_start << 1), ${_name.length << 1})) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
                     }
                 }
             }
-            if (name.length < 3) {
+            if (_name.length < 3) {
                 DESERIALIZE += `      default: {\n        return false;\n      }\n    }\n`;
             }
-            else if (name.length == 4) {
+            else if (_name.length == 4) {
                 DESERIALIZE =
                     DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
                         ` else {\n      return false;\n    }\n`;
@@ -400,11 +402,12 @@ export default class Transformer extends Transform {
 }
 var PropertyFlags;
 (function (PropertyFlags) {
-    PropertyFlags[PropertyFlags["Omit"] = 0] = "Omit";
-    PropertyFlags[PropertyFlags["OmitNull"] = 1] = "OmitNull";
-    PropertyFlags[PropertyFlags["OmitIf"] = 2] = "OmitIf";
-    PropertyFlags[PropertyFlags["Alias"] = 3] = "Alias";
-    PropertyFlags[PropertyFlags["JSON_Raw"] = 4] = "JSON_Raw";
+    PropertyFlags[PropertyFlags["Null"] = 0] = "Null";
+    PropertyFlags[PropertyFlags["Omit"] = 1] = "Omit";
+    PropertyFlags[PropertyFlags["OmitNull"] = 2] = "OmitNull";
+    PropertyFlags[PropertyFlags["OmitIf"] = 3] = "OmitIf";
+    PropertyFlags[PropertyFlags["Alias"] = 4] = "Alias";
+    PropertyFlags[PropertyFlags["JSON_Raw"] = 5] = "JSON_Raw";
 })(PropertyFlags || (PropertyFlags = {}));
 class Property {
     constructor() {
@@ -426,8 +429,14 @@ class Property {
         if (this.flags.has(PropertyFlags.Omit))
             return;
         if (this.flags.has(PropertyFlags.JSON_Raw)) {
-            this.right_s = "this." + name;
-            this.right_d = "data.substring(value_start, value_end);";
+            if (this.flags.has(PropertyFlags.Null)) {
+                this.right_s = "(this." + name + " || \"null\")";
+                this.right_d = "value_start === value_end - 4 && 30399761348886638 === load<u64>(changetype<usize>(data) + (value_start << 1)) ? null : data.substring(value_start, value_end)";
+            }
+            else {
+                this.right_s = "this." + name;
+                this.right_d = "data.substring(value_start, value_end);";
+            }
         }
         else {
             this.right_s = "__SERIALIZE<" + type + ">(this." + name + ")";

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.9.20",
+  "version": "0.9.21",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",

package/transform/src/index.ts

@@ -24,7 +24,7 @@ class JSONTransform extends BaseVisitor {
   public currentClass!: SchemaData;
   public sources = new Set<Source>();
 
-  visitMethodDeclaration(): void {}
+  visitMethodDeclaration(): void { }
   visitClassDeclaration(node: ClassDeclaration): void {
     if (!node.decorators?.length) return;
 
@@ -109,9 +109,9 @@ class JSONTransform extends BaseVisitor {
       if (!member.type) {
         throw new Error(
           "Fields must be strongly typed! Found " +
-            toString(member) +
-            " at " +
-            node.range.source.normalizedPath,
+          toString(member) +
+          " at " +
+          node.range.source.normalizedPath,
         );
       }
       const type = toString(member.type!);
@@ -128,10 +128,14 @@ class JSONTransform extends BaseVisitor {
       mem.value = value;
       mem.node = member;
 
-      if (type == "JSON.Raw") {
+      if (type.includes("JSON.Raw")) {
         mem.flags.set(PropertyFlags.JSON_Raw, []);
       }
 
+      if (member.type.isNullable) {
+        mem.flags.set(PropertyFlags.Null, []);
+      }
+
       if (member.decorators) {
         for (const decorator of member.decorators) {
           const decoratorName = (decorator.name as IdentifierExpression).text;
@@ -143,7 +147,7 @@ class JSONTransform extends BaseVisitor {
               if (!args.length)
                 throw new Error(
                   "Expected 1 argument but got zero at @alias in " +
-                    node.range.source.normalizedPath,
+                  node.range.source.normalizedPath,
                 );
               mem.alias = args[0]!;
               mem.flags.set(PropertyFlags.Alias, args);
@@ -157,7 +161,7 @@ class JSONTransform extends BaseVisitor {
               if (!decorator.args?.length)
                 throw new Error(
                   "Expected 1 argument but got zero at @omitif in " +
-                    node.range.source.normalizedPath,
+                  node.range.source.normalizedPath,
                 );
               mem.flags.set(PropertyFlags.OmitIf, args);
               break;
@@ -268,36 +272,35 @@ class JSONTransform extends BaseVisitor {
       SERIALIZE_PRETTY +=
         "`;\n  store<u32>(changetype<usize>(out) + ((out.length - 2) << 1), 8192010);\n  return out;\n}";
     } else {
-      SERIALIZE_RAW += "`;\n};";
-      SERIALIZE_PRETTY += "`;\n};";
+      SERIALIZE_RAW += "}`;\n  return out;\n}";
+      SERIALIZE_PRETTY += "}`;\n  return out;\n}";
     }
 
     INITIALIZE += "  return this;\n}";
 
     const sortedMembers: Property[][] = [];
     const _sorted = schema.members.sort(
-      (a, b) => a.name.length - b.name.length,
+      (a, b) => (a.alias?.length! || a.name.length) - (b.alias?.length! || b.name.length),
     );
-    let len = 0;
-    let offset = 0;
-    sortedMembers.push([_sorted[0]!]);
-    len = _sorted[0]?.name.length!;
-    for (let i = 1; i < _sorted.length; i++) {
+    let len = -1;
+    let offset = -1;
+    for (let i = 0; i < _sorted.length; i++) {
       const member = _sorted[i]!;
-      if (member.alias?.length || member.name.length > len) {
+      const _name = member.alias || member.name;
+      if (_name.length === len) {
+        sortedMembers[offset]?.push(member);
+      } else {
         sortedMembers.push([member]);
-        len = member.alias?.length || member.name.length;
+        len = _name.length;
         offset++;
-      } else {
-        sortedMembers[offset]!.push(member);
       }
     }
 
     let first = true;
     for (const memberSet of sortedMembers) {
       const firstMember = memberSet[0]!;
-      const name = encodeKey(firstMember.alias || firstMember.name);
-      if (name.length === 1) {
+      const _name = encodeKey(firstMember.alias || firstMember.name);
+      if (_name.length === 1) {
         if (first) {
           DESERIALIZE +=
             "  if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
@@ -306,7 +309,7 @@ class JSONTransform extends BaseVisitor {
           DESERIALIZE +=
             "else if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
         }
-      } else if (name.length === 2) {
+      } else if (_name.length === 2) {
         if (first) {
           DESERIALIZE +=
             "  if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
@@ -315,7 +318,7 @@ class JSONTransform extends BaseVisitor {
           DESERIALIZE +=
             "else if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
         }
-      } else if (name.length === 4) {
+      } else if (_name.length === 4) {
         if (first) {
           DESERIALIZE +=
             "  if (4 === len) {\n    const code = load<u64>(changetype<usize>(data) + (key_start << 1));\n";
@@ -326,44 +329,44 @@ class JSONTransform extends BaseVisitor {
         }
       } else {
         if (first) {
-          DESERIALIZE += "  if (" + name.length + " === len) {\n";
+          DESERIALIZE += "  if (" + _name.length + " === len) {\n";
           first = false;
         } else {
-          DESERIALIZE += "else if (" + name.length + " === len) {\n";
+          DESERIALIZE += "else if (" + _name.length + " === len) {\n";
         }
       }
       let f = true;
       for (let i = 0; i < memberSet.length; i++) {
         const member = memberSet[i]!;
         if (!member.deserialize) continue;
-        const name = encodeKey(member.alias || member.name);
-        if (name.length === 1) {
-          DESERIALIZE += `      case ${name.charCodeAt(0)}: {\n        ${member.deserialize}\n        return true;\n      }\n`;
-        } else if (name.length === 2) {
-          DESERIALIZE += `      case ${charCodeAt32(name, 0)}: {\n        ${member.deserialize}\n        return true;\n      }\n`;
-        } else if (name.length === 4) {
+        const _name = encodeKey(member.alias || member.name);
+        if (_name.length === 1) {
+          DESERIALIZE += `      case ${_name.charCodeAt(0)}: { /* ${_name} */\n        ${member.deserialize}\n        return true;\n      }\n`;
+        } else if (_name.length === 2) {
+          DESERIALIZE += `      case ${charCodeAt32(_name, 0)}: { /* ${_name} */\n        ${member.deserialize}\n        return true;\n      }\n`;
+        } else if (_name.length === 4) {
           if (f) {
             f = false;
-            DESERIALIZE += `    if (${charCodeAt64(name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+            DESERIALIZE += `    if (${charCodeAt64(_name, 0)} === code) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
           } else {
             DESERIALIZE =
               DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
-              `else if (${charCodeAt64(name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+              `else if (${charCodeAt64(_name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
           }
         } else {
           if (f) {
             f = false;
-            DESERIALIZE += `    if (0 == memory.compare(changetype<usize>("${escapeQuote(escapeSlash(name))}"), changetype<usize>(data) + (key_start << 1), ${name.length << 1})) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+            DESERIALIZE += `    if (0 === memory.compare(changetype<usize>("${escapeQuote(escapeSlash(_name))}"), changetype<usize>(data) + (key_start << 1), ${_name.length << 1})) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
           } else {
             DESERIALIZE =
               DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
-              ` else if (0 == memory.compare(changetype<usize>("${escapeQuote(escapeSlash(name))}"), changetype<usize>(data) + (key_start << 1), ${name.length << 1})) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+              ` else if (0 === memory.compare(changetype<usize>("${escapeQuote(escapeSlash(_name))}"), changetype<usize>(data) + (key_start << 1), ${_name.length << 1})) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
           }
         }
       }
-      if (name.length < 3) {
+      if (_name.length < 3) {
         DESERIALIZE += `      default: {\n        return false;\n      }\n    }\n`;
-      } else if (name.length == 4) {
+      } else if (_name.length == 4) {
         DESERIALIZE =
           DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
           ` else {\n      return false;\n    }\n`;
@@ -456,6 +459,7 @@ export default class Transformer extends Transform {
 }
 
 enum PropertyFlags {
+  Null,
   Omit,
   OmitNull,
   OmitIf,
@@ -489,8 +493,13 @@ class Property {
     if (this.flags.has(PropertyFlags.Omit)) return;
 
     if (this.flags.has(PropertyFlags.JSON_Raw)) {
-      this.right_s = "this." + name;
-      this.right_d = "data.substring(value_start, value_end);";
+      if (this.flags.has(PropertyFlags.Null)) {
+        this.right_s = "(this." + name + " || \"null\")";
+        this.right_d = "value_start === value_end - 4 && 30399761348886638 === load<u64>(changetype<usize>(data) + (value_start << 1)) ? null : data.substring(value_start, value_end)";
+      } else {
+        this.right_s = "this." + name;
+        this.right_d = "data.substring(value_start, value_end);";
+      }
     } else {
       this.right_s = "__SERIALIZE<" + type + ">(this." + name + ")";
       this.right_d =