json-as 0.9.19 → 0.9.21

package/CHANGELOG

@@ -27,6 +27,8 @@ v0.9.16 - JSON.Raw should be completely untouched
 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.19
+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.19",
+  "version": "0.9.21",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",