json-as 0.9.8 → 0.9.9-a

package/assembly/{src/chars.ts → chars.ts}

@@ -1,76 +1,76 @@
 // Characters
 // @ts-ignore = Decorator is valid here
-export const COMMA = 44;
+@inline export const COMMA = 44;
 // @ts-ignore = Decorator is valid here
-export const QUOTE = 34;
+@inline export const QUOTE = 34;
 // @ts-ignore = Decorator is valid here
-export const BACK_SLASH = 92;
+@inline export const BACK_SLASH = 92;
 // @ts-ignore: Decorator is valid here
-export const FWD_SLASH = 47;
+@inline export const FWD_SLASH = 47;
 // @ts-ignore: Decorator is valid here
-export const BRACE_LEFT = 123;
+@inline export const BRACE_LEFT = 123;
 // @ts-ignore: Decorator is valid here
-export const BRACE_RIGHT = 125;
+@inline export const BRACE_RIGHT = 125;
 // @ts-ignore: Decorator is valid here
-export const BRACKET_LEFT = 91;
+@inline export const BRACKET_LEFT = 91;
 // @ts-ignore: Decorator is valid here
-export const BRACKET_RIGHT = 93;
+@inline export const BRACKET_RIGHT = 93;
 // @ts-ignore: Decorator is valid here
-export const COLON = 58;
+@inline export const COLON = 58;
 // @ts-ignore: Decorator is valid here
-export const CHAR_T = 116;
+@inline export const CHAR_T = 116;
 // @ts-ignore: Decorator is valid here
-export const CHAR_R = 114;
+@inline export const CHAR_R = 114;
 // @ts-ignore: Decorator is valid here
-export const CHAR_U = 117;
+@inline export const CHAR_U = 117;
 // @ts-ignore: Decorator is valid here
-export const CHAR_E = 101;
+@inline export const CHAR_E = 101;
 // @ts-ignore: Decorator is valid here
-export const CHAR_F = 102;
+@inline export const CHAR_F = 102;
 // @ts-ignore: Decorator is valid here
-export const CHAR_A = 97;
+@inline export const CHAR_A = 97;
 // @ts-ignore: Decorator is valid here
-export const CHAR_L = 108;
+@inline export const CHAR_L = 108;
 // @ts-ignore: Decorator is valid here
-export const CHAR_S = 115;
+@inline export const CHAR_S = 115;
 // @ts-ignore = Decorator is valid here
-export const CHAR_N = 110;
+@inline export const CHAR_N = 110;
 // @ts-ignore = Decorator is valid here
-export const CHAR_B = 98;
+@inline export const CHAR_B = 98;
 // Strings
 // @ts-ignore: Decorator is valid here
-export const TRUE_WORD = "true";
+@inline export const TRUE_WORD = "true";
 // @ts-ignore: Decorator is valid here
-export const FALSE_WORD = "false";
+@inline export const FALSE_WORD = "false";
 // @ts-ignore: Decorator is valid here
-export const NULL_WORD = "null";
+@inline export const NULL_WORD = "null";
 // @ts-ignore: Decorator is valid here
-export const BRACE_LEFT_WORD = "{";
+@inline export const BRACE_LEFT_WORD = "{";
 // @ts-ignore: Decorator is valid here
-export const BRACKET_LEFT_WORD = "[";
+@inline export const BRACKET_LEFT_WORD = "[";
 // @ts-ignore: Decorator is valid here
-export const EMPTY_BRACKET_WORD = "[]";
+@inline export const EMPTY_BRACKET_WORD = "[]";
 // @ts-ignore: Decorator is valid here
-export const COLON_WORD = ":";
+@inline export const COLON_WORD = ":";
 // @ts-ignore: Decorator is valid here
-export const COMMA_WORD = ",";
+@inline export const COMMA_WORD = ",";
 // @ts-ignore: Decorator is valid here
-export const BRACE_RIGHT_WORD = "}";
+@inline export const BRACE_RIGHT_WORD = "}";
 // @ts-ignore: Decorator is valid here
-export const BRACKET_RIGHT_WORD = "]";
+@inline export const BRACKET_RIGHT_WORD = "]";
 // @ts-ignore: Decorator is valid here
-export const QUOTE_WORD = "\"";
+@inline export const QUOTE_WORD = "\"";
 // @ts-ignore: Decorator is valid here
-export const EMPTY_QUOTE_WORD = "\"\"";
+@inline export const EMPTY_QUOTE_WORD = "\"\"";
 
 // Escape Codes
 // @ts-ignore: Decorator is valid here
-export const BACKSPACE = 8; // \b
+@inline export const BACKSPACE = 8; // \b
 // @ts-ignore: Decorator is valid here
-export const TAB = 9; // \t
+@inline export const TAB = 9; // \t
 // @ts-ignore: Decorator is valid here
-export const NEW_LINE = 10; // \n
+@inline export const NEW_LINE = 10; // \n
 // @ts-ignore: Decorator is valid here
-export const FORM_FEED = 12; // \f
+@inline export const FORM_FEED = 12; // \f
 // @ts-ignore: Decorator is valid here
-export const CARRIAGE_RETURN = 13; // \r
+@inline export const CARRIAGE_RETURN = 13; // \r

package/assembly/deserialize/array/array.ts

@@ -1,9 +1,9 @@
-import { BRACKET_LEFT, BRACKET_RIGHT } from "../../src/chars";
+import { BRACKET_LEFT, BRACKET_RIGHT } from "../../chars";
 import { JSON } from "../..";
-import { unsafeCharCodeAt } from "../../src/util";
+import { unsafeCharCodeAt } from "../../util";
 
-// @ts-ignore: Decorator
-export function deserializeArrayArray<T extends unknown[][]>(data: string): T {
+// @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;

package/assembly/deserialize/array/bool.ts

@@ -1,9 +1,9 @@
-import { CHAR_E, CHAR_F, CHAR_T } from "../../src/chars";
-import { unsafeCharCodeAt } from "../../src/util";
+import { CHAR_E, CHAR_F, CHAR_T } from "../../chars";
+import { unsafeCharCodeAt } from "../../util";
 import { deserializeBoolean } from "../bool";
 
-// @ts-ignore: Decorator
-export function deserializeBooleanArray<T extends boolean[]>(data: string): T {
+// @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++) {

package/assembly/deserialize/array/float.ts

@@ -1,10 +1,10 @@
 import { isSpace } from "util/string";
-import { unsafeCharCodeAt } from "../../src/util";
-import { COMMA, BRACKET_RIGHT } from "../../src/chars";
+import { unsafeCharCodeAt } from "../../util";
+import { COMMA, BRACKET_RIGHT } from "../../chars";
 import { deserializeFloat } from "../float";
 
-// @ts-ignore: Decorator
-export function deserializeFloatArray<T extends number[]>(data: string): T {
+// @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;

package/assembly/deserialize/array/integer.ts

@@ -1,10 +1,10 @@
 import { isSpace } from "util/string";
-import { unsafeCharCodeAt } from "../../src/util";
-import { COMMA, BRACKET_RIGHT } from "../../src/chars";
+import { unsafeCharCodeAt } from "../../util";
+import { COMMA, BRACKET_RIGHT } from "../../chars";
 import { deserializeInteger } from "../integer";
 
-// @ts-ignore: Decorator
-export function deserializeIntegerArray<T extends number[]>(data: string): T {
+// @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;

package/assembly/deserialize/array/map.ts

@@ -1,9 +1,9 @@
-import { BRACE_LEFT, BRACE_RIGHT } from "../../src/chars";
+import { BRACE_LEFT, BRACE_RIGHT } from "../../chars";
 import { JSON } from "../..";
-import { unsafeCharCodeAt } from "../../src/util";
+import { unsafeCharCodeAt } from "../../util";
 
-// @ts-ignore: Decorator
-export function deserializeMapArray<T extends unknown[]>(data: string): T {
+// @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;

package/assembly/deserialize/array/object.ts

@@ -1,9 +1,9 @@
-import { BRACE_LEFT, BRACE_RIGHT } from "../../src/chars";
+import { BRACE_LEFT, BRACE_RIGHT } from "../../chars";
 import { JSON } from "../..";
-import { unsafeCharCodeAt } from "../../src/util";
+import { unsafeCharCodeAt } from "../../util";
 
-// @ts-ignore: Decorator
-export function deserializeObjectArray<T extends unknown[]>(data: string): T {
+// @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;

package/assembly/deserialize/array/string.ts

@@ -1,9 +1,9 @@
-import { BACK_SLASH, QUOTE } from "../../src/chars";
-import { unsafeCharCodeAt } from "../../src/util";
+import { BACK_SLASH, QUOTE } from "../../chars";
+import { unsafeCharCodeAt } from "../../util";
 import { deserializeString } from "../string";
 
-// @ts-ignore: Decorator
-export function deserializeStringArray(data: string): string[] {
+// @ts-ignore: Decorator valid here
+@inline export function deserializeStringArray(data: string): string[] {
   const result: string[] = [];
   let lastPos = 0;
   let instr = false;

package/assembly/deserialize/array.ts

@@ -1,4 +1,4 @@
-import { isMap } from "../src/util";
+import { isMap } from "../util";
 import { deserializeArrayArray } from "./array/array";
 import { deserializeBooleanArray } from "./array/bool";
 import { deserializeFloatArray } from "./array/float";
@@ -7,7 +7,7 @@ import { deserializeMapArray } from "./array/map";
 import { deserializeObjectArray } from "./array/object";
 import { deserializeStringArray } from "./array/string";
 
-// @ts-ignore: Decorator
+// @ts-ignore: Decorator valid here
 export function deserializeArray<T extends unknown[]>(data: string): T {
     if (isString<valueof<T>>()) {
         return <T>deserializeStringArray(data);
@@ -31,7 +31,8 @@ export function deserializeArray<T extends unknown[]>(data: string): T {
         if (isDefined(type.__DESERIALIZE)) {
             return deserializeObjectArray<T>(data);
         }
+        ERROR("Could not parse array of type " + nameof<T>() + "! Make sure to add the @json decorator over classes!");
+    } else {
+        ERROR("Could not parse array of type " + nameof<T>() + "!");
     }
-
-    throw new Error("Could not parse array of type " + nameof<T>() + "!");
 }

package/assembly/deserialize/bool.ts

@@ -1,13 +1,13 @@
-import { CHAR_F, CHAR_T } from "../src/chars";
-import { unsafeCharCodeAt } from "../src/util";
+import { CHAR_F, CHAR_T } from "../chars";
+import { unsafeCharCodeAt } from "../util";
 
 /**
  * Deserialize a string to type boolean
  * @param data data to parse
  * @returns boolean
  */
-// @ts-ignore: Decorator
-export function deserializeBoolean(data: string, start: i32 = 0, end: i32 = 0): 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);

package/assembly/deserialize/date.ts

@@ -1,5 +1,5 @@
-// @ts-ignore
-export function deserializeDate(dateTimeString: string): Date {
+// @ts-ignore: Decorator valid here
+@inline export function deserializeDate(dateTimeString: string): Date {
     // Use AssemblyScript's date parser
     const d = Date.fromString(dateTimeString);
   

package/assembly/deserialize/float.ts

@@ -1,5 +1,5 @@
-// @ts-ignore: Decorator
-export function deserializeFloat<T>(data: string): T {
+// @ts-ignore: Decorator valid here
+@inline export function deserializeFloat<T>(data: string): T {
     // @ts-ignore
     const type: T = 0;
     // @ts-ignore

package/assembly/deserialize/integer.ts

@@ -1,7 +1,7 @@
-import { snip_fast } from "../src/util";
+import { snip_fast } from "../util";
 
-// @ts-ignore: Decorator
-export function deserializeInteger<T>(data: string): T {
+// @ts-ignore: Decorator valid here
+@inline export function deserializeInteger<T>(data: string): T {
     // @ts-ignore
     return snip_fast<T>(data);
 }

package/assembly/deserialize/map.ts

@@ -1,5 +1,5 @@
 import { Virtual } from "as-virtual/assembly";
-import { containsCodePoint, unsafeCharCodeAt } from "../src/util";
+import { containsCodePoint, unsafeCharCodeAt } from "../util";
 import {
     CHAR_A,
     BACK_SLASH,
@@ -18,7 +18,7 @@ import {
     CHAR_S,
     CHAR_T,
     CHAR_U
-} from "../src/chars";
+} from "../chars";
 import { deserializeBoolean } from "./bool";
 import { JSON } from "..";
 import { deserializeString } from "./string";
@@ -26,8 +26,8 @@ import { isSpace } from "util/string";
 import { deserializeInteger } from "./integer";
 import { deserializeFloat } from "./float";
 
-// @ts-ignore: Decorator
-export function deserializeMap<T extends Map>(data: string): T {
+// @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>>())
@@ -72,6 +72,8 @@ export function deserializeMap<T extends Map>(data: string): T {
                     depth--;
                     if (depth === 0) {
                         ++objectValueIndex;
+                        console.log("Index: " + nameof<indexof<T>>());
+                        console.log("Value: " + nameof<valueof<T>>());
                         map.set(deserializeMapKey<indexof<T>>(key), JSON.parse<valueof<T>>(data.slice(outerLoopIndex, objectValueIndex)));
                         outerLoopIndex = objectValueIndex;
                         isKey = false;

package/assembly/deserialize/mpz.ts

@@ -0,0 +1,12 @@
+import { MpZ } from "@hypercubed/as-mpz";
+
+/**
+ * Deserialize a string to type MpZ
+ * @param data data to parse
+ * @returns MpZ
+ */
+// @ts-ignore: Decorator valid here
+@inline export function deserializeMpZ(data: string, start: i32 = 0, end: i32 = 0): MpZ {
+    if (!end) end = data.length;
+    return MpZ.from(data.slice(start, end));
+}

package/assembly/deserialize/object.ts

@@ -1,9 +1,9 @@
-import { containsCodePoint, unsafeCharCodeAt } from "../src/util";
-import { CHAR_A, BACK_SLASH, 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 "../src/chars";
+import {  unsafeCharCodeAt } from "../util";
+import { CHAR_A, BACK_SLASH, 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 "../chars";
 import { isSpace } from "util/string";
 
-// @ts-ignore: Decorator
-export function deserializeObject<T>(data: string): T {
+// @ts-ignore: Decorator valid here
+@inline export function deserializeObject<T>(data: string): T {
   const schema: nonnull<T> = changetype<nonnull<T>>(
     __new(offsetof<nonnull<T>>(), idof<nonnull<T>>())
   );

package/assembly/deserialize/string.ts

@@ -13,12 +13,12 @@ import {
     CHAR_T,
     TAB,
     CHAR_U
-} from "../src/chars";
-import { Sink } from "../src/sink";
-import { unsafeCharCodeAt } from "../src/util";
+} from "../chars";
+import { Sink } from "../sink";
+import { unsafeCharCodeAt } from "../util";
 
-// @ts-ignore: Decorator
-export function deserializeString(data: string, start: i32 = 0, end: i32 = 0): string {
+// @ts-ignore: Decorator valid here
+@inline export function deserializeString(data: string, start: i32 = 0, end: i32 = 0): string {
     end = end || data.length - 1;
     let result = Sink.withCapacity(end - start - 1);
     let last = start + 1;

package/assembly/index.ts

@@ -1,10 +1,6 @@
 /// <reference path="./index.d.ts" />
-
-import { Box } from "as-container/assembly";
-
 import { serializeString } from "./serialize/string";
 import { serializeBool } from "./serialize/bool";
-import { serializeBox } from "./serialize/box";
 import { serializeInteger } from "./serialize/integer";
 import { serializeFloat } from "./serialize/float";
 import { serializeObject } from "./serialize/object";
@@ -14,15 +10,17 @@ import { serializeMap } from "./serialize/map";
 import { deserializeBoolean } from "./deserialize/bool";
 import { deserializeArray } from "./deserialize/array";
 import { deserializeFloat } from "./deserialize/float";
-import { deserializeBox } from "./deserialize/box";
 import { deserializeObject } from "./deserialize/object";
 import { deserializeMap } from "./deserialize/map";
 import { deserializeDate } from "./deserialize/date";
-import { FALSE_WORD, NULL_WORD, TRUE_WORD } from "./src/chars";
+import { FALSE_WORD, NULL_WORD, TRUE_WORD } from "./chars";
 import { deserializeInteger } from "./deserialize/integer";
 import { deserializeString } from "./deserialize/string";
-import { Sink } from "./src/sink";
+import { Sink } from "./sink";
 import { Variant } from "as-variant/assembly";
+import { MpZ } from "@hypercubed/as-mpz";
+import { serializeMpZ } from "./serialize/mpz";
+import { deserializeMpZ } from "./deserialize/mpz";
 
 /**
  * Offset of the 'storage' property in the JSON.Value class.
@@ -46,13 +44,15 @@ export namespace JSON {
     F64,
     Bool,
     String,
+    ManagedString,
     Struct,
-    Array
+    ManagedStruct,
+    Array,
+    ManagedArray
   }
+
   export class Value {
     public type: i32;
-    public length: i32 = 0;
-
     // @ts-ignore: storage is set directly through memory
     private storage: u64;
 
@@ -102,7 +102,6 @@ export namespace JSON {
         store<T>(changetype<usize>(this), value, STORAGE);
       } else if (isString<T>()) {
         this.type = JSON.Types.String;
-        this.length = String.UTF8.byteLength(value as string);
         store<T>(changetype<usize>(this), value, STORAGE);
       } else if (value instanceof Map) {
         if (idof<T>() !== idof<Map<string, JSON.Value>>()) {
@@ -117,8 +116,6 @@ export namespace JSON {
       } else if (isArray<T>()) {
         // @ts-ignore: T satisfies constraints of any[]
         this.type = JSON.Types.Array + getArrayDepth<T>(0);
-        // @ts-ignore
-        this.length = value.length;
         store<T>(changetype<usize>(this), value, STORAGE);
       }
     }
@@ -207,6 +204,14 @@ export namespace JSON {
       }
     }
   }
+
+  export class Box<T> {
+    constructor(public value: T) {}
+    @inline static from<T>(value: T): Box<T> {
+      return new Box(value);
+    }
+  }
+  
   /**
    * Stringifies valid JSON data.
    * ```js
@@ -231,10 +236,6 @@ export namespace JSON {
       // @ts-ignore
     } else if (isString<nonnull<T>>()) {
       return serializeString(changetype<string>(data));
-    } else if (data instanceof Box) {
-      // @ts-ignore
-      return serializeBox(changetype<nonnull<T>>(data));
-      // @ts-ignore
     } else if (isDefined(data.__SERIALIZE)) {
       // @ts-ignore
       return serializeObject(changetype<nonnull<T>>(data));
@@ -247,6 +248,8 @@ export namespace JSON {
     } else if (data instanceof Map) {
       // @ts-ignore
       return serializeMap(changetype<nonnull<T>>(data));
+    } else if (data instanceof MpZ) {
+      return serializeMpZ(data);
     } else {
       throw new Error(
         `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
@@ -281,17 +284,16 @@ export namespace JSON {
       return deserializeArray<nonnull<T>>(data);
     }
     let type: nonnull<T> = changetype<nonnull<T>>(0);
-    if (type instanceof Box) {
-      // @ts-ignore
-      return deserializeBox<nonnull<T>>(data);
-      // @ts-ignore
-    } else if (isDefined(type.__DESERIALIZE)) {
+    if (isDefined(type.__DESERIALIZE)) {
       // @ts-ignore
       return deserializeObject<nonnull<T>>(data.trimStart());
     } else if (type instanceof Map) {
       // @ts-ignore
       return deserializeMap<nonnull<T>>(data.trimStart());
-    } else if (type instanceof Date) {
+    } else if (type instanceof MpZ) {
+      // @ts-ignore
+      return deserializeMpZ(data);
+    }else if (type instanceof Date) {
       // @ts-ignore
       return deserializeDate(data);
     } else {

package/assembly/serialize/array.ts

@@ -6,14 +6,15 @@ import {
     BRACKET_LEFT_WORD,
     BRACKET_RIGHT,
     BRACKET_RIGHT_WORD
-} from "../src/chars";
-import { Sink } from "../src/sink";
+} from "../chars";
+import { Sink } from "../sink";
 import { serializeString } from "./string";
 
-// @ts-ignore
-export function serializeArray<T extends any[]>(data: T): string {
+// @ts-ignore: Decorator valid here
+@inline export function serializeArray<T extends any[]>(data: T): string {
+    if (changetype<usize>(data) == <usize>0) return EMPTY_BRACKET_WORD;
     // @ts-ignore
-    if (data.length == 0) {
+    else if (data.length == 0) {
         return EMPTY_BRACKET_WORD;
         // @ts-ignore
     } else if (isString<valueof<T>>()) {

package/assembly/serialize/bool.ts

@@ -3,7 +3,7 @@
  * @param data data to serialize
  * @returns string
  */
-// @ts-ignore
-export function serializeBool(data: bool): string {
+// @ts-ignore: Decorator valid here
+@inline export function serializeBool(data: bool): string {
     return data ? "true" : "false";
 }

package/assembly/serialize/date.ts

@@ -1,4 +1,4 @@
-// @ts-ignore
-export function serializeDate(data: Date): string {
+// @ts-ignore: Decorator valid here
+@inline export function serializeDate(data: Date): string {
     return `"${data.toISOString()}"`
 }

package/assembly/serialize/float.ts

@@ -1,4 +1,4 @@
-// @ts-ignore
-export function serializeFloat<T extends number>(data: T): string {
+// @ts-ignore: Decorator valid here
+@inline export function serializeFloat<T extends number>(data: T): string {
     return data.toString();
 }

package/assembly/serialize/integer.ts

@@ -1,5 +1,5 @@
-// @ts-ignore
-export function serializeInteger<T extends number>(data: T): string {
+// @ts-ignore: Decorator valid here
+@inline export function serializeInteger<T extends number>(data: T): string {
     // I have a much faster implementation of itoa that I will port over later. Its ~4x faster
     return data.toString();
 }

package/assembly/serialize/map.ts

@@ -1,21 +1,22 @@
-import { COLON, COMMA, BRACE_LEFT_WORD, BRACE_RIGHT } from "../src/chars";
+import { COLON, COMMA, BRACE_LEFT_WORD, BRACE_RIGHT } from "../chars";
 import { JSON } from "..";
-import { Sink } from "../src/sink";
-import { serializeString } from "./string";
+import { Sink } from "../sink";
 
-// @ts-ignore
-export function serializeMap<T extends Map<any, any>>(data: T): string {
+// @ts-ignore: Decorator valid here
+@inline export function serializeMap<T extends Map<any, any>>(data: T): string {
+    if (changetype<usize>(data) == <usize>0) return "{}";
     let result = Sink.fromString(BRACE_LEFT_WORD);
+    if (!data.size) return "{}";
     let keys = data.keys();
     let values = data.values();
     const end = data.size - 1;
     for (let i = 0; i < end; i++) {
-        result.write(serializeString(unchecked(keys[i]).toString()));
+        result.write(JSON.stringify(unchecked(keys[i]).toString()));
         result.writeCodePoint(COLON);
         result.write(JSON.stringify(unchecked(values[i])));
         result.writeCodePoint(COMMA);
     }
-    result.write(serializeString(unchecked(keys[end]).toString()));
+    result.write(JSON.stringify(unchecked(keys[end]).toString()));
     result.writeCodePoint(COLON);
     result.write(JSON.stringify(unchecked(values[end])));
 

package/assembly/serialize/mpz.ts

@@ -0,0 +1,6 @@
+import { MpZ } from "@hypercubed/as-mpz";
+
+// @ts-ignore: Decorator valid here
+@inline export function serializeMpZ(data: MpZ): string {
+  return data.toString();
+}

package/assembly/serialize/object.ts

@@ -1,7 +1,7 @@
 interface GeneratedInterface {
     __SERIALIZE(): string;
 }
-// @ts-ignore
-export function serializeObject<T extends GeneratedInterface>(data: T): string {
+// @ts-ignore: Decoraor valid here
+@inline export function serializeObject<T extends GeneratedInterface>(data: T): string {
     return changetype<nonnull<T>>(data).__SERIALIZE();
 }

package/assembly/serialize/string.ts

@@ -7,12 +7,12 @@ import {
     QUOTE,
     QUOTE_WORD,
     TAB
-} from "../src/chars";
-import { Sink } from "../src/sink";
-import { unsafeCharCodeAt } from "../src/util";
+} from "../chars";
+import { Sink } from "../sink";
+import { unsafeCharCodeAt } from "../util";
 
-// @ts-ignore: Decorator
-export function serializeString(data: string): string {
+// @ts-ignore: Decorator valid here
+@inline export function serializeString(data: string): string {
     if (data.length === 0) {
         return QUOTE_WORD + QUOTE_WORD;
     }