json-as 1.4.0 → 1.6.0

package/transform/lib/index.js

@@ -50,6 +50,7 @@ function envFlagDefaultTrue(value) {
 }
 const USE_FAST_PATH = envFlagDefaultTrue(process.env["JSON_USE_FAST_PATH"]);
 const THROW_FAST_PATH = process.env["JSON_FAST_PATH_THROW"]?.trim() === "1";
+const USE_DEFAULT_OBJECT_SPECIALIZATION = true;
 function parseJSONCacheConfig(value) {
     if (!value)
         return { enabled: false, bytes: 0 };
@@ -115,6 +116,20 @@ function getSerializeCall(type, realName) {
     if (type == "ArrayBuffer") {
         return `JSON.__serialize<ArrayBuffer>(load<ArrayBuffer>(ptr, offsetof<this>(${JSON.stringify(realName)})));\n`;
     }
+    if (type == "bool" ||
+        type == "boolean" ||
+        type == "i8" ||
+        type == "i16" ||
+        type == "i32" ||
+        type == "i64" ||
+        type == "isize" ||
+        type == "u8" ||
+        type == "u16" ||
+        type == "u32" ||
+        type == "u64" ||
+        type == "usize") {
+        return `JSON.__serializePrimitiveUnsafe<${type}>(load<${type}>(ptr, offsetof<this>(${JSON.stringify(realName)})));\n`;
+    }
     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`;
@@ -287,6 +302,174 @@ export class JSONTransform extends Visitor {
         }
         return type;
     }
+    getDefaultSchema(owner, type) {
+        const name = stripNull(type).trim();
+        const matches = (schema) => schema.name == name ||
+            schema.name.endsWith("." + name) ||
+            name.endsWith("." + schema.name);
+        if (matches(owner))
+            return owner;
+        for (const dep of owner.deps) {
+            if (dep && matches(dep))
+                return dep;
+        }
+        if (owner.parent && matches(owner.parent))
+            return owner.parent;
+        return null;
+    }
+    getDefaultElementType(type) {
+        const value = stripNull(type).trim();
+        if (value.startsWith("Array<") && value.endsWith(">"))
+            return value.slice(6, -1).trim();
+        if (value.startsWith("StaticArray<") && value.endsWith(">"))
+            return value.slice(12, -1).trim();
+        return null;
+    }
+    getDefaultExpressionJSON(expression, type, owner, visiting) {
+        if (expression.kind == NodeKind.Parenthesized) {
+            return this.getDefaultExpressionJSON(expression.expression, type, owner, visiting);
+        }
+        if (expression.kind == NodeKind.Assertion) {
+            return this.getDefaultExpressionJSON(expression.expression, type, owner, visiting);
+        }
+        if (expression.kind == NodeKind.Null)
+            return "null";
+        if (expression.kind == NodeKind.True)
+            return "true";
+        if (expression.kind == NodeKind.False)
+            return "false";
+        if (expression.kind == NodeKind.Literal) {
+            const literal = expression;
+            if (literal.literalKind == 2)
+                return JSON.stringify(literal.value);
+            if (literal.literalKind == 1) {
+                const value = toString(expression).trim();
+                return /^\d+$/.test(value) ? value : null;
+            }
+            if (literal.literalKind == 5) {
+                const elementType = this.getDefaultElementType(type);
+                if (!elementType)
+                    return null;
+                const values = [];
+                for (const element of literal
+                    .elementExpressions) {
+                    const value = this.getDefaultExpressionJSON(element, elementType, owner, visiting);
+                    if (value == null)
+                        return null;
+                    values.push(value);
+                }
+                return "[" + values.join(",") + "]";
+            }
+            return null;
+        }
+        if (expression.kind == NodeKind.UnaryPrefix) {
+            const value = toString(expression).trim();
+            return /^-\d+$/.test(value) ? value : null;
+        }
+        if (expression.kind == NodeKind.New) {
+            const value = expression;
+            if (value.args.length != 0)
+                return null;
+            const constructed = toString(value.typeName).trim();
+            if (constructed == "Array" ||
+                constructed.startsWith("Array<") ||
+                constructed == "StaticArray" ||
+                constructed.startsWith("StaticArray<"))
+                return "[]";
+            const nested = this.getDefaultSchema(owner, type) ||
+                this.getDefaultSchema(owner, constructed);
+            return nested ? this.getDefaultObjectJSON(nested, visiting) : null;
+        }
+        return null;
+    }
+    getImplicitDefaultJSON(member, owner, visiting) {
+        if (member.node.type.isNullable)
+            return "null";
+        const type = stripNull(member.type).trim();
+        if (isBoolean(type))
+            return "false";
+        if (isPrimitive(type) ||
+            isEnum(type, this.sources.get(owner.node.range.source), this.parser))
+            return "0";
+        if (isString(type))
+            return '""';
+        if (this.getDefaultElementType(type))
+            return "[]";
+        const nested = this.getDefaultSchema(owner, type);
+        return nested ? this.getDefaultObjectJSON(nested, visiting) : null;
+    }
+    getDefaultObjectJSON(schema, visiting = new Set()) {
+        if (visiting.has(schema) ||
+            schema.custom ||
+            !schema.static ||
+            schema.node.isGeneric ||
+            schema.members.some((member) => member.flags.size != 0 || member.custom || member.generic))
+            return null;
+        visiting.add(schema);
+        const fields = [];
+        for (const member of schema.members) {
+            const value = member.node.initializer
+                ? this.getDefaultExpressionJSON(member.node.initializer, member.type, schema, visiting)
+                : this.getImplicitDefaultJSON(member, schema, visiting);
+            if (value == null) {
+                visiting.delete(schema);
+                return null;
+            }
+            fields.push(JSON.stringify(member.alias || member.name) + ":" + value);
+        }
+        visiting.delete(schema);
+        return "{" + fields.join(",") + "}";
+    }
+    getDefaultMatcherSource(defaultJSON) {
+        const literal = JSON.stringify(defaultJSON);
+        if (defaultJSON.length > 256)
+            return (`@inline __DESERIALIZE_DEFAULT(srcStart: usize, srcEnd: usize, knownMatch: bool = false): this {\n` +
+                `  if (!knownMatch && !JSON.Util.matchesLiteral(srcStart, srcEnd, ${literal})) return changetype<this>(0);\n` +
+                `  return changetype<this>(__new(offsetof<this>(), idof<this>())).__INITIALIZE();\n` +
+                `}`);
+        const bytes = [];
+        for (let i = 0; i < defaultJSON.length; i++) {
+            const code = defaultJSON.charCodeAt(i);
+            bytes.push(code & 0xff, code >>> 8);
+        }
+        const mismatches = [];
+        let offset = 0;
+        for (; offset + 16 <= bytes.length; offset += 16) {
+            const lanes = bytes
+                .slice(offset, offset + 16)
+                .map((value) => (value < 128 ? value : value - 256))
+                .join(", ");
+            mismatches.push(`v128.xor(v128.load(srcStart, ${offset}), v128(${lanes}))`);
+        }
+        const checks = [];
+        if (mismatches.length != 0) {
+            checks.push(`  let mismatch = ${mismatches[0]};`);
+            for (let i = 1; i < mismatches.length; i++)
+                checks.push(`  mismatch = v128.or(mismatch, ${mismatches[i]});`);
+            checks.push("  if (v128.any_true(mismatch)) return false;");
+        }
+        const scalar = (start, size) => {
+            let value = 0n;
+            for (let i = 0; i < size; i++)
+                value |= BigInt(bytes[start + i]) << BigInt(i << 3);
+            return "0x" + value.toString(16);
+        };
+        for (; offset + 8 <= bytes.length; offset += 8)
+            checks.push(`  if (load<u64>(srcStart, ${offset}) != ${scalar(offset, 8)}) return false;`);
+        for (; offset + 4 <= bytes.length; offset += 4)
+            checks.push(`  if (load<u32>(srcStart, ${offset}) != ${scalar(offset, 4)}) return false;`);
+        for (; offset + 2 <= bytes.length; offset += 2)
+            checks.push(`  if (load<u16>(srcStart, ${offset}) != ${scalar(offset, 2)}) return false;`);
+        return (`@inline __DESERIALIZE_DEFAULT(srcStart: usize, srcEnd: usize, knownMatch: bool = false): this {\n` +
+            `  if (!knownMatch) {\n` +
+            `    if (srcEnd - srcStart != ${bytes.length}) return changetype<this>(0);\n` +
+            checks
+                .join("\n")
+                .replaceAll("  ", "    ")
+                .replaceAll("return false;", "return changetype<this>(0);") +
+            `\n  }` +
+            `\n  return changetype<this>(__new(offsetof<this>(), idof<this>())).__INITIALIZE();\n}`);
+    }
     visitClassDeclaration(node) {
         if (!node.decorators?.length)
             return;
@@ -310,6 +493,7 @@ export class JSONTransform extends Visitor {
             }) ??
                 false));
         let __hasLazy = false;
+        const __lazyValInits = new Map();
         for (let i = node.members.length - 1; i >= 0; i--) {
             const fd = node.members[i];
             if (fd.kind !== NodeKind.FieldDeclaration ||
@@ -340,7 +524,7 @@ export class JSONTransform extends Visitor {
                 continue;
             if (hasCustomSerde)
                 throwError("Lazy fields (@lazy / JSON.Lazy<T> / @json({ lazy })) are not supported " +
-                    "on a class with a custom @serializer/@deserializer — the custom methods " +
+                    "on a class with a custom @serializer/@deserializer - the custom methods " +
                     "bypass the generated (de)serializer, so the deferred slot is never filled. " +
                     "Remove the lazy marker or the custom (de)serializer.", fd.range);
             const fname = fd.name.text;
@@ -356,6 +540,13 @@ export class JSONTransform extends Visitor {
                     : "null";
             const fdInit = fd.initializer;
             const fieldDefault = fdInit ? toString(fdInit) : null;
+            const refDefault = fieldDefault != null
+                ? fieldDefault
+                : !storesScalar && baseT == T && !baseT.startsWith("StaticArray<")
+                    ? baseT == "string" || baseT == "String"
+                        ? '""'
+                        : `new ${baseT}()`
+                    : null;
             __hasLazy = true;
             const omitIfDeco = decos?.find((d) => d.name.text === "omitif");
             lazyInner.set("__" + fname + "_lz", {
@@ -397,8 +588,8 @@ export class JSONTransform extends Visitor {
                         `  this.__${fname}_lz = ((<u64>0xffffffff) << 32) | ${encVal("value")};\n}`,
                 ]
                 : [
-                    `@alias(${key}) private __${fname}_lz: u64 = ${fieldDefault != null ? "u64.MAX_VALUE" : "0"};`,
-                    `private __${fname}_val: ${valueType} = ${fieldDefault ?? valueDefault};`,
+                    `@alias(${key}) private __${fname}_lz: u64 = ${refDefault != null ? "u64.MAX_VALUE" : "0"};`,
+                    `private __${fname}_val: ${valueType} = ${refDefault ?? valueDefault};`,
                     `get ${fname}(): ${T} {\n` +
                         `  const __lz = this.__${fname}_lz;\n` +
                         `  if (__lz != 0 && __lz != u64.MAX_VALUE) {\n` +
@@ -411,6 +602,9 @@ export class JSONTransform extends Visitor {
                         `  this.__${fname}_lz = u64.MAX_VALUE;\n}`,
                 ]).map((src) => SimpleParser.parseClassMember(src, node));
             node.members.splice(i, 1, ...lowered);
+            if (!packScalar && refDefault != null) {
+                __lazyValInits.set(`__${fname}_lz`, `  store<${valueType}>(changetype<usize>(this), ${refDefault}, offsetof<this>(${JSON.stringify(`__${fname}_val`)}));\n`);
+            }
         }
         if (__hasLazy) {
             node.members.push(SimpleParser.parseClassMember(`private __src: string = "";`, node), SimpleParser.parseClassMember(`__SET_SRC(s: string): void { this.__src = s; }`, node));
@@ -569,7 +763,7 @@ export class JSONTransform extends Visitor {
             else if (isString(type) || isPrimitive(type)) {
                 return types;
             }
-            else if (["JSON.Box", "JSON.Obj", "JSON.Value", "JSON.Raw"].includes(type)) {
+            else if (["JSON.Box", "JSON.Obj", "JSON.Arr", "JSON.Value", "JSON.Raw"].includes(type)) {
                 return types;
             }
             else if (node.isGeneric &&
@@ -667,7 +861,8 @@ export class JSONTransform extends Visitor {
         let SERIALIZE = "__SERIALIZE(ptr: usize): void {\n";
         let INITIALIZE = "@inline __INITIALIZE(): this {\n";
         let DESERIALIZE = "__DESERIALIZE_SLOW<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): usize {\n";
-        let DESERIALIZE_FAST = "@inline __DESERIALIZE_FAST<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): usize {\n";
+        let DESERIALIZE_FAST = "__DESERIALIZE_FAST<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): usize {\n";
+        let fastPrettyTailStart = 0;
         let DESERIALIZE_CUSTOM = "";
         let SERIALIZE_CUSTOM = "";
         if (DEBUG > 0)
@@ -773,8 +968,7 @@ export class JSONTransform extends Visitor {
             if (!deserializer.decorators.some((v) => v.name.text == "inline")) {
                 deserializer.decorators.push(Node.createDecorator(Node.createIdentifierExpression("inline", deserializer.range), null, deserializer.range));
             }
-            DESERIALIZE_CUSTOM +=
-                "  @inline __DESERIALIZE_CUSTOM(data: string): this {\n";
+            DESERIALIZE_CUSTOM += "  __DESERIALIZE_CUSTOM(data: string): this {\n";
             DESERIALIZE_CUSTOM +=
                 "    return this." + deserializer.name.text + "(data);\n";
             DESERIALIZE_CUSTOM += "  }\n";
@@ -783,6 +977,7 @@ export class JSONTransform extends Visitor {
             this.generateEmptyMethods(node);
             return;
         }
+        const defaultStringLiterals = new Map();
         for (const member of members) {
             if (!member.type)
                 throwError("Fields must be strongly typed", node.range);
@@ -799,6 +994,18 @@ export class JSONTransform extends Visitor {
             mem.value = value;
             mem.node = member;
             mem.byteSize = estimatedSerializedByteSize(mem.type, source, this.parser);
+            if (member.initializer?.kind == NodeKind.Literal &&
+                member.initializer.literalKind ==
+                    2 &&
+                isString(stripNull(mem.type))) {
+                const literal = member.initializer;
+                const encoded = JSON.stringify(literal.value);
+                mem.byteSize = encoded.length << 1;
+                defaultStringLiterals.set(mem.name, {
+                    expression: toString(member.initializer),
+                    encoded,
+                });
+            }
             mem.custom = schema.deps.some((dep) => dep?.name == stripNull(type) && dep.custom);
             const lzInner = lazyInner.get(name.text);
             if (lzInner !== undefined) {
@@ -841,6 +1048,10 @@ export class JSONTransform extends Visitor {
                             this.schema.static = false;
                             break;
                         }
+                        case "optional": {
+                            mem.flags.set(PropertyFlags.Optional, null);
+                            break;
+                        }
                         case "omitnull": {
                             if (isPrimitive(type)) {
                                 throwError("@omitnull cannot be used on primitive types!", member.range);
@@ -857,11 +1068,11 @@ export class JSONTransform extends Visitor {
             }
             this.schema.members.push(mem);
         }
-        if (!this.schema.static)
-            this.schema.members = sortMembers(this.schema.members);
+        this.schema.members = sortMembers(this.schema.members);
         const hasOmitIfMembers = this.schema.members.some((v) => v.flags.has(PropertyFlags.OmitIf));
         const hasOmitNullMembers = this.schema.members.some((v) => v.flags.has(PropertyFlags.OmitNull));
-        const hasOptionalMembers = hasOmitIfMembers || hasOmitNullMembers;
+        const hasExplicitOptionalMembers = this.schema.members.some((v) => v.flags.has(PropertyFlags.Optional));
+        const hasOptionalMembers = hasOmitIfMembers || hasOmitNullMembers || hasExplicitOptionalMembers;
         const hasLazyMembers = this.schema.members.some((v) => v.flags.has(PropertyFlags.Lazy));
         const supportsFastOptionalPath = requestedFastPath && hasOptionalMembers;
         const hasTypeParams = !!node.typeParameters && node.typeParameters.length > 0;
@@ -884,8 +1095,24 @@ export class JSONTransform extends Visitor {
         let isRegular = isPure;
         let isFirst = true;
         const serValue = (member, realName) => {
-            if (!member.flags.has(PropertyFlags.Lazy))
+            if (!member.flags.has(PropertyFlags.Lazy)) {
+                const defaultString = defaultStringLiterals.get(member.name);
+                if (defaultString) {
+                    const stores = this.getStores(defaultString.encoded, this.program.options.hasFeature(16)).join("\n");
+                    return (`{\n` +
+                        `  const __str = load<${member.type}>(ptr, offsetof<this>(${JSON.stringify(realName)}));\n` +
+                        `  if (changetype<usize>(__str) == changetype<usize>(${defaultString.expression})) {\n` +
+                        stores
+                            .split("\n")
+                            .map((line) => `    ${line}\n`)
+                            .join("") +
+                        `  } else {\n` +
+                        `    JSON.__serialize<${member.type}>(__str);\n` +
+                        `  }\n` +
+                        `}\n`);
+                }
                 return getSerializeCall(member.type, realName);
+            }
             const T = member.lazyInner;
             const baseName = realName.slice(0, -3);
             const baseT = stripNull(T);
@@ -942,12 +1169,10 @@ export class JSONTransform extends Visitor {
             const aliasName = JSON.stringify(member.alias || member.name);
             const realName = member.name;
             if (member.value) {
-                if (member.value != "null" &&
-                    member.value != "0" &&
-                    member.value != "0.0" &&
-                    member.value != "false") {
-                    INITIALIZE += `  store<${member.type}>(changetype<usize>(this), ${member.value}, offsetof<this>(${JSON.stringify(member.name)}));\n`;
-                }
+                INITIALIZE += `  store<${member.type}>(changetype<usize>(this), ${member.value}, offsetof<this>(${JSON.stringify(member.name)}));\n`;
+                const __valInit = __lazyValInits.get(member.name);
+                if (__valInit)
+                    INITIALIZE += __valInit;
             }
             else if (member.generic) {
                 INITIALIZE += `  if (isManaged<nonnull<${member.type}>>() || isReference<nonnull<${member.type}>>()) {\n`;
@@ -974,6 +1199,9 @@ export class JSONTransform extends Visitor {
                     INITIALIZE += `  store<${member.type}>(changetype<usize>(this), "", offsetof<this>(${JSON.stringify(member.name)}));\n`;
                 }
             }
+            else {
+                INITIALIZE += `  store<${member.type}>(changetype<usize>(this), null, offsetof<this>(${JSON.stringify(member.name)}));\n`;
+            }
             const SIMD_ENABLED = this.program.options.hasFeature(16);
             if (!isRegular &&
                 !member.flags.has(PropertyFlags.OmitIf) &&
@@ -1116,7 +1344,10 @@ export class JSONTransform extends Visitor {
                     type.startsWith("JSON.Box<") ||
                     isEnum(type, this.sources.get(this.schema.node.range.source), this.parser))
                     sortedMembers.number.push(member);
-                else if (isArray(type))
+                else if (isArray(type) ||
+                    type == "JSON.Arr" ||
+                    type == "Arr" ||
+                    needsReferenceLoad(type))
                     sortedMembers.array.push(member);
                 else
                     sortedMembers.object.push(member);
@@ -1168,6 +1399,8 @@ export class JSONTransform extends Visitor {
         const FLOAT_TYPES = ["f32", "f64"];
         const INTEGER_TYPES = [...UNSIGNED_INTEGER_TYPES, ...SIGNED_INTEGER_TYPES];
         const STRING_FIELD_DESERIALIZER = "__deserializeStringField";
+        const STRING_FIELD_TRUSTED_DESERIALIZER = "__deserializeStringFieldTrusted";
+        const getCustomDeserializeExpression = (type, valueStart, valueEnd) => `changetype<nonnull<${stripNull(type)}>>(0).__DESERIALIZE_CUSTOM(JSON.Util.ptrToStr(${valueStart}, ${valueEnd}))`;
         const getArrayValueType = (type) => {
             if (!type.startsWith("Array<") && !type.startsWith("StaticArray<"))
                 return null;
@@ -1204,7 +1437,32 @@ export class JSONTransform extends Visitor {
                     out.push(`    ${srcPtr} = ${valuePtr} + 8;`);
                     out.push("  } else {");
                 }
-                out.push(`  ${srcPtr} = ${STRING_FIELD_DESERIALIZER}<${member.type}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                const declaredDefaultString = defaultStringLiterals.get(member.name);
+                const defaultString = declaredDefaultString?.encoded == '""'
+                    ? undefined
+                    : declaredDefaultString;
+                const stringFieldDeserializer = fastPath && keyOffset && !member.node.type.isNullable
+                    ? STRING_FIELD_TRUSTED_DESERIALIZER
+                    : STRING_FIELD_DESERIALIZER;
+                const stringValuePtr = stringFieldDeserializer == STRING_FIELD_TRUSTED_DESERIALIZER
+                    ? `${valuePtr} + 2`
+                    : valuePtr;
+                const stringFieldCall = stringFieldDeserializer == STRING_FIELD_TRUSTED_DESERIALIZER
+                    ? stringFieldDeserializer
+                    : `${stringFieldDeserializer}<${member.type}>`;
+                if (defaultString) {
+                    const encodedBytes = defaultString.encoded.length << 1;
+                    const comparisons = getComparisions(defaultString.encoded, valuePtr, "==").join(" && ");
+                    out.push(`  if (${valuePtr} + ${encodedBytes} <= srcEnd && ${comparisons}) {`);
+                    out.push(`    store<${member.type}>(${outPtr}, ${defaultString.expression}, ${fieldOffset});`);
+                    out.push(`    ${srcPtr} = ${valuePtr} + ${encodedBytes};`);
+                    out.push("  } else {");
+                    out.push(`    ${srcPtr} = ${stringFieldCall}(${stringValuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                    out.push("  }");
+                }
+                else {
+                    out.push(`  ${srcPtr} = ${stringFieldCall}(${stringValuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                }
                 if (member.node.type.isNullable) {
                     out.push("  }");
                 }
@@ -1275,37 +1533,11 @@ export class JSONTransform extends Visitor {
             }
             else if (resolvedType == "JSON.Raw") {
                 out.push("{");
-                out.push(`  const valueStart = ${srcPtr};`);
-                out.push("  let depth: i32 = 0;");
-                out.push("  let inString = false;");
-                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(`      ${srcPtr} += 2;`);
-                out.push("      continue;");
-                out.push("    }");
-                out.push("    if (code == 0x22) {");
-                out.push("      inString = true;");
-                out.push(`      ${srcPtr} += 2;`);
-                out.push("      continue;");
-                out.push("    }");
-                out.push("    if (code == 0x7b || code == 0x5b) {");
-                out.push("      depth++;");
-                out.push(`      ${srcPtr} += 2;`);
-                out.push("      continue;");
-                out.push("    }");
-                out.push("    if (code == 0x7d || code == 0x5d) {");
-                out.push("      if (depth == 0) break;");
-                out.push("      depth--;");
-                out.push(`      ${srcPtr} += 2;`);
-                out.push("      continue;");
-                out.push("    }");
-                out.push("    if (code == 0x2c && depth == 0) break;");
-                out.push(`    ${srcPtr} += 2;`);
-                out.push("  }");
-                out.push(`  if (inString || depth != 0 || ${srcPtr} <= valueStart) break;`);
-                out.push(`  store<${member.type}>(${outPtr}, JSON.Raw.from(JSON.Util.ptrToStr(valueStart, ${srcPtr})), ${fieldOffset});`);
+                out.push(`  const valueStart = ${valuePtr};`);
+                out.push(`  const valueEnd = JSON.Util.scanValueEnd<JSON.Raw>(valueStart, srcEnd);`);
+                out.push("  if (!valueEnd) break;");
+                out.push(`  store<${member.type}>(${outPtr}, JSON.Raw.from(JSON.Util.ptrToStr(valueStart, valueEnd)), ${fieldOffset});`);
+                out.push(`  ${srcPtr} = valueEnd;`);
                 out.push("}");
             }
             else if (isBoolean(resolvedType)) {
@@ -1324,6 +1556,24 @@ export class JSONTransform extends Visitor {
             else if (FLOAT_TYPES.includes(resolvedType)) {
                 out.push(`${srcPtr} = __deserializeFloatField<${resolvedType}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
             }
+            else if (resolvedSchema?.custom) {
+                out.push("{");
+                if (member.node.type.isNullable) {
+                    out.push(`  if (load<u64>(${valuePtr}) == 30399761348886638) {`);
+                    out.push(`    store<${member.type}>(${outPtr}, changetype<${member.type}>(0), ${fieldOffset});`);
+                    out.push(`    ${srcPtr} = ${valuePtr} + 8;`);
+                    out.push("  } else {");
+                }
+                out.push(`  const valueStart = ${valuePtr};`);
+                out.push(`  const valueEnd = JSON.Util.scanValueEnd<${resolvedType}>(valueStart, srcEnd);`);
+                out.push("  if (!valueEnd) break;");
+                out.push(`  store<${member.type}>(${outPtr}, ${getCustomDeserializeExpression(resolvedType, "valueStart", "valueEnd")}, ${fieldOffset});`);
+                out.push(`  ${srcPtr} = valueEnd;`);
+                if (member.node.type.isNullable) {
+                    out.push("  }");
+                }
+                out.push("}");
+            }
             else if (resolvedSchema && !resolvedSchema.custom) {
                 if (fastPath) {
                     out.push("{");
@@ -1337,9 +1587,18 @@ export class JSONTransform extends Visitor {
                     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(`    changetype<nonnull<${resolvedType}>>(value).__INITIALIZE();`);
                     out.push("  }");
-                    out.push(`  ${srcPtr} = changetype<nonnull<${resolvedType}>>(value).__DESERIALIZE_FAST<${resolvedType}>(${valuePtr}, srcEnd, value);`);
-                    out.push(`  if (!${srcPtr}) break;`);
+                    out.push(`  const __fe = changetype<nonnull<${resolvedType}>>(value).__DESERIALIZE_FAST<${resolvedType}>(${valuePtr}, srcEnd, value);`);
+                    out.push(`  if (__fe) {`);
+                    out.push(`    ${srcPtr} = __fe;`);
+                    out.push(`  } else {`);
+                    out.push(`    const __ve = JSON.Util.scanValueEnd<${resolvedType}>(${valuePtr}, srcEnd);`);
+                    out.push(`    if (!__ve) break;`);
+                    out.push(`    changetype<nonnull<${resolvedType}>>(value).__INITIALIZE();`);
+                    out.push(`    changetype<nonnull<${resolvedType}>>(value).__DESERIALIZE_SLOW<${resolvedType}>(${valuePtr}, __ve, value);`);
+                    out.push(`    ${srcPtr} = __ve;`);
+                    out.push(`  }`);
                     if (member.node.type.isNullable) {
                         out.push("  }");
                     }
@@ -1393,25 +1652,29 @@ export class JSONTransform extends Visitor {
                     out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
                     out.push("  }");
                     out.push("  let index = 0;");
+                    out.push("  const reusableLength = value.length;");
+                    out.push("  const reusableDataStart = value.dataStart;");
                     out.push(`  ${srcPtr} = ${valuePtr} + 2;`);
                     out.push(`  ${srcPtr} = JSON.Util.skipWhitespace(${srcPtr}, srcEnd);`);
                     out.push(`  if (load<u16>(${srcPtr}) == 0x5d) {`);
-                    out.push("    value.length = 0;");
+                    out.push("    if (value.length != 0) value.length = 0;");
                     out.push(`    ${srcPtr} += 2;`);
                     out.push("  } else while (true) {");
                     out.push(`    ${srcPtr} = JSON.Util.skipWhitespace(${srcPtr}, srcEnd);`);
                     if (elementNullable) {
-                        out.push(`    if (index >= value.length) value.push(changetype<${valueType} | null>(0));`);
+                        out.push(`    if (index >= reusableLength) value.push(changetype<${valueType} | null>(0));`);
+                        out.push(`    const slot = index < reusableLength ? reusableDataStart + ((<usize>index) << alignof<${valueType}>()) : value.dataStart + ((<usize>index) << alignof<${valueType}>());`);
                         out.push(`    if (load<u64>(${srcPtr}) == 30399761348886638) {`);
-                        out.push(`      store<usize>(value.dataStart + ((<usize>index) << alignof<${valueType}>()), 0);`);
+                        out.push("      store<usize>(slot, 0);");
                         out.push(`      ${srcPtr} += 8;`);
                         out.push("    } else {");
-                        out.push(`      ${srcPtr} = ${STRING_FIELD_DESERIALIZER}<${valueType}>(${srcPtr}, srcEnd, value.dataStart + ((<usize>index) << alignof<${valueType}>()));`);
+                        out.push(`      ${srcPtr} = ${STRING_FIELD_DESERIALIZER}<${valueType}>(${srcPtr}, srcEnd, slot);`);
                         out.push("    }");
                     }
                     else {
-                        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('    if (index >= reusableLength) value.push("");');
+                        out.push(`    const slot = index < reusableLength ? reusableDataStart + ((<usize>index) << alignof<${valueType}>()) : value.dataStart + ((<usize>index) << alignof<${valueType}>());`);
+                        out.push(`    ${srcPtr} = ${STRING_FIELD_DESERIALIZER}<${valueType}>(${srcPtr}, srcEnd, slot);`);
                     }
                     out.push("    index++;");
                     out.push(`    ${srcPtr} = JSON.Util.skipWhitespace(${srcPtr}, srcEnd);`);
@@ -1421,7 +1684,7 @@ export class JSONTransform extends Visitor {
                     out.push("      continue;");
                     out.push("    }");
                     out.push("    if (code == 0x5d) {");
-                    out.push("      value.length = index;");
+                    out.push("      if (index != reusableLength) value.length = index;");
                     out.push(`      ${srcPtr} += 2;`);
                     out.push("      break;");
                     out.push("    }");
@@ -1442,25 +1705,39 @@ export class JSONTransform extends Visitor {
                     out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
                     out.push("  }");
                     out.push("  let index = 0;");
+                    out.push("  const reusableLength = value.length;");
+                    out.push("  const reusableDataStart = value.dataStart;");
                     out.push(`  ${srcPtr} = ${valuePtr} + 2;`);
                     out.push(`  ${srcPtr} = JSON.Util.skipWhitespace(${srcPtr}, srcEnd);`);
                     out.push(`  if (load<u16>(${srcPtr}) == 0x5d) {`);
-                    out.push("    value.length = 0;");
+                    out.push("    if (value.length != 0) 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 (index < reusableLength) {");
+                    out.push(`      const itemSlot = reusableDataStart + ((<usize>index) << alignof<${valueType}>());`);
+                    out.push(`      item = load<${valueType}>(itemSlot);`);
                     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(`        store<${valueType}>(itemSlot, item);`);
+                    out.push(`        changetype<nonnull<${valueType}>>(item).__INITIALIZE();`);
                     out.push("      }");
                     out.push("    } else {");
                     out.push(`      item = changetype<${valueType}>(__new(offsetof<nonnull<${valueType}>>(), idof<nonnull<${valueType}>>()));`);
                     out.push("      value.push(item);");
+                    out.push(`      changetype<nonnull<${valueType}>>(item).__INITIALIZE();`);
                     out.push("    }");
-                    out.push(`    ${srcPtr} = changetype<nonnull<${valueType}>>(item).__DESERIALIZE_FAST<${valueType}>(${srcPtr}, srcEnd, item);`);
-                    out.push(`    if (!${srcPtr}) break;`);
+                    out.push(`    const __es = ${srcPtr};`);
+                    out.push(`    const __ee = changetype<nonnull<${valueType}>>(item).__DESERIALIZE_FAST<${valueType}>(${srcPtr}, srcEnd, item);`);
+                    out.push(`    if (__ee) {`);
+                    out.push(`      ${srcPtr} = __ee;`);
+                    out.push(`    } else {`);
+                    out.push(`      const __ve = JSON.Util.scanValueEnd<${valueType}>(__es, srcEnd);`);
+                    out.push(`      if (!__ve) break;`);
+                    out.push(`      changetype<nonnull<${valueType}>>(item).__INITIALIZE();`);
+                    out.push(`      changetype<nonnull<${valueType}>>(item).__DESERIALIZE_SLOW<${valueType}>(__es, __ve, item);`);
+                    out.push(`      ${srcPtr} = __ve;`);
+                    out.push(`    }`);
                     out.push("    index++;");
                     out.push(`    ${srcPtr} = JSON.Util.skipWhitespace(${srcPtr}, srcEnd);`);
                     out.push(`    const code = load<u16>(${srcPtr});`);
@@ -1469,7 +1746,7 @@ export class JSONTransform extends Visitor {
                     out.push("      continue;");
                     out.push("    }");
                     out.push("    if (code == 0x5d) {");
-                    out.push("      value.length = index;");
+                    out.push("      if (reusableLength != index) value.length = index;");
                     out.push(`      ${srcPtr} += 2;`);
                     out.push("      break;");
                     out.push("    }");
@@ -1481,8 +1758,25 @@ export class JSONTransform extends Visitor {
                     out.push("}");
                     return out;
                 }
-                out.push(`  ${srcPtr} = __deserializeArrayField_SWAR<${resolvedType}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
-                out.push(`  if (!${srcPtr}) break;`);
+                if (valueType == "i64") {
+                    out.push(`  if (load<u32>(${valuePtr}) == 0x005d005b) {`);
+                    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("    } else if (value.length != 0) {");
+                    out.push("      value.length = 0;");
+                    out.push("    }");
+                    out.push(`    ${srcPtr} = ${valuePtr} + 4;`);
+                    out.push("  } else {");
+                    out.push(`    ${srcPtr} = __deserializeArrayField_SWAR<nonnull<${resolvedType}>>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                    out.push(`    if (!${srcPtr}) break;`);
+                    out.push("  }");
+                }
+                else {
+                    out.push(`  ${srcPtr} = __deserializeArrayField_SWAR<nonnull<${resolvedType}>>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                    out.push(`  if (!${srcPtr}) break;`);
+                }
                 if (member.node.type.isNullable) {
                     out.push("  }");
                 }
@@ -1502,6 +1796,7 @@ export class JSONTransform extends Visitor {
             }
             else if (resolvedType == "JSON.Value" ||
                 resolvedType == "JSON.Obj" ||
+                resolvedType == "JSON.Arr" ||
                 isEnum(resolvedType, this.sources.get(this.schema.node.range.source), this.parser)) {
                 out.push("break;");
             }
@@ -1531,32 +1826,28 @@ export class JSONTransform extends Visitor {
             }
             return calls;
         };
-        const chunkFastBlocksOptional = (blocks, tag, callIndent, needsKp) => {
-            if (blocks.length <= FAST_CHUNK_SIZE)
-                return blocks.join("");
-            let calls = "";
-            for (let c = 0; c < blocks.length; c += FAST_CHUNK_SIZE) {
-                const name = `__DESERIALIZE_FAST_${tag}_${fastChunkId++}`;
-                const body = blocks
-                    .slice(c, c + FAST_CHUNK_SIZE)
-                    .join("")
-                    .replace(/\bbreak;/g, "return 0;");
-                fastChunkMethods.push(`${name}(srcStart: usize, srcEnd: usize, dst: usize, seenAny: bool): u64 {\n` +
-                    (needsKp ? "  let kp: usize = 0;\n" : "") +
-                    `${body}\n` +
-                    `  return (<u64>srcStart) | ((<u64>(seenAny ? 1 : 0)) << 32);\n}`);
-                calls +=
-                    `${callIndent}{\n` +
-                        `${callIndent}  const __r = this.${name}(srcStart, srcEnd, dst, seenAny);\n` +
-                        `${callIndent}  if (__r == 0) break;\n` +
-                        `${callIndent}  srcStart = <usize>(<u32>__r);\n` +
-                        `${callIndent}  seenAny = (<u32>(__r >>> 32)) != 0;\n` +
-                        `${callIndent}}\n`;
-            }
-            return calls;
+        const chunkFastBlocksOptional = (blocks, _tag, _callIndent, _needsKp) => {
+            return blocks.join("");
         };
+        const traceOptionalObject = supportsFastOptionalPath && this.schema.members.length <= 63;
+        const objectTraceHeader = traceOptionalObject
+            ? "  const __traceToken = JSON.Util.beginObjectTrace(dst, start, " +
+                JSON.stringify(this.schema.name) +
+                ");\n" +
+                "  const __traceActive = __traceToken != i32.MIN_VALUE;\n" +
+                "  const __traceHit = __traceActive && __traceToken < 0;\n" +
+                "  const __traceSlot = __traceHit ? ~__traceToken : __traceToken;\n" +
+                "  const __traceMask = __traceHit ? JSON.Util.getObjectTraceMask(__traceSlot) : <u64>0;\n" +
+                "  const __traceTier = __traceHit ? JSON.Util.getObjectTraceTier(__traceSlot) : <u8>0;\n" +
+                "  let __tracePresent: u64 = 0;\n"
+            : "";
         DESERIALIZE_FAST += indent + "const start = srcStart;\n";
         DESERIALIZE_FAST += indent + "const dst = changetype<usize>(out);\n";
+        if (traceOptionalObject) {
+            DESERIALIZE_FAST += objectTraceHeader;
+            DESERIALIZE_FAST += indent + "if (__traceTier < 2) {\n";
+            indent += "  ";
+        }
         DESERIALIZE_FAST += indent + "do {\n";
         indent += "  ";
         if (supportsFastOptionalPath) {
@@ -1570,25 +1861,40 @@ export class JSONTransform extends Visitor {
                 const key = JSON.stringify(member.alias || member.name);
                 if (key.length <= 2)
                     throw new Error("Key cannot be empty!");
-                const firstKeySection = key + ":";
-                const nextKeySection = "," + key + ":";
-                const firstKeyOffset = firstKeySection.length << 1;
-                const nextKeyOffset = nextKeySection.length << 1;
                 const resolvedType = stripNull(member.type);
                 const inlineStringValue = ["string", "String"].includes(resolvedType);
-                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 packedQuote = inlineStringValue && !member.node.type.isNullable ? '"' : "";
+                const firstKeySection = key + ":" + packedQuote;
+                const nextKeySection = "," + key + ":" + packedQuote;
+                const firstKeyOffset = firstKeySection.length << 1;
+                const nextKeyOffset = nextKeySection.length << 1;
+                const trustedStringValue = packedQuote.length != 0;
+                const firstValueOffset = trustedStringValue
+                    ? firstKeyOffset - 2
+                    : firstKeyOffset;
+                const nextValueOffset = trustedStringValue
+                    ? nextKeyOffset - 2
+                    : nextKeyOffset;
+                const deserializerFirst = getDeserializer(member.type, "srcStart", "dst", member, inlineStringValue ? firstValueOffset : 0, true);
+                const deserializerNext = getDeserializer(member.type, "srcStart", "dst", member, inlineStringValue ? nextValueOffset : 0, true);
                 const isOptional = member.flags.has(PropertyFlags.OmitNull) ||
                     member.flags.has(PropertyFlags.OmitIf);
+                const traceBit = `<u64>1 << ${i}`;
+                const firstMismatch = getComparisions(firstKeySection, "srcStart", "!=").join(" || ");
+                const nextMismatch = getComparisions(nextKeySection, "srcStart", "!=").join(" || ");
+                const firstAbsent = traceOptionalObject
+                    ? `__traceHit ? (__traceMask & (${traceBit})) == 0 : (${firstMismatch})`
+                    : firstMismatch;
+                const nextAbsent = traceOptionalObject
+                    ? `__traceHit ? (__traceMask & (${traceBit})) == 0 : (${nextMismatch})`
+                    : nextMismatch;
                 if (!deserializerFirst.length || !deserializerNext.length) {
                     t1opt.push(indent + "break;\n\n");
                     continue;
                 }
                 let blk = indent + "if (!seenAny) {\n";
                 indent += "  ";
-                blk +=
-                    indent +
-                        `if ( // ${firstKeySection}\n${(indent += "  ")}${getComparisions(firstKeySection, "srcStart", "!=").join("\n" + indent + "|| ")}\n${(indent = indent.slice(0, -2))}) {\n`;
+                blk += indent + `if (${firstAbsent}) {\n`;
                 indent += "  ";
                 if (isOptional) {
                     blk += indent + "// optional @omitnull field omitted\n";
@@ -1601,19 +1907,20 @@ export class JSONTransform extends Visitor {
                 indent += "  ";
                 if (!inlineStringValue)
                     blk += indent + `srcStart += ${firstKeyOffset};\n`;
-                blk +=
-                    indent +
-                        `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${firstKeyOffset}` : "srcStart"}))) break;\n`;
+                if (!trustedStringValue)
+                    blk +=
+                        indent +
+                            `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${firstValueOffset}` : "srcStart"}))) break;\n`;
                 blk += indent + deserializerFirst.join("\n" + indent) + "\n";
+                if (traceOptionalObject)
+                    blk += indent + `__tracePresent |= ${traceBit};\n`;
                 blk += indent + "seenAny = true;\n";
                 indent = indent.slice(0, -2);
                 blk += indent + "}\n";
                 indent = indent.slice(0, -2);
                 blk += indent + "} else {\n";
                 indent += "  ";
-                blk +=
-                    indent +
-                        `if ( // ${nextKeySection}\n${(indent += "  ")}${getComparisions(nextKeySection, "srcStart", "!=").join("\n" + indent + "|| ")}\n${(indent = indent.slice(0, -2))}) {\n`;
+                blk += indent + `if (${nextAbsent}) {\n`;
                 indent += "  ";
                 if (isOptional) {
                     blk += indent + "// optional @omitnull field omitted\n";
@@ -1626,10 +1933,13 @@ export class JSONTransform extends Visitor {
                 indent += "  ";
                 if (!inlineStringValue)
                     blk += indent + `srcStart += ${nextKeyOffset};\n`;
-                blk +=
-                    indent +
-                        `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${nextKeyOffset}` : "srcStart"}))) break;\n`;
+                if (!trustedStringValue)
+                    blk +=
+                        indent +
+                            `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${nextValueOffset}` : "srcStart"}))) break;\n`;
                 blk += indent + deserializerNext.join("\n" + indent) + "\n";
+                if (traceOptionalObject)
+                    blk += indent + `__tracePresent |= ${traceBit};\n`;
                 indent = indent.slice(0, -2);
                 blk += indent + "}\n";
                 indent = indent.slice(0, -2);
@@ -1645,24 +1955,27 @@ export class JSONTransform extends Visitor {
                 const key = JSON.stringify(member.alias || member.name);
                 if (key.length <= 2)
                     throw new Error("Key cannot be empty!");
-                const keySection = (i == 0 ? "{" : ",") + key + ":";
-                let blk = indent +
-                    `if ( // ${keySection}\n${(indent += "  ")}${getComparisions(keySection, "srcStart", "!=").join("\n" + indent + "|| ")}\n${(indent = indent.slice(0, -2))}) break;\n`;
-                const keyOffset = keySection.length << 1;
                 const resolvedType = stripNull(member.type);
                 const inlineStringValue = ["string", "String"].includes(resolvedType);
+                const trustedStringValue = inlineStringValue && !member.node.type.isNullable;
+                const keySection = (i == 0 ? "{" : ",") + key + ":" + (trustedStringValue ? '"' : "");
+                let blk = indent +
+                    `if (${getComparisions(keySection, "srcStart", "!=").join(" || ")}) break;\n`;
+                const keyOffset = keySection.length << 1;
+                const valueOffset = trustedStringValue ? keyOffset - 2 : keyOffset;
                 if (!inlineStringValue) {
                     blk += indent + `srcStart += ${keyOffset};\n\n`;
                 }
-                const deserializer = getDeserializer(member.type, "srcStart", "dst", member, inlineStringValue ? keyOffset : 0, true);
+                const deserializer = getDeserializer(member.type, "srcStart", "dst", member, inlineStringValue ? valueOffset : 0, true);
                 if (!deserializer.length) {
                     blk += indent + "break;\n\n";
                     t1blocks.push(blk);
                     continue;
                 }
-                blk +=
-                    indent +
-                        `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${keyOffset}` : "srcStart"}))) break;\n`;
+                if (!trustedStringValue)
+                    blk +=
+                        indent +
+                            `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${valueOffset}` : "srcStart"}))) break;\n`;
                 blk += indent + deserializer.join("\n" + indent) + "\n\n";
                 t1blocks.push(blk);
             }
@@ -1671,9 +1984,18 @@ export class JSONTransform extends Visitor {
         DESERIALIZE_FAST +=
             indent + "if (load<u16>(srcStart) !== 0x7d) break; // }\n";
         DESERIALIZE_FAST += indent + "srcStart += 2;\n";
+        if (traceOptionalObject)
+            DESERIALIZE_FAST +=
+                indent +
+                    "if (__traceActive) JSON.Util.saveObjectTrace(__traceSlot, __tracePresent, 1);\n";
         DESERIALIZE_FAST += indent + "return srcStart;\n";
         indent = indent.slice(0, -2);
         DESERIALIZE_FAST += indent + "} while (false);\n\n";
+        if (traceOptionalObject) {
+            indent = indent.slice(0, -2);
+            DESERIALIZE_FAST += indent + "}\n\n";
+        }
+        fastPrettyTailStart = DESERIALIZE_FAST.length;
         const tier2Desers = this.schema.members.map((member) => getDeserializer(member.type, "srcStart", "dst", member, 0, true));
         const tier2Ok = tier2Desers.every((d) => d.length && !(d.length === 1 && d[0].trim() === "break;"));
         if (tier2Ok && !supportsFastOptionalPath) {
@@ -1694,9 +2016,7 @@ export class JSONTransform extends Visitor {
                 blk += skip;
                 blk +=
                     i2 +
-                        `if ( // ${key}\n${i2}  ` +
-                        getComparisions(key, "srcStart", "!=").join("\n" + i2 + "  || ") +
-                        `\n${i2}) break;\n`;
+                        `if (${getComparisions(key, "srcStart", "!=").join(" || ")}) break;\n`;
                 blk += i2 + `srcStart += ${keyBytes};\n`;
                 blk += skip;
                 blk += i2 + "if (load<u16>(srcStart) != 0x3a) break; // :\n";
@@ -1725,6 +2045,16 @@ export class JSONTransform extends Visitor {
             const i3 = "      ";
             DESERIALIZE_FAST += i1 + "srcStart = start;\n";
             DESERIALIZE_FAST += i1 + "do {\n";
+            if (traceOptionalObject) {
+                DESERIALIZE_FAST += i2 + "__tracePresent = 0;\n";
+                DESERIALIZE_FAST +=
+                    i2 +
+                        "const __traceSeparator = __traceHit ? JSON.Util.getObjectTraceSeparator(__traceSlot) : <usize>0;\n";
+                DESERIALIZE_FAST += i2 + "let __traceCandidateSeparator: usize = 0;\n";
+                DESERIALIZE_FAST += i2 + "let __traceSeparatorStart: usize = 0;\n";
+                DESERIALIZE_FAST += i2 + "let __traceSeparatorSeen = false;\n";
+                DESERIALIZE_FAST += i2 + "let __traceCanonicalPretty = true;\n";
+            }
             DESERIALIZE_FAST +=
                 i2 + "srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
             DESERIALIZE_FAST += i2 + "if (load<u16>(srcStart) != 0x7b) break; // {\n";
@@ -1737,23 +2067,91 @@ export class JSONTransform extends Visitor {
                 const member = this.schema.members[i];
                 const key = JSON.stringify(member.alias || member.name);
                 const keyBytes = key.length << 1;
+                const traceBit = `<u64>1 << ${i}`;
+                const keyMatches = getComparisions(key, "kp", "==").join(" && ");
+                const presentCondition = traceOptionalObject
+                    ? `__traceHit ? (__traceMask & (${traceBit})) != 0 : (${keyMatches})`
+                    : keyMatches;
                 let blk = "\n";
-                blk += i2 + "kp = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
-                if (multi && i > 0) {
+                if (traceOptionalObject) {
+                    blk += i2 + `if (__traceHit && (${traceBit} & __traceMask) != 0) {\n`;
+                    blk += i3 + "kp = srcStart;\n";
+                    if (multi && i > 0) {
+                        blk += i3 + "if (seenAny) {\n";
+                        blk += i3 + "  if (load<u16>(kp) != 0x2c) break; // ,\n";
+                        blk += i3 + "  kp += 2;\n";
+                        blk += i3 + "}\n";
+                    }
+                    blk += i3 + "if (__traceTier == 3) kp += __traceSeparator;\n";
+                    blk += i3 + "else kp = JSON.Util.skipWhitespace(kp, srcEnd);\n";
+                    blk += i2 + "} else if (!__traceHit) {\n";
+                    blk += i3 + "__traceSeparatorStart = srcStart;\n";
+                    blk += i3 + "kp = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+                    if (multi && i > 0) {
+                        blk += i3 + "if (seenAny && load<u16>(kp) == 0x2c) {\n";
+                        blk +=
+                            i3 + "  if (kp != srcStart) __traceCanonicalPretty = false;\n";
+                        blk += i3 + "  __traceSeparatorStart = kp + 2;\n";
+                        blk +=
+                            i3 +
+                                "  kp = JSON.Util.skipWhitespace(__traceSeparatorStart, srcEnd);\n";
+                        blk += i3 + "}\n";
+                    }
+                    blk += i2 + "}\n";
+                }
+                else {
+                    blk += i2 + "kp = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+                    if (multi && i > 0) {
+                        blk +=
+                            i2 +
+                                "if (seenAny && load<u16>(kp) == 0x2c) kp = JSON.Util.skipWhitespace(kp + 2, srcEnd);\n";
+                    }
+                }
+                blk += i2 + `if (${presentCondition}) {\n`;
+                if (traceOptionalObject) {
+                    blk += i3 + "if (__traceHit && __traceTier == 3) {\n";
+                    blk += i3 + `  kp += ${keyBytes};\n`;
+                    blk += i3 + "  if (load<u16>(kp) != 0x3a) break; // :\n";
+                    blk += i3 + "  if (load<u16>(kp + 2) != 0x20) break; // space\n";
+                    blk += i3 + "  srcStart = kp + 4;\n";
+                    blk += i3 + "} else {\n";
+                    blk += i3 + "  if (!__traceHit) {\n";
+                    blk +=
+                        i3 +
+                            "    const __traceCurrentSeparator = kp - __traceSeparatorStart;\n";
+                    blk += i3 + "    if (__traceSeparatorSeen) {\n";
+                    blk +=
+                        i3 +
+                            "      if (__traceCurrentSeparator != __traceCandidateSeparator) __traceCanonicalPretty = false;\n";
+                    blk += i3 + "    } else {\n";
+                    blk +=
+                        i3 + "      __traceCandidateSeparator = __traceCurrentSeparator;\n";
+                    blk += i3 + "      __traceSeparatorSeen = true;\n";
+                    blk += i3 + "    }\n";
+                    blk += i3 + "  }\n";
+                    blk += i3 + `  kp += ${keyBytes};\n`;
+                    blk += i3 + "  const __traceKeyEnd = kp;\n";
+                    blk += i3 + "  kp = JSON.Util.skipWhitespace(kp, srcEnd);\n";
                     blk +=
-                        i2 +
-                            "if (seenAny && load<u16>(kp) == 0x2c) kp = JSON.Util.skipWhitespace(kp + 2, srcEnd);\n";
+                        i3 +
+                            "  if (!__traceHit && kp != __traceKeyEnd) __traceCanonicalPretty = false;\n";
+                    blk += i3 + "  if (load<u16>(kp) != 0x3a) break; // :\n";
+                    blk +=
+                        i3 + "  srcStart = JSON.Util.skipWhitespace(kp + 2, srcEnd);\n";
+                    blk +=
+                        i3 +
+                            "  if (!__traceHit && (load<u16>(kp + 2) != 0x20 || srcStart != kp + 4)) __traceCanonicalPretty = false;\n";
+                    blk += i3 + "}\n";
+                }
+                else {
+                    blk += i3 + `kp += ${keyBytes};\n`;
+                    blk += i3 + "kp = JSON.Util.skipWhitespace(kp, srcEnd);\n";
+                    blk += i3 + "if (load<u16>(kp) != 0x3a) break; // :\n";
+                    blk += i3 + "srcStart = JSON.Util.skipWhitespace(kp + 2, srcEnd);\n";
                 }
-                blk +=
-                    i2 +
-                        `if ( // ${key}\n${i2}  ` +
-                        getComparisions(key, "kp", "==").join("\n" + i2 + "  && ") +
-                        `\n${i2}) {\n`;
-                blk += i3 + `kp += ${keyBytes};\n`;
-                blk += i3 + "kp = JSON.Util.skipWhitespace(kp, srcEnd);\n";
-                blk += i3 + "if (load<u16>(kp) != 0x3a) break; // :\n";
-                blk += i3 + "srcStart = JSON.Util.skipWhitespace(kp + 2, srcEnd);\n";
                 blk += i3 + tier2Desers[i].join("\n" + i3) + "\n";
+                if (traceOptionalObject)
+                    blk += i3 + `__tracePresent |= ${traceBit};\n`;
                 if (multi)
                     blk += i3 + "seenAny = true;\n";
                 blk += i2 + "}\n";
@@ -1765,6 +2163,137 @@ export class JSONTransform extends Visitor {
                 i2 + "srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
             DESERIALIZE_FAST += i2 + "if (load<u16>(srcStart) != 0x7d) break; // }\n";
             DESERIALIZE_FAST += i2 + "srcStart += 2;\n";
+            if (traceOptionalObject)
+                DESERIALIZE_FAST +=
+                    i2 +
+                        "if (__traceActive) JSON.Util.saveObjectTrace(__traceSlot, __tracePresent, __traceHit ? __traceTier : (__traceCanonicalPretty && __traceSeparatorSeen ? 3 : 2), __traceHit ? __traceSeparator : __traceCandidateSeparator);\n";
+            DESERIALIZE_FAST += i2 + "return srcStart;\n";
+            DESERIALIZE_FAST += i1 + "} while (false);\n\n";
+        }
+        const keyedUnionAlternatives = this.schema.members.filter((member) => member.node.type.isNullable &&
+            this.getSchema(stripNull(member.type)) != null).length;
+        const scalarKeyedSchema = this.schema.members.every((member) => {
+            const type = stripNull(member.type);
+            return (INTEGER_TYPES.includes(type) ||
+                FLOAT_TYPES.includes(type) ||
+                ["string", "String"].includes(type) ||
+                isBoolean(type));
+        });
+        const structKeyedSchema = this.schema.members.every((member) => {
+            const type = stripNull(member.type);
+            return (INTEGER_TYPES.includes(type) ||
+                FLOAT_TYPES.includes(type) ||
+                ["string", "String"].includes(type) ||
+                isBoolean(type) ||
+                this.getSchema(type) != null);
+        });
+        const keyedFallbackEnabled = tier2Ok &&
+            this.schema.members.length > 0 &&
+            this.schema.members.length <= 24 &&
+            (keyedUnionAlternatives >= 2 ||
+                (scalarKeyedSchema && this.schema.members.length >= 12) ||
+                (structKeyedSchema && hasExplicitOptionalMembers));
+        if (keyedFallbackEnabled) {
+            const i1 = "  ";
+            const i2 = "    ";
+            const i3 = "      ";
+            const keyedResets = this.schema.members.map((member) => {
+                const offset = `offsetof<this>(${JSON.stringify(member.name)})`;
+                if (member.value)
+                    return `store<${member.type}>(dst, ${member.value}, ${offset});`;
+                if (member.node.type.isNullable)
+                    return `store<${member.type}>(dst, null, ${offset});`;
+                if (this.getSchema(member.type))
+                    return (`store<${member.type}>(dst, ` +
+                        `changetype<nonnull<${member.type}>>(__new(offsetof<nonnull<${member.type}>>(), idof<nonnull<${member.type}>>())).__INITIALIZE(), ${offset});`);
+                if (["string", "String"].includes(member.type))
+                    return `store<${member.type}>(dst, "", ${offset});`;
+                if (member.type.endsWith("[]")) {
+                    const element = member.type.slice(0, -2).trim();
+                    return `store<${member.type}>(dst, new Array<${element}>(), ${offset});`;
+                }
+                if (member.type.startsWith("Array<") ||
+                    member.type.startsWith("Map<") ||
+                    member.type.startsWith("Set<"))
+                    return `store<${member.type}>(dst, new ${member.type}(), ${offset});`;
+                if (member.type.startsWith("StaticArray<")) {
+                    const element = member.type.slice("StaticArray<".length, -1).trim();
+                    return `store<${member.type}>(dst, new StaticArray<${element}>(0), ${offset});`;
+                }
+                return `store<${member.type}>(dst, 0, ${offset});`;
+            });
+            DESERIALIZE_FAST += i1 + "srcStart = start;\n";
+            DESERIALIZE_FAST += i1 + "do {\n";
+            DESERIALIZE_FAST +=
+                i2 + "srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+            DESERIALIZE_FAST += i2 + "if (load<u16>(srcStart) != 0x7b) break; // {\n";
+            DESERIALIZE_FAST += i2 + "srcStart += 2;\n";
+            DESERIALIZE_FAST += i2 + "let seen: u32 = 0;\n";
+            DESERIALIZE_FAST += i2 + "let complete = false;\n";
+            DESERIALIZE_FAST += i2 + "while (true) {\n";
+            DESERIALIZE_FAST +=
+                i3 + "srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+            DESERIALIZE_FAST += i3 + "let code = load<u16>(srcStart);\n";
+            DESERIALIZE_FAST += i3 + "if (code == 0x7d) {\n";
+            DESERIALIZE_FAST += i3 + "  srcStart += 2;\n";
+            DESERIALIZE_FAST += i3 + "  complete = true;\n";
+            DESERIALIZE_FAST += i3 + "  break;\n";
+            DESERIALIZE_FAST += i3 + "}\n";
+            DESERIALIZE_FAST += i3 + "if (code != 0x22) break; // opening quote\n";
+            DESERIALIZE_FAST += i3 + "const keyStart = srcStart;\n";
+            DESERIALIZE_FAST +=
+                i3 +
+                    "const keyEnd = JSON.Util.scanValueEnd<string>(keyStart, srcEnd);\n";
+            DESERIALIZE_FAST += i3 + "if (!keyEnd) break;\n";
+            DESERIALIZE_FAST +=
+                i3 + "srcStart = JSON.Util.skipWhitespace(keyEnd, srcEnd);\n";
+            DESERIALIZE_FAST += i3 + "if (load<u16>(srcStart) != 0x3a) break; // :\n";
+            DESERIALIZE_FAST +=
+                i3 + "srcStart = JSON.Util.skipWhitespace(srcStart + 2, srcEnd);\n";
+            DESERIALIZE_FAST += i3 + "const keyBytes = keyEnd - keyStart;\n";
+            DESERIALIZE_FAST += i3 + "let matched = false;\n";
+            for (let i = 0; i < this.schema.members.length; i++) {
+                const member = this.schema.members[i];
+                const key = JSON.stringify(member.alias || member.name);
+                const condition = [
+                    `keyBytes == ${key.length << 1}`,
+                    ...getComparisions(key, "keyStart", "=="),
+                ].join(" &&\n" + i3 + "  ");
+                DESERIALIZE_FAST += i3 + `if (!matched && (${condition})) {\n`;
+                DESERIALIZE_FAST += i3 + "  matched = true;\n";
+                DESERIALIZE_FAST +=
+                    i3 + "  " + tier2Desers[i].join("\n" + i3 + "  ") + "\n";
+                DESERIALIZE_FAST += i3 + `  seen |= <u32>1 << ${i};\n`;
+                DESERIALIZE_FAST += i3 + "}\n";
+            }
+            DESERIALIZE_FAST += i3 + "if (!matched) {\n";
+            if (STRICT) {
+                DESERIALIZE_FAST += i3 + "  break;\n";
+            }
+            else {
+                DESERIALIZE_FAST +=
+                    i3 +
+                        "  const valueEnd = JSON.Util.scanValueEnd<usize>(srcStart, srcEnd);\n";
+                DESERIALIZE_FAST += i3 + "  if (!valueEnd) break;\n";
+                DESERIALIZE_FAST += i3 + "  srcStart = valueEnd;\n";
+            }
+            DESERIALIZE_FAST += i3 + "}\n";
+            DESERIALIZE_FAST +=
+                i3 + "srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+            DESERIALIZE_FAST += i3 + "code = load<u16>(srcStart);\n";
+            DESERIALIZE_FAST += i3 + "if (code == 0x7d) {\n";
+            DESERIALIZE_FAST += i3 + "  srcStart += 2;\n";
+            DESERIALIZE_FAST += i3 + "  complete = true;\n";
+            DESERIALIZE_FAST += i3 + "  break;\n";
+            DESERIALIZE_FAST += i3 + "}\n";
+            DESERIALIZE_FAST += i3 + "if (code != 0x2c) break; // comma\n";
+            DESERIALIZE_FAST += i3 + "srcStart += 2;\n";
+            DESERIALIZE_FAST += i2 + "}\n";
+            DESERIALIZE_FAST += i2 + "if (!complete) break;\n";
+            for (let i = 0; i < keyedResets.length; i++) {
+                DESERIALIZE_FAST +=
+                    i2 + `if ((seen & (<u32>1 << ${i})) == 0) ${keyedResets[i]}\n`;
+            }
             DESERIALIZE_FAST += i2 + "return srcStart;\n";
             DESERIALIZE_FAST += i1 + "} while (false);\n\n";
         }
@@ -1797,19 +2326,48 @@ export class JSONTransform extends Visitor {
                 "  while (srcEnd > srcStart && JSON.Util.isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;\n";
         DESERIALIZE +=
             indent +
-                '  if (srcStart - srcEnd == 0) throw new Error("Input string had zero length or was all whitespace");\n';
+                "  if (srcStart == srcEnd) return JSON.Util.failProductionParse();\n";
         DESERIALIZE +=
             indent +
-                "  if (load<u16>(srcStart) != 123) throw new Error(\"Expected '{' at start of object at position \" + (srcEnd - srcStart).toString());\n";
+                "  if (load<u16>(srcStart) != 123) return JSON.Util.failProductionParse();\n";
         DESERIALIZE +=
             indent +
-                "  if (load<u16>(srcEnd - 2) != 125) throw new Error(\"Expected '}' at end of object at position \" + (srcEnd - srcStart).toString());\n";
+                "  if (load<u16>(srcEnd - 2) != 125) return JSON.Util.failProductionParse();\n";
+        DESERIALIZE += indent + "  const objectStart = srcStart;\n";
         DESERIALIZE += indent + "  srcStart += 2;\n\n";
         DESERIALIZE += indent + "  while (srcStart < srcEnd) {\n";
         DESERIALIZE += indent + "    let code = load<u16>(srcStart);\n";
+        DESERIALIZE += indent + "    while (JSON.Util.isSpace(code)) {\n";
+        DESERIALIZE += indent + "      srcStart += 2;\n";
+        DESERIALIZE +=
+            indent +
+                "      if (srcStart >= srcEnd) return JSON.Util.failProductionParse();\n";
+        DESERIALIZE += indent + "      code = load<u16>(srcStart);\n";
+        DESERIALIZE += indent + "    }\n";
+        DESERIALIZE += indent + "    if (keyStart == 0 && !isKey) {\n";
+        DESERIALIZE += indent + "      let prev = srcStart - 2;\n";
+        DESERIALIZE +=
+            indent +
+                "      while (prev > objectStart && JSON.Util.isSpace(load<u16>(prev))) prev -= 2;\n";
+        DESERIALIZE += indent + "      const prevCode = load<u16>(prev);\n";
+        DESERIALIZE += indent + "      if (code == 125) {\n";
+        DESERIALIZE +=
+            indent +
+                "        if (prevCode == 44) return JSON.Util.failProductionParse();\n";
+        DESERIALIZE += indent + "        return srcStart + 2;\n";
+        DESERIALIZE += indent + "      }\n";
+        DESERIALIZE += indent + "      if (code == 44) {\n";
         DESERIALIZE +=
             indent +
-                "    while (JSON.Util.isSpace(code)) code = load<u16>(srcStart += 2);\n";
+                "        if (prevCode == 123 || prevCode == 44) return JSON.Util.failProductionParse();\n";
+        DESERIALIZE += indent + "      } else if (code == 34) {\n";
+        DESERIALIZE +=
+            indent +
+                "        if (prevCode != 123 && prevCode != 44) return JSON.Util.failProductionParse();\n";
+        DESERIALIZE += indent + "      } else {\n";
+        DESERIALIZE += indent + "        return JSON.Util.failProductionParse();\n";
+        DESERIALIZE += indent + "      }\n";
+        DESERIALIZE += indent + "    }\n";
         DESERIALIZE += indent + "    if (keyStart == 0) {\n";
         DESERIALIZE +=
             indent + "      if (code == 34 && load<u16>(srcStart - 2) !== 92) {\n";
@@ -1822,20 +2380,16 @@ export class JSONTransform extends Visitor {
                     '          console.log("Key: " + JSON.Util.ptrToStr(keyStart, keyEnd));\n';
         DESERIALIZE +=
             indent +
-                "          while (JSON.Util.isSpace((code = load<u16>((srcStart += 2))))) {}\n";
+                "          do { srcStart += 2; if (srcStart >= srcEnd) return JSON.Util.failProductionParse(); code = load<u16>(srcStart); } while (JSON.Util.isSpace(code));\n";
         DESERIALIZE +=
             indent +
-                "          if (code !== 58) throw new Error(\"Expected ':' after key at position \" + (srcEnd - srcStart).toString());\n";
+                "          if (code !== 58) return JSON.Util.failProductionParse();\n";
         DESERIALIZE += indent + "          isKey = false;\n";
         DESERIALIZE += indent + "        } else {\n";
         DESERIALIZE += indent + "          isKey = true;\n";
         DESERIALIZE += indent + "          lastIndex = srcStart + 2;\n";
         DESERIALIZE += indent + "        }\n";
         DESERIALIZE += indent + "      }\n";
-        if (STRICT)
-            DESERIALIZE +=
-                indent +
-                    '      else if (!isKey && code != 44 && code != 125) throw new Error("Expected \'\\"\' to start key in JSON object at position " + (srcEnd - srcStart).toString());\n';
         DESERIALIZE += indent + "      srcStart += 2;\n";
         DESERIALIZE += indent + "    } else {\n";
         const groupMembers = (members) => {
@@ -1938,8 +2492,18 @@ export class JSONTransform extends Visitor {
         const getSlowValueStore = (member, valueStart, valueEnd, prefix) => {
             if (member.flags.has(PropertyFlags.Lazy))
                 return getLazyRangeStore(member, valueStart, valueEnd, prefix);
+            const offset = JSON.stringify(member.name);
+            const memberSchema = this.getSchema(member.type);
+            if (memberSchema?.custom) {
+                return (prefix +
+                    `store<${member.type}>(changetype<usize>(out), ${getCustomDeserializeExpression(member.type, valueStart, valueEnd)}, offsetof<this>(${offset}));\n`);
+            }
+            if (needsReferenceLoad(member.type)) {
+                return (prefix +
+                    `store<${member.type}>(changetype<usize>(out), JSON.__deserialize<${member.type}>(${valueStart}, ${valueEnd}, changetype<usize>(load<${member.type}>(changetype<usize>(out), offsetof<this>(${offset})))), offsetof<this>(${offset}));\n`);
+            }
             return (prefix +
-                `store<${member.type}>(changetype<usize>(out), JSON.__deserialize<${member.type}>(${valueStart}, ${valueEnd}), offsetof<this>(${JSON.stringify(member.name)}));\n`);
+                `store<${member.type}>(changetype<usize>(out), JSON.__deserialize<${member.type}>(${valueStart}, ${valueEnd}), offsetof<this>(${offset}));\n`);
         };
         const getSlowBooleanStore = (member, value, valueStart, valueEnd, prefix) => {
             if (member.flags.has(PropertyFlags.Lazy))
@@ -1965,10 +2529,10 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += mbElse + "if (code == 34) {\n";
             DESERIALIZE += "          lastIndex = srcStart;\n";
             DESERIALIZE += "          srcStart += 2;\n";
+            DESERIALIZE += "          let escaped = false;\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 && !escaped) {\n";
             if (DEBUG > 1)
                 DESERIALIZE +=
                     '              console.log("Value (string, ' +
@@ -2024,6 +2588,7 @@ export class JSONTransform extends Visitor {
                 }
             }, "string");
             DESERIALIZE += "          }\n";
+            DESERIALIZE += "          escaped = code == 92 ? !escaped : false;\n";
             DESERIALIZE += "          srcStart += 2;\n";
             DESERIALIZE += "        }\n";
             DESERIALIZE += "      }\n";
@@ -2453,6 +3018,11 @@ export class JSONTransform extends Visitor {
         indentDec();
         DESERIALIZE += `  }\n`;
         indentDec();
+        DESERIALIZE +=
+            `  if (srcStart == srcEnd && lastIndex != 0) {\n` +
+                `    const lastCode = load<u16>(lastIndex);\n` +
+                `    if (lastCode == 123 || lastCode == 91) return 0;\n` +
+                `  }\n`;
         DESERIALIZE += `  return srcStart;\n}\n`;
         indent = "  ";
         this.schema.byteSize += 2;
@@ -2473,11 +3043,6 @@ export class JSONTransform extends Visitor {
             console.log(INITIALIZE);
             console.log(DESERIALIZE_CUSTOM || DESERIALIZE);
         }
-        const WIDE_STRUCT_FIELD_LIMIT = 32;
-        if (this.schema.members.length > WIDE_STRUCT_FIELD_LIMIT) {
-            INITIALIZE = INITIALIZE.replace(/^@inline /, "");
-            DESERIALIZE_FAST = DESERIALIZE_FAST.replace(/^@inline /, "");
-        }
         const SERIALIZE_METHOD = SimpleParser.parseClassMember(SERIALIZE_CUSTOM || SERIALIZE, node);
         const INITIALIZE_METHOD = SimpleParser.parseClassMember(INITIALIZE, node);
         const DESERIALIZE_CUSTOM_METHOD = DESERIALIZE_CUSTOM
@@ -2487,6 +3052,86 @@ export class JSONTransform extends Visitor {
         const DESERIALIZE_FAST_METHOD = useFastPath
             ? SimpleParser.parseClassMember(DESERIALIZE_FAST, node)
             : null;
+        const mapHeavySource = source
+            .getClasses()
+            .some((candidate) => candidate.members.some((member) => member.kind == NodeKind.FieldDeclaration &&
+            toString(member.type).includes("Map<")));
+        let DESERIALIZE_FAST_PRETTY_METHOD = null;
+        let PRETTY_SPECIALIZED_METHOD = null;
+        if (this.program.options.hasFeature(16) &&
+            useFastPath &&
+            mapHeavySource) {
+            let prettyTail = DESERIALIZE_FAST.slice(fastPrettyTailStart);
+            prettyTail = prettyTail.replaceAll("    if (load<u16>(srcStart) != 0x3a) break; // :\n" +
+                "    srcStart += 2;\n" +
+                "    srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n", "    if (load<u16>(srcStart) != 0x3a) break; // :\n" +
+                "    srcStart += 2;\n" +
+                "    if (load<u16>(srcStart) == 0x20) srcStart += 2;\n" +
+                "    else srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n");
+            const prettyFast = ("__DESERIALIZE_FAST_PRETTY<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): usize {\n" +
+                "  const start = srcStart;\n" +
+                "  const dst = changetype<usize>(out);\n" +
+                objectTraceHeader +
+                prettyTail)
+                .replaceAll("JSON.Util.skipWhitespace(", "JSON.Util.skipPrettyWhitespace(")
+                .replaceAll(".__DESERIALIZE_FAST<", ".__DESERIALIZE_FAST_PRETTY<")
+                .replaceAll(".__DESERIALIZE_FAST(", ".__DESERIALIZE_FAST_PRETTY(");
+            DESERIALIZE_FAST_PRETTY_METHOD = SimpleParser.parseClassMember(prettyFast, node);
+            PRETTY_SPECIALIZED_METHOD = SimpleParser.parseClassMember("__DESERIALIZE_PRETTY_SPECIALIZED(): void {}", node);
+        }
+        else if (this.program.options.hasFeature(16) && useFastPath) {
+            const prettyTail = DESERIALIZE_FAST.slice(fastPrettyTailStart);
+            DESERIALIZE_FAST_PRETTY_METHOD = SimpleParser.parseClassMember("__DESERIALIZE_FAST_PRETTY<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): usize {\n" +
+                "  const start = srcStart;\n" +
+                "  const dst = changetype<usize>(out);\n" +
+                objectTraceHeader +
+                prettyTail +
+                "}", node);
+        }
+        else if (useFastPath) {
+            DESERIALIZE_FAST_PRETTY_METHOD = SimpleParser.parseClassMember("__DESERIALIZE_FAST_PRETTY<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): usize {\n" +
+                "  return this.__DESERIALIZE_FAST(srcStart, srcEnd, out);\n" +
+                "}", node);
+        }
+        const sourceFreeDeserialize = !DESERIALIZE_CUSTOM &&
+            this.schema.members.every((member) => {
+                const type = stripNull(member.type);
+                return (!member.flags.has(PropertyFlags.Lazy) &&
+                    (isPrimitive(type) ||
+                        isString(type) ||
+                        type == "Date" ||
+                        type == "JSON.Raw" ||
+                        type == "Raw"));
+            });
+        const SOURCE_FREE_METHOD = sourceFreeDeserialize
+            ? SimpleParser.parseClassMember("__DESERIALIZE_SOURCE_FREE(): void {}", node)
+            : null;
+        const FULL_WRITE_METHOD = useFastPath && !supportsFastOptionalPath
+            ? SimpleParser.parseClassMember("__DESERIALIZE_FULL_WRITE(): void {}", node)
+            : null;
+        const defaultObjectJSON = USE_DEFAULT_OBJECT_SPECIALIZATION &&
+            this.program.options.hasFeature(16) &&
+            useFastPath &&
+            !supportsFastOptionalPath &&
+            !DESERIALIZE_CUSTOM &&
+            !node.extendsType &&
+            !node.is(2) &&
+            !source.getClasses().some((candidate) => {
+                if (!candidate.extendsType)
+                    return false;
+                const base = source.resolveExtendsName(candidate);
+                return base == this.schema.name || base == node.name.text;
+            })
+            ? this.getDefaultObjectJSON(this.schema)
+            : null;
+        const DEFAULT_OBJECT_METHOD = defaultObjectJSON
+            ? SimpleParser.parseClassMember(this.getDefaultMatcherSource(defaultObjectJSON), node)
+            : null;
+        const DEFAULT_OBJECT_FACTORY_METHOD = defaultObjectJSON
+            ? SimpleParser.parseClassMember("@inline __DESERIALIZE_DEFAULT_NEW(): this {\n" +
+                "  return changetype<this>(__new(offsetof<this>(), idof<this>())).__INITIALIZE();\n" +
+                "}", node)
+            : null;
         if (!node.members.find((v) => v.name.text == "__SERIALIZE"))
             node.members.push(SERIALIZE_METHOD);
         if (INITIALIZE_METHOD &&
@@ -2504,6 +3149,26 @@ export class JSONTransform extends Visitor {
             DESERIALIZE_FAST_METHOD &&
             !node.members.find((v) => v.name.text == "__DESERIALIZE_FAST"))
             node.members.push(DESERIALIZE_FAST_METHOD);
+        if (!DESERIALIZE_CUSTOM &&
+            DESERIALIZE_FAST_PRETTY_METHOD &&
+            !node.members.find((v) => v.name.text == "__DESERIALIZE_FAST_PRETTY"))
+            node.members.push(DESERIALIZE_FAST_PRETTY_METHOD);
+        if (!DESERIALIZE_CUSTOM &&
+            PRETTY_SPECIALIZED_METHOD &&
+            !node.members.find((v) => v.name.text == "__DESERIALIZE_PRETTY_SPECIALIZED"))
+            node.members.push(PRETTY_SPECIALIZED_METHOD);
+        if (SOURCE_FREE_METHOD &&
+            !node.members.find((v) => v.name.text == "__DESERIALIZE_SOURCE_FREE"))
+            node.members.push(SOURCE_FREE_METHOD);
+        if (FULL_WRITE_METHOD &&
+            !node.members.find((v) => v.name.text == "__DESERIALIZE_FULL_WRITE"))
+            node.members.push(FULL_WRITE_METHOD);
+        if (DEFAULT_OBJECT_METHOD &&
+            !node.members.find((v) => v.name.text == "__DESERIALIZE_DEFAULT"))
+            node.members.push(DEFAULT_OBJECT_METHOD);
+        if (DEFAULT_OBJECT_FACTORY_METHOD &&
+            !node.members.find((v) => v.name.text == "__DESERIALIZE_DEFAULT_NEW"))
+            node.members.push(DEFAULT_OBJECT_FACTORY_METHOD);
         if (useFastPath && !DESERIALIZE_CUSTOM) {
             for (const chunk of fastChunkMethods) {
                 const chunkMethod = SimpleParser.parseClassMember(chunk, node);
@@ -2515,14 +3180,21 @@ export class JSONTransform extends Visitor {
     }
     getSchema(name) {
         name = stripNull(name);
-        return (this.schemas
+        const local = this.schemas
             .get(this.schema.node.range.source.internalPath)
-            .find((s) => s.name == name) || null);
+            .find((s) => s.name == name) || null;
+        if (local)
+            return local;
+        const exact = this.schema.deps.filter((schema) => schema && schema.name == name);
+        if (exact.length == 1)
+            return exact[0];
+        const qualified = this.schema.deps.filter((schema) => schema && schema.name.endsWith("." + name));
+        return qualified.length == 1 ? qualified[0] : null;
     }
     generateEmptyMethods(node) {
-        const SERIALIZE_EMPTY = "@inline __SERIALIZE(ptr: usize): void {\n  bs.proposeSize(4);\n  store<u32>(bs.offset, 8192123);\n  bs.offset += 4;\n}";
-        const INITIALIZE_EMPTY = "@inline __INITIALIZE(): this {\n  return this;\n}";
-        const DESERIALIZE_SLOW_EMPTY = "@inline __DESERIALIZE_SLOW<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): usize {\n  return srcEnd;\n}";
+        const SERIALIZE_EMPTY = "__SERIALIZE(ptr: usize): void {\n  bs.proposeSize(4);\n  store<u32>(bs.offset, 8192123);\n  bs.offset += 4;\n}";
+        const INITIALIZE_EMPTY = "__INITIALIZE(): this {\n  return this;\n}";
+        const DESERIALIZE_SLOW_EMPTY = "__DESERIALIZE_SLOW<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): usize {\n  return srcEnd;\n}";
         if (DEBUG > 0) {
             console.log(SERIALIZE_EMPTY);
             console.log(INITIALIZE_EMPTY);
@@ -2617,6 +3289,7 @@ export class JSONTransform extends Visitor {
                 fieldHelper("deserializeUnsignedField", "__deserializeUnsignedField"),
                 fieldHelper("deserializeFloatField", "__deserializeFloatField"),
                 fieldHelper("deserializeStringField", "__deserializeStringField"),
+                fieldHelper("deserializeStringFieldTrusted", "__deserializeStringFieldTrusted"),
                 fieldHelper("deserializeArrayField_SWAR", "__deserializeArrayField_SWAR"),
                 fieldHelper("deserializeMapField", "__deserializeMapField"),
                 fieldHelper("deserializeSetField", "__deserializeSetField"),
@@ -2698,9 +3371,11 @@ export class JSONTransform extends Visitor {
             "Date",
             "JSON.Value",
             "JSON.Obj",
+            "JSON.Arr",
             "JSON.Raw",
             "Value",
             "Obj",
+            "Arr",
             "Raw",
             ...this.schemas
                 .get(this.schema.node.range.source.internalPath)
@@ -2729,6 +3404,8 @@ var JSONMode;
     JSONMode[JSONMode["NAIVE"] = 2] = "NAIVE";
 })(JSONMode || (JSONMode = {}));
 let MODE = JSONMode.SWAR;
+let MODE_TEXT = "SWAR";
+const STAGES = process.env["JSON_STAGES"] !== undefined;
 export default class Transformer extends Transform {
     afterInitialize(program) {
         if (program.options.hasFeature(16))
@@ -2749,7 +3426,23 @@ export default class Transformer extends Transform {
                 }
             }
         }
+        switch (MODE) {
+            case JSONMode.SWAR:
+                MODE_TEXT = "SWAR";
+                break;
+            case JSONMode.SIMD:
+                MODE_TEXT = "SIMD";
+                break;
+            case JSONMode.NAIVE:
+                MODE_TEXT = "NAIVE";
+                break;
+        }
+        if (STAGES)
+            console.log("[transform]: Finished initializing transformer in " +
+                MODE_TEXT +
+                " mode");
         program.registerConstantInteger("JSON_MODE", Type.i32, i64_new(MODE));
+        program.registerConstantInteger("JSON_STRICT", Type.bool, STRICT ? i64_one : i64_zero);
         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));
@@ -2757,6 +3450,8 @@ export default class Transformer extends Transform {
     }
     afterParse(parser) {
         const transformer = new JSONTransform();
+        if (STAGES)
+            console.log("[transform]: Walking AST and generating schemas");
         const sources = parser.sources
             .filter((source) => {
             const p = source.internalPath;
@@ -2812,23 +3507,12 @@ export default class Transformer extends Transform {
                 source.sourceKind = 2;
             }
         }
+        if (STAGES)
+            console.log("[transform]: Finished generating " +
+                transformer.schemas.size +
+                " schemas");
     }
 }
-function sortMembers(members) {
-    return members.sort((a, b) => {
-        const aMove = a.flags.has(PropertyFlags.OmitIf) || a.flags.has(PropertyFlags.OmitNull);
-        const bMove = b.flags.has(PropertyFlags.OmitIf) || b.flags.has(PropertyFlags.OmitNull);
-        if (aMove && !bMove) {
-            return -1;
-        }
-        else if (!aMove && bMove) {
-            return 1;
-        }
-        else {
-            return 0;
-        }
-    });
-}
 function toU16(data, offset = 0) {
     return data.charCodeAt(offset + 0);
 }
@@ -3011,6 +3695,8 @@ function lazyTypeCost(type, source, parser) {
         base === "Value" ||
         base === "JSON.Obj" ||
         base === "Obj" ||
+        base === "JSON.Arr" ||
+        base === "Arr" ||
         base === "JSON.Raw" ||
         base === "Raw")
         return 15;
@@ -3076,6 +3762,8 @@ function estimatedSerializedByteSize(type, source, parser) {
         }
         else if (baseType == "JSON.Obj" ||
             baseType == "Obj" ||
+            baseType == "JSON.Arr" ||
+            baseType == "Arr" ||
             baseType == "JSON.Raw" ||
             baseType == "Raw" ||
             baseType == "JSON.Value" ||
@@ -3134,6 +3822,21 @@ export function stripNull(type) {
     }
     return type;
 }
+function sortMembers(members) {
+    return members.sort((a, b) => {
+        const aMove = a.flags.has(PropertyFlags.OmitIf) || a.flags.has(PropertyFlags.OmitNull);
+        const bMove = b.flags.has(PropertyFlags.OmitIf) || b.flags.has(PropertyFlags.OmitNull);
+        if (aMove && !bMove) {
+            return -1;
+        }
+        else if (!aMove && bMove) {
+            return 1;
+        }
+        else {
+            return 0;
+        }
+    });
+}
 function getComparison(data) {
     switch (data.length << 1) {
         case 2: {