json-as 0.9.27 → 0.9.29

package/assembly/index.ts

@@ -43,7 +43,7 @@ export namespace JSON {
     Bool = 7,
     String = 8,
     Obj = 8,
-    Array = 9
+    Array = 9,
   }
   export type Raw = string;
   export class Value {
@@ -52,7 +52,9 @@ export namespace JSON {
     // @ts-ignore
     private storage: u64;
 
-    private constructor() { unreachable(); }
+    private constructor() {
+      unreachable();
+    }
 
     /**
      * Creates an JSON.Value instance from a given value.
@@ -125,12 +127,18 @@ export namespace JSON {
      */
     toString(): string {
       switch (this.type) {
-        case JSON.Types.U8: return this.get<u8>().toString();
-        case JSON.Types.U16: return this.get<u16>().toString();
-        case JSON.Types.U32: return this.get<u32>().toString();
-        case JSON.Types.U64: return this.get<u64>().toString();
-        case JSON.Types.String: return "\"" + this.get<string>() + "\"";
-        case JSON.Types.Bool: return this.get<boolean>() ? "true" : "false";
+        case JSON.Types.U8:
+          return this.get<u8>().toString();
+        case JSON.Types.U16:
+          return this.get<u16>().toString();
+        case JSON.Types.U32:
+          return this.get<u32>().toString();
+        case JSON.Types.U64:
+          return this.get<u64>().toString();
+        case JSON.Types.String:
+          return '"' + this.get<string>() + '"';
+        case JSON.Types.Bool:
+          return this.get<boolean>() ? "true" : "false";
         default: {
           const arr = this.get<JSON.Value[]>();
           if (!arr.length) return "[]";
@@ -152,7 +160,9 @@ export namespace JSON {
     }
   }
   export class Box<T> {
-    constructor(public value: T) { }
+    constructor(public value: T) {}
+
+
     @inline static from<T>(value: T): Box<T> {
       return new Box(value);
     }
@@ -166,8 +176,7 @@ export namespace JSON {
    * @param data T
    * @returns string
    */
-  // @ts-ignore: Decorator
-  @inline export function stringify<T>(data: T/*, options: SerializeOptions = DEFAULT_SERIALIZE_OPTIONS*/): string {
+  export function stringify<T>(data: T /*, options: SerializeOptions = DEFAULT_SERIALIZE_OPTIONS*/): string {
     if (isBoolean<T>()) {
       return serializeBool(data as bool);
     } else if (isInteger<T>() && nameof<T>() == "usize" && data == 0) {
@@ -202,9 +211,7 @@ export namespace JSON {
       // @ts-ignore
       return serializeMap(changetype<nonnull<T>>(data));
     } else {
-      throw new 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.`);
     }
   }
   /**
@@ -215,9 +222,7 @@ export namespace JSON {
    * @param data string
    * @returns T
    */
-
-  // @ts-ignore: Decorator
-  @inline export function parse<T>(data: string): T {
+  export function parse<T>(data: string): T {
     if (isBoolean<T>()) {
       return deserializeBoolean(data) as T;
     } else if (isInteger<T>()) {
@@ -246,9 +251,7 @@ export namespace JSON {
       // @ts-ignore
       return deserializeDate(data);
     } else {
-      throw new 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.`);
     }
   }
   /**
@@ -290,9 +293,7 @@ export namespace JSON {
       // @ts-ignore
       return deserializeDate_Safe(data);
     } else {
-      throw new 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.`);
     }
   }
 }
@@ -309,4 +310,4 @@ export namespace JSON {
 // @ts-ignore: Decorator
 @global @inline function __DESERIALIZE_SAFE<T>(data: string): T {
   return JSON.parseSafe<T>(data);
-}
+}

package/assembly/serialize/array.ts

@@ -1,51 +1,44 @@
 import { JSON } from "..";
-import {
-    COMMA,
-    COMMA_WORD,
-    EMPTY_BRACKET_WORD,
-    BRACKET_LEFT_WORD,
-    BRACKET_RIGHT,
-    BRACKET_RIGHT_WORD
-} from "../custom/chars";
+import { COMMA, COMMA_WORD, EMPTY_BRACKET_WORD, BRACKET_LEFT_WORD, BRACKET_RIGHT, BRACKET_RIGHT_WORD } from "../custom/chars";
 import { Sink } from "../custom/sink";
 import { serializeString } from "./string";
 
 // @ts-ignore: Decorator valid here
 @inline export function serializeArray<T extends any[]>(data: T): string {
-    if (data.length == 0) {
-        return EMPTY_BRACKET_WORD;
-        // @ts-ignore
-    } else if (isString<valueof<T>>()) {
-        let result = BRACKET_LEFT_WORD;
-        // @ts-ignore
-        for (let i = 0; i < data.length - 1; i++) {
-            // @ts-ignore
-            result += serializeString(unchecked(data[i]));
-            result += COMMA_WORD;
-        }
-        // @ts-ignore
-        result += serializeString(unchecked(data[data.length - 1]));
-        result += BRACKET_RIGHT_WORD;
-        return result;
-        // @ts-ignore
-    } else if (isBoolean<valueof<T>>()) {
-        // @ts-ignore
-        return BRACKET_LEFT_WORD + data.join(COMMA_WORD) + BRACKET_RIGHT_WORD;
-        // @ts-ignore
-    } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
-        // @ts-ignore
-        return BRACKET_LEFT_WORD + data.join(COMMA_WORD) + BRACKET_RIGHT_WORD;
-    } else {
-        let result = Sink.fromString(BRACKET_LEFT_WORD);
-        // @ts-ignore
-        for (let i = 0; i < data.length - 1; i++) {
-            // @ts-ignore
-            result.write(JSON.stringify(unchecked(data[i])));
-            result.writeCodePoint(COMMA);
-        }
-        // @ts-ignore
-        result.write(JSON.stringify(unchecked(data[data.length - 1])));
-        result.writeCodePoint(BRACKET_RIGHT);
-        return result.toString();
+  if (data.length == 0) {
+    return EMPTY_BRACKET_WORD;
+    // @ts-ignore
+  } else if (isString<valueof<T>>()) {
+    let result = BRACKET_LEFT_WORD;
+    // @ts-ignore
+    for (let i = 0; i < data.length - 1; i++) {
+      // @ts-ignore
+      result += serializeString(unchecked(data[i]));
+      result += COMMA_WORD;
     }
-}
+    // @ts-ignore
+    result += serializeString(unchecked(data[data.length - 1]));
+    result += BRACKET_RIGHT_WORD;
+    return result;
+    // @ts-ignore
+  } else if (isBoolean<valueof<T>>()) {
+    // @ts-ignore
+    return BRACKET_LEFT_WORD + data.join(COMMA_WORD) + BRACKET_RIGHT_WORD;
+    // @ts-ignore
+  } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
+    // @ts-ignore
+    return BRACKET_LEFT_WORD + data.join(COMMA_WORD) + BRACKET_RIGHT_WORD;
+  } else {
+    let result = Sink.fromString(BRACKET_LEFT_WORD);
+    // @ts-ignore
+    for (let i = 0; i < data.length - 1; i++) {
+      // @ts-ignore
+      result.write(JSON.stringify(unchecked(data[i])));
+      result.writeCodePoint(COMMA);
+    }
+    // @ts-ignore
+    result.write(JSON.stringify(unchecked(data[data.length - 1])));
+    result.writeCodePoint(BRACKET_RIGHT);
+    return result.toString();
+  }
+}

package/assembly/serialize/bool.ts

@@ -6,5 +6,5 @@
 
 // @ts-ignore: Decorator valid here
 @inline export function serializeBool(data: bool): string {
-    return data ? "true" : "false";
-}
+  return data ? "true" : "false";
+}

package/assembly/serialize/date.ts

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

package/assembly/serialize/float.ts

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

package/assembly/serialize/integer.ts

@@ -1,5 +1,5 @@
 // @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();
-}
+  // 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

@@ -4,21 +4,21 @@ import { Sink } from "../custom/sink";
 
 // @ts-ignore: Decorator valid here
 @inline export function serializeMap<T extends Map<any, any>>(data: T): string {
-    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(JSON.stringify(unchecked(keys[i]).toString()));
-        result.writeCodePoint(COLON);
-        result.write(JSON.stringify(unchecked(values[i])));
-        result.writeCodePoint(COMMA);
-    }
-    result.write(JSON.stringify(unchecked(keys[end]).toString()));
+  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(JSON.stringify(unchecked(keys[i]).toString()));
     result.writeCodePoint(COLON);
-    result.write(JSON.stringify(unchecked(values[end])));
+    result.write(JSON.stringify(unchecked(values[i])));
+    result.writeCodePoint(COMMA);
+  }
+  result.write(JSON.stringify(unchecked(keys[end]).toString()));
+  result.writeCodePoint(COLON);
+  result.write(JSON.stringify(unchecked(values[end])));
 
-    result.writeCodePoint(BRACE_RIGHT);
-    return result.toString();
-}
+  result.writeCodePoint(BRACE_RIGHT);
+  return result.toString();
+}

package/assembly/serialize/object.ts

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

package/assembly/serialize/string.ts

@@ -32,7 +32,7 @@ import { Sink } from "../custom/sink";
 
 // /**
 //  * A prototype SIMD implementation for string serialization which can only work in 128-byte (or 16 chars with wtf-16).
-//  * 
+//  *
 //  * A faster version could perhaps look like the following:
 //  */
 // // @ts-ignore: Decorator
@@ -77,7 +77,6 @@ import { Sink } from "../custom/sink";
 //     }
 // }
 
-
 // const back_slash_reg = i16x8.splat(92); // "\"
 // const quote_reg = i16x8.splat(34); // "\""
 
@@ -96,7 +95,6 @@ import { Sink } from "../custom/sink";
 //         const quote_mask = i16x8.eq(block, quote_reg);
 //         const is_quote_or_backslash = v128.or(quote_mask, backslash_mask);
 //         console.log("mask:  " + prt10(is_quote_or_backslash))
-        
 
 //         // store<v128>(dst_ptr, expanded);
 //         src_ptr += 8;
@@ -146,66 +144,66 @@ import { Sink } from "../custom/sink";
 
 // @ts-ignore: Decorator
 @inline export function serializeString(data: string): string {
-    // if (!needsEscaping(data)) {
-    //     return "\"" + data + "\"";
-    // }
-
-    if (data.length === 0) {
-        return "\"\"";
-    }
-    let result = Sink.fromString("\"");
-
-    let last: i32 = 0;
-    for (let i = 0; i < data.length; i++) {
-        const char = unsafeCharCodeAt(<string>data, i);
-        if (char === 34 || char === 92) {
-            result.write(<string>data, last, i);
-            result.writeCodePoint(92);
-            last = i;
-        } else if (char < 16) {
-            result.write(<string>data, last, i);
-            last = i + 1;
-            switch (char) {
-                case 8: {
-                    result.write("\\b");
-                    break;
-                }
-                case 9: {
-                    result.write("\\t");
-                    break;
-                }
-                case 10: {
-                    result.write("\\n");
-                    break;
-                }
-                case 12: {
-                    result.write("\\f");
-                    break;
-                }
-                case 13: {
-                    result.write("\\r");
-                    break;
-                }
-                default: {
-                    // all chars 0-31 must be encoded as a four digit unicode escape sequence
-                    // \u0000 to \u000f handled here
-                    result.write("\\u000");
-                    result.write(char.toString(16));
-                    break;
-                }
-            }
-        } else if (char < 32) {
-            result.write(<string>data, last, i);
-            last = i + 1;
-            // all chars 0-31 must be encoded as a four digit unicode escape sequence
-            // \u0010 to \u001f handled here
-            result.write("\\u00");
-            result.write(char.toString(16));
+  // if (!needsEscaping(data)) {
+  //     return "\"" + data + "\"";
+  // }
+
+  if (data.length === 0) {
+    return '""';
+  }
+  let result = Sink.fromString('"');
+
+  let last: i32 = 0;
+  for (let i = 0; i < data.length; i++) {
+    const char = unsafeCharCodeAt(<string>data, i);
+    if (char === 34 || char === 92) {
+      result.write(<string>data, last, i);
+      result.writeCodePoint(92);
+      last = i;
+    } else if (char < 16) {
+      result.write(<string>data, last, i);
+      last = i + 1;
+      switch (char) {
+        case 8: {
+          result.write("\\b");
+          break;
+        }
+        case 9: {
+          result.write("\\t");
+          break;
+        }
+        case 10: {
+          result.write("\\n");
+          break;
         }
+        case 12: {
+          result.write("\\f");
+          break;
+        }
+        case 13: {
+          result.write("\\r");
+          break;
+        }
+        default: {
+          // all chars 0-31 must be encoded as a four digit unicode escape sequence
+          // \u0000 to \u000f handled here
+          result.write("\\u000");
+          result.write(char.toString(16));
+          break;
+        }
+      }
+    } else if (char < 32) {
+      result.write(<string>data, last, i);
+      last = i + 1;
+      // all chars 0-31 must be encoded as a four digit unicode escape sequence
+      // \u0010 to \u001f handled here
+      result.write("\\u00");
+      result.write(char.toString(16));
     }
-    result.write(<string>data, last);
-    result.writeCodePoint(34);
-    return result.toString();
+  }
+  result.write(<string>data, last);
+  result.writeCodePoint(34);
+  return result.toString();
 }
 
 // // @ts-ignore: Decorator valid here
@@ -218,7 +216,6 @@ import { Sink } from "../custom/sink";
 
 //     bs.write_16(QUOTE);
 
-
 //     let last: i32 = 0;
 //     for (let i = 0; i < len; i += 2) {
 //         const char = load<u16>(changetype<usize>(data) + i);
@@ -284,4 +281,4 @@ import { Sink } from "../custom/sink";
 //         bs.write_s_se(<string>data, last, changetype<OBJECT>(changetype<usize>(data) - TOTAL_OVERHEAD).rtSize);
 //         bs.write_16(QUOTE);
 //     }
-// }
+// }

package/assembly/test.ts

@@ -1,4 +1,5 @@
-import { JSON } from "."
+import { JSON } from ".";
+
 
 @json
 class Vec3 {
@@ -31,4 +32,4 @@ class Vec3 {
 const serialized = JSON.stringify(new Vec3());
 console.log("Serialized: " + serialized);
 const deserialized = JSON.parseSafe<Vec3>(`{"x":1,"y":true,"z":3}`);
-console.log("Deserialized: " + JSON.stringify(deserialized));
+console.log("Deserialized: " + JSON.stringify(deserialized));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.27",
+  "version": "0.9.29",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -37,6 +37,7 @@
     "assemblyscript": "^0.27.29",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
+    "json-as": "file:.",
     "microtime": "^3.1.1",
     "prettier": "^3.3.3",
     "tinybench": "^2.8.0",