json-as 0.9.29 → 1.0.0-alpha.2

package/assembly/custom/bs.ts

@@ -1,202 +0,0 @@
-import { dtoa_buffered, itoa_buffered } from "util/number";
-import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
-// @ts-ignore
-@inline const MAX_LEN: usize = 65536;
-const STORE: usize[] = [];
-let STORE_LEN: usize = 0;
-const CACHE = memory.data(i32(MAX_LEN));
-// Configurable amount of referenceable strings
-let POINTER = changetype<usize>(CACHE);
-// @ts-ignore
-@inline const MAX_CACHE = CACHE + MAX_LEN;
-
-export namespace bs {
-  // @ts-ignore
-  @inline export function write_int<T extends number>(num: T): void {
-    POINTER += itoa_buffered(POINTER, num) << 1;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_int_u<T extends number>(num: T): void {
-    POINTER += itoa_buffered(POINTER, num) << 1;
-  }
-
-  // @ts-ignore
-  @inline export function write_fl<T extends number>(num: T): void {
-    POINTER += dtoa_buffered(POINTER, num) << 1;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_fl_u<T extends number>(num: T): void {
-    POINTER += dtoa_buffered(POINTER, num) << 1;
-  }
-
-  // @ts-ignore
-  @inline export function write_b(buf: usize, bytes: usize = changetype<OBJECT>(buf - TOTAL_OVERHEAD).rtSize): void {
-    memory.copy(POINTER, buf, bytes);
-    POINTER += bytes;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_b_u(buf: usize, bytes: usize = changetype<OBJECT>(buf - TOTAL_OVERHEAD).rtSize): void {
-    memory.copy(POINTER, buf, bytes);
-    POINTER += bytes;
-  }
-
-  // @ts-ignore
-  @inline export function write_s(str: string, bytes: usize = changetype<OBJECT>(changetype<usize>(str) - TOTAL_OVERHEAD).rtSize): void {
-    memory.copy(POINTER, changetype<usize>(str), bytes);
-    POINTER += bytes;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_s_u(str: string, bytes: usize = changetype<OBJECT>(changetype<usize>(str) - TOTAL_OVERHEAD).rtSize): void {
-    memory.copy(POINTER, changetype<usize>(str), bytes);
-    POINTER += bytes;
-  }
-
-  // @ts-ignore
-  @inline export function write_s_se(str: string, start: usize, end: usize): void {
-    const bytes = end - start;
-    memory.copy(POINTER, changetype<usize>(str) + start, bytes);
-    POINTER += bytes;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_s_se_u(str: string, start: usize, end: usize): void {
-    const bytes = end - start;
-    memory.copy(POINTER, changetype<usize>(str) + start, bytes);
-    POINTER += bytes;
-  }
-
-  // @ts-ignore
-  @inline export function write_8(char: i32): void {
-    store<u8>(POINTER, char);
-    POINTER += 2;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_8_u(char: i32): void {
-    store<u8>(POINTER, char);
-    //POINTER += 2;
-  }
-
-  // @ts-ignore
-  @inline export function write_16(char: i32): void {
-    store<u16>(POINTER, char);
-    POINTER += 2;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_16_u(char: i32): void {
-    store<u16>(POINTER, char);
-    //POINTER += 2;
-  }
-
-  // @ts-ignore
-  @inline export function write_32(chars: i32): void {
-    store<u32>(POINTER, chars);
-    POINTER += 4;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_32_u(chars: i32): void {
-    store<u32>(POINTER, chars);
-    //POINTER += 4;
-  }
-
-  // @ts-ignore
-  @inline export function write_64(chars: i64): void {
-    store<u64>(POINTER, chars);
-    POINTER += 8;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_64_u(chars: i64): void {
-    store<u64>(POINTER, chars);
-    POINTER += 8;
-  }
-
-  // @ts-ignore
-  @inline export function write_128(chars: v128): void {
-    store<v128>(POINTER, chars);
-    POINTER += 16;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_128_n(chars: v128, n: usize): void {
-    store<v128>(POINTER, chars);
-    POINTER += n;
-    if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function write_128_u(chars: v128): void {
-    store<v128>(POINTER, chars);
-    //POINTER += 16;
-    //if (MAX_CACHE <= POINTER) bs.shrink();
-  }
-
-  // @ts-ignore
-  @inline export function shrink(): void {
-    const len = POINTER - CACHE;
-    STORE_LEN += len;
-    const out = __new(len, idof<ArrayBuffer>());
-    memory.copy(out, CACHE, len);
-    bs.reset();
-    STORE.push(out);
-  }
-
-  // @ts-ignore
-  @inline export function out<T>(): T {
-    const len = POINTER - CACHE;
-    let out = __new(len + STORE_LEN, idof<T>());
-
-    memory.copy(out, CACHE, len);
-    if (STORE_LEN) {
-      out += len;
-      for (let i = 0; i < STORE.length; i++) {
-        const ptr = changetype<usize>(unchecked(STORE[i]));
-        const storeLen = changetype<OBJECT>(ptr - TOTAL_OVERHEAD).rtSize;
-        memory.copy(out, ptr, storeLen);
-        //__unpin(ptr);
-        out += storeLen;
-      }
-      STORE_LEN = 0;
-    }
-    bs.reset();
-
-    return changetype<T>(out);
-  }
-
-  // @ts-ignore
-  @inline export function out_u<T>(): T {
-    const len = POINTER - CACHE;
-    const out = __new(len + STORE_LEN, idof<T>());
-
-    memory.copy(out, CACHE, len);
-    bs.reset();
-
-    return changetype<T>(out);
-  }
-
-  // @ts-ignore
-  @inline export function _out(out: usize): void {
-    memory.copy(out, CACHE, POINTER - CACHE);
-  }
-
-  // @ts-ignore
-  @inline export function reset(): void {
-    POINTER = CACHE;
-  }
-}

package/assembly/deserialize/array/array.ts

@@ -1,31 +0,0 @@
-import { BRACKET_LEFT, BRACKET_RIGHT } from "../../custom/chars";
-import { JSON } from "../..";
-import { unsafeCharCodeAt } from "../../custom/util";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeArrayArray<T extends unknown[][]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos = 0;
-  let depth = 0;
-  let i = 1;
-  // Find start of bracket
-  //for (; unsafeCharCodeAt(data, i) !== leftBracketCode; i++) {}
-  //i++;
-  for (; i < data.length - 1; i++) {
-    const char = unsafeCharCodeAt(data, i);
-    if (char === BRACKET_LEFT) {
-      if (depth === 0) {
-        lastPos = i;
-      }
-      // Shifting is 6% faster than incrementing
-      depth++;
-    } else if (char === BRACKET_RIGHT) {
-      depth--;
-      if (depth === 0) {
-        i++;
-        result.push(JSON.parse<valueof<T>>(data.slice(lastPos, i)));
-      }
-    }
-  }
-  return result;
-}

package/assembly/deserialize/array/bool.ts

@@ -1,19 +0,0 @@
-import { CHAR_E, CHAR_F, CHAR_T } from "../../custom/chars";
-import { unsafeCharCodeAt } from "../../custom/util";
-import { deserializeBoolean } from "../bool";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeBooleanArray<T extends boolean[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos = 1;
-  for (let i = 1; i < data.length - 1; i++) {
-    const char = unsafeCharCodeAt(data, i);
-    if (char === CHAR_T || char === CHAR_F) {
-      lastPos = i;
-    } else if (char === CHAR_E) {
-      i++;
-      result.push(deserializeBoolean(data.slice(lastPos, i)));
-    }
-  }
-  return result;
-}

package/assembly/deserialize/array/float.ts

@@ -1,24 +0,0 @@
-import { isSpace } from "util/string";
-import { unsafeCharCodeAt } from "../../custom/util";
-import { COMMA, BRACKET_RIGHT } from "../../custom/chars";
-import { deserializeFloat } from "../float";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeFloatArray<T extends number[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos = 0;
-  let i = 1;
-  let awaitingParse = false;
-  for (; i < data.length; i++) {
-    const char = unsafeCharCodeAt(data, i);
-    if (lastPos === 0 && ((char >= 48 && char <= 57) || char === 45)) {
-      awaitingParse = true;
-      lastPos = i;
-    } else if (awaitingParse && (isSpace(char) || char == COMMA || char == BRACKET_RIGHT) && lastPos > 0) {
-      awaitingParse = false;
-      result.push(deserializeFloat<valueof<T>>(data.slice(lastPos, i)));
-      lastPos = 0;
-    }
-  }
-  return result;
-}

package/assembly/deserialize/array/integer.ts

@@ -1,24 +0,0 @@
-import { isSpace } from "util/string";
-import { unsafeCharCodeAt } from "../../custom/util";
-import { COMMA, BRACKET_RIGHT } from "../../custom/chars";
-import { deserializeInteger } from "../integer";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeIntegerArray<T extends number[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos = 0;
-  let i = 1;
-  let awaitingParse = false;
-  for (; i < data.length; i++) {
-    const char = unsafeCharCodeAt(data, i);
-    if (lastPos === 0 && ((char >= 48 && char <= 57) || char === 45)) {
-      awaitingParse = true;
-      lastPos = i;
-    } else if (awaitingParse && (isSpace(char) || char == COMMA || char == BRACKET_RIGHT) && lastPos > 0) {
-      awaitingParse = false;
-      result.push(deserializeInteger<valueof<T>>(data.slice(lastPos, i)));
-      lastPos = 0;
-    }
-  }
-  return result;
-}

package/assembly/deserialize/array/map.ts

@@ -1,27 +0,0 @@
-import { BRACE_LEFT, BRACE_RIGHT } from "../../custom/chars";
-import { JSON } from "../..";
-import { unsafeCharCodeAt } from "../../custom/util";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeMapArray<T extends unknown[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos: u32 = 1;
-  let depth: u32 = 0;
-  for (let pos: u32 = 0; pos < <u32>data.length; pos++) {
-    const char = unsafeCharCodeAt(data, pos);
-    if (char === BRACE_LEFT) {
-      if (depth === 0) {
-        lastPos = pos;
-      }
-      depth++;
-    } else if (char === BRACE_RIGHT) {
-      depth--;
-      if (depth === 0) {
-        pos++;
-        result.push(JSON.parse<valueof<T>>(data.slice(lastPos, pos)));
-        //lastPos = pos + 2;
-      }
-    }
-  }
-  return result;
-}

package/assembly/deserialize/array/object.ts

@@ -1,27 +0,0 @@
-import { BRACE_LEFT, BRACE_RIGHT } from "../../custom/chars";
-import { JSON } from "../..";
-import { unsafeCharCodeAt } from "../../custom/util";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeObjectArray<T extends unknown[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos: u32 = 1;
-  let depth: u32 = 0;
-  for (let pos: u32 = 0; pos < <u32>data.length; pos++) {
-    const char = unsafeCharCodeAt(data, pos);
-    if (char === BRACE_LEFT) {
-      if (depth === 0) {
-        lastPos = pos;
-      }
-      depth++;
-    } else if (char === BRACE_RIGHT) {
-      depth--;
-      if (depth === 0) {
-        pos++;
-        result.push(JSON.parse<valueof<T>>(data.slice(lastPos, pos)));
-        //lastPos = pos + 2;
-      }
-    }
-  }
-  return result;
-}

package/assembly/deserialize/array/string.ts

@@ -1,29 +0,0 @@
-import { BACK_SLASH, QUOTE } from "../../custom/chars";
-import { unsafeCharCodeAt } from "../../custom/util";
-import { deserializeString } from "../string";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeStringArray(data: string): string[] {
-  const result: string[] = [];
-  let lastPos = 0;
-  let instr = false;
-  let escaping = false;
-  for (let i = 1; i < data.length - 1; i++) {
-    const char = unsafeCharCodeAt(data, i);
-    if (char === BACK_SLASH && !escaping) {
-      escaping = true;
-    } else {
-      if (char === QUOTE && !escaping) {
-        if (instr === false) {
-          instr = true;
-          lastPos = i;
-        } else {
-          instr = false;
-          result.push(deserializeString(data, lastPos, i));
-        }
-      }
-      escaping = false;
-    }
-  }
-  return result;
-}

package/assembly/deserialize/array.ts

@@ -1,46 +0,0 @@
-import { BRACKET_LEFT } from "../custom/chars";
-import { isMap } from "../custom/util";
-import { deserializeArrayArray } from "./array/array";
-import { deserializeBooleanArray } from "./array/bool";
-import { deserializeFloatArray } from "./array/float";
-import { deserializeIntegerArray } from "./array/integer";
-import { deserializeMapArray } from "./array/map";
-import { deserializeObjectArray } from "./array/object";
-import { deserializeStringArray } from "./array/string";
-
-// @ts-ignore: Decorator valid here
-export function deserializeArray<T extends unknown[]>(data: string): T {
-  if (isString<valueof<T>>()) {
-    return <T>deserializeStringArray(data);
-  } else if (isBoolean<valueof<T>>()) {
-    // @ts-ignore
-    return deserializeBooleanArray<T>(data);
-  } else if (isInteger<valueof<T>>()) {
-    // @ts-ignore
-    return deserializeIntegerArray<T>(data);
-  } else if (isFloat<valueof<T>>()) {
-    // @ts-ignore
-    return deserializeFloatArray<T>(data);
-  } else if (isArrayLike<valueof<T>>()) {
-    // @ts-ignore
-    return deserializeArrayArray<T>(data);
-  } else if (isMap<valueof<T>>()) {
-    return deserializeMapArray<T>(data);
-  } else if (isManaged<valueof<T>>() || isReference<valueof<T>>()) {
-    const type = changetype<nonnull<valueof<T>>>(0);
-    // @ts-ignore
-    if (isDefined(type.__DESERIALIZE)) {
-      return deserializeObjectArray<T>(data);
-    }
-    throw new Error("Could not parse array of type " + nameof<T>() + "! Make sure to add the @json decorator over classes!");
-  } else {
-    throw new Error("Could not parse array of type " + nameof<T>() + "!");
-  }
-}
-
-// @ts-ignore: Decorator valid here
-export function deserializeArray_Safe<T extends unknown[]>(data: string): T {
-  const firstChar = load<u8>(changetype<usize>(data));
-  if (firstChar != BRACKET_LEFT) throw new Error("Mismatched Types! Expected " + nameof<T>() + ' but got "' + data.slice(0, 100) + '" instead!');
-  return deserializeArray<T>(data);
-}

package/assembly/deserialize/bool.ts

@@ -1,34 +0,0 @@
-import { CHAR_F, CHAR_T } from "../custom/chars";
-import { unsafeCharCodeAt } from "../custom/util";
-
-/**
- * Deserialize a string to type boolean
- * @param data data to parse
- * @returns boolean
- */
-// @ts-ignore: Decorator valid here
-@inline export function deserializeBoolean(data: string, start: i32 = 0, end: i32 = 0): boolean {
-  if (!end) end = data.length;
-  const len = end - start;
-  const ptr = changetype<usize>(data) + <usize>(start << 1);
-  const firstChar = unsafeCharCodeAt(data, start);
-  if (len === 4 && firstChar === CHAR_T && load<u64>(ptr) === 28429475166421108) return true;
-  else if (len === 5 && firstChar === CHAR_F && load<u64>(ptr, 2) === 28429466576093281) return false;
-  return false; //ERROR(`Expected to find boolean, but found "${data.slice(0, 100)}" instead!`);
-}
-
-/**
- * Deserialize a string to type boolean (safely)
- * @param data data to parse
- * @returns boolean
- */
-// @ts-ignore: Decorator valid here
-@inline export function deserializeBoolean_Safe(data: string, start: i32 = 0, end: i32 = 0): boolean {
-  if (!end) end = data.length;
-  const len = end - start;
-  const ptr = changetype<usize>(data) + <usize>(start << 1);
-  const firstChar = unsafeCharCodeAt(data, start);
-  if (len === 4 && firstChar === CHAR_T && load<u64>(ptr) === 28429475166421108) return true;
-  else if (len === 5 && firstChar === CHAR_F && load<u64>(ptr, 2) === 28429466576093281) return false;
-  throw new Error('Mismatched Types! Expected boolean but got "' + data.slice(0, 100) + '" instead!');
-}

package/assembly/deserialize/date.ts

@@ -1,19 +0,0 @@
-import { QUOTE } from "../custom/chars";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeDate(dateTimeString: string): Date {
-  // Use AssemblyScript's date parser
-  const d = Date.fromString(dateTimeString.slice(1, -1));
-
-  // Return a new object instead of the one that the parser returned.
-  // This may seem redundant, but addresses the issue when Date
-  // is globally aliased to wasi_Date (or some other superclass).
-  return new Date(d.getTime());
-}
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeDate_Safe(dateTimeString: string): Date {
-  const firstChar = load<u8>(changetype<usize>(dateTimeString));
-  if (firstChar != QUOTE) throw new Error('Mismatched Types! Expected Date but got "' + dateTimeString.slice(0, 100) + '" instead!');
-  return deserializeDate(dateTimeString);
-}

package/assembly/deserialize/float.ts

@@ -1,21 +0,0 @@
-// @ts-ignore: Decorator valid here
-@inline export function deserializeFloat<T>(data: string): T {
-  // @ts-ignore
-  const type: T = 0;
-  // @ts-ignore
-  if (type instanceof f64) return f64.parse(data);
-  // @ts-ignore
-  return f32.parse(data);
-}
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeFloat_Safe<T>(data: string): T {
-  const firstChar = load<u8>(changetype<usize>(data));
-  if ((firstChar < 48 || firstChar > 57) && firstChar != 45) throw new Error('Mismatched Types! Expected float but got "' + data.slice(0, 100) + '" instead!');
-  // @ts-ignore
-  const type: T = 0;
-  // @ts-ignore
-  if (type instanceof f64) return f64.parse(data);
-  // @ts-ignore
-  return f32.parse(data);
-}

package/assembly/deserialize/integer.ts

@@ -1,16 +0,0 @@
-import { snip_fast } from "../custom/util";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeInteger<T>(data: string): T {
-  // @ts-ignore
-  return snip_fast<T>(data);
-}
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeInteger_Safe<T>(data: string): T {
-  const firstChar = load<u8>(changetype<usize>(data));
-  console.log(firstChar.toString());
-  if ((firstChar < 48 || firstChar > 57) && firstChar != 45) throw new Error("Mismatched Types! Expected " + nameof<T>() + ' but got "' + data.slice(0, 100) + '" instead!');
-  // @ts-ignore
-  return snip_fast<T>(data);
-}

package/assembly/deserialize/map.ts

@@ -1,139 +0,0 @@
-import { Virtual } from "as-virtual/assembly";
-import { containsCodePoint, unsafeCharCodeAt } from "../custom/util";
-import { CHAR_A, BACK_SLASH, COLON, COMMA, CHAR_E, CHAR_F, CHAR_L, BRACE_LEFT, BRACKET_LEFT, CHAR_N, QUOTE, CHAR_R, BRACE_RIGHT, BRACKET_RIGHT, CHAR_S, CHAR_T, CHAR_U } from "../custom/chars";
-import { deserializeBoolean } from "./bool";
-import { JSON } from "..";
-import { deserializeString } from "./string";
-import { isSpace } from "util/string";
-import { deserializeInteger } from "./integer";
-import { deserializeFloat } from "./float";
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeMap<T extends Map>(data: string): T {
-  const map: nonnull<T> = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()));
-
-  const key = Virtual.createEmpty<string>();
-  let isKey = false;
-  let depth = 0;
-  let outerLoopIndex = 1;
-  for (; outerLoopIndex < data.length - 1; outerLoopIndex++) {
-    const char = unsafeCharCodeAt(data, outerLoopIndex);
-    if (char === BRACKET_LEFT) {
-      for (let arrayValueIndex = outerLoopIndex; arrayValueIndex < data.length - 1; arrayValueIndex++) {
-        const char = unsafeCharCodeAt(data, arrayValueIndex);
-        if (char === BRACKET_LEFT) {
-          depth++;
-        } else if (char === BRACKET_RIGHT) {
-          depth--;
-          if (depth === 0) {
-            ++arrayValueIndex;
-            map.set(deserializeMapKey<indexof<T>>(key), JSON.parse<valueof<T>>(data.slice(outerLoopIndex, arrayValueIndex)));
-            outerLoopIndex = arrayValueIndex;
-            isKey = false;
-            break;
-          }
-        }
-      }
-    } else if (char === BRACE_LEFT) {
-      for (let objectValueIndex = outerLoopIndex; objectValueIndex < data.length - 1; objectValueIndex++) {
-        const char = unsafeCharCodeAt(data, objectValueIndex);
-        if (char === BRACE_LEFT) {
-          depth++;
-        } else if (char === BRACE_RIGHT) {
-          depth--;
-          if (depth === 0) {
-            ++objectValueIndex;
-            map.set(deserializeMapKey<indexof<T>>(key), JSON.parse<valueof<T>>(data.slice(outerLoopIndex, objectValueIndex)));
-            outerLoopIndex = objectValueIndex;
-            isKey = false;
-            break;
-          }
-        }
-      }
-    } else if (char === QUOTE) {
-      let escaping = false;
-      for (let stringValueIndex = ++outerLoopIndex; stringValueIndex < data.length - 1; stringValueIndex++) {
-        const char = unsafeCharCodeAt(data, stringValueIndex);
-        if (char === BACK_SLASH && !escaping) {
-          escaping = true;
-        } else {
-          if (char === QUOTE && !escaping) {
-            if (isKey === false) {
-              // perf: we can avoid creating a new string here if the key doesn't contain any escape sequences
-              if (containsCodePoint(data, BACK_SLASH, outerLoopIndex, stringValueIndex)) {
-                key.reinst(deserializeString(data, outerLoopIndex - 1, stringValueIndex));
-              } else {
-                key.reinst(data, outerLoopIndex, stringValueIndex);
-              }
-              isKey = true;
-            } else {
-              if (isString<valueof<T>>()) {
-                const value = deserializeString(data, outerLoopIndex - 1, stringValueIndex);
-                map.set(deserializeMapKey<indexof<T>>(key), value);
-              }
-              isKey = false;
-            }
-            outerLoopIndex = ++stringValueIndex;
-            break;
-          }
-          escaping = false;
-        }
-      }
-    } else if (char == CHAR_N && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_U && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_L && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_L) {
-      if (isNullable<valueof<T>>()) {
-        map.set(deserializeMapKey<indexof<T>>(key), null);
-      }
-      isKey = false;
-    } else if (char === CHAR_T && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_R && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_U && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_E) {
-      if (isBoolean<valueof<T>>()) {
-        map.set(deserializeMapKey<indexof<T>>(key), true);
-      }
-      isKey = false;
-    } else if (char === CHAR_F && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_A && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_L && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_S && unsafeCharCodeAt(data, ++outerLoopIndex) === CHAR_E) {
-      if (isBoolean<valueof<T>>()) {
-        map.set(deserializeMapKey<indexof<T>>(key), false);
-      }
-      isKey = false;
-    } else if ((char >= 48 && char <= 57) || char === 45) {
-      let numberValueIndex = ++outerLoopIndex;
-      for (; numberValueIndex < data.length; numberValueIndex++) {
-        const char = unsafeCharCodeAt(data, numberValueIndex);
-        if (char === COLON || char === COMMA || char === BRACE_RIGHT || isSpace(char)) {
-          if (isInteger<valueof<T>>()) {
-            map.set(deserializeMapKey<indexof<T>>(key), deserializeInteger<valueof<T>>(data.slice(outerLoopIndex - 1, numberValueIndex)));
-          } else if (isFloat<valueof<T>>()) {
-            map.set(deserializeMapKey<indexof<T>>(key), deserializeFloat<valueof<T>>(data.slice(outerLoopIndex - 1, numberValueIndex)));
-          }
-          outerLoopIndex = numberValueIndex;
-          isKey = false;
-          break;
-        }
-      }
-    }
-  }
-
-  return map;
-}
-
-//@ts-ignore: Decorator
-function deserializeMapKey<T>(key: Virtual<string>): T {
-  const k = key.copyOut();
-  if (isString<T>()) {
-    return k as T;
-  } else if (isBoolean<T>()) {
-    return deserializeBoolean(k) as T;
-  } else if (isInteger<T>()) {
-    return deserializeInteger<T>(k);
-  } else if (isFloat<T>()) {
-    return deserializeFloat<T>(k);
-  }
-
-  throw new Error(`JSON: Cannot parse JSON object to a Map with a key of type ${nameof<T>()}`);
-}
-
-// @ts-ignore: Decorator valid here
-@inline export function deserializeMap_Safe<T extends Map>(data: string): T {
-  const firstChar = load<u8>(changetype<usize>(data));
-  if (firstChar != BRACE_LEFT) throw new Error("Mismatched Types! Expected " + nameof<T>() + ' but got "' + data.slice(0, 100) + '" instead!');
-  return deserializeMap<T>(data);
-}