json-as 1.3.2 → 1.3.4

package/transform/lib/index.js

@@ -13,7 +13,59 @@ const WRITE = process.env["JSON_WRITE"]?.trim();
 const rawValue = process.env["JSON_DEBUG"]?.trim();
 const DEBUG = rawValue === "true" ? 1 : rawValue === "false" || rawValue === "" ? 0 : isNaN(Number(rawValue)) ? 0 : Number(rawValue);
 const STRICT = process.env["JSON_STRICT"] && process.env["JSON_STRICT"] == "true";
-const USE_FAST_PATH = process.env["JSON_USE_FAST_PATH"]?.trim() === "1";
+const DEFAULT_JSON_CACHE_BYTES = 1 << 20;
+function envFlagDefaultTrue(value) {
+    if (!value)
+        return true;
+    switch (value.trim().toLowerCase()) {
+        case "0":
+        case "false":
+        case "off":
+        case "no":
+            return false;
+        default:
+            return true;
+    }
+}
+const USE_FAST_PATH = envFlagDefaultTrue(process.env["JSON_USE_FAST_PATH"]);
+const THROW_FAST_PATH = process.env["JSON_FAST_PATH_THROW"]?.trim() === "1";
+function parseJSONCacheConfig(value) {
+    if (!value)
+        return { enabled: false, bytes: 0 };
+    const raw = value.trim();
+    if (!raw)
+        return { enabled: false, bytes: 0 };
+    const lower = raw.toLowerCase();
+    if (lower === "false" || lower === "off" || lower === "no" || lower === "none" || lower === "0") {
+        return { enabled: false, bytes: 0 };
+    }
+    if (lower === "true" || lower === "on" || lower === "yes") {
+        return { enabled: true, bytes: DEFAULT_JSON_CACHE_BYTES };
+    }
+    const match = /^(\d+)\s*([kKmMgG]?[bB])?$/.exec(raw);
+    if (!match) {
+        throw new Error(`Invalid JSON_CACHE value '${value}'. Expected true/false or <int>[kb|mb|gb|KB|MB|GB].`);
+    }
+    const amount = Number(match[1]);
+    const suffix = match[2] || "B";
+    if (!Number.isFinite(amount)) {
+        throw new Error(`Invalid JSON_CACHE value '${value}'.`);
+    }
+    const unit = suffix[0];
+    const scale = unit == "k" || unit == "K" ? 1_000 : unit == "m" || unit == "M" ? 1_000_000 : unit == "g" || unit == "G" ? 1_000_000_000 : 1;
+    let bytes = amount * scale;
+    if (suffix.endsWith("b")) {
+        bytes = Math.ceil(bytes / 8);
+    }
+    if (bytes <= 0) {
+        return { enabled: false, bytes: 0 };
+    }
+    if (bytes > 0xffff_ffff) {
+        throw new Error(`JSON_CACHE value '${value}' is too large (max 4GB).`);
+    }
+    return { enabled: true, bytes: Math.floor(bytes) };
+}
+const JSON_CACHE_CONFIG = parseJSONCacheConfig(process.env["JSON_CACHE"]);
 function needsReferenceLoad(type) {
     return type == "ArrayBuffer" || type == "Int8Array" || type == "Uint8Array" || type == "Uint8ClampedArray" || type == "Int16Array" || type == "Uint16Array" || type == "Int32Array" || type == "Uint32Array" || type == "Int64Array" || type == "Uint64Array" || type == "Float32Array" || type == "Float64Array";
 }
@@ -23,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);
@@ -446,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) {
@@ -630,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))
@@ -671,6 +732,11 @@ export class JSONTransform extends Visitor {
         const FLOAT_TYPES = ["f32", "f64"];
         const INTEGER_TYPES = [...UNSIGNED_INTEGER_TYPES, ...SIGNED_INTEGER_TYPES];
         const STRING_FIELD_DESERIALIZER = codegenMode === JSONMode.SIMD ? "deserializeStringField_SIMD" : "deserializeStringField_SWAR";
+        const getArrayValueType = (type) => {
+            if (!type.startsWith("Array<") && !type.startsWith("StaticArray<"))
+                return null;
+            return stripNull(type.slice(type.indexOf("<") + 1, -1).trim());
+        };
         const getDeserializer = (type, srcPtr, outPtr, member, keyOffset = 0, fastPath = false) => {
             const out = [];
             const resolvedType = stripNull(type);
@@ -706,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;");
@@ -751,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;");
@@ -759,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("    }");
@@ -800,7 +866,24 @@ export class JSONTransform extends Visitor {
             }
             else if (resolvedSchema && !resolvedSchema.custom) {
                 if (fastPath) {
-                    out.push("break;");
+                    out.push("{");
+                    if (member.node.type.isNullable) {
+                        out.push(`  if (load<u64>(${valuePtr}) == 30399761348886638) {`);
+                        out.push(`    store<${resolvedType}>(${outPtr}, changetype<${resolvedType}>(0), ${fieldOffset});`);
+                        out.push(`    ${srcPtr} = ${valuePtr} + 8;`);
+                        out.push("  } else {");
+                    }
+                    out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
+                    out.push(`  if (changetype<usize>(value) == 0) {`);
+                    out.push(`    value = changetype<${resolvedType}>(__new(offsetof<nonnull<${resolvedType}>>(), idof<nonnull<${resolvedType}>>()));`);
+                    out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
+                    out.push("  }");
+                    out.push(`  ${srcPtr} = changetype<nonnull<${resolvedType}>>(value).__DESERIALIZE_FAST<${resolvedType}>(${valuePtr}, srcEnd, value);`);
+                    out.push(`  if (!${srcPtr}) break;`);
+                    if (member.node.type.isNullable) {
+                        out.push("  }");
+                    }
+                    out.push("}");
                     return out;
                 }
                 out.push("{");
@@ -830,6 +913,7 @@ export class JSONTransform extends Visitor {
                 out.push("}");
             }
             else if (resolvedType.startsWith("Array<")) {
+                const valueType = getArrayValueType(resolvedType);
                 out.push("{");
                 if (member.node.type.isNullable) {
                     out.push(`  if (load<u64>(${valuePtr}) == 30399761348886638) {`);
@@ -837,23 +921,96 @@ export class JSONTransform extends Visitor {
                     out.push(`    ${srcPtr} = ${valuePtr} + 8;`);
                     out.push("  } else {");
                 }
-                out.push(`  if (load<u16>(${valuePtr}) == 0x5b && load<u16>(${valuePtr}, 2) == 0x5d) {`);
-                out.push(`    let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
-                if (member.node.type.isNullable) {
-                    out.push(`    if (changetype<usize>(value) == 0) {`);
-                    out.push(`      value = changetype<${resolvedType}>(instantiate<nonnull<${resolvedType}>>());`);
-                    out.push(`      store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
+                if (fastPath && valueType && ["string", "String"].includes(valueType)) {
+                    out.push(`  if (load<u16>(${valuePtr}) != 0x5b) break;`);
+                    out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
+                    out.push("  if (changetype<usize>(value) == 0) {");
+                    out.push(`    value = instantiate<nonnull<${resolvedType}>>();`);
+                    out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
+                    out.push("  }");
+                    out.push("  let index = 0;");
+                    out.push(`  ${srcPtr} = ${valuePtr} + 2;`);
+                    out.push(`  if (load<u16>(${srcPtr}) == 0x5d) {`);
+                    out.push("    value.length = 0;");
+                    out.push(`    ${srcPtr} += 2;`);
+                    out.push("  } else while (true) {");
+                    out.push('    if (index >= value.length) value.push("");');
+                    out.push(`    ${srcPtr} = ${STRING_FIELD_DESERIALIZER}<${valueType}>(${srcPtr}, srcEnd, value.dataStart + ((<usize>index) << alignof<${valueType}>()));`);
+                    out.push("    index++;");
+                    out.push(`    const code = load<u16>(${srcPtr});`);
+                    out.push("    if (code == 0x2c) {");
+                    out.push(`      ${srcPtr} += 2;`);
+                    out.push("      continue;");
+                    out.push("    }");
+                    out.push("    if (code == 0x5d) {");
+                    out.push("      value.length = index;");
+                    out.push(`      ${srcPtr} += 2;`);
+                    out.push("      break;");
                     out.push("    }");
+                    out.push("    break;");
+                    out.push("  }");
+                    if (member.node.type.isNullable) {
+                        out.push("  }");
+                    }
+                    out.push("}");
+                    return out;
                 }
+                const valueSchema = valueType ? this.getSchema(valueType) : null;
+                if (fastPath && valueType && valueSchema && !valueSchema.custom) {
+                    out.push(`  if (load<u16>(${valuePtr}) != 0x5b) break;`);
+                    out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
+                    out.push("  if (changetype<usize>(value) == 0) {");
+                    out.push(`    value = instantiate<nonnull<${resolvedType}>>();`);
+                    out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
+                    out.push("  }");
+                    out.push("  let index = 0;");
+                    out.push(`  ${srcPtr} = ${valuePtr} + 2;`);
+                    out.push(`  if (load<u16>(${srcPtr}) == 0x5d) {`);
+                    out.push("    value.length = 0;");
+                    out.push(`    ${srcPtr} += 2;`);
+                    out.push("  } else while (true) {");
+                    out.push(`    let item: ${valueType};`);
+                    out.push("    if (index < value.length) {");
+                    out.push("      item = unchecked(value[index]);");
+                    out.push("      if (changetype<usize>(item) == 0) {");
+                    out.push(`        item = changetype<${valueType}>(__new(offsetof<nonnull<${valueType}>>(), idof<nonnull<${valueType}>>()));`);
+                    out.push("        unchecked((value[index] = item));");
+                    out.push("      }");
+                    out.push("    } else {");
+                    out.push(`      item = changetype<${valueType}>(__new(offsetof<nonnull<${valueType}>>(), idof<nonnull<${valueType}>>()));`);
+                    out.push("      value.push(item);");
+                    out.push("    }");
+                    out.push(`    ${srcPtr} = changetype<nonnull<${valueType}>>(item).__DESERIALIZE_FAST<${valueType}>(${srcPtr}, srcEnd, item);`);
+                    out.push(`    if (!${srcPtr}) break;`);
+                    out.push("    index++;");
+                    out.push(`    const code = load<u16>(${srcPtr});`);
+                    out.push("    if (code == 0x2c) {");
+                    out.push(`      ${srcPtr} += 2;`);
+                    out.push("      continue;");
+                    out.push("    }");
+                    out.push("    if (code == 0x5d) {");
+                    out.push("      value.length = index;");
+                    out.push(`      ${srcPtr} += 2;`);
+                    out.push("      break;");
+                    out.push("    }");
+                    out.push("    break;");
+                    out.push("  }");
+                    if (member.node.type.isNullable) {
+                        out.push("  }");
+                    }
+                    out.push("}");
+                    return out;
+                }
+                out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
+                out.push(`  if (changetype<usize>(value) == 0) {`);
+                out.push(`    value = changetype<${resolvedType}>(instantiate<nonnull<${resolvedType}>>());`);
+                out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
+                out.push("  }");
+                out.push(`  if (load<u16>(${valuePtr}) == 0x5b && load<u16>(${valuePtr}, 2) == 0x5d) {`);
                 out.push("    value.length = 0;");
                 out.push(`    ${srcPtr} = ${valuePtr} + 4;`);
                 out.push("  } else {");
-                if (member.node.type.isNullable) {
-                    out.push(`    ${srcPtr} = deserializeArrayField_SWAR<${resolvedType}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
-                }
-                else {
-                    out.push(`    ${srcPtr} = deserializeArrayInto_SWAR<${resolvedType}>(${valuePtr}, srcEnd, load<${resolvedType}>(${outPtr}, ${fieldOffset}));`);
-                }
+                out.push(`    ${srcPtr} = deserializeArrayInto_SWAR<${resolvedType}>(${valuePtr}, srcEnd, value);`);
                 out.push(`    if (!${srcPtr}) break;`);
                 out.push("  }");
                 if (member.node.type.isNullable) {
@@ -865,6 +1022,16 @@ export class JSONTransform extends Visitor {
                 if (member.node.type.isNullable) {
                     out.push(`${srcPtr} = deserializeMapField<${resolvedType}>(${srcPtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
                 }
+                else if (fastPath) {
+                    out.push("{");
+                    out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
+                    out.push("  if (changetype<usize>(value) == 0) {");
+                    out.push(`    value = new ${resolvedType}();`);
+                    out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
+                    out.push("  }");
+                    out.push(`  ${srcPtr} = deserializeMapInto<${resolvedType}>(${srcPtr}, srcEnd, value);`);
+                    out.push("}");
+                }
                 else {
                     out.push(`${srcPtr} = deserializeMapInto<${resolvedType}>(${srcPtr}, srcEnd, load<${resolvedType}>(${outPtr}, ${fieldOffset}));`);
                 }
@@ -874,6 +1041,16 @@ export class JSONTransform extends Visitor {
                 if (member.node.type.isNullable) {
                     out.push(`${srcPtr} = deserializeSetField<${resolvedType}>(${srcPtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
                 }
+                else if (fastPath) {
+                    out.push("{");
+                    out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
+                    out.push("  if (changetype<usize>(value) == 0) {");
+                    out.push(`    value = new ${resolvedType}();`);
+                    out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
+                    out.push("  }");
+                    out.push(`  ${srcPtr} = deserializeSetInto<${resolvedType}>(${srcPtr}, srcEnd, value);`);
+                    out.push("}");
+                }
                 else {
                     out.push(`${srcPtr} = deserializeSetInto<${resolvedType}>(${srcPtr}, srcEnd, load<${resolvedType}>(${outPtr}, ${fieldOffset}));`);
                 }
@@ -893,6 +1070,7 @@ export class JSONTransform extends Visitor {
         };
         indent = "  ";
         DESERIALIZE_FAST += indent + "const start = srcStart;\n";
+        DESERIALIZE_FAST += indent + "const dst = changetype<usize>(out);\n";
         DESERIALIZE_FAST += indent + "do {\n";
         indent += "  ";
         if (supportsFastOptionalPath) {
@@ -910,8 +1088,8 @@ export class JSONTransform extends Visitor {
                 const nextKeyOffset = nextKeySection.length << 1;
                 const resolvedType = stripNull(member.type);
                 const inlineStringValue = ["string", "String"].includes(resolvedType);
-                const deserializerFirst = getDeserializer(member.type, "srcStart", "changetype<usize>(out)", member, inlineStringValue ? firstKeyOffset : 0, true);
-                const deserializerNext = getDeserializer(member.type, "srcStart", "changetype<usize>(out)", member, inlineStringValue ? nextKeyOffset : 0, true);
+                const deserializerFirst = getDeserializer(member.type, "srcStart", "dst", member, inlineStringValue ? firstKeyOffset : 0, true);
+                const deserializerNext = getDeserializer(member.type, "srcStart", "dst", member, inlineStringValue ? nextKeyOffset : 0, true);
                 const isOptional = member.flags.has(PropertyFlags.OmitNull) || member.flags.has(PropertyFlags.OmitIf);
                 if (!deserializerFirst.length || !deserializerNext.length) {
                     DESERIALIZE_FAST += indent + "break;\n\n";
@@ -973,7 +1151,7 @@ export class JSONTransform extends Visitor {
                 if (!inlineStringValue) {
                     DESERIALIZE_FAST += indent + `srcStart += ${keyOffset};\n\n`;
                 }
-                const deserializer = getDeserializer(member.type, "srcStart", "changetype<usize>(out)", member, inlineStringValue ? keyOffset : 0, true);
+                const deserializer = getDeserializer(member.type, "srcStart", "dst", member, inlineStringValue ? keyOffset : 0, true);
                 if (!deserializer.length) {
                     DESERIALIZE_FAST += indent + "break;\n\n";
                     continue;
@@ -986,9 +1164,14 @@ export class JSONTransform extends Visitor {
         DESERIALIZE_FAST += indent + "return srcStart;\n";
         indent = indent.slice(0, -2);
         DESERIALIZE_FAST += indent + "} while (false);\n\n";
-        DESERIALIZE_FAST += indent + "if (isDefined(out.__INITIALIZE)) out.__INITIALIZE();\n";
-        DESERIALIZE_FAST += indent + "const end = JSON.Util.scanValueEnd(start, srcEnd);\n";
-        DESERIALIZE_FAST += indent + "return out.__DESERIALIZE_SLOW(start, end ? end : srcEnd, out);";
+        if (THROW_FAST_PATH) {
+            DESERIALIZE_FAST += indent + "const failAt = srcStart ? srcStart : start;\n";
+            DESERIALIZE_FAST += indent + "const failEnd = failAt + 160 < srcEnd ? failAt + 160 : srcEnd;\n";
+            DESERIALIZE_FAST += indent + `throw new Error("Fast path failed for ${this.schema.name} at char offset " + ((failAt - start) >> 1).toString() + " near: " + JSON.Util.ptrToStr(failAt, failEnd));`;
+        }
+        else {
+            DESERIALIZE_FAST += indent + "return 0;";
+        }
         indent = indent.slice(0, -2);
         DESERIALIZE_FAST += indent + "}";
         DESERIALIZE += indent + "  let keyStart: usize = 0;\n";
@@ -1007,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";
@@ -1112,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) => {
@@ -1211,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";
@@ -1265,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";
@@ -1321,16 +1504,11 @@ 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")) {
-                    DESERIALIZE +=
-                        indent +
-                            "            store<" +
-                            first.type +
-                            ">(changetype<usize>(out), changetype<" +
-                            first.type +
-                            ">(JSON.Box.from<bool>(true)), offsetof<this>(" +
-                            JSON.stringify(first.name) +
-                            "));\n";
+                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 {
                     DESERIALIZE += indent + "            store<boolean>(changetype<usize>(out), true, offsetof<this>(" + JSON.stringify(first.name) + "));\n";
@@ -1343,16 +1521,11 @@ 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")) {
-                        DESERIALIZE +=
-                            indent +
-                                "            store<" +
-                                mem.type +
-                                ">(changetype<usize>(out), changetype<" +
-                                mem.type +
-                                ">(JSON.Box.from<bool>(true)), offsetof<this>(" +
-                                JSON.stringify(mem.name) +
-                                "));\n";
+                    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 {
                         DESERIALIZE += indent + "            store<boolean>(changetype<usize>(out), true, offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
@@ -1391,16 +1564,11 @@ 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")) {
-                    DESERIALIZE +=
-                        indent +
-                            "            store<" +
-                            first.type +
-                            ">(changetype<usize>(out), changetype<" +
-                            first.type +
-                            ">(JSON.Box.from<bool>(false)), offsetof<this>(" +
-                            JSON.stringify(first.name) +
-                            "));\n";
+                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 {
                     DESERIALIZE += indent + "            store<boolean>(changetype<usize>(out), false, offsetof<this>(" + JSON.stringify(first.name) + "));\n";
@@ -1413,16 +1581,11 @@ 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")) {
-                        DESERIALIZE +=
-                            indent +
-                                "            store<" +
-                                mem.type +
-                                ">(changetype<usize>(out), changetype<" +
-                                mem.type +
-                                ">(JSON.Box.from<bool>(false)), offsetof<this>(" +
-                                JSON.stringify(mem.name) +
-                                "));\n";
+                    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 {
                         DESERIALIZE += indent + "            store<boolean>(changetype<usize>(out), false, offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
@@ -1460,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";
@@ -1469,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";
@@ -1793,8 +1966,9 @@ export default class Transformer extends Transform {
             }
         }
         program.registerConstantInteger("JSON_MODE", Type.i32, i64_new(MODE));
-        if (process.env["JSON_CACHE"]?.trim().toLowerCase() === "true" || process.env["JSON_CACHE"]?.trim().toLowerCase() === "1") {
+        if (JSON_CACHE_CONFIG.enabled) {
             program.registerConstantInteger("JSON_CACHE", Type.bool, i64_one);
+            program.registerConstantInteger("JSON_CACHE_SIZE", Type.u32, i64_new(JSON_CACHE_CONFIG.bytes));
         }
     }
     afterParse(parser) {
@@ -1961,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));