json-as 0.9.8-a → 0.9.8-b

package/CHANGELOG

@@ -14,6 +14,7 @@ v0.9.6 - Fix bugs
 v0.9.7 - Update testing framework and readme logo
 v0.9.8 - Update dependencies
 v0.9.8a - Fix #80 - Empty Maps were not serialized to {}, instead, threw memory out of bounds
+v0.9.8b - Fix #81 - Revert transform
 [UNRELEASED] v0.9.9
  - Allow nullable primitives
  - Port over JSON.Value

package/README.md

@@ -3,7 +3,7 @@
  __|  ||   __||     ||   | | ___ |  _  ||   __|
 |  |  ||__   ||  |  || | | ||___||     ||__   |
 |_____||_____||_____||_|___|     |__|__||_____|
-v0.9.8a
+v0.9.8b
 </pre>
 </h5>
 

package/assembly/index.ts

@@ -302,4 +302,14 @@ export namespace JSON {
       );
     }
   }
+}
+
+// This allows JSON.stringify and JSON.parse to be available globally through an alias
+// @ts-ignore: Decorator
+@global function __SERIALIZE<T>(data: T): string {
+  return JSON.stringify(data);
+}
+// @ts-ignore: Decorator
+@global function __DESERIALIZE<T>(data: string): T {
+  return JSON.parse<T>(data);
 }

package/assembly/test.ts

@@ -1,85 +1,14 @@
-import {
-  __atoi_fast
-} from "json-as/assembly/util";
-import {
-  JSON as __JSON
-} from "json-as/assembly";
-import {
-  JSON
-} from ".";
+import { JSON } from "json-as/assembly";
+import * as console from "as-console";
 @json
-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 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;
-          }
+class Yo {
+  map: Map<string, u64>;
 
-        default:
-          {
-            return false;
-          }
-
-}
-    } 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;
+  constructor() {
+    this.map = new Map();
   }
 }
 
-console.log(JSON.stringify(new Map<string, Inner>()))
-let serializedState = JSON.stringify(new Outer("haadf"));
-console.log(serializedState);
+let y = new Yo();
+y.map.set("bhavya", 3000);
+console.log(JSON.stringify(y));