json-as 1.0.0-beta.1 → 1.0.0-beta.10

package/assembly/__tests__/date.spec.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { describe, expect } from "../../modules/test/assembly";
+import { describe, expect } from "./lib";
 
 describe("Should serialize Date", () => {
   expect(JSON.stringify<Date>(new Date(0)))

package/assembly/__tests__/float.spec.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { describe, expect } from "../../modules/test/assembly";
+import { describe, expect } from "./lib";
 
 describe("Should serialize floats", () => {
   expect(JSON.stringify<f64>(7.23)).toBe("7.23");
@@ -34,9 +34,9 @@ describe("Should deserialize floats", () => {
 
   expect(JSON.parse<f64>("0.000001").toString()).toBe("0.000001");
 
-  // expect(JSON.parse<f64>("1e-7")).toBe(1e-7);
+  expect(JSON.parse<f64>("1e-7").toString()).toBe(1e-7.toString());
 
-  // expect(JSON.parse<f64>("100000000000000000000.0").toString()).toBe(1e20);
+  expect(JSON.parse<f64>("100000000000000000000.0").toString()).toBe(1e20.toString());
 
-  // expect(JSON.parse<f64>("1e+21")).toBe(1e21);
+  expect(JSON.parse<f64>("1e+21").toString()).toBe(1e21.toString());
 });

package/assembly/__tests__/integer.spec.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { describe, expect } from "../../modules/test/assembly";
+import { describe, expect } from "./lib";
 
 describe("Should serialize integers", () => {
   expect(JSON.stringify(0)).toBe("0");

package/assembly/__tests__/null.spec.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { describe, expect } from "../../modules/test/assembly";
+import { describe, expect } from "./lib";
 
 describe("Should serialize null", () => {
   expect(JSON.stringify(null)).toBe("null");

package/assembly/__tests__/raw.spec.ts

@@ -0,0 +1,23 @@
+import { JSON } from "..";
+import { describe, expect } from "./lib";
+
+describe("Should serialize JSON.Raw", () => {
+  expect(JSON.stringify<JSON.Raw>(JSON.Raw.from('{"x":1.0,"y":2.0,"z":3.0}'))).toBe('{"x":1.0,"y":2.0,"z":3.0}');
+});
+
+describe("Should deserialize JSON.Raw", () => {
+  expect(JSON.parse<JSON.Raw>('{"x":1.0,"y":2.0,"z":3.0}').toString()).toBe('{"x":1.0,"y":2.0,"z":3.0}');
+});
+
+describe("Should serialize Map<string, JSON.Raw>", () => {
+  const m1 = new Map<string, JSON.Raw>();
+  m1.set("hello", new JSON.Raw("\"world\""));
+  m1.set("pos", new JSON.Raw("{\"x\":1.0,\"y\":2.0,\"z\":3.0}"));
+
+  expect(JSON.stringify(m1)).toBe('{"hello":"world","pos":{"x":1.0,"y":2.0,"z":3.0}}');
+});
+
+describe("Should deserialize Map<string, JSON.Raw>", () => {
+  const m1 = JSON.parse<Map<string, JSON.Raw>>('{"hello":"world","pos":{"x":1.0,"y":2.0,"z":3.0}}');
+  expect(JSON.stringify(m1)).toBe('{"hello":"world","pos":{"x":1.0,"y":2.0,"z":3.0}}');
+});

package/assembly/__tests__/string.spec.ts

@@ -1,5 +1,5 @@
 import { JSON } from "..";
-import { describe, expect } from "../../modules/test/assembly";
+import { describe, expect } from "./lib";
 
 describe("Should serialize strings", () => {
   expect(JSON.stringify("abcdefg")).toBe('"abcdefg"');

package/assembly/__tests__/{obj.spec.ts → struct.spec.ts}

@@ -1,7 +1,7 @@
 import { JSON } from "..";
-import { describe, expect } from "../../modules/test/assembly";
+import { describe, expect } from "./lib";
 
-describe("Should serialize objects", () => {
+describe("Should serialize structs", () => {
   expect(
     JSON.stringify<Vec3>({
       x: 3.4,
@@ -38,7 +38,7 @@ describe("Should serialize objects", () => {
   expect(JSON.stringify<ObjWithStrangeKey<string>>({ data: "foo" })).toBe('{"a\\\\\\t\\"\\u0002b`c":"foo"}');
 });
 
-describe("Should serialize objects with inheritance", () => {
+describe("Should serialize structs with inheritance", () => {
   const obj = new DerivedObject("1", "2");
 
   expect(JSON.stringify(obj)).toBe('{"a":"1","b":"2"}');
@@ -52,6 +52,21 @@ describe("Should ignore properties decorated with @omit", () => {
   ).toBe('{"y":1,"x":1,"z":1}');
 });
 
+describe("Should deserialize structs", () => {
+  expect(
+    JSON.stringify(JSON.parse<Vec3>('{"x":3.4,"y":1.2,"z":8.3}')),
+  ).toBe('{"x":3.4,"y":1.2,"z":8.3}');
+});
+
+describe("Should deserialize structs with whitespace", () => {
+  expect(
+    JSON.stringify(JSON.parse<Vec3>('    {  "x"  :  3.4  ,  "y"  :  1.2    ,  "z"   :  8.3   }   ')),
+  ).toBe('{"x":3.4,"y":1.2,"z":8.3}');
+});
+
+// describe("Should serialize Suite struct", () => {
+
+// });
 
 @json
 class BaseObject {
@@ -99,7 +114,6 @@ class ObjWithString {
 
 @json
 class ObjWithStrangeKey<T> {
-
   @alias('a\\\t"\x02b`c')
   data!: T;
 }

package/assembly/__tests__/test.spec.ts

@@ -1,5 +1,5 @@
 import { JSON } from "../";
-import { describe, expect } from "../../modules/test/assembly/index";
+import { describe, expect } from "./lib";
 import { DerivedObject, Null, ObjWithStrangeKey, ObjectWithFloat, OmitIf, Player, Vec3 } from "./types";
 
 // describe("Should serialize objects", () => {

package/assembly/as-bs.d.ts

@@ -0,0 +1,53 @@
+/**
+ * Central buffer namespace for managing memory operations.
+ */
+declare namespace bs {
+  /** Current buffer pointer. */
+  export let buffer: ArrayBuffer;
+
+  /** Current offset within the buffer. */
+  export let offset: usize;
+
+  /** Proposed size of output. */
+  export let stackSize: usize;
+
+  /**
+   * Ensures the buffer size is at least the proposed size.
+   * If necessary, reallocates the buffer to the exact new size.
+   * @param size - The size to propose.
+   */
+  export function ensureSize(size: u32): void;
+
+  /**
+   * Proposes that the buffer size should be at least the given size.
+   * If necessary, reallocates the buffer to the exact new size.
+   * @param size - The size to propose.
+   */
+  export function proposeSize(size: u32): void;
+
+  /**
+   * Increases the proposed size by nextPowerOf2(n + 64) if necessary.
+   * If necessary, reallocates the buffer to the exact new size.
+   * @param size - The size to grow by.
+   */
+  export function growSize(size: u32): void;
+
+  /**
+   * Resizes the buffer to the specified size.
+   * @param newSize - The new buffer size.
+   */
+  export function resize(newSize: u32): void;
+
+  /**
+   * Copies the buffer's content to a new object of a specified type.
+   * @returns The new object containing the buffer's content.
+   */
+  export function out<T>(): T;
+
+  /**
+   * Copies the buffer's content to a given destination pointer.
+   * @param dst - The destination pointer.
+   * @returns The destination pointer cast to the specified type.
+   */
+  export function outTo<T>(dst: usize): T;
+}

package/assembly/custom/bench.ts

@@ -0,0 +1,26 @@
+export function bench(description: string, routine: () => void, ops: u64 = 1_000_000): void {
+  console.log(" - Benchmarking " + description);
+  const start = Date.now();
+  let count = ops;
+  while (count != 0) {
+    routine();
+    count--;
+  }
+  const elapsed = Date.now() - start;
+
+  let opsPerSecond = (ops * 1000) / elapsed;
+
+  console.log(`   Completed benchmark in ${formatNumber(elapsed)}ms at ${formatNumber(opsPerSecond)} ops/s\n`);
+}
+
+function formatNumber(n: u64): string {
+  let str = n.toString();
+  let len = str.length;
+  let result = "";
+  let commaOffset = len % 3;
+  for (let i = 0; i < len; i++) {
+    if (i > 0 && (i - commaOffset) % 3 == 0) result += ",";
+    result += str.charAt(i);
+  }
+  return result;
+}

package/assembly/deserialize/simple/array/arbitrary.ts

@@ -1,10 +1,9 @@
 import { BACK_SLASH, BRACE_LEFT, BRACE_RIGHT, BRACKET_LEFT, BRACKET_RIGHT, CHAR_F, CHAR_N, CHAR_T, COMMA, QUOTE } from "../../../custom/chars";
 import { JSON } from "../../../";
 import { isSpace } from "util/string";
-import { ptrToStr } from "../../../util/ptrToStr";
 
 export function deserializeArbitraryArray(srcStart: usize, srcEnd: usize, dst: usize): JSON.Value[] {
-  const out = dst ? changetype<JSON.Value[]>(dst) : instantiate<JSON.Value[]>();
+  const out = changetype<JSON.Value[]>(dst || changetype<usize>(instantiate<JSON.Value[]>()));
   let lastIndex: usize = 0;
   let depth: u32 = 0;
   // if (load<u16>(srcStart) != BRACKET_LEFT)

package/assembly/deserialize/simple/array/array.ts

@@ -2,15 +2,16 @@ import { BRACKET_LEFT, BRACKET_RIGHT } from "../../../custom/chars";
 import { JSON } from "../../../";
 
 export function deserializeArrayArray<T extends unknown[][]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   let depth: u32 = 0;
-  while (srcStart < srcEnd) {
+  srcStart += 2;
+  while (srcStart < srcEnd - 2) {
     const code = load<u16>(srcStart);
     if (code == BRACKET_LEFT && depth++ == 0) {
       lastIndex = srcStart;
     } else if (code == BRACKET_RIGHT && --depth == 0) {
-      out.push(JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
+      out.push(JSON.__deserialize<valueof<T>>(lastIndex, srcStart + 2));
     }
     srcStart += 2;
   }

package/assembly/deserialize/simple/array/bool.ts

@@ -1,17 +1,17 @@
-import { CHAR_E, CHAR_F, CHAR_T } from "../../../custom/chars";
-
 export function deserializeBooleanArray<T extends boolean[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
+  srcStart += 2; // skip [
   while (srcStart < srcEnd) {
-    const code = load<u16>(srcStart);
-    if (code == CHAR_T && load<u16>(srcStart, 8) == CHAR_E) {
+    const block = load<u64>(srcStart);
+    if (block == 28429475166421108) {
       out.push(true);
       srcStart += 10;
-    } else if (code == CHAR_F && load<u16>(srcStart, 10) == CHAR_E) {
+    } else if (block == 32370086184550502 && load<u16>(srcStart, 8) == 101) {
       out.push(false);
       srcStart += 12;
+    } else {
+      srcStart += 2;
     }
-    srcStart += 2;
   }
   return out;
 }

package/assembly/deserialize/simple/array/float.ts

@@ -3,7 +3,7 @@ import { COMMA, BRACE_RIGHT, BRACKET_RIGHT } from "../../../custom/chars";
 import { JSON } from "../../..";
 
 export function deserializeFloatArray<T extends number[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   while (srcStart < srcEnd) {
     const code = load<u16>(srcStart);

package/assembly/deserialize/simple/array/integer.ts

@@ -2,7 +2,7 @@ import { atoi, isSpace } from "../../../util";
 import { COMMA, BRACKET_RIGHT } from "../../../custom/chars";
 
 export function deserializeIntegerArray<T extends number[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out: T = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   while (srcStart < srcEnd) {
     const code = load<u16>(srcStart);

package/assembly/deserialize/simple/array/map.ts

@@ -2,7 +2,7 @@ import { BRACE_LEFT, BRACE_RIGHT } from "../../../custom/chars";
 import { JSON } from "../../..";
 
 export function deserializeMapArray<T extends Map<any, any>[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   let depth: u32 = 0;
   while (srcStart < srcEnd) {

package/assembly/deserialize/simple/array/string.ts

@@ -2,8 +2,8 @@ import { JSON } from "../../..";
 import { BACK_SLASH, QUOTE } from "../../../custom/chars";
 
 export function deserializeStringArray(srcStart: usize, srcEnd: usize, dst: usize): string[] {
-  const out = dst ? changetype<string[]>(dst) : new Array<string>();
-  let lastPos = 2;
+  const out = changetype<string[]>(dst || changetype<usize>(instantiate<string[]>()));
+  let lastPos: usize = 2;
   let inString = false;
   while (srcStart < srcEnd) {
     const code = load<u16>(srcStart);
@@ -12,7 +12,7 @@ export function deserializeStringArray(srcStart: usize, srcEnd: usize, dst: usiz
         inString = true;
         lastPos = srcStart;
       } else if (load<u16>(srcStart - 2) != BACK_SLASH) {
-        out.push(JSON.__deserialize<string>(lastPos, srcStart));
+        out.push(JSON.__deserialize<string>(lastPos, srcStart + 2));
         inString = false;
       }
     }

package/assembly/deserialize/simple/array/struct.ts

@@ -1,16 +1,27 @@
-import { BRACE_LEFT, BRACE_RIGHT } from "../../../custom/chars";
+import { BRACE_LEFT, BRACE_RIGHT, BRACKET_LEFT, BRACKET_RIGHT } from "../../../custom/chars";
 import { JSON } from "../../..";
+import { isSpace } from "util/string";
 
 export function deserializeStructArray<T extends unknown[]>(srcStart: usize, srcEnd: usize, dst: usize): T {
-  const out = dst ? changetype<T>(dst) : instantiate<T>();
+  const out = changetype<nonnull<T>>(dst || changetype<usize>(instantiate<T>()));
   let lastIndex: usize = 0;
   let depth: u32 = 0;
+
+  while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
+  while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;
+
+  if (srcStart - srcEnd == 0)
+    throw new Error("Input string had zero length or was all whitespace");
+
+  if (load<u16>(srcStart) != BRACKET_LEFT) throw new Error("Expected '[' at start of object at position " + (srcEnd - srcStart).toString());
+  if (load<u16>(srcEnd - 2) != BRACKET_RIGHT) throw new Error("Expected ']' at end of object at position " + (srcEnd - srcStart).toString());
+
   while (srcStart < srcEnd) {
     const code = load<u16>(srcStart);
     if (code == BRACE_LEFT && depth++ == 0) {
       lastIndex = srcStart;
     } else if (code == BRACE_RIGHT && --depth == 0) {
-      out.push(JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
+      out.push(JSON.__deserialize<valueof<T>>(lastIndex, srcStart += 2));
     }
     srcStart += 2;
   }

package/assembly/deserialize/simple/array.ts

@@ -33,6 +33,9 @@ export function deserializeArray<T extends unknown[]>(srcStart: usize, srcEnd: u
       // @ts-ignore: type
       return deserializeMapArray<T>(srcStart, srcEnd, dst);
       // @ts-ignore: defined by transform
+    } else if (isDefined(type.__DESERIALIZE_CUSTOM)) {
+      return deserializeStructArray<T>(srcStart, srcEnd, dst);
+      // @ts-ignore: defined by transform
     } else if (isDefined(type.__DESERIALIZE)) {
       return deserializeStructArray<T>(srcStart, srcEnd, dst);
     }

package/assembly/deserialize/simple/map.ts

@@ -1,145 +1,170 @@
 import { JSON } from "../..";
 import { BACK_SLASH, COMMA, CHAR_F, BRACE_LEFT, BRACKET_LEFT, CHAR_N, QUOTE, BRACE_RIGHT, BRACKET_RIGHT, CHAR_T, COLON } from "../../custom/chars";
 import { isSpace } from "../../util";
+import { ptrToStr } from "../../util/ptrToStr";
 
 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>()));
+  const out = changetype<nonnull<T>>(dst || __new(offsetof<T>(), idof<T>()));
   // @ts-ignore: type
   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;
+  let keyStart: usize = 0;
+  let keyEnd: usize = 0;
   let isKey = false;
   let depth = 0;
-  let lastIndex = 0;
+  let lastIndex: usize = 0;
 
-  // while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
-  // while (srcEnd > srcStart && isSpace(load<u16>(srcEnd))) srcEnd -= 2;
+  while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
+  while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2; // would like to optimize this later
 
+  if (srcStart - srcEnd == 0)
+    throw new Error("Input string had zero length or was all whitespace");
+  if (load<u16>(srcStart) != BRACE_LEFT) throw new Error("Expected '{' at start of object at position " + (srcEnd - srcStart).toString());
+  if (load<u16>(srcEnd - 2) != BRACE_RIGHT) throw new Error("Expected '}' at end of object at position " + (srcEnd - srcStart).toString());
+
+  srcStart += 2;
   while (srcStart < srcEnd) {
     let code = load<u16>(srcStart); // while (isSpace(code)) code = load<u16>(srcStart += 2);
-    if (key == null) {
+    if (keyStart == 0) {
       if (code == QUOTE && load<u16>(srcStart - 2) !== BACK_SLASH) {
         if (isKey) {
-          key = sliceTo(lastIndex, srcStart);
-          while (isSpace((code = load<u16>((srcStart += 2))))) {
-            /* empty */
-          }
-          if (code !== COLON) throw new Error("Expected ':' after key at position " + (srcStart - srcPtr).toString());
+          keyStart = lastIndex;
+          keyEnd = srcStart;
+          // console.log("Key: " + ptrToStr(lastIndex, srcStart));
+          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart + 2)));
+          while (isSpace((code = load<u16>((srcStart += 2))))) { }
+          if (code !== COLON) throw new Error("Expected ':' after key at position " + (srcEnd - srcStart).toString());
           isKey = false;
         } else {
-          isKey = true;
+          // console.log("Got key start");
+          isKey = true; // i don't like this
           lastIndex = srcStart + 2;
         }
       }
       // isKey = !isKey;
       srcStart += 2;
     } else {
-      // @ts-ignore: type
-      if (isString<valueof<T>>() && code == QUOTE) {
+      if (code == QUOTE) {
         lastIndex = srcStart;
         srcStart += 2;
         while (srcStart < srcEnd) {
           const code = load<u16>(srcStart);
           if (code == QUOTE && load<u16>(srcStart - 2) !== BACK_SLASH) {
-            while (isSpace(load<u16>((srcStart += 2)))) {
-              /* empty */
-            }
+            // console.log("Value (string): " + ptrToStr(lastIndex, srcStart + 2));
             // @ts-ignore: type
-            out.set(key, JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
-            key = null;
+            out.set(ptrToStr(keyStart, keyEnd), JSON.__deserialize<valueof<T>>(lastIndex, srcStart + 2));
+            // while (isSpace(load<u16>(srcStart))) srcStart += 2;
+            srcStart += 4;
+            // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+            keyStart = 0;
             break;
           }
           srcStart += 2;
         }
-        // @ts-ignore: type
-      } else if ((!isBoolean<valueof<T>>() && isInteger<valueof<T>>() && code - 48 <= 9) || code == 45) {
+      } else if (code - 48 <= 9 || code == 45) {
         lastIndex = srcStart;
         srcStart += 2;
         while (srcStart < srcEnd) {
           const code = load<u16>(srcStart);
-          if (code == COMMA || isSpace(code) || code == BRACE_RIGHT) {
+          if (code == COMMA || code == BRACE_RIGHT || isSpace(code)) {
+            // console.log("Value (number): " + ptrToStr(lastIndex, srcStart));
             // @ts-ignore: type
-            out.set(key, JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
-            while (isSpace(load<u16>((srcStart += 2)))) {
-              /* empty */
-            }
-            key = null;
+            out.set(ptrToStr(keyStart, keyEnd), JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
+            // while (isSpace(load<u16>((srcStart += 2)))) {
+            //   /* empty */
+            // }
+            srcStart += 2;
+            // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+            keyStart = 0;
             break;
           }
           srcStart += 2;
         }
-        // @ts-ignore: type
-      } else if (isArray<valueof<T>>() && code == BRACKET_LEFT) {
+      } else if (code == BRACE_LEFT) {
         lastIndex = srcStart;
         depth++;
         srcStart += 2;
         while (srcStart < srcEnd) {
           const code = load<u16>(srcStart);
-          if (code == BRACKET_RIGHT) {
+          if (code == QUOTE) {
+            srcStart += 2;
+            while (!(load<u16>(srcStart) == QUOTE && load<u16>(srcStart - 2) != BACK_SLASH)) srcStart += 2;
+          } else if (code == BRACE_RIGHT) {
             if (--depth == 0) {
+              // console.log("Value (object): " + ptrToStr(lastIndex, srcStart + 2));
               // @ts-ignore: type
-              out.set(key, JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
-              while (isSpace(load<u16>((srcStart += 2)))) {
-                /* empty */
-              }
-              key = null;
+              out.set(ptrToStr(keyStart, keyEnd), JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 2)));
+              // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+              keyStart = 0;
+              // while (isSpace(load<u16>(srcStart))) {
+              //   /* empty */
+              // }
               break;
             }
-          } else if (code == BRACKET_LEFT) depth++;
+          } else if (code == BRACE_LEFT) depth++;
           srcStart += 2;
         }
-        // @ts-ignore: type
-      } else if (isDefined(changetype<nonnull<valueof<T>>>(0).__DESERIALIZE) && code == BRACE_LEFT) {
+      } else if (code == BRACKET_LEFT) {
         lastIndex = srcStart;
         depth++;
         srcStart += 2;
         while (srcStart < srcEnd) {
           const code = load<u16>(srcStart);
-          if (code == BRACE_RIGHT) {
+          if (code == BRACKET_RIGHT) {
             if (--depth == 0) {
+              // console.log("Value (array): " + ptrToStr(lastIndex, srcStart + 2));
               // @ts-ignore: type
-              out.set(key, JSON.__deserialize<valueof<T>>(lastIndex, srcStart));
-              while (isSpace(load<u16>((srcStart += 2)))) {
-                /* empty */
-              }
-              key = null;
+              out.set(ptrToStr(keyStart, keyEnd), JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 2)));
+              // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+              keyStart = 0;
+              // while (isSpace(load<u16>((srcStart += 2)))) {
+              //   /* empty */
+              // }
               break;
             }
-          } else if (code == BRACE_LEFT) depth++;
+          } else if (code == BRACKET_LEFT) depth++;
           srcStart += 2;
         }
-        // @ts-ignore: type
-      } else if (isBoolean<valueof<T>>() && code == CHAR_T) {
+      } else if (code == CHAR_T) {
         if (load<u64>(srcStart) == 28429475166421108) {
+          // console.log("Value (bool): " + ptrToStr(srcStart, srcStart + 8));
           // @ts-ignore: type
-          out.set(key, JSON.__deserialize<valueof<T>>(srcStart, (srcStart += 8)));
-          while (isSpace(load<u16>((srcStart += 2)))) {
-            /* empty */
-          }
-          key = null;
+          out.set(ptrToStr(keyStart, keyEnd), JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 8)));
+          // while (isSpace(load<u16>((srcStart += 2)))) {
+          //   /* empty */
+          // }
+          srcStart += 2;
+          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)) + "  " + (srcStart < srcEnd).toString());
+          keyStart = 0;
         }
-        // @ts-ignore: type
-      } else if (isBoolean<valueof<T>>() && code == CHAR_F) {
+      } else if (code == CHAR_F) {
         if (load<u64>(srcStart, 2) == 28429466576093281) {
+          // console.log("Value (bool): " + ptrToStr(srcStart, srcStart + 10));
           // @ts-ignore: type
-          out.set(key, JSON.__deserialize<valueof<T>>(srcStart, (srcStart += 10)));
-          while (isSpace(load<u16>((srcStart += 2)))) {
-            /* empty */
-          }
-          key = null;
+          out.set(ptrToStr(keyStart, keyEnd), JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 10)));
+          // while (isSpace(load<u16>((srcStart += 2)))) {
+          //   /* empty */
+          // }
+          srcStart += 2;
+          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+          keyStart = 0;
         }
-      } else if ((isNullable<T>() || nameof<T>() == "usize") && code == CHAR_N) {
+      } else if (code == CHAR_N) {
         if (load<u64>(srcStart) == 30399761348886638) {
+          // console.log("Value (null): " + ptrToStr(srcStart, srcStart + 8));
           // @ts-ignore: type
-          out.set(key, JSON.__deserialize<valueof<T>>(srcStart, (srcStart += 8)));
-          while (isSpace(load<u16>((srcStart += 2)))) {
-            /* empty */
-          }
+          out.set(ptrToStr(keyStart, keyEnd), JSON.__deserialize<valueof<T>>(lastIndex, (srcStart += 8)));
+          // while (isSpace(load<u16>((srcStart += 2)))) {
+          /* empty */
+          // }
+          srcStart += 2;
+          // console.log("Next: " + String.fromCharCode(load<u16>(srcStart)));
+          keyStart = 0;
         }
+      } else if (isSpace(code)) {
+        srcStart += 2;
       } else {
-        // @ts-ignore: type
-        throw new Error("Unexpected character " + String.fromCharCode(code) + " or type " + nameof<valueof<T>>() + " does not match found type!");
+        throw new Error("Unexpected character in JSON object '" + String.fromCharCode(code) + "' at position " + (srcEnd - srcStart).toString());
       }
     }
   }

package/assembly/deserialize/simple/object.ts

@@ -13,8 +13,9 @@ export function deserializeObject(srcStart: usize, srcEnd: usize, dst: usize): J
   let depth = 0;
   let lastIndex: usize = 0;
 
-  // while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
-  // while (srcEnd > srcStart && isSpace(load<u16>(srcEnd))) srcEnd -= 2;
+  while (srcStart < srcEnd && isSpace(load<u16>(srcStart))) srcStart += 2;
+  while (srcEnd > srcStart && isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;
+
   srcStart += 2;
   while (srcStart < srcEnd) {
     let code = load<u16>(srcStart); // while (isSpace(code)) code = load<u16>(srcStart += 2);

package/assembly/deserialize/simple/raw.ts

@@ -0,0 +1,6 @@
+import { JSON } from "../..";
+import { ptrToStr } from "../../util/ptrToStr";
+
+export function deserializeRaw(srcStart: usize, srcEnd: usize): JSON.Raw {
+  return JSON.Raw.from(ptrToStr(srcStart, srcEnd));
+}