json-as 1.0.0-alpha.2 → 1.0.0-alpha.3

package/assembly/__tests__/test.spec.ts

@@ -1,193 +1,122 @@
-import { JSON } from "json-as";
-import { describe, expect, run } from "as-test/assembly";
+import { JSON } from "../";
+import { describe, expect } from "../../modules/test/assembly/index";
 import { DerivedObject, Null, ObjWithStrangeKey, ObjectWithFloat, OmitIf, Player, Vec3 } from "./types";
 
-describe("Should serialize class inheritance", () => {
-  const obj = new DerivedObject("1", "2");
-
-  expect(JSON.stringify(obj)).toBe('{"a":"1","b":"2"}');
-});
-
-describe("Should serialize nulls", () => {
-  expect(JSON.stringify<Null>(null)).toBe("null");
-});
-
-describe("Should serialize integer arrays", () => {
-  expect(JSON.stringify<u32[]>([0, 100, 101])).toBe("[0,100,101]");
-
-  expect(JSON.stringify<u64[]>([0, 100, 101])).toBe("[0,100,101]");
-
-  expect(JSON.stringify<i32[]>([0, 100, 101, -100, -101])).toBe("[0,100,101,-100,-101]");
-
-  expect(JSON.stringify<i64[]>([0, 100, 101, -100, -101])).toBe("[0,100,101,-100,-101]");
-});
-
-describe("Should serialize float arrays", () => {
-  expect(JSON.stringify<f64[]>([7.23, 10e2, 10e2, 123456e-5, 123456e-5, 0.0, 7.23])).toBe("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]");
-
-  expect(JSON.stringify<f64[]>([1e21, 1e22, 1e-7, 1e-8, 1e-9])).toBe("[1e+21,1e+22,1e-7,1e-8,1e-9]");
-});
-
-describe("Should serialize boolean arrays", () => {
-  expect(JSON.stringify<bool[]>([true, false])).toBe("[true,false]");
-
-  expect(JSON.stringify<boolean[]>([true, false])).toBe("[true,false]");
-});
-
-describe("Should serialize string arrays", () => {
-  expect(JSON.stringify<string[]>(['string "with random spa\nces and \nnewlines\n\n\n'])).toBe('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]');
-});
-
-describe("Should serialize nested integer arrays", () => {
-  expect(JSON.stringify<i64[][]>([[100, 101], [-100, -101], [0]])).toBe("[[100,101],[-100,-101],[0]]");
-});
-
-describe("Should serialize nested float arrays", () => {
-  expect(JSON.stringify<f64[][]>([[7.23], [10e2], [10e2], [123456e-5], [123456e-5], [0.0], [7.23]])).toBe("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]");
-});
-
-describe("Should serialize nested boolean arrays", () => {
-  expect(JSON.stringify<bool[][]>([[true], [false]])).toBe("[[true],[false]]");
-
-  expect(JSON.stringify<boolean[][]>([[true], [false]])).toBe("[[true],[false]]");
-});
-
-describe("Should serialize object arrays", () => {
-  expect(
-    JSON.stringify<Vec3[]>([
-      {
-        x: 3.4,
-        y: 1.2,
-        z: 8.3,
-      },
-      {
-        x: 3.4,
-        y: -2.1,
-        z: 9.3,
-      },
-    ]),
-  ).toBe('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]');
-});
-
-describe("Should serialize objects", () => {
-  expect(
-    JSON.stringify<Vec3>({
-      x: 3.4,
-      y: 1.2,
-      z: 8.3,
-    }),
-  ).toBe('{"x":3.4,"y":1.2,"z":8.3}');
-
-  expect(
-    JSON.stringify<Player>({
-      firstName: "Emmet",
-      lastName: "West",
-      lastActive: [8, 27, 2022],
-      age: 23,
-      pos: {
-        x: 3.4,
-        y: 1.2,
-        z: 8.3,
-      },
-      isVerified: true,
-    }),
-  ).toBe('{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}');
-
-  expect(JSON.stringify<ObjectWithFloat>({ f: 7.23 })).toBe('{"f":7.23}');
-
-  expect(JSON.stringify<ObjectWithFloat>({ f: 0.000001 })).toBe('{"f":0.000001}');
-
-  expect(JSON.stringify<ObjectWithFloat>({ f: 1e-7 })).toBe('{"f":1e-7}');
-
-  expect(JSON.stringify<ObjectWithFloat>({ f: 1e20 })).toBe('{"f":100000000000000000000.0}');
-
-  expect(JSON.stringify<ObjectWithFloat>({ f: 1e21 })).toBe('{"f":1e+21}');
-
-  expect(JSON.stringify<ObjWithStrangeKey<string>>({ data: "foo" })).toBe('{"a\\\\\\t\\"\\u0002b`c":"foo"}');
-});
-
-describe("Should serialize @omit'ed objects", () => {
-  expect(
-    JSON.stringify(<OmitIf>{
-      y: 1,
-    }),
-  ).toBe('{"x":1,"y":1,"z":1}');
-});
-describe("Should deserialize class inheritance", () => {
-  const jsonStr = '{"a":"1","b":"2"}';
-  const obj = JSON.parse<DerivedObject>(jsonStr);
-
-  expect(obj instanceof DerivedObject).toBe(true);
-  expect(obj.a).toBe("1");
-  expect(obj.b).toBe("2");
-});
-
-describe("Should deserialize nulls", () => {
-  expect(JSON.stringify(JSON.parse<Null>("null"))).toBe("null");
-});
-
-describe("Should deserialize integer arrays", () => {
-  expect(JSON.stringify(JSON.parse<u32[]>("[0,100,101]"))).toBe(JSON.stringify([0, 100, 101]));
-
-  expect(JSON.stringify(JSON.parse<i32[]>("[0,100,101,-100,-101]"))).toBe(JSON.stringify([0, 100, 101, -100, -101]));
-});
-
-describe("Should deserialize float arrays", () => {
-  expect(JSON.stringify(JSON.parse<f64[]>("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]"))).toBe(JSON.stringify([7.23, 1000.0, 1000.0, 1.23456, 1.23456, 0.0, 7.23]));
-
-  expect(JSON.stringify(JSON.parse<f64[]>("[1e+21,1e+22,1e-7,1e-8,1e-9]"))).toBe(JSON.stringify([1e21, 1e22, 1e-7, 1e-8, 1e-9]));
-});
-
-describe("Should deserialize boolean arrays", () => {
-  expect(JSON.stringify(JSON.parse<boolean[]>("[true,false]"))).toBe(JSON.stringify([true, false]));
-});
-
-describe("Should deserialize string arrays", () => {
-  expect(JSON.stringify(JSON.parse<string[]>('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]'))).toBe(JSON.stringify(['string "with random spa\nces and \nnewlines\n\n\n']));
-});
-
-describe("Should deserialize nested integer arrays", () => {
-  expect(JSON.stringify(JSON.parse<i64[][]>("[[100,101],[-100,-101],[0]]"))).toBe(JSON.stringify([[100, 101], [-100, -101], [0]]));
-});
-
-describe("Should deserialize nested float arrays", () => {
-  expect(JSON.stringify(JSON.parse<f64[][]>("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]"))).toBe(JSON.stringify([[7.23], [1000.0], [1000.0], [1.23456], [1.23456], [0.0], [7.23]]));
-});
-
-describe("Should deserialize nested boolean arrays", () => {
-  expect(JSON.stringify(JSON.parse<boolean[][]>("[[true],[false]]"))).toBe(JSON.stringify([[true], [false]]));
-});
-
-describe("Should deserialize object arrays", () => {
-  expect(JSON.stringify(JSON.parse<Vec3[]>('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]'))).toBe(
-    JSON.stringify(<Vec3[]>[
-      { x: 3.4, y: 1.2, z: 8.3 },
-      { x: 3.4, y: -2.1, z: 9.3 },
-    ]),
-  );
-});
-
-describe("Should deserialize Objects", () => {
-  expect(JSON.stringify(JSON.parse<Vec3>('{"x":3.4,"y":1.2,"z":8.3}'))).toBe(JSON.stringify(<Vec3>{ x: 3.4, y: 1.2, z: 8.3 }));
-
-  expect(JSON.stringify(JSON.parse<Player>('{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}'))).toBe(
-    JSON.stringify(<Player>{
-      firstName: "Emmet",
-      lastName: "West",
-      lastActive: [8, 27, 2022],
-      age: 23,
-      pos: { x: 3.4, y: 1.2, z: 8.3 },
-      isVerified: true,
-    }),
-  );
-
-  expect(JSON.stringify(JSON.parse<ObjectWithFloat>('{"f":7.23}'))).toBe(JSON.stringify(<ObjectWithFloat>{ f: 7.23 }));
-
-  expect(JSON.stringify(JSON.parse<ObjectWithFloat>('{"f":0.000001}'))).toBe(JSON.stringify(<ObjectWithFloat>{ f: 0.000001 }));
-
-  expect(JSON.stringify(JSON.parse<ObjWithStrangeKey<string>>('{"a\\\\\\t\\"\\u0002b`c":"foo"}'))).toBe(JSON.stringify(<ObjWithStrangeKey<string>>{ data: "foo" }));
-});
-
-run({
-  log: true,
-});
+// describe("Should serialize objects", () => {
+//   expect(
+//     JSON.stringify<Vec3>({
+//       x: 3.4,
+//       y: 1.2,
+//       z: 8.3,
+//     }),
+//   ).toBe('{"x":3.4,"y":1.2,"z":8.3}');
+
+//   expect(
+//     JSON.stringify<Player>({
+//       firstName: "Emmet",
+//       lastName: "West",
+//       lastActive: [8, 27, 2022],
+//       age: 23,
+//       pos: {
+//         x: 3.4,
+//         y: 1.2,
+//         z: 8.3,
+//       },
+//       isVerified: true,
+//     }),
+//   ).toBe('{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}');
+
+//   expect(JSON.stringify<ObjectWithFloat>({ f: 7.23 })).toBe('{"f":7.23}');
+
+//   expect(JSON.stringify<ObjectWithFloat>({ f: 0.000001 })).toBe('{"f":0.000001}');
+
+//   expect(JSON.stringify<ObjectWithFloat>({ f: 1e-7 })).toBe('{"f":1e-7}');
+
+//   expect(JSON.stringify<ObjectWithFloat>({ f: 1e20 })).toBe('{"f":100000000000000000000.0}');
+
+//   expect(JSON.stringify<ObjectWithFloat>({ f: 1e21 })).toBe('{"f":1e+21}');
+
+//   expect(JSON.stringify<ObjWithStrangeKey<string>>({ data: "foo" })).toBe('{"a\\\\\\t\\"\\u0002b`c":"foo"}');
+// });
+
+// describe("Should serialize @omit'ed objects", () => {
+//   expect(
+//     JSON.stringify(<OmitIf>{
+//       y: 1,
+//     }),
+//   ).toBe('{"x":1,"y":1,"z":1}');
+// });
+// describe("Should deserialize class inheritance", () => {
+//   const jsonStr = '{"a":"1","b":"2"}';
+//   const obj = JSON.parse<DerivedObject>(jsonStr);
+
+//   expect((obj instanceof DerivedObject).toString()).toBe("true");
+//   expect(obj.a).toBe("1");
+//   expect(obj.b).toBe("2");
+// });
+
+// describe("Should deserialize nulls", () => {
+//   expect(JSON.stringify(JSON.parse<Null>("null"))).toBe("null");
+// });
+
+// describe("Should deserialize integer arrays", () => {
+//   expect(JSON.stringify(JSON.parse<u32[]>("[0,100,101]"))).toBe(JSON.stringify([0, 100, 101]));
+
+//   expect(JSON.stringify(JSON.parse<i32[]>("[0,100,101,-100,-101]"))).toBe(JSON.stringify([0, 100, 101, -100, -101]));
+// });
+
+// describe("Should deserialize float arrays", () => {
+//   expect(JSON.stringify(JSON.parse<f64[]>("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]"))).toBe(JSON.stringify([7.23, 1000.0, 1000.0, 1.23456, 1.23456, 0.0, 7.23]));
+
+//   expect(JSON.stringify(JSON.parse<f64[]>("[1e+21,1e+22,1e-7,1e-8,1e-9]"))).toBe(JSON.stringify([1e21, 1e22, 1e-7, 1e-8, 1e-9]));
+// });
+
+// describe("Should deserialize boolean arrays", () => {
+//   expect(JSON.stringify(JSON.parse<boolean[]>("[true,false]"))).toBe(JSON.stringify([true, false]));
+// });
+
+// describe("Should deserialize string arrays", () => {
+//   expect(JSON.stringify(JSON.parse<string[]>('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]'))).toBe(JSON.stringify(['string "with random spa\nces and \nnewlines\n\n\n']));
+// });
+
+// describe("Should deserialize nested integer arrays", () => {
+//   expect(JSON.stringify(JSON.parse<i64[][]>("[[100,101],[-100,-101],[0]]"))).toBe(JSON.stringify([[100, 101], [-100, -101], [0]]));
+// });
+
+// describe("Should deserialize nested float arrays", () => {
+//   expect(JSON.stringify(JSON.parse<f64[][]>("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]"))).toBe(JSON.stringify([[7.23], [1000.0], [1000.0], [1.23456], [1.23456], [0.0], [7.23]]));
+// });
+
+// describe("Should deserialize nested boolean arrays", () => {
+//   expect(JSON.stringify(JSON.parse<boolean[][]>("[[true],[false]]"))).toBe(JSON.stringify([[true], [false]]));
+// });
+
+// describe("Should deserialize object arrays", () => {
+//   expect(JSON.stringify(JSON.parse<Vec3[]>('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]'))).toBe(
+//     JSON.stringify(<Vec3[]>[
+//       { x: 3.4, y: 1.2, z: 8.3 },
+//       { x: 3.4, y: -2.1, z: 9.3 },
+//     ]),
+//   );
+// });
+
+// describe("Should deserialize Objects", () => {
+//   expect(JSON.stringify(JSON.parse<Vec3>('{"x":3.4,"y":1.2,"z":8.3}'))).toBe(JSON.stringify(<Vec3>{ x: 3.4, y: 1.2, z: 8.3 }));
+
+//   expect(JSON.stringify(JSON.parse<Player>('{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}'))).toBe(
+//     JSON.stringify(<Player>{
+//       firstName: "Emmet",
+//       lastName: "West",
+//       lastActive: [8, 27, 2022],
+//       age: 23,
+//       pos: { x: 3.4, y: 1.2, z: 8.3 },
+//       isVerified: true,
+//     }),
+//   );
+
+//   expect(JSON.stringify(JSON.parse<ObjectWithFloat>('{"f":7.23}'))).toBe(JSON.stringify(<ObjectWithFloat>{ f: 7.23 }));
+
+//   expect(JSON.stringify(JSON.parse<ObjectWithFloat>('{"f":0.000001}'))).toBe(JSON.stringify(<ObjectWithFloat>{ f: 0.000001 }));
+
+//   expect(JSON.stringify(JSON.parse<ObjWithStrangeKey<string>>('{"a\\\\\\t\\"\\u0002b`c":"foo"}'))).toBe(JSON.stringify(<ObjWithStrangeKey<string>>{ data: "foo" }));
+// });

package/assembly/deserialize/simple/bool.ts

@@ -5,5 +5,5 @@ export function deserializeBoolean(srcStart: usize, srcEnd: usize): boolean {
   const firstChar = load<u16>(srcStart);
   if (firstChar == CHAR_T && load<u64>(srcStart) == 28429475166421108) return true;
   else if (firstChar == CHAR_F && load<u64>(srcSize, 2) == 28429466576093281) return false;
-  return false; //ERROR(`Expected to find boolean, but found "${data.slice(0, 100)}" instead!`);
+  return false; //throw new Error(`Expected to find boolean, but found "${data.slice(0, 100)}" instead!`);
 }

package/assembly/deserialize/simple/map.ts

@@ -5,7 +5,7 @@ import { isSpace } from "../../util";
 export function deserializeMap<T extends Map<any, any>>(srcStart: usize, srcEnd: usize, dst: usize): T {
   const out = changetype<T>(dst || __new(offsetof<T>(), idof<T>()));
   // @ts-ignore: type
-  if (!isString<indexof<T>>() && !isInteger<indexof<T>>() && !isFloat<indexof<T>>()) ERROR("Map key must also be a valid JSON key!");
+  if (!isString<indexof<T>>() && !isInteger<indexof<T>>() && !isFloat<indexof<T>>()) throw new Error("Map key must also be a valid JSON key!");
 
   const srcPtr = srcStart;
   let key: string | null = null;

package/assembly/deserialize/simple/string.ts

@@ -4,13 +4,14 @@ import { DESERIALIZE_ESCAPE_TABLE, ESCAPE_HEX_TABLE } from "../../globals/tables
 export function deserializeString(srcStart: usize, srcEnd: usize, dst: usize): string {
   srcStart += 2;
   srcEnd -= 2;
+  const startPtr = srcStart;
   if (dst == 0) dst = __new(srcEnd - srcStart, idof<string>());
   let dstPtr = dst;
   let lastPtr = srcStart;
   while (srcStart < srcEnd) {
     let code = load<u16>(srcStart);
     if (code == BACK_SLASH) {
-      code = load<u16>(DESERIALIZE_ESCAPE_TABLE + load<u8>(srcStart, 2));
+      code = <u16>load<u8>(DESERIALIZE_ESCAPE_TABLE + load<u8>(srcStart, 2));
       if (code == 117 && load<u32>(srcStart, 4) == 3145776) {
         const block = load<u32>(srcStart, 8);
         const codeA = block & 0xffff;
@@ -21,7 +22,7 @@ export function deserializeString(srcStart: usize, srcEnd: usize, dst: usize): s
         const remBytes = srcStart - lastPtr;
         memory.copy(dstPtr, lastPtr, remBytes);
         dstPtr += remBytes;
-        store<u16>(dst, escaped);
+        store<u16>(dstPtr, escaped);
         dstPtr += 2;
         srcStart += 12;
         lastPtr = srcStart;
@@ -43,6 +44,6 @@ export function deserializeString(srcStart: usize, srcEnd: usize, dst: usize): s
   memory.copy(dstPtr, lastPtr, remBytes);
   dstPtr += remBytes;
 
-  if (lastPtr != srcStart) dst = __renew(dst, dstPtr - dst);
+  if (lastPtr != startPtr) dst = __renew(dst, dstPtr - dst);
   return changetype<string>(dst);
 }