json-as 0.4.9 → 0.5.1

package/README.md

@@ -27,25 +27,17 @@ Or, add it to `asconfig.json`
 }
 ```
 
-## Support
-
-- ✅ Objects (Supported)
-- ✅ Arrays (Supported)
-- ✅ Numbers (Supported)
-- ✅ Integers (Supported)
-- ✅ Null (Supported)
-- ❌ Dynamic Variants (Not supported)
-
 ## Usage
 
 ```js
-import { JSON } from "json-as";
+import { JSON } from "json-as/assembly";
 
 @json
 class Vec2 {
   x: f32
   y: f32
 }
+
 @json
 class Player {
   firstName: string
@@ -69,46 +61,24 @@ const data: Player = {
 }
 
 const stringified = JSON.stringify<Player>(data);
-// {
-//  "firstName": "Emmet",
-//  "lastName": "West",
-//  "lastActive": [8, 27, 2022],
-//  "age": 23,
-//  "pos": {
-//    "x": -3.4000000953674318,
-//    "y": 1.2000000476837159
-//  },
-//  "isVerified": true
-// }
-console.log(`Stringified: ${stringified}`);
 
 const parsed = JSON.parse<Player>(stringified);
-// Player {
-//  firstName: "Emmet",
-//  lastName: "West",
-//  lastActive: [8, 27, 2022],
-//  age: 23,
-//  pos: {
-//    x: -3.4000000953674318,
-//    y: 1.2000000476837159
-//  },
-//  isVerified: true
-// }
-console.log(`Parsed: ${JSON.stringify(parsed)}`);
 ```
 
-## FAQ
-
-- Does it support the full JSON spec?
-  Yes, as-json supports the full JSON specification and trys to mimic the JSON API as much as possible
-- What are the differences between as-json and the JSON API?
-  The main difference between as-json and the JSON API is the ability to create new fields in objects during runtime. Since classes are static, Map ser/de support will be added soon allowing the user to parse and stringify dynamic objects and their properties
-- Does this support nested structures?
-  Yes, as-json supports nested structures
-- Does this support whitespace?
-  Yes, as-json supports whitespace!
-- How fast is it?
-  Really fast. For example, here are some benchmarks for ser/de a Vec2 with as-json
+## Performance
+
+**Serialize Object (Vec2):** ~7.29m ops/s
+
+**Deserialize Object (Vec2):** ~1.36m ops/s
+
+**Serialize Array (int[4]):** ~1.4m ops/s
+
+**Deserialize Array (int[4]):** ~2.8m ops/s
+
+**Serialize String (5):** ~5.2m ops/sw
+
+**Deserialize String (5):** ~1.36m ops/s
+
 ## Issues
 
 Please submit an issue to https://github.com/JairusSW/as-json/issues if you find anything wrong with this library

package/assembly/__benches__/as-json.ts

@@ -1,5 +1,4 @@
 import { JSON } from "..";
-import { rainbow } from "as-rainbow/assembly"
 
 @json
 class Vec2 {
@@ -12,8 +11,6 @@ const vec: Vec2 = blackbox<Vec2>({
   y: 0.0,
 });
 
-//console.log(rainbow.bgBlue("Running benchmark for as-json"));
-
 bench("Stringify Object (Vec2)", () => {
   blackbox(JSON.stringify(vec));
 });

package/assembly/__tests__/as-json.spec.ts

@@ -5,6 +5,20 @@ function canSerde<T>(data: T): void {
     expect(serialized).toBe(deserialized);
 }
 
+// @ts-ignore
+@json
+class Vec2 {
+    x: f32;
+    y: f32;
+}
+
+class Nullable {}
+type Null = Nullable | null
+
+describe("Ser/de Nulls", () => {
+    canSerde<Null>(null)
+})
+
 describe("Ser/de Numbers", () => {
     it("should ser/de integers", () => {
         canSerde<i32>(0)
@@ -82,4 +96,14 @@ describe("Ser/de Array", () => {
     it("should ser/de string arrays", () => {
         canSerde<string[][]>([["abcdefg"], ["st\"ring\" w\"\"ith quotes\""], ["string \t\r\\\"with ran\tdom spa\nces and \nnewlines\n\n\n"], ["string with colon : comma , brace [ ] bracket { } and quote \" and other quote \\\""]])
     });
-});
+});
+
+describe("Ser/de Objects", () => {
+    it("should ser/de Vec2 Objects", () => {
+        canSerde<Vec2>({
+            x: 3.4,
+            y: 1.2
+        })
+    })
+
+})

package/assembly/chars.ts

@@ -15,3 +15,4 @@ export const fCode = "f".charCodeAt(0);
 export const aCode = "a".charCodeAt(0);
 export const lCode = "l".charCodeAt(0);
 export const sCode = "s".charCodeAt(0);
+export const nCode = "n".charCodeAt(0);

package/assembly/index.ts

@@ -1,457 +1 @@
-import { StringSink } from "as-string-sink/assembly";
-import { Variant } from "as-variant/assembly";
-import { isSpace } from "util/string";
-import {
-  backSlashCode,
-  colonCode,
-  commaCode,
-  eCode,
-  fCode,
-  forwardSlashCode,
-  leftBraceCode,
-  leftBracketCode,
-  quoteCode,
-  rightBraceCode,
-  rightBracketCode,
-  tCode,
-} from "./chars";
-import { removeWhitespace, unsafeCharCodeAt } from "./util";
-
-/**
- * JSON Encoder/Decoder for AssemblyScript
- */
-export class JSON {
-  private static parseObjectValue<T>(data: string): T {
-    let type!: T;
-    if (isString<T>()) {
-      // @ts-ignore
-      return data.replaceAll('\\"', '"');
-    } else if (isBoolean<T>()) {
-      // @ts-ignore
-      return parseBoolean<T>(data);
-    } else if (isFloat<T>() || isInteger<T>()) {
-      return parseNumber<T>(data);
-    } else if (isArrayLike<T>()) {
-      // @ts-ignore
-      return parseArray<T>(data);
-      // @ts-ignore
-    } else if (isDefined(type.__JSON_Deserialize)) {
-      return parseObject<T>(data);
-    } else {
-      // @ts-ignore
-      return null;
-    }
-  }
-  /**
-   * Stringifies valid JSON data.
-   * ```js
-   * JSON.stringify<T>(data)
-   * ```
-   * @param data T
-   * @returns string
-   */
-  static stringify<T = Nullable | null>(data: T): string {
-    // String
-    if (isString<T>()) {
-      return '"' + (<string>data).replaceAll('"', '\\"') + '"';
-    }
-    // Boolean
-    else if (isBoolean<T>()) {
-      return data ? "true" : "false";
-    }
-    // Integers/Floats
-    // @ts-ignore
-    else if ((isInteger<T>() || isFloat<T>()) && isFinite(data)) {
-      // @ts-ignore
-      return data.toString();
-    }
-    // Class-Based serialization
-    // @ts-ignore
-    else if (isDefined(data.__JSON_Serialize)) {
-      // @ts-ignore
-      return data.__JSON_Serialize();
-    }
-    // ArrayLike
-    else if (isArrayLike<T>()) {
-      let result = new StringSink("[");
-      // @ts-ignore
-      if (data.length == 0) return "[]";
-      // @ts-ignore
-      for (let i = 0; i < data.length - 1; i++) {
-        // @ts-ignore
-        result.write(JSON.stringify(unchecked(data[i])));
-        result.write(",");
-      }
-      // @ts-ignore
-      result.write(JSON.stringify(unchecked(data[data.length - 1])));
-      result.write("]");
-      return result.toString();
-    }
-    // Null
-    else if (isNullable<T>() && data == null) {
-      return "null";
-    } else {
-      return "null";
-    }
-  }
-  /**
-   * Parses valid JSON strings into their original format.
-   * ```js
-   * JSON.parse<T>(data)
-   * ```
-   * @param data string
-   * @returns T
-   */
-  static parse<T = Variant>(data: string): T {
-    let type!: T;
-    if (isString<T>()) {
-      // @ts-ignore
-      return parseString(data);
-    } else if (isBoolean<T>()) {
-      // @ts-ignore
-      return parseBoolean<T>(data);
-    } else if (isFloat<T>() || isInteger<T>()) {
-      return parseNumber<T>(data);
-    } else if (isArrayLike<T>()) {
-      // @ts-ignore
-      return parseArray<T>(data.trimStart());
-      // @ts-ignore
-    } else if (isDefined(type.__JSON_Deserialize)) {
-      return parseObject<T>(data.trimStart());
-    } else {
-      // @ts-ignore
-      return null;
-    }
-  }
-}
-
-// @ts-ignore
-@inline
-  function parseString(data: string): string {
-  return data.slice(1, data.length - 1).replaceAll('\\"', '"');
-}
-
-// @ts-ignore
-@inline
-  function parseBoolean<T extends boolean>(data: string): T {
-  if (data.length > 3 && data.startsWith("true")) return <T>true;
-  else if (data.length > 4 && data.startsWith("false")) return <T>false;
-  else throw new Error(`JSON: Cannot parse "${data}" as boolean`);
-}
-
-// @ts-ignore
-@inline
-  function parseNumber<T>(data: string): T {
-  let type: T;
-  // @ts-ignore
-  if (type instanceof f64) return F64.parseFloat(data);
-  // @ts-ignore
-  else if (type instanceof f32) return F32.parseFloat(data);
-  // @ts-ignore
-  else if (type instanceof u64) return U64.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof u32) return U32.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof u8) return U8.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof u16) return U16.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof i64) return I64.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof i32) return I32.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof i16) return I16.parseInt(data);
-  // @ts-ignore
-  else if (type instanceof i8) return I8.parseInt(data);
-  else
-    throw new Error(
-      `JSON: Cannot parse invalid data into a number. Either "${data}" is not a valid number, or <${nameof<T>()}> is an invald number type.`
-    );
-}
-
-// @ts-ignore
-@inline
-  export function parseObject<T>(data: string): T {
-  let schema!: T;
-  const result = new Map<string, string>();
-  let key = "";
-  let isKey = false;
-  let depth = 1;
-  let char = 0;
-  for (
-    let outerLoopIndex = 1;
-    outerLoopIndex < data.length - 1;
-    outerLoopIndex++
-  ) {
-    char = unsafeCharCodeAt(data, outerLoopIndex);
-    if (char === leftBracketCode) {
-      for (
-        let arrayValueIndex = outerLoopIndex;
-        arrayValueIndex < data.length - 1;
-        arrayValueIndex++
-      ) {
-        char = unsafeCharCodeAt(data, arrayValueIndex);
-        if (char === leftBracketCode) {
-          depth = depth << 1;
-        } else if (char === rightBracketCode) {
-          depth = depth >> 1;
-          if (depth === 1) {
-            ++arrayValueIndex;
-            result.set(
-              key,
-              data.slice(outerLoopIndex, arrayValueIndex)
-            );
-            outerLoopIndex = arrayValueIndex;
-            isKey = false;
-            break;
-          }
-        }
-      }
-    } else if (char === leftBraceCode) {
-      for (
-        let objectValueIndex = outerLoopIndex;
-        objectValueIndex < data.length - 1;
-        objectValueIndex++
-      ) {
-        char = unsafeCharCodeAt(data, objectValueIndex);
-        if (char === leftBraceCode) {
-          depth = depth << 1;
-        } else if (char === rightBraceCode) {
-          depth = depth >> 1;
-          if (depth === 1) {
-            ++objectValueIndex;
-            result.set(
-              key,
-              data.slice(outerLoopIndex, objectValueIndex)
-            );
-            outerLoopIndex = objectValueIndex;
-            isKey = false;
-            break;
-          }
-        }
-      }
-    } else if (char === quoteCode) {
-      for (
-        let stringValueIndex = ++outerLoopIndex;
-        stringValueIndex < data.length - 1;
-        stringValueIndex++
-      ) {
-        char = unsafeCharCodeAt(data, stringValueIndex);
-        if (
-          char === quoteCode &&
-          unsafeCharCodeAt(data, stringValueIndex - 1) !== backSlashCode
-        ) {
-          if (isKey === false) {
-            key = data.slice(outerLoopIndex, stringValueIndex);
-            isKey = true;
-          } else {
-            result.set(
-              key,
-              data.slice(outerLoopIndex, stringValueIndex)
-            );
-            isKey = false;
-          }
-          outerLoopIndex = ++stringValueIndex;
-          break;
-        }
-      }
-    } else if (
-      char === tCode &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "r".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "u".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
-    ) {
-      result.set(key, "true");
-      isKey = false;
-    } else if (
-      char === fCode &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "a".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "l".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === "s".charCodeAt(0) &&
-      unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
-    ) {
-      result.set(key, "false");
-      isKey = false;
-    } else if ((char >= 48 && char <= 57) || char === 45) {
-      let numberValueIndex = ++outerLoopIndex;
-      for (; numberValueIndex < data.length - 1; numberValueIndex++) {
-        char = unsafeCharCodeAt(data, numberValueIndex);
-        if (
-          char === commaCode ||
-          isSpace(char) ||
-          numberValueIndex == data.length - 2
-        ) {
-          result.set(
-            key,
-            data.slice(outerLoopIndex - 1, numberValueIndex)
-          );
-          outerLoopIndex = numberValueIndex;
-          isKey = false;
-          break;
-        }
-      }
-    }
-  }
-  // @ts-ignore
-  return schema.__JSON_Deserialize(result);
-}
-
-// @ts-ignore
-@inline
-  // @ts-ignore
-  export function parseArray<T extends unknown[]>(data: string): T {
-  // TODO: Replace with opt
-  let type!: valueof<T>;
-  if (type instanceof String) {
-    return <T>parseStringArray(data);
-  } else if (isBoolean<valueof<T>>()) {
-    // @ts-ignore
-    return parseBooleanArray<T>(data);
-  } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
-    // @ts-ignore
-    return parseNumberArray<T>(data);
-  } else if (isArrayLike<valueof<T>>()) {
-    // @ts-ignore
-    return parseArrayArray<T>(data);
-    // @ts-ignore
-  } else if (isDefined(type.__JSON_Deserialize)) {
-    // @ts-ignore
-    return parseObjectArray<T>(data);
-  }
-}
-
-// @ts-ignore
-@inline
-  export function parseStringArray(data: string): string[] {
-  const result: string[] = [];
-  let lastPos = 0;
-  let instr = false;
-  for (let i = 1; i < data.length - 1; i++) {
-    if (unsafeCharCodeAt(data, i) === quoteCode) {
-      if (instr === false) {
-        instr = true;
-        lastPos = i;
-      } else if (unsafeCharCodeAt(data, i - 1) !== backSlashCode) {
-        instr = false;
-        result.push(data.slice(lastPos + 1, i).replaceAll('\\"', '"'));
-      }
-    }
-  }
-  return result;
-}
-
-// @ts-ignore
-@inline
-  export function parseBooleanArray<T extends boolean[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos = 1;
-  let char = 0;
-  for (let i = 1; i < data.length - 1; i++) {
-    char = unsafeCharCodeAt(data, i);
-    /*// if char == "t" && i+3 == "e"
-    if (char === tCode && data.charCodeAt(i + 3) === eCode) {
-      //i += 3;
-      result.push(parseBoolean<valueof<T>>(data.slice(lastPos, i+2)));
-      //i++;
-    } else if (char === fCode && data.charCodeAt(i + 4) === eCode) {
-      //i += 4;
-      result.push(parseBoolean<valueof<T>>(data.slice(lastPos, i+3)));
-      //i++;
-    }*/
-    if (char === tCode || char === fCode) {
-      lastPos = i;
-    } else if (char === eCode) {
-      i++;
-      result.push(parseBoolean<valueof<T>>(data.slice(lastPos, i)));
-    }
-  }
-  return result;
-}
-
-// @ts-ignore
-@inline
-  export function parseNumberArray<T extends number[]>(data: string): T {
-  const result = instantiate<T>();
-  let lastPos = 0;
-  let char = 0;
-  let i = 1;
-  for (; i < data.length - 1; i++) {
-    char = unsafeCharCodeAt(data, i);
-    if (lastPos === 0 && (char >= 48 && char <= 57) || char === 45) {
-      lastPos = i;
-    } else if ((isSpace(char) || char == commaCode) && lastPos > 0) {
-      result.push(parseNumber<valueof<T>>(data.slice(lastPos, i)));
-      lastPos = 0;
-    }
-  }
-  for (; i > lastPos - 1; i--) {
-    char = unsafeCharCodeAt(data, i);
-    if (char !== rightBracketCode) {
-      result.push(parseNumber<valueof<T>>(data.slice(lastPos, i + 1)));
-      break;
-    }
-  }
-  return result;
-}
-
-// @ts-ignore
-@inline
-  export function parseArrayArray<T extends unknown[][]>(data: string): T {
-  const result = instantiate<T>();
-  let char = 0;
-  let lastPos = 0;
-  let depth = 1;
-  let i = 1;
-  // Find start of bracket
-  //for (; unsafeCharCodeAt(data, i) !== leftBracketCode; i++) {}
-  //i++;
-  for (; i < data.length - 1; i++) {
-    char = unsafeCharCodeAt(data, i);
-    if (char === leftBracketCode) {
-      if (depth === 1) {
-        lastPos = i;
-      }
-      // Shifting is 6% faster than incrementing
-      depth = depth << 1;
-    } else if (char === rightBracketCode) {
-      depth = depth >> 1;
-      if (depth === 1) {
-        i++;
-        result.push(JSON.parse<valueof<T>>(data.slice(lastPos, i)));
-      }
-    }
-  }
-  return result;
-}
-
-// @ts-ignore
-@inline
-  export function parseObjectArray<T extends unknown[][]>(data: string): T {
-  const result = instantiate<T>();
-  let char = 0;
-  let lastPos = 1;
-  let depth = 1;
-  let i = 1;
-  // Find start of bracket
-  //for (; unsafeCharCodeAt(data, i) !== leftBracketCode; i++) { }
-  //i++;
-  for (; i < data.length - 1; i++) {
-    char = unsafeCharCodeAt(data, i);
-    if (char === leftBraceCode) {
-      if (depth === 1) {
-        lastPos = i;
-      }
-      // Shifting is 6% faster than incrementing
-      depth = depth << 1;
-    } else if (char === rightBraceCode) {
-      depth = depth >> 1;
-      if (depth === 1) {
-        i++;
-        result.push(JSON.parse<valueof<T>>(data.slice(lastPos, i)));
-      }
-    }
-  }
-  return result;
-}
-
-class Nullable { }
+export { JSON } from "./json";