json-as 1.3.3 → 1.3.4

package/assembly/serialize/swar/string.ts

@@ -1,5 +1,5 @@
-import { bs, sc } from "../../../lib/as-bs";
-import { BACK_SLASH } from "../../custom/chars";
+import { bs } from "../../../lib/as-bs";
+import { BACK_SLASH, QUOTE } from "../../custom/chars";
 import { SERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
 import { u16_to_hex4_swar } from "../../util/swar";
 import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
@@ -11,18 +11,166 @@ import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
 
 export function serializeString_SWAR(src: string): void {
   let srcStart = changetype<usize>(src);
+  const srcInitial = srcStart;
+  const srcSize = changetype<OBJECT>(srcStart - TOTAL_OVERHEAD).rtSize;
+  const srcEnd = srcStart + srcSize;
+  do {
+    const srcEnd8Fast = srcEnd - 8;
+    bs.proposeSize(srcSize + 4);
+
+    const dstStart = bs.offset;
+    let dst = dstStart + 2;
+
+    while (srcStart < srcEnd8Fast) {
+      const block = load<u64>(srcStart);
+      if ((block & 0xff00_ff00_ff00_ff00) != 0) break;
+      const lo = block & 0x00ff_00ff_00ff_00ff;
+      const asciiMask = ((lo - 0x0020_0020_0020_0020) | ((lo ^ 0x0022_0022_0022_0022) - 0x0001_0001_0001_0001) | ((lo ^ 0x005c_005c_005c_005c) - 0x0001_0001_0001_0001)) & (0x0080_0080_0080_0080 & ~lo);
+      if (asciiMask != 0) break;
+      store<u64>(dst, block);
+      srcStart += 8;
+      dst += 8;
+    }
+    if (srcStart < srcEnd8Fast) break;
+
+    while (srcStart <= srcEnd - 2) {
+      const code = load<u16>(srcStart);
+      if (code > 0x7f || code == BACK_SLASH || code == QUOTE || code < 32) break;
+      store<u16>(dst, code);
+      srcStart += 2;
+      dst += 2;
+    }
+    if (srcStart <= srcEnd - 2) break;
+
+    store<u16>(dstStart, QUOTE);
+    store<u16>(dst, QUOTE);
+    bs.offset = dst + 2;
+    return;
+  } while (false);
+
+  srcStart = srcInitial;
+  const srcEnd8 = srcEnd - 8;
+
+  bs.proposeSize(srcSize + 4);
+  store<u16>(bs.offset, 34); // "
+  bs.offset += 2;
+
+  while (srcStart < srcEnd8) {
+    const block = load<u64>(srcStart);
+    let mask = detect_escapable_u64_swar_safe(block);
+    store<u64>(bs.offset, block);
+
+    if (mask === 0) {
+      srcStart += 8;
+      bs.offset += 8;
+      continue;
+    }
+
+    do {
+      const laneIdx = usize(ctz(mask) >> 3);
+      const srcIdx = srcStart + laneIdx;
+      // Even (0 2 4 6) -> Confirmed ASCII Escape
+      // Odd (1 3 5 7) -> Possibly a Unicode code unit or surrogate
+      if ((laneIdx & 1) === 0) {
+        mask &= mask - 1;
+        const code = load<u16>(srcIdx);
+        const escaped = load<u32>(SERIALIZE_ESCAPE_TABLE + (code << 2));
+
+        if ((escaped & 0xffff) != BACK_SLASH) {
+          bs.growSize(10);
+          const dstIdx = bs.offset + laneIdx;
+          store<u64>(dstIdx, U00_MARKER);
+          store<u32>(dstIdx, escaped, 8);
+          store<u64>(dstIdx, load<u64>(srcIdx, 2), 12);
+          bs.offset += 10;
+        } else {
+          bs.growSize(2);
+          const dstIdx = bs.offset + laneIdx;
+          store<u32>(dstIdx, escaped);
+          store<u64>(dstIdx, load<u64>(srcIdx, 2), 4);
+          bs.offset += 2;
+        }
+        continue;
+      }
+      mask &= mask - 1;
+
+      const code = load<u16>(srcIdx - 1);
+      if (code < 0xd800 || code > 0xdfff) continue;
+
+      if (code <= 0xdbff && srcIdx + 2 < srcEnd) {
+        const next = load<u16>(srcIdx, 1);
+        if (next >= 0xdc00 && next <= 0xdfff) {
+          // paired surrogate
+          // mask &= ~(0xFF << ((laneIdx+2) << 3));
+          mask &= mask - 1;
+          continue;
+        }
+      }
+
+      bs.growSize(10);
+
+      // unpaired high/low surrogate
+      const dstIdx = bs.offset + laneIdx - 1;
+      store<u32>(dstIdx, U_MARKER); // \u
+      store<u64>(dstIdx, u16_to_hex4_swar(code), 4);
+      store<u64>(dstIdx, load<u64>(srcIdx, 1), 12);
+      bs.offset += 10;
+    } while (mask !== 0);
+
+    srcStart += 8;
+    bs.offset += 8;
+  }
+
+  while (srcStart <= srcEnd - 2) {
+    const code = load<u16>(srcStart);
+
+    if (code == BACK_SLASH || code == QUOTE || code < 32) {
+      const escaped = load<u32>(SERIALIZE_ESCAPE_TABLE + (code << 2));
+      if ((escaped & 0xffff) != BACK_SLASH) {
+        bs.growSize(10);
+        store<u64>(bs.offset, U00_MARKER);
+        store<u32>(bs.offset, escaped, 8);
+        bs.offset += 12;
+      } else {
+        bs.growSize(2);
+        store<u32>(bs.offset, escaped);
+        bs.offset += 4;
+      }
+      srcStart += 2;
+      continue;
+    }
+
+    if (code < 0xd800 || code > 0xdfff) {
+      store<u16>(bs.offset, code);
+      bs.offset += 2;
+      srcStart += 2;
+      continue;
+    }
 
-  if (isDefined(JSON_CACHE)) {
-    const e = unchecked(sc.entries[i32((srcStart >> 4) & sc.CACHE_MASK)]);
-    if (e.key == srcStart) {
-      bs.offset += e.len;
-      bs.stackSize += e.len;
-      bs.cacheOutput = e.ptr;
-      bs.cacheOutputLen = e.len;
-      return;
+    if (code <= 0xdbff && srcStart + 2 <= srcEnd - 2) {
+      const next = load<u16>(srcStart, 2);
+      if (next >= 0xdc00 && next <= 0xdfff) {
+        // valid surrogate pair
+        store<u16>(bs.offset, code);
+        store<u16>(bs.offset + 2, next);
+        bs.offset += 4;
+        srcStart += 4;
+        continue;
+      }
     }
+
+    // unpaired high/low surrogate
+    write_u_escape(code);
+    srcStart += 2;
+    continue;
   }
 
+  store<u16>(bs.offset, 34); // "
+  bs.offset += 2;
+}
+
+export function serializeString_SWAR_ExperimentalTableEscapes(src: string): void {
+  let srcStart = changetype<usize>(src);
   const srcSize = changetype<OBJECT>(srcStart - TOTAL_OVERHEAD).rtSize;
   const srcEnd = srcStart + srcSize;
   const srcEnd8 = srcEnd - 8;
@@ -32,10 +180,9 @@ export function serializeString_SWAR(src: string): void {
   bs.offset += 2;
 
   while (srcStart < srcEnd8) {
-    let block = load<u64>(srcStart);
-    store<u64>(bs.offset, block);
-
+    const block = load<u64>(srcStart);
     let mask = detect_escapable_u64_swar_safe(block);
+    store<u64>(bs.offset, block);
 
     if (mask === 0) {
       srcStart += 8;
@@ -49,7 +196,7 @@ export function serializeString_SWAR(src: string): void {
       // Even (0 2 4 6) -> Confirmed ASCII Escape
       // Odd (1 3 5 7) -> Possibly a Unicode code unit or surrogate
       if ((laneIdx & 1) === 0) {
-        mask &= ~(0xffff << (laneIdx << 3));
+        mask &= mask - 1;
         const code = load<u16>(srcIdx);
         const escaped = load<u32>(SERIALIZE_ESCAPE_TABLE + (code << 2));
 
@@ -69,7 +216,7 @@ export function serializeString_SWAR(src: string): void {
         }
         continue;
       }
-      mask &= ~(0xffff << (laneIdx << 3));
+      mask &= mask - 1;
 
       const code = load<u16>(srcIdx - 1);
       if (code < 0xd800 || code > 0xdfff) continue;
@@ -101,7 +248,7 @@ export function serializeString_SWAR(src: string): void {
   while (srcStart <= srcEnd - 2) {
     const code = load<u16>(srcStart);
 
-    if (code == 92 || code == 34 || code < 32) {
+    if (code == BACK_SLASH || code == QUOTE || code < 32) {
       const escaped = load<u32>(SERIALIZE_ESCAPE_TABLE + (code << 2));
       if ((escaped & 0xffff) != BACK_SLASH) {
         bs.growSize(10);
@@ -144,8 +291,6 @@ export function serializeString_SWAR(src: string): void {
 
   store<u16>(bs.offset, 34); // "
   bs.offset += 2;
-
-  if (isDefined(JSON_CACHE)) sc.insertCached(changetype<usize>(src), srcStart, srcSize);
 }
 
 // @ts-expect-error: @inline is a valid decorator
@@ -158,8 +303,10 @@ export function serializeString_SWAR(src: string): void {
 
 // @ts-expect-error: @inline is a valid decorator
 @inline export function detect_escapable_u64_swar_safe(block: u64): u64 {
+  const hi = block & 0xff00_ff00_ff00_ff00;
   const lo = block & 0x00ff_00ff_00ff_00ff;
   const ascii_mask = ((lo - 0x0020_0020_0020_0020) | ((lo ^ 0x0022_0022_0022_0022) - 0x0001_0001_0001_0001) | ((lo ^ 0x005c_005c_005c_005c) - 0x0001_0001_0001_0001)) & (0x0080_0080_0080_0080 & ~lo);
+  if (hi == 0) return ascii_mask;
   const hi_mask = ((block - 0x0100_0100_0100_0100) & ~block & 0x8000_8000_8000_8000) ^ 0x8000_8000_8000_8000;
   return (ascii_mask & (~hi_mask >> 8)) | hi_mask;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "author": "Jairus Tanaka",
   "repository": {
     "type": "git",

package/transform/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA4G,eAAe,EAA8G,MAAM,EAAE,OAAO,EAAS,MAAM,EAA6C,MAAM,uCAAuC,CAAC;AAC3X,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAK7D,OAAO,EAA2B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAmJvC,qBAAa,aAAc,SAAQ,OAAO;IACxC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAuB;IAExC,OAAO,EAAG,OAAO,CAAC;IAClB,OAAO,EAAG,MAAM,CAAC;IACjB,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAA+B;IAC7D,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,SAAS,CAAmB;IACrC,OAAO,EAAE,eAAe,EAAE,CAAM;IAChC,cAAc,EAAE,MAAM,EAAE,CAAM;IAE9B,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAqB;IAEvD,OAAO,CAAC,4BAA4B;IA6CpC,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAYtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,cAAoB,GAAG,MAAM;IAsC3E,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAghDnD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAItC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA4ClD,oBAAoB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAIjD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI/B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IA+J9B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,OAAe,GAAG,MAAM,EAAE;IA0BxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO;CAc3D;AA4BD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAwDjC;AAoKD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA4G,eAAe,EAA8G,MAAM,EAAE,OAAO,EAAS,MAAM,EAA6C,MAAM,uCAAuC,CAAC;AAC3X,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAK7D,OAAO,EAA2B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAuJvC,qBAAa,aAAc,SAAQ,OAAO;IACxC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAuB;IAExC,OAAO,EAAG,OAAO,CAAC;IAClB,OAAO,EAAG,MAAM,CAAC;IACjB,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAA+B;IAC7D,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,SAAS,CAAmB;IACrC,OAAO,EAAE,eAAe,EAAE,CAAM;IAChC,cAAc,EAAE,MAAM,EAAE,CAAM;IAE9B,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAqB;IAEvD,OAAO,CAAC,4BAA4B;IA6CpC,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAYtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,cAAoB,GAAG,MAAM;IAsC3E,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAuiDnD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAItC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA4ClD,oBAAoB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAIjD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI/B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IA+J9B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,OAAe,GAAG,MAAM,EAAE;IA0BxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO;CAc3D;AA4BD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAwDjC;AA+MD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9C"}

package/transform/lib/index.js

@@ -75,6 +75,9 @@ function getSerializeCall(type, realName) {
     }
     return needsReferenceLoad(type) ? `JSON.__serialize<${type}>(changetype<${type}>(load<usize>(ptr, offsetof<this>(${JSON.stringify(realName)}))));\n` : `JSON.__serialize<${type}>(load<${type}>(ptr, offsetof<this>(${JSON.stringify(realName)})));\n`;
 }
+function isRawType(type) {
+    return type == "JSON.Raw" || type == "Raw";
+}
 const CUSTOM_JSON_KINDS = new Set(["any", "string", "number", "object", "array", "boolean", "null", "any | null", "string | null", "number | null", "object | null", "array | null", "boolean | null"]);
 function parseCustomJsonKind(method, decoratorName) {
     const decorator = method.decorators?.find((v) => v.name.text.toLowerCase() == decoratorName);
@@ -498,7 +501,7 @@ export class JSONTransform extends Visitor {
             mem.type = type;
             mem.value = value;
             mem.node = member;
-            mem.byteSize = sizeof(mem.type);
+            mem.byteSize = estimatedSerializedByteSize(mem.type, source, this.parser);
             mem.custom = schema.deps.some((dep) => dep?.name == stripNull(type) && dep.custom);
             this.schema.byteSize += mem.byteSize;
             if (member.decorators) {
@@ -682,8 +685,14 @@ export class JSONTransform extends Visitor {
                     sortedMembers.null.push(member);
                 if (isString(type) || type == "Date")
                     sortedMembers.string.push(member);
-                else if (type == "JSON.Raw")
+                else if (isRawType(type)) {
+                    sortedMembers.string.push(member);
+                    sortedMembers.number.push(member);
+                    sortedMembers.boolean.push(member);
+                    sortedMembers.null.push(member);
                     sortedMembers.object.push(member);
+                    sortedMembers.array.push(member);
+                }
                 else if (isBoolean(type) || type.startsWith("JSON.Box<bool"))
                     sortedMembers.boolean.push(member);
                 else if (isPrimitive(type) || type.startsWith("JSON.Box<") || isEnum(type, this.sources.get(this.schema.node.range.source), this.parser))
@@ -763,7 +772,7 @@ export class JSONTransform extends Visitor {
                 out.push(`  if (load<u16>(${valuePtr}) != 0x22) break;`);
                 out.push(`  let dateEnd = ${valuePtr} + 2;`);
                 out.push(`  while (dateEnd < srcEnd) {`);
-                out.push("    if (load<u16>(dateEnd) == 0x22 && load<u16>(dateEnd - 2) != 0x5c) break;");
+                out.push("    if (load<u16>(dateEnd) == 0x22 && JSON.Util.isUnescapedQuote(dateEnd)) break;");
                 out.push("    dateEnd += 2;");
                 out.push("  }");
                 out.push("  if (dateEnd >= srcEnd) break;");
@@ -808,7 +817,7 @@ export class JSONTransform extends Visitor {
                 }
                 out.push("}");
             }
-            else if (resolvedType == "JSON.Raw") {
+            else if (isRawType(resolvedType)) {
                 out.push("{");
                 out.push(`  const valueStart = ${srcPtr};`);
                 out.push("  let depth: i32 = 0;");
@@ -816,7 +825,7 @@ export class JSONTransform extends Visitor {
                 out.push(`  while (${srcPtr} < srcEnd) {`);
                 out.push(`    const code = load<u16>(${srcPtr});`);
                 out.push("    if (inString) {");
-                out.push(`      if (code == 0x22 && load<u16>(${srcPtr} - 2) != 0x5c) inString = false;`);
+                out.push(`      if (code == 0x22 && JSON.Util.isUnescapedQuote(${srcPtr})) inString = false;`);
                 out.push(`      ${srcPtr} += 2;`);
                 out.push("      continue;");
                 out.push("    }");
@@ -1181,7 +1190,7 @@ export class JSONTransform extends Visitor {
         DESERIALIZE += indent + "    let code = load<u16>(srcStart);\n";
         DESERIALIZE += indent + "    while (JSON.Util.isSpace(code)) code = load<u16>(srcStart += 2);\n";
         DESERIALIZE += indent + "    if (keyStart == 0) {\n";
-        DESERIALIZE += indent + "      if (code == 34 && load<u16>(srcStart - 2) !== 92) {\n";
+        DESERIALIZE += indent + "      if (code == 34 && JSON.Util.isUnescapedQuote(srcStart)) {\n";
         DESERIALIZE += indent + "        if (isKey) {\n";
         DESERIALIZE += indent + "          keyStart = lastIndex;\n";
         DESERIALIZE += indent + "          keyEnd = srcStart;\n";
@@ -1286,7 +1295,7 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += "          srcStart += 2;\n";
             DESERIALIZE += "          while (srcStart < srcEnd) {\n";
             DESERIALIZE += "            const code = load<u16>(srcStart);\n";
-            DESERIALIZE += "            if (code == 34 && load<u16>(srcStart - 2) !== 92) {\n";
+            DESERIALIZE += "            if (code == 34 && JSON.Util.isUnescapedQuote(srcStart)) {\n";
             if (DEBUG > 1)
                 DESERIALIZE += '              console.log("Value (string, ' + ++id + '): " + JSON.Util.ptrToStr(lastIndex, srcStart + 2));';
             generateGroups(sortedMembers.string, (group) => {
@@ -1385,7 +1394,7 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += "          const code = load<u16>(srcStart);\n";
             DESERIALIZE += "          if (code == 34) {\n";
             DESERIALIZE += "            srcStart += 2;\n";
-            DESERIALIZE += "            while (!(load<u16>(srcStart) == 34 && load<u16>(srcStart - 2) != 92)) srcStart += 2;\n";
+            DESERIALIZE += "            while (!(load<u16>(srcStart) == 34 && JSON.Util.isUnescapedQuote(srcStart))) srcStart += 2;\n";
             DESERIALIZE += "          } else if (code == 125) {\n";
             DESERIALIZE += "            if (--depth == 0) {\n";
             DESERIALIZE += "              srcStart += 2;\n";
@@ -1439,7 +1448,7 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += "          const code = load<u16>(srcStart);\n";
             DESERIALIZE += "          if (code == 34) {\n";
             DESERIALIZE += "            srcStart += 2;\n";
-            DESERIALIZE += "            while (!(load<u16>(srcStart) == 34 && load<u16>(srcStart - 2) != 92)) srcStart += 2;\n";
+            DESERIALIZE += "            while (!(load<u16>(srcStart) == 34 && JSON.Util.isUnescapedQuote(srcStart))) srcStart += 2;\n";
             DESERIALIZE += "          } else if (code == 93) {\n";
             DESERIALIZE += "            if (--depth == 0) {\n";
             DESERIALIZE += "              srcStart += 2;\n";
@@ -1495,7 +1504,10 @@ export class JSONTransform extends Visitor {
                 const first = group[0];
                 const fName = first.alias || first.name;
                 DESERIALIZE += indent + "          if (" + (first.generic ? "isBoolean<" + first.type + ">() && " : "") + getComparison(fName) + ") { // " + fName + "\n";
-                if (first.type.startsWith("JSON.Box<bool") || first.type.startsWith("JSON.Box<boolean") || first.type.startsWith("Box<bool") || first.type.startsWith("Box<boolean")) {
+                if (isRawType(first.type)) {
+                    DESERIALIZE += indent + "            store<" + first.type + ">(changetype<usize>(out), JSON.__deserialize<" + first.type + ">(srcStart - 8, srcStart), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
+                }
+                else if (first.type.startsWith("JSON.Box<bool") || first.type.startsWith("JSON.Box<boolean") || first.type.startsWith("Box<bool") || first.type.startsWith("Box<boolean")) {
                     DESERIALIZE += indent + "            store<" + first.type + ">(changetype<usize>(out), changetype<" + first.type + ">(JSON.Box.from<bool>(true)), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
                 }
                 else {
@@ -1509,7 +1521,10 @@ export class JSONTransform extends Visitor {
                     const mem = group[i];
                     const memName = mem.alias || mem.name;
                     DESERIALIZE += indent + " else if (" + (mem.generic ? "isBoolean<" + mem.type + ">() && " : "") + getComparison(memName) + ") { // " + memName + "\n";
-                    if (mem.type.startsWith("JSON.Box<bool") || mem.type.startsWith("JSON.Box<boolean") || mem.type.startsWith("Box<bool") || mem.type.startsWith("Box<boolean")) {
+                    if (isRawType(mem.type)) {
+                        DESERIALIZE += indent + "            store<" + mem.type + ">(changetype<usize>(out), JSON.__deserialize<" + mem.type + ">(srcStart - 8, srcStart), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
+                    }
+                    else if (mem.type.startsWith("JSON.Box<bool") || mem.type.startsWith("JSON.Box<boolean") || mem.type.startsWith("Box<bool") || mem.type.startsWith("Box<boolean")) {
                         DESERIALIZE += indent + "            store<" + mem.type + ">(changetype<usize>(out), changetype<" + mem.type + ">(JSON.Box.from<bool>(true)), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
                     }
                     else {
@@ -1549,7 +1564,10 @@ export class JSONTransform extends Visitor {
                 const first = group[0];
                 const fName = first.alias || first.name;
                 DESERIALIZE += indent + "          if (" + (first.generic ? "isBoolean<" + first.type + ">() && " : "") + getComparison(fName) + ") { // " + fName + "\n";
-                if (first.type.startsWith("JSON.Box<bool") || first.type.startsWith("JSON.Box<boolean") || first.type.startsWith("Box<bool") || first.type.startsWith("Box<boolean")) {
+                if (isRawType(first.type)) {
+                    DESERIALIZE += indent + "            store<" + first.type + ">(changetype<usize>(out), JSON.__deserialize<" + first.type + ">(srcStart - 10, srcStart), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
+                }
+                else if (first.type.startsWith("JSON.Box<bool") || first.type.startsWith("JSON.Box<boolean") || first.type.startsWith("Box<bool") || first.type.startsWith("Box<boolean")) {
                     DESERIALIZE += indent + "            store<" + first.type + ">(changetype<usize>(out), changetype<" + first.type + ">(JSON.Box.from<bool>(false)), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
                 }
                 else {
@@ -1563,7 +1581,10 @@ export class JSONTransform extends Visitor {
                     const mem = group[i];
                     const memName = mem.alias || mem.name;
                     DESERIALIZE += indent + " else if (" + (mem.generic ? "isBoolean<" + mem.type + ">() && " : "") + getComparison(memName) + ") { // " + memName + "\n";
-                    if (mem.type.startsWith("JSON.Box<bool") || mem.type.startsWith("JSON.Box<boolean") || mem.type.startsWith("Box<bool") || mem.type.startsWith("Box<boolean")) {
+                    if (isRawType(mem.type)) {
+                        DESERIALIZE += indent + "            store<" + mem.type + ">(changetype<usize>(out), JSON.__deserialize<" + mem.type + ">(srcStart - 10, srcStart), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
+                    }
+                    else if (mem.type.startsWith("JSON.Box<bool") || mem.type.startsWith("JSON.Box<boolean") || mem.type.startsWith("Box<bool") || mem.type.startsWith("Box<boolean")) {
                         DESERIALIZE += indent + "            store<" + mem.type + ">(changetype<usize>(out), changetype<" + mem.type + ">(JSON.Box.from<bool>(false)), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
                     }
                     else {
@@ -1602,7 +1623,12 @@ export class JSONTransform extends Visitor {
                 const first = group[0];
                 const fName = first.alias || first.name;
                 DESERIALIZE += indent + "          if (" + (first.generic ? "isNullable<" + first.type + ">() && " : "") + getComparison(fName) + ") { // " + fName + "\n";
-                DESERIALIZE += indent + "            store<usize>(changetype<usize>(out), 0, offsetof<this>(" + JSON.stringify(first.name) + "));\n";
+                if (isRawType(first.type) && !first.node.type.isNullable) {
+                    DESERIALIZE += indent + "            store<" + first.type + ">(changetype<usize>(out), JSON.__deserialize<" + first.type + ">(srcStart - 8, srcStart), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
+                }
+                else {
+                    DESERIALIZE += indent + "            store<usize>(changetype<usize>(out), 0, offsetof<this>(" + JSON.stringify(first.name) + "));\n";
+                }
                 DESERIALIZE += indent + "            srcStart += 2;\n";
                 DESERIALIZE += indent + "            keyStart = 0;\n";
                 DESERIALIZE += indent + "            break;\n";
@@ -1611,7 +1637,12 @@ export class JSONTransform extends Visitor {
                     const mem = group[i];
                     const memName = mem.alias || mem.name;
                     DESERIALIZE += indent + " else if (" + (mem.generic ? "isNullable<" + mem.type + ">() && " : "") + getComparison(memName) + ") { // " + memName + "\n";
-                    DESERIALIZE += indent + "            store<usize>(changetype<usize>(out), 0, offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
+                    if (isRawType(mem.type) && !mem.node.type.isNullable) {
+                        DESERIALIZE += indent + "            store<" + mem.type + ">(changetype<usize>(out), JSON.__deserialize<" + mem.type + ">(srcStart - 8, srcStart), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
+                    }
+                    else {
+                        DESERIALIZE += indent + "            store<usize>(changetype<usize>(out), 0, offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
+                    }
                     DESERIALIZE += indent + "            srcStart += 2;\n";
                     DESERIALIZE += indent + "            keyStart = 0;\n";
                     DESERIALIZE += indent + "            break;\n";
@@ -2104,15 +2135,56 @@ function sizeof(type) {
         return 20;
     else if (type == "i32")
         return 22;
+    else if (type == "usize")
+        return 40;
+    else if (type == "isize")
+        return 42;
     else if (type == "u64")
         return 40;
     else if (type == "i64")
-        return 40;
+        return 42;
+    else if (type == "f32")
+        return 34;
+    else if (type == "f64")
+        return 66;
     else if (type == "bool" || type == "boolean")
         return 10;
     else
         return 0;
 }
+function estimatedSerializedByteSize(type, source, parser) {
+    const trimmed = type.trim();
+    const baseType = stripNull(trimmed);
+    const nullable = trimmed != baseType;
+    let estimated = sizeof(baseType);
+    if (estimated == 0) {
+        if (isEnum(baseType, source, parser)) {
+            estimated = 22;
+        }
+        else if (baseType == "Date") {
+            estimated = 52;
+        }
+        else if (isString(baseType)) {
+            estimated = 4;
+        }
+        else if (isArray(baseType) || baseType.startsWith("Map<")) {
+            estimated = 4;
+        }
+        else if (baseType == "JSON.Obj" || baseType == "Obj" || baseType == "JSON.Raw" || baseType == "Raw" || baseType == "JSON.Value" || baseType == "Value") {
+            estimated = 4;
+        }
+        else if (baseType == "ArrayBuffer" || needsReferenceLoad(baseType)) {
+            estimated = 4;
+        }
+        else {
+            estimated = 4;
+        }
+    }
+    if (nullable) {
+        estimated = Math.max(estimated, 8);
+    }
+    return estimated;
+}
 function isPrimitive(type) {
     const primitiveTypes = ["u8", "u16", "u32", "u64", "i8", "i16", "i32", "i64", "f32", "f64", "bool", "boolean"];
     return primitiveTypes.some((v) => type.startsWith(v));