json-as 1.1.19 → 1.1.21

package/assembly/serialize/simple/arbitrary.ts

@@ -44,6 +44,7 @@ export function serializeArbitrary(src: JSON.Value): void {
       const fn = JSON.Value.METHODS.get(src.type - JSON.Types.Struct);
       const ptr = src.get<usize>();
       call_indirect<void>(fn, 0, ptr);
+      break;
     }
   }
 }

package/assembly/serialize/simple/array.ts

@@ -27,7 +27,7 @@ export function serializeArray<T extends any[]>(src: T): void {
 
   const lastBlock = unchecked(src[end]);
   JSON.__serialize<valueof<T>>(lastBlock);
-  bs.growSize(2);
+  // bs.growSize(2);
   store<u16>(bs.offset, BRACKET_RIGHT);
   bs.offset += 2;
 }

package/assembly/serialize/simple/bool.ts

@@ -5,7 +5,7 @@ import { bs } from "../../../lib/as-bs";
  * @returns void
  */
 export function serializeBool(data: bool): void {
-  if (data == true) {
+  if (data === true) {
     bs.proposeSize(8);
     store<u64>(bs.offset, 28429475166421108);
     bs.offset += 8;

package/assembly/serialize/simple/float.ts

@@ -4,5 +4,7 @@ import { dtoa_buffered } from "util/number";
 // @ts-ignore: inline
 @inline export function serializeFloat<T extends number>(data: T): void {
   bs.ensureSize(64);
-  bs.offset += dtoa_buffered(bs.offset, data) << 1;
+  const size = dtoa_buffered(bs.offset, data) << 1;
+  bs.stackSize += size;
+  bs.offset += size;
 }

package/assembly/serialize/simple/integer.ts

@@ -5,8 +5,8 @@ import { itoa_buffered } from "util/number";
 @inline export function serializeInteger<T extends number>(data: T): void {
   bs.ensureSize(sizeof<T>() << 3);
   const bytesWritten = itoa_buffered(bs.offset, data) << 1;
-  bs.offset += bytesWritten;
   bs.growSize(bytesWritten);
+  bs.offset += bytesWritten;
 }
 
 // 32 {"x":,"y":,"z"}

package/assembly/serialize/simple/map.ts

@@ -16,7 +16,7 @@ export function serializeMap<T extends Map<any, any>>(src: T): void {
   let keys = src.keys();
   let values = src.values();
 
-  bs.proposeSize(srcSize << 3); // This needs to be predicted better
+  bs.proposeSize(4);
 
   store<u16>(bs.offset, BRACE_LEFT);
   bs.offset += 2;
@@ -37,7 +37,7 @@ export function serializeMap<T extends Map<any, any>>(src: T): void {
   store<u16>(bs.offset, COLON);
   bs.offset += 2;
   JSON.__serialize(unchecked(values[srcEnd]));
-  bs.growSize(2);
+  // bs.growSize(2);
   store<u16>(bs.offset, BRACE_RIGHT);
   bs.offset += 2;
 }

package/assembly/serialize/simple/object.ts

@@ -1,44 +1,46 @@
 import { bs } from "../../../lib/as-bs";
 import { JSON } from "../..";
-import { BRACE_LEFT, BRACE_RIGHT, QUOTE } from "../../custom/chars";
-import { bytes } from "../../util";
+import { BRACE_LEFT, BRACE_RIGHT, COLON, COMMA } from "../../custom/chars";
+import { serializeArbitrary } from "./arbitrary";
+import { serializeString } from "./string";
 
-export function serializeObject(data: JSON.Obj): void {
-  if (!data.size) {
+export function serializeObject(src: JSON.Obj): void {
+  const srcSize = src.size;
+  const srcEnd = srcSize - 1;
+
+  if (srcSize == 0) {
     bs.proposeSize(4);
     store<u32>(bs.offset, 8192123);
     bs.offset += 4;
     return;
   }
 
-  bs.proposeSize(load<u32>(changetype<usize>(data), offsetof<JSON.Obj>("stackSize")) - 2);
-  const keys = data.keys();
-  const values = data.values();
-
-  // console.log(" Keys    " + keys.join(" "));
-  // console.log(" Values  " + values.map<string>(v => v.toString()).join(" "))
+  const keys = src.keys();
+  const values = src.values();
 
+  bs.growSize(2);
   store<u16>(bs.offset, BRACE_LEFT);
   bs.offset += 2;
 
-  const firstKey = unchecked(keys[0]);
-  const keySize = bytes(firstKey);
-  store<u16>(bs.offset, QUOTE);
-  memory.copy(bs.offset + 2, changetype<usize>(firstKey), keySize);
-  store<u32>((bs.offset += keySize + 2), 3801122); // ":
-  bs.offset += 4;
-  JSON.__serialize(unchecked(values[0]));
-
-  for (let i = 1; i < keys.length; i++) {
-    const key = unchecked(keys[i]);
-    const keySize = bytes(key);
-    store<u32>(bs.offset, 2228268); // ,"
-    memory.copy(bs.offset + 4, changetype<usize>(key), keySize);
-    store<u32>((bs.offset += keySize + 4), 3801122); // ":
-    bs.offset += 4;
-    JSON.__serialize(unchecked(values[i]));
+  for (let i = 0; i < srcEnd; i++) {
+    serializeString(unchecked(keys[i]));
+    bs.growSize(2);
+    store<u16>(bs.offset, COLON);
+    bs.offset += 2;
+
+    serializeArbitrary(unchecked(values[i]));
+    bs.growSize(2);
+    store<u16>(bs.offset, COMMA);
+    bs.offset += 2;
   }
 
+  serializeString(unchecked(keys[srcEnd]));
+  bs.growSize(2);
+  store<u16>(bs.offset, COLON);
+  bs.offset += 2;
+  serializeArbitrary(unchecked(values[srcEnd]));
+
+  bs.growSize(2);
   store<u16>(bs.offset, BRACE_RIGHT);
   bs.offset += 2;
 }