json-as 0.9.7 → 0.9.8-b

package/assembly/test.ts

@@ -1,51 +1,14 @@
-import { JSON } from ".";
-
-// @json or @serializable work here
+import { JSON } from "json-as/assembly";
+import * as console from "as-console";
 @json
-class Vec3 {
-  x: f32 = 0.0;
-  y: f32 = 0.0;
-  z: f32 = 0.0;
-}
-
-class Box<T> {
-  value: T;
-}
+class Yo {
+  map: Map<string, u64>;
 
-@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;
+  constructor() {
+    this.map = new Map();
+  }
 }
 
-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
-};
-
-const stringified = JSON.stringify<Player>(player);
-
-const parsed = JSON.parse<Player>(stringified);
-
-console.log("Stringified: " + stringified);
-console.log("Parsed: " + JSON.stringify(parsed));
+let y = new Yo();
+y.map.set("bhavya", 3000);
+console.log(JSON.stringify(y));

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