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

package/assembly/globals/tables.ts

@@ -1,417 +1,75 @@
 export const SERIALIZE_ESCAPE_TABLE = memory.data<u16>([
-  48,
-  48,
-  48,
-  49,
-  48,
-  50,
-  48,
-  51, // Pair 0-3
-  48,
-  52,
-  48,
-  53,
-  48,
-  54,
-  48,
-  55, // Pair 4-7
-
-  92,
-  98,
-  92,
-  116,
-  92,
-  110,
-  48,
-  98, // Pair 8-11
-  92,
-  102,
-  92,
-  114,
-  48,
-  101,
-  48,
-  102, // Pair 12-15
-
-  49,
-  48,
-  49,
-  49,
-  49,
-  50,
-  49,
-  51, // Pair 16-19
-  49,
-  52,
-  49,
-  53,
-  49,
-  54,
-  49,
-  55, // Pair 20-23
-
-  49,
-  56,
-  49,
-  57,
-  49,
-  97,
-  49,
-  98, // Pair 24-27
-  49,
-  99,
-  49,
-  100,
-  49,
-  101,
-  49,
-  102, // Pair 28-31
-
-  0,
-  0,
-  0,
-  0,
-  92,
-  34,
-  0,
-  0, // Pair 32-35
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 36-39
-
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 40-43
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 44-47
-
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 48-51
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 52-55
-
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 56-59
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 60-63
-
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 64-67
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 68-71
-
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 72-75
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 76-79
-
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 80-83
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 84-87
-
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // Pair 88-91
-  92,
-  92, // Pair 92-93
-]);
-
-export const DESERIALIZE_ESCAPE_TABLE = memory.data<u8>([
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 0-7
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 8-15
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 16-23
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 24-31
-  0,
-  0,
-  34,
-  0,
-  0,
-  0,
-  0,
-  0, // 32-39
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 40-47
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 48-55
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 56-63
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 64-71
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 72-79
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 80-87
-  0,
-  0,
-  0,
-  0,
-  92,
-  0,
-  0,
-  0, // 88-95
-  0,
-  0,
-  8,
-  0,
-  0,
-  0,
-  12,
-  0, // 96-103
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  10,
-  0, // 104-111
-  0,
-  0,
-  13,
-  0,
-  9,
-  117,
-  0,
-  0, // 112-119
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 120-127
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 128-135
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 136-143
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0, // 144-151
-]);
-
-export const ESCAPE_HEX_TABLE =
-  memory.data<u8>([
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7, // 0-7
-    8,
-    9,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0, // 8-15
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0, // 16-23
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0, // 24-31
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0, // 32-39
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0, // 40-47
-    0,
-    10,
-    11,
-    12,
-    13,
-    14,
-    15, // 48-54
-  ]) - 48;
-
-export const POW_TEN_TABLE_32 = memory.data<u32>([1, 10, 1_000, 10_000, 100_000, 1_000_000, 10_000_000, 100_000_000, 1_000_000_000]);
-
-export const POW_TEN_TABLE_64 = memory.data<u64>([1, 10, 1_000, 10_000, 100_000, 1_000_000, 10_000_000, 100_000_000, 1_000_000_000, 10_000_000_000, 100_000_000_000, 1_000_000_000_000, 10_000_000_000_000, 100_000_000_000_000, 1_000_000_000_000_000, 10_000_000_000_000_000, 100_000_000_000_000_000, 1_000_000_000_000_000_000, 10_000_000_000_000_000_000]);
+  48,  48,  48,  49,  48,  50,  48,  51,   // Pair 0-3
+  48,  52,  48,  53,  48,  54,  48,  55,   // Pair 4-7
+ 
+  92,  98,  92, 116,  92, 110,  48,  98,   // Pair 8-11
+  92,  102, 92, 114,  48, 101,  48, 102,   // Pair 12-15
+ 
+  49,  48,  49,  49,  49,  50,  49,  51,   // Pair 16-19
+  49,  52,  49,  53,  49,  54,  49,  55,   // Pair 20-23
+ 
+  49,  56,  49,  57,  49,  97,  49,  98,   // Pair 24-27
+  49,  99,  49, 100,  49, 101,  49, 102,   // Pair 28-31
+ 
+   0,   0,   0,   0,  92,  34,   0,   0,   // Pair 32-35
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 36-39
+ 
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 40-43
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 44-47
+ 
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 48-51
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 52-55
+ 
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 56-59
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 60-63
+ 
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 64-67
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 68-71
+ 
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 72-75
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 76-79
+ 
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 80-83
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 84-87
+ 
+   0,   0,   0,   0,   0,   0,   0,   0,   // Pair 88-91
+  92,  92,                                 // Pair 92-93
+ ]);
+ 
+ export const DESERIALIZE_ESCAPE_TABLE = memory.data<u8>([
+   0,   0,   0,   0,   0,   0,   0,   0,   // 0-7
+   0,   0,   0,   0,   0,   0,   0,   0,   // 8-15
+   0,   0,   0,   0,   0,   0,   0,   0,   // 16-23
+   0,   0,   0,   0,   0,   0,   0,   0,   // 24-31
+   0,   0,  34,   0,   0,   0,   0,   0,   // 32-39
+   0,   0,   0,   0,   0,   0,   0,   0,   // 40-47
+   0,   0,   0,   0,   0,   0,   0,   0,   // 48-55
+   0,   0,   0,   0,   0,   0,   0,   0,   // 56-63
+   0,   0,   0,   0,   0,   0,   0,   0,   // 64-71
+   0,   0,   0,   0,   0,   0,   0,   0,   // 72-79
+   0,   0,   0,   0,   0,   0,   0,   0,   // 80-87
+   0,   0,   0,   0,  92,   0,   0,   0,   // 88-95
+   0,   0,   8,   0,   0,   0,  12,   0,   // 96-103
+   0,   0,   0,   0,   0,   0,  10,   0,   // 104-111
+   0,   0,  13,   0,   9, 117,   0,   0,   // 112-119
+   0,   0,   0,   0,   0,   0,   0,   0,   // 120-127
+   0,   0,   0,   0,   0,   0,   0,   0,   // 128-135
+   0,   0,   0,   0,   0,   0,   0,   0,   // 136-143
+   0,   0,   0,   0,   0,   0,   0,   0,   // 144-151
+ ]);
+ 
+ export const ESCAPE_HEX_TABLE =
+   memory.data<u8>([
+     0,   1,   2,   3,   4,   5,   6,   7,   // 0-7
+     8,   9,   0,   0,   0,   0,   0,   0,   // 8-15
+     0,   0,   0,   0,   0,   0,   0,   0,   // 16-23
+     0,   0,   0,   0,   0,   0,   0,   0,   // 24-31
+     0,   0,   0,   0,   0,   0,   0,   0,   // 32-39
+     0,   0,   0,   0,   0,   0,   0,   0,   // 40-47
+     0,  10,  11,  12,  13,  14,  15,   // 48-54
+   ]) - 48;
+ 
+ export const POW_TEN_TABLE_32 = memory.data<u32>([1, 10, 1_000, 10_000, 100_000, 1_000_000, 10_000_000, 100_000_000, 1_000_000_000]);
+ 
+ export const POW_TEN_TABLE_64 = memory.data<u64>([1, 10, 1_000, 10_000, 100_000, 1_000_000, 10_000_000, 100_000_000, 1_000_000_000, 10_000_000_000, 100_000_000_000, 1_000_000_000_000, 10_000_000_000_000, 100_000_000_000_000, 1_000_000_000_000_000, 10_000_000_000_000_000, 100_000_000_000_000_000, 1_000_000_000_000_000_000, 10_000_000_000_000_000_000]);
+ 

package/assembly/index.ts

@@ -36,6 +36,11 @@ export type Raw = string;
  * JSON Encoder/Decoder for AssemblyScript
  */
 export namespace JSON {
+  export namespace Memory {
+    export function shrink(): void {
+      bs.resize(64);
+    }
+  }
   /**
    * Serializes valid JSON data
    * ```js
@@ -93,23 +98,21 @@ export namespace JSON {
       return NULL_WORD;
       // @ts-ignore
     } else if (isString<nonnull<T>>()) {
-      if (out) {
-        out = changetype<string>(__renew(changetype<usize>(out), bytes(data) + 4));
-        // const oldSize = bs.byteLength;
-        const oldBuf = bs.buffer;
-        const newSize = bytes(data) + 4;
-        const newBuf = __new(newSize, idof<string>());
-        bs.setBuffer(newBuf);
-        serializeString(changetype<string>(data));
-        bs.setBuffer(oldBuf);
-        return changetype<string>(newBuf);
-      }
+      // if (out) {
+      //   out = changetype<string>(__renew(changetype<usize>(out), bytes(data) + 4));
+      //   // const oldSize = bs.byteLength;
+      //   const oldBuf = bs.buffer;
+      //   const newSize = bytes(data) + 4;
+      //   const newBuf = __new(newSize, idof<string>());
+      //   bs.setBuffer(newBuf);
+      //   serializeString(changetype<string>(data));
+      //   bs.setBuffer(oldBuf);
+      //   return changetype<string>(newBuf);
+      // }
       serializeString(changetype<string>(data));
       return bs.out<string>();
       // @ts-ignore: Supplied by transform
-    } else if (isDefined(data.__SERIALIZE) && isDefined(data.__ALLOCATE)) {
-      // @ts-ignore
-      data.__ALLOCATE();
+    } else if (isDefined(data.__SERIALIZE)) {
       // @ts-ignore
       data.__SERIALIZE(changetype<usize>(data));
       return bs.out<string>();
@@ -119,8 +122,8 @@ export namespace JSON {
 
       store<u16>(changetype<usize>(out), QUOTE);
       memory.copy(changetype<usize>(out) + 2, changetype<usize>(data.toISOString()), 48);
-      store<u16>(changetype<usize>(out), 50);
-      return out;
+      store<u16>(changetype<usize>(out), QUOTE, 50);
+      return changetype<string>(out);
     } else if (data instanceof Array) {
       // @ts-ignore
       serializeArray(changetype<nonnull<T>>(data));
@@ -135,7 +138,7 @@ export namespace JSON {
     } else if (data instanceof JSON.Box) {
       return JSON.stringify(data.value);
     } else {
-      ERROR(`Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`);
+      throw new Error(`Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`);
     }
   }
 
@@ -156,12 +159,12 @@ export namespace JSON {
       return deserializeInteger<T>(dataPtr, dataPtr + dataSize);
     } else if (isFloat<T>()) {
       return deserializeFloat<T>(dataPtr, dataPtr + dataSize);
-    } else if (isNullable<T>() && data.length == 4 && data == "null") {
+    } else if (isNullable<T>() && dataSize == 8 && load<u64>(dataPtr) == 30399761348886638) {
       // @ts-ignore
       return null;
     } else if (isString<T>()) {
       // @ts-ignore
-      return deserializeString(dataPtr, dataPtr + dataSize);
+      return deserializeString(dataPtr, dataPtr + dataSize, __new(dataSize - 4, idof<string>()));
     } else if (isArray<T>()) {
       // @ts-ignore
       return deserializeArray<nonnull<T>>(dataPtr, dataPtr + dataSize, changetype<usize>(instantiate<T>()));
@@ -182,9 +185,9 @@ export namespace JSON {
       return deserializeDate(dataPtr, dataPtr + dataSize);
     } else if (type instanceof JSON.Box) {
       // @ts-ignore
-      return new JSON.Box(JSON.parse<indexof<T>>(data));
+      return new JSON.Box(parseBox(data, changetype<nonnull<T>>(0).value));
     } else {
-      ERROR(`Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`);
+      throw new Error(`Could not deserialize data ${data} to type ${nameof<T>()}. Make sure to add the correct decorators to classes.`);
     }
   }
 
@@ -339,7 +342,9 @@ export namespace JSON {
    * Box for primitive types
    */
   export class Box<T> {
-    constructor(public value: T) {}
+    constructor(public value: T) {
+      if (!isInteger<T>() && !isFloat<T>()) ERROR("JSON.Box should only hold primitive types!");
+    }
     /**
      * Creates a reference to a primitive type
      * This means that it can create a nullable primitive
@@ -353,13 +358,19 @@ export namespace JSON {
     @inline static from<T>(value: T): Box<T> {
       return new Box(value);
     }
+    toString(): string {
+      if (isNullable<this>() && changetype<usize>(this) == null) return "null";
+      // @ts-ignore: type
+      if (isDefined(this.value.toString)) return this.value.toString();
+      return "null";
+    }
   }
 
   export function __serialize<T>(src: T): void {
     if (isBoolean<T>()) {
       serializeBool(src as bool);
     } else if (isInteger<T>() && nameof<T>() == "usize" && src == 0) {
-      bs.ensureSize(8);
+      bs.proposeSize(8);
       store<u64>(bs.offset, 30399761348886638);
       bs.offset += 8;
     } else if (isInteger<T>()) {
@@ -370,7 +381,7 @@ export namespace JSON {
       serializeFloat<T>(src);
       // @ts-ignore: Function is generated by transform
     } else if (isNullable<T>() && changetype<usize>(src) == <usize>0) {
-      bs.ensureSize(8);
+      bs.proposeSize(8);
       store<u64>(bs.offset, 30399761348886638);
       bs.offset += 8;
     } else if (isString<nonnull<T>>()) {
@@ -393,7 +404,7 @@ export namespace JSON {
     } else if (src instanceof JSON.Box) {
       __serialize(src.value);
     } else {
-      ERROR(`Could not serialize provided data. Make sure to add the correct decorators to classes.`);
+      throw new Error(`Could not serialize provided data. Make sure to add the correct decorators to classes.`);
     }
   }
   export function __deserialize<T>(srcStart: usize, srcEnd: usize, dst: usize = 0): T {
@@ -421,8 +432,20 @@ export namespace JSON {
       } else if (type instanceof Date) {
         // @ts-ignore: type
         return deserializeDate(srcStart, srcEnd);
+      } else if (type instanceof JSON.Box) {
+        // @ts-ignore: type
+        return new JSON.Box(deserializeBox(srcStart, srcEnd, dst, changetype<nonnull<T>>(0).value));
       }
     }
     throw new Error(`Could not deserialize data '${ptrToStr(srcStart, srcEnd).slice(0, 100)}' to type. Make sure to add the correct decorators to classes.`);
   }
 }
+
+// @ts-ignore: decorator
+@inline function parseBox<T>(data: string, ty: T): T {
+  return JSON.parse<T>(data);
+}
+
+function deserializeBox<T>(srcStart: usize, srcEnd: usize, dst: usize, ty: T): T {
+  return JSON.__deserialize<T>(srcStart, srcEnd, dst);
+}