json-as 0.9.7 → 0.9.8-a

package/assembly/serialize/unknown.ts

@@ -1,7 +1,6 @@
 import { JSON } from "..";
-import { Sink } from "../src/sink";
-import { __atoi_fast } from "../src/util";
-import { serializeUnknownArray } from "./array/unknown";
+import { Sink } from "../sink";
+import { __atoi_fast } from "../util";
 import { serializeBool } from "./bool";
 import { serializeFloat } from "./float";
 import { serializeInteger } from "./integer";
@@ -13,7 +12,8 @@ import { serializeString } from "./string";
  * @param data - The JSON.Value to be serialized.
  * @returns The serialized result.
  */
-export function serializeUnknown(data: JSON.Value): string {
+// @ts-ignore: Decorator valid here
+@inline export function serializeUnknown(data: JSON.Value): string {
     const type = data.type;
     switch (type) {
         case JSON.Types.String: {
@@ -41,5 +41,5 @@ export function serializeUnknown(data: JSON.Value): string {
             return serializeFloat(data.get<f64>());
         }
     }
-    return serializeUnknownArray(data.get<JSON.Value[]>());
+    return "ERROR"//serializeUnknownArray(data.get<JSON.Value[]>());
 }

package/assembly/test.ts

@@ -1,51 +1,85 @@
-import { JSON } from ".";
-
-// @json or @serializable work here
+import {
+  __atoi_fast
+} from "json-as/assembly/util";
+import {
+  JSON as __JSON
+} from "json-as/assembly";
+import {
+  JSON
+} from ".";
 @json
-class Vec3 {
-  x: f32 = 0.0;
-  y: f32 = 0.0;
-  z: f32 = 0.0;
-}
-
-class Box<T> {
-  value: T;
+class Inner {
+  name: string;
+  constructor(name: string) {
+    this.name = name;
+  }
+  __SERIALIZE(): string {
+    let out = `{"name":${__JSON.stringify<string>(this.name)},`;
+    store<u16>(changetype<usize>(out) + ((out.length - 1) << 1), 125);
+    return out;
+  }
+  __INITIALIZE(): this {
+    return this;
+  }
+  __DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {
+    const len = key_end - key_start;
+    if (4 === len) {
+      const code = load<u64>(changetype<usize>(data) + (key_start << 1));
+      if (28429440805568622 === code) {
+        this.name = __JSON.parse<string>(data.substring(value_start, value_end));
+        return true;
+      } else {
+        return false;
+      }
+    }
+    return false;
+  }
 }
-
 @json
-class Player {
-  @alias("first name")
-  @omitnull()
-  firstName: string | null;
-  lastName!: string;
-  lastActive!: i32[];
-  // Drop in a code block, function, or expression that evaluates to a boolean
-  @omitif("this.age < 18")
-  age!: i32;
-  @omitnull()
-  pos!: Vec3 | null;
-  isVerified!: boolean;
-  @flatten("value")
-  box: Box<i32> | null;
-}
-
-const player: Player = {
-  firstName: null,
-  lastName: "West",
-  lastActive: [8, 27, 2022],
-  age: 23,
-  pos: {
-    x: 3.4,
-    y: 1.2,
-    z: 8.3
-  },
-  isVerified: true,
-  box: null
-};
+class Outer {
+  name: string;
+  m: Map<string, Inner>;
+  constructor(name: string) {
+    this.name = name;
+    this.m = new Map<string, Inner>();
+  }
+  __SERIALIZE(): string {
+    let out = `{"name":${__JSON.stringify<string>(this.name)},"m":${__JSON.stringify<Map<string, Inner>>(this.m)},`;
+    store<u16>(changetype<usize>(out) + ((out.length - 1) << 1), 125);
+    return out;
+  }
+  __INITIALIZE(): this {
+    return this;
+  }
+  __DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {
+    const len = key_end - key_start;
+    if (1 === len) {
+      switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {
+        case 109:
+          {
+            this.m = __JSON.parse<Map<string, Inner>>(data.substring(value_start, value_end));
+            return true;
+          }
 
-const stringified = JSON.stringify<Player>(player);
+        default:
+          {
+            return false;
+          }
 
-const parsed = JSON.parse<Player>(stringified);
+}
+    } else if (4 === len) {
+      const code = load<u64>(changetype<usize>(data) + (key_start << 1));
+      if (28429440805568622 === code) {
+        this.name = __JSON.parse<string>(data.substring(value_start, value_end));
+        return true;
+      } else {
+        return false;
+      }
+    }
+    return false;
+  }
+}
 
-console.log("Stringified: " + stringified);
-console.log("Parsed: " + JSON.stringify(parsed));
+console.log(JSON.stringify(new Map<string, Inner>()))
+let serializedState = JSON.stringify(new Outer("haadf"));
+console.log(serializedState);

package/assembly/types.ts

@@ -0,0 +1,4 @@
+@json
+export class Vec3 {
+  x: f64 = 1.0;
+}

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

@@ -1,6 +1,6 @@
-import { StringSink } from "as-string-sink/assembly";
 import { isSpace } from "util/string";
 import { BACK_SLASH, QUOTE } from "./chars";
+import { Sink } from "./sink";
 
 // @ts-ignore: Decorator
 export function isMap<T>(): bool {
@@ -15,7 +15,7 @@ export function unsafeCharCodeAt(data: string, pos: i32): i32 {
 
 // @ts-ignore: Decorator
 export function removeWhitespace(data: string): string {
-  const result = new StringSink();
+  const result = new Sink();
   let instr = false;
   for (let i = 0; i < data.length; i++) {
     const char = unsafeCharCodeAt(data, i);
@@ -258,7 +258,7 @@ export function snip_fast<T extends number>(str: string, len: u32 = 0, offset: u
  */
 
 // @ts-ignore
-@global export function __atoi_fast<T extends number>(str: string, start: u32 = 0, end: u32 = 0): T {
+export function __atoi_fast<T extends number>(str: string, start: u32 = 0, end: u32 = 0): T {
   // @ts-ignore
   let val: T = 0;
   if (!end) end = start + u32(str.length << 1);

package/bench/benchmark.ts

@@ -1,5 +1,5 @@
 import { bench, blackbox } from "as-bench/assembly/bench";
-import { __atoi_fast } from "../assembly/src/util";
+import { __atoi_fast } from "../assembly/util";
 import { JSON } from "../assembly";
 
 @json