json-as 1.3.9 → 1.5.0

package/transform/lib/index.js

@@ -301,10 +301,135 @@ export class JSONTransform extends Visitor {
             return;
         if (!this.schemas.has(source.internalPath))
             this.schemas.set(source.internalPath, []);
+        const lazyInner = new Map();
+        const lazyMode = classLazyMode(node);
+        const hasCustomSerde = node.members.some((m) => m.kind === NodeKind.MethodDeclaration &&
+            (m.decorators?.some((d) => {
+                const t = d.name.text.toLowerCase();
+                return t === "serializer" || t === "deserializer";
+            }) ??
+                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 ||
+                fd.is(32) ||
+                fd.is(512) ||
+                fd.is(1024) ||
+                !fd.type)
+                continue;
+            const written = toString(fd.type).trim();
+            const decos = fd.decorators;
+            const hasDeco = (name) => decos?.some((d) => d.name.text === name) ??
+                false;
+            let inner = lazyWrapperInner(fd.type);
+            if (inner === null) {
+                if (hasDeco("lazy")) {
+                    inner = written;
+                }
+                else if (lazyMode !== "none" &&
+                    !hasDeco("eager") &&
+                    !hasDeco("omit")) {
+                    if (lazyMode === "all")
+                        inner = written;
+                    else if (lazyAutoCost(this.resolveType(written, source), source, this.parser) >= LAZY_AUTO_THRESHOLD)
+                        inner = written;
+                }
+            }
+            if (inner === null)
+                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 " +
+                    "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;
+            const key = JSON.stringify(fname);
+            const T = inner;
+            const baseT = stripNull(T);
+            const storesScalar = isPrimitive(baseT) || isEnum(baseT, source, this.parser);
+            const valueType = storesScalar || baseT != T ? T : `${T} | null`;
+            const valueDefault = isBoolean(baseT)
+                ? "false"
+                : storesScalar
+                    ? "0"
+                    : "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", {
+                inner: T,
+                valueType,
+                omitNull: hasDeco("omitnull"),
+                omitIf: omitIfDeco?.args?.[0] ?? null,
+            });
+            const packScalar = baseT === "i8" ||
+                baseT === "u8" ||
+                baseT === "i16" ||
+                baseT === "u16" ||
+                baseT === "i32" ||
+                baseT === "u32" ||
+                baseT === "bool" ||
+                baseT === "boolean" ||
+                baseT === "f32";
+            const encVal = (v) => baseT === "f32"
+                ? `(<u64>reinterpret<u32>(${v}))`
+                : `(<u64><u32>(${v}))`;
+            const decSlot = (lz) => baseT === "f32"
+                ? `reinterpret<f32>(<u32>(${lz}))`
+                : `(<${T}>(<u32>(${lz})))`;
+            const lowered = (packScalar
+                ? [
+                    `@alias(${key}) private __${fname}_lz: u64 = ${fieldDefault != null
+                        ? `(((<u64>0xffffffff) << 32) | ${encVal(`<${T}>(${fieldDefault})`)})`
+                        : "0"};`,
+                    `get ${fname}(): ${T} {\n` +
+                        `  const __lz = this.__${fname}_lz;\n` +
+                        `  if ((__lz >>> 32) == 0xffffffff) return ${decSlot("__lz")};\n` +
+                        `  if (__lz != 0) {\n` +
+                        `    const __v = JSON.__deserialize<${T}>(<usize>(__lz >>> 32), <usize>(<u32>__lz));\n` +
+                        `    this.__${fname}_lz = ((<u64>0xffffffff) << 32) | ${encVal("__v")};\n` +
+                        `    return __v;\n` +
+                        `  }\n` +
+                        `  return ${valueDefault};\n}`,
+                    `set ${fname}(value: ${T}) {\n` +
+                        `  this.__${fname}_lz = ((<u64>0xffffffff) << 32) | ${encVal("value")};\n}`,
+                ]
+                : [
+                    `@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` +
+                        `    this.__${fname}_val = JSON.__deserialize<${T}>(<usize>(__lz >>> 32), <usize>(<u32>__lz));\n` +
+                        `    this.__${fname}_lz = u64.MAX_VALUE;\n` +
+                        `  }\n` +
+                        `  return this.__${fname}_val as ${T};\n}`,
+                    `set ${fname}(value: ${T}) {\n` +
+                        `  this.__${fname}_val = value;\n` +
+                        `  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));
+        }
         const members = [
             ...node.members.filter((v) => v.kind === NodeKind.FieldDeclaration &&
                 !v.is(32) &&
-                !v.is(512) &&
+                (!v.is(512) || lazyInner.has(v.name.text)) &&
                 !v.is(1024) &&
                 !v.decorators?.some((decorator) => decorator.name.text === "omit")),
         ];
@@ -455,7 +580,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 &&
@@ -549,12 +674,11 @@ export class JSONTransform extends Visitor {
         this.schemas.get(source.internalPath).push(schema);
         this.schema = schema;
         this.visitedClasses.add(fullClassPath);
-        const codegenMode = getCodegenMode(this.program);
-        const requestedFastPath = USE_FAST_PATH && codegenMode !== JSONMode.NAIVE;
+        const requestedFastPath = USE_FAST_PATH;
         let SERIALIZE = "__SERIALIZE(ptr: usize): void {\n";
-        let INITIALIZE = "@inline __INITIALIZE(): this {\n";
+        let INITIALIZE = " __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 DESERIALIZE_CUSTOM = "";
         let SERIALIZE_CUSTOM = "";
         if (DEBUG > 0)
@@ -660,12 +784,9 @@ 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 += "  __DESERIALIZE_CUSTOM(data: string): this {\n";
             DESERIALIZE_CUSTOM +=
-                "  @inline __DESERIALIZE_CUSTOM(data: string): this {\n";
-            DESERIALIZE_CUSTOM +=
-                "    return inline.always(this." +
-                    deserializer.name.text +
-                    "(data));\n";
+                "    return this." + deserializer.name.text + "(data);\n";
             DESERIALIZE_CUSTOM += "  }\n";
         }
         if (!members.length && !deserializers.length && !serializers.length) {
@@ -689,6 +810,19 @@ export class JSONTransform extends Visitor {
             mem.node = member;
             mem.byteSize = estimatedSerializedByteSize(mem.type, source, this.parser);
             mem.custom = schema.deps.some((dep) => dep?.name == stripNull(type) && dep.custom);
+            const lzInner = lazyInner.get(name.text);
+            if (lzInner !== undefined) {
+                mem.flags.set(PropertyFlags.Lazy, null);
+                mem.lazyInner = lzInner.inner;
+                if (lzInner.omitNull) {
+                    mem.flags.set(PropertyFlags.OmitNull, null);
+                    this.schema.static = false;
+                }
+                if (lzInner.omitIf) {
+                    mem.flags.set(PropertyFlags.OmitIf, lzInner.omitIf);
+                    this.schema.static = false;
+                }
+            }
             this.schema.byteSize += mem.byteSize;
             if (member.decorators) {
                 for (const decorator of member.decorators) {
@@ -717,6 +851,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);
@@ -733,11 +871,12 @@ 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;
         const useFastPath = requestedFastPath &&
@@ -748,6 +887,9 @@ export class JSONTransform extends Visitor {
             if (this.schema.members.some((v) => v.flags.has(PropertyFlags.OmitNull))) {
                 SERIALIZE += indent + "let block: usize = 0;\n";
             }
+            if (hasOptionalMembers) {
+                SERIALIZE += indent + "let wrote = false;\n";
+            }
             this.schema.byteSize += 2;
             SERIALIZE += indent + "store<u16>(bs.offset, 123, 0); // {\n";
             SERIALIZE += indent + "bs.offset += 2;\n";
@@ -755,18 +897,69 @@ export class JSONTransform extends Visitor {
         const isPure = this.schema.static;
         let isRegular = isPure;
         let isFirst = true;
+        const serValue = (member, realName) => {
+            if (!member.flags.has(PropertyFlags.Lazy))
+                return getSerializeCall(member.type, realName);
+            const T = member.lazyInner;
+            const baseName = realName.slice(0, -3);
+            const baseT = stripNull(T);
+            const packScalar = baseT === "i8" ||
+                baseT === "u8" ||
+                baseT === "i16" ||
+                baseT === "u16" ||
+                baseT === "i32" ||
+                baseT === "u32" ||
+                baseT === "bool" ||
+                baseT === "boolean" ||
+                baseT === "f32";
+            if (packScalar) {
+                const dec = baseT === "f32"
+                    ? `reinterpret<f32>(<u32>(__s))`
+                    : `(<${T}>(<u32>(__s)))`;
+                const def = baseT === "bool" || baseT === "boolean" ? "false" : "0";
+                return (`{\n` +
+                    `  const __s = this.${realName};\n` +
+                    `  if ((__s >>> 32) == 0xffffffff) {\n` +
+                    `    JSON.__serialize<${T}>(${dec});\n` +
+                    `  } else if (__s != 0) {\n` +
+                    `    const __hi = <usize>(__s >>> 32);\n` +
+                    `    const __len = (<usize>(<u32>__s)) - __hi;\n` +
+                    `    bs.ensureSize(<u32>__len);\n` +
+                    `    memory.copy(bs.offset, __hi, __len);\n` +
+                    `    bs.offset += __len;\n` +
+                    `  } else {\n` +
+                    `    JSON.__serialize<${T}>(${def});\n` +
+                    `  }\n` +
+                    `}\n`);
+            }
+            return (`{\n` +
+                `  const __s = this.${realName};\n` +
+                `  if (__s == u64.MAX_VALUE) {\n` +
+                `    JSON.__serialize<${T}>(this.${baseName}_val as ${T});\n` +
+                `  } else if (__s != 0) {\n` +
+                `    const __hi = <usize>(__s >>> 32);\n` +
+                `    const __len = (<usize>(<u32>__s)) - __hi;\n` +
+                `    bs.ensureSize(<u32>__len);\n` +
+                `    memory.copy(bs.offset, __hi, __len);\n` +
+                `    bs.offset += __len;\n` +
+                `  } else {\n` +
+                (isPrimitive(baseT)
+                    ? `    JSON.__serialize<${T}>(0);\n`
+                    : `    bs.ensureSize(8);\n` +
+                        `    store<u64>(bs.offset, 0x006c006c0075006e);\n` +
+                        `    bs.offset += 8;\n`) +
+                `  }\n` +
+                `}\n`);
+        };
         for (let i = 0; i < this.schema.members.length; i++) {
             const member = this.schema.members[i];
             const aliasName = JSON.stringify(member.alias || member.name);
             const realName = member.name;
-            const isLast = i == this.schema.members.length - 1;
             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`;
@@ -793,6 +986,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) &&
@@ -801,40 +997,69 @@ export class JSONTransform extends Visitor {
             if (isRegular && isPure) {
                 const keyPart = (isFirst ? "{" : ",") + aliasName + ":";
                 this.schema.byteSize += keyPart.length << 1;
+                if (hasLazyMembers)
+                    SERIALIZE += indent + `bs.ensureSize(${keyPart.length << 1});\n`;
                 SERIALIZE += this.getStores(keyPart, SIMD_ENABLED)
                     .map((v) => indent + v + "\n")
                     .join("");
-                SERIALIZE += indent + getSerializeCall(member.type, realName);
+                SERIALIZE += indent + serValue(member, realName);
                 if (isFirst)
                     isFirst = false;
             }
             else if (isRegular && !isPure) {
-                const keyPart = (isFirst ? "" : ",") + aliasName + ":";
-                this.schema.byteSize += keyPart.length << 1;
-                SERIALIZE += this.getStores(keyPart, SIMD_ENABLED)
-                    .map((v) => indent + v + "\n")
-                    .join("");
-                SERIALIZE += indent + getSerializeCall(member.type, realName);
+                if (isFirst && hasOptionalMembers) {
+                    const keyPart = aliasName + ":";
+                    this.schema.byteSize += 2 + (keyPart.length << 1);
+                    SERIALIZE +=
+                        indent +
+                            "if (wrote) { store<u16>(bs.offset, 44, 0); bs.offset += 2; } // ,\n";
+                    if (hasLazyMembers)
+                        SERIALIZE += indent + `bs.ensureSize(${keyPart.length << 1});\n`;
+                    SERIALIZE += this.getStores(keyPart, SIMD_ENABLED)
+                        .map((v) => indent + v + "\n")
+                        .join("");
+                    SERIALIZE += indent + serValue(member, realName);
+                }
+                else {
+                    const keyPart = (isFirst ? "" : ",") + aliasName + ":";
+                    this.schema.byteSize += keyPart.length << 1;
+                    if (hasLazyMembers)
+                        SERIALIZE += indent + `bs.ensureSize(${keyPart.length << 1});\n`;
+                    SERIALIZE += this.getStores(keyPart, SIMD_ENABLED)
+                        .map((v) => indent + v + "\n")
+                        .join("");
+                    SERIALIZE += indent + serValue(member, realName);
+                }
                 if (isFirst)
                     isFirst = false;
             }
             else {
                 if (member.flags.has(PropertyFlags.OmitNull)) {
-                    SERIALIZE +=
-                        indent +
-                            `if ((block = load<usize>(ptr, offsetof<this>(${JSON.stringify(realName)}))) !== 0) {\n`;
+                    let omitNullCond;
+                    if (member.flags.has(PropertyFlags.Lazy)) {
+                        const base = realName.slice(0, -3);
+                        omitNullCond =
+                            `!JSON.__lazyIsNull(` +
+                                `load<usize>(ptr, offsetof<this>(${JSON.stringify(base + "_val")})), ` +
+                                `load<u64>(ptr, offsetof<this>(${JSON.stringify(realName)})))`;
+                    }
+                    else {
+                        omitNullCond = `(block = load<usize>(ptr, offsetof<this>(${JSON.stringify(realName)}))) !== 0`;
+                    }
+                    SERIALIZE += indent + `if (${omitNullCond}) {\n`;
                     indentInc();
                     const keyPart = aliasName + ":";
-                    this.schema.byteSize += keyPart.length << 1;
+                    this.schema.byteSize += 2 + (keyPart.length << 1);
+                    SERIALIZE +=
+                        indent +
+                            "if (wrote) { store<u16>(bs.offset, 44, 0); bs.offset += 2; } // ,\n";
+                    if (hasLazyMembers)
+                        SERIALIZE += indent + `bs.ensureSize(${keyPart.length << 1});\n`;
                     SERIALIZE += this.getStores(keyPart, SIMD_ENABLED)
                         .map((v) => indent + v + "\n")
                         .join("");
-                    SERIALIZE += indent + getSerializeCall(member.type, realName);
-                    if (!isLast) {
-                        this.schema.byteSize += 2;
-                        SERIALIZE += indent + `store<u16>(bs.offset, 44, 0); // ,\n`;
-                        SERIALIZE += indent + `bs.offset += 2;\n`;
-                    }
+                    SERIALIZE += indent + serValue(member, realName);
+                    SERIALIZE += indent + "wrote = true;\n";
                     indentDec();
                     this.schema.byteSize += 2;
                     SERIALIZE += indent + `}\n`;
@@ -860,15 +1085,15 @@ export class JSONTransform extends Visitor {
                         SERIALIZE += indent + `if (!(${rendered})) {\n`;
                     }
                     indentInc();
+                    this.schema.byteSize += 2;
+                    SERIALIZE +=
+                        indent +
+                            "if (wrote) { store<u16>(bs.offset, 44, 0); bs.offset += 2; } // ,\n";
                     SERIALIZE += this.getStores(aliasName + ":", SIMD_ENABLED)
                         .map((v) => indent + v + "\n")
                         .join("");
-                    SERIALIZE += indent + getSerializeCall(member.type, realName);
-                    if (!isLast) {
-                        this.schema.byteSize += 2;
-                        SERIALIZE += indent + `store<u16>(bs.offset, 44, 0); // ,\n`;
-                        SERIALIZE += indent + `bs.offset += 2;\n`;
-                    }
+                    SERIALIZE += indent + serValue(member, realName);
+                    SERIALIZE += indent + "wrote = true;\n";
                     indentDec();
                     SERIALIZE += indent + `}\n`;
                 }
@@ -906,12 +1131,29 @@ 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")
                     sortedMembers.array.push(member);
                 else
                     sortedMembers.object.push(member);
             }
         }
+        const lazyMembers = this.schema.members.filter((member) => member.flags.has(PropertyFlags.Lazy));
+        const withLazyMembers = (members) => {
+            if (!lazyMembers.length)
+                return members;
+            const out = members.slice();
+            for (const member of lazyMembers) {
+                if (!out.includes(member))
+                    out.push(member);
+            }
+            return out;
+        };
+        const slowStringMembers = withLazyMembers(sortedMembers.string);
+        const slowNumberMembers = withLazyMembers(sortedMembers.number);
+        const slowObjectMembers = withLazyMembers(sortedMembers.object);
+        const slowArrayMembers = withLazyMembers(sortedMembers.array);
+        const slowBooleanMembers = withLazyMembers(sortedMembers.boolean);
+        const slowNullMembers = withLazyMembers(sortedMembers.null);
         const getComparisions = (data, ptr, operator) => {
             const dataBytes = data.length << 1;
             let offset = 0;
@@ -952,6 +1194,17 @@ export class JSONTransform extends Visitor {
             const resolvedSchema = this.getSchema(resolvedType);
             const fieldOffset = `offsetof<this>(${JSON.stringify(member.name)})`;
             const valuePtr = keyOffset ? `${srcPtr} + ${keyOffset}` : srcPtr;
+            if (member.flags.has(PropertyFlags.Lazy)) {
+                const lazyInner = member.lazyInner;
+                out.push("{");
+                out.push(`  const valueStart = JSON.Util.skipWhitespace(${valuePtr}, srcEnd);`);
+                out.push(`  const valueEnd = JSON.Util.scanValueEnd<${lazyInner}>(valueStart, srcEnd);`);
+                out.push("  if (!valueEnd) break;");
+                out.push(`  store<u64>(${outPtr}, ((<u64>valueStart) << 32) | (<u64>(<u32>valueEnd)), ${fieldOffset});`);
+                out.push(`  ${srcPtr} = valueEnd;`);
+                out.push("}");
+                return out;
+            }
             if (INTEGER_TYPES.includes(resolvedType)) {
                 const helper = SIGNED_INTEGER_TYPES.includes(resolvedType)
                     ? "__deserializeIntegerField"
@@ -1099,9 +1352,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("  }");
                     }
@@ -1121,7 +1383,7 @@ export class JSONTransform extends Visitor {
                 out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
                 out.push("  }");
                 out.push(`  const valueStart = ${valuePtr};`);
-                out.push(`  const valueEnd = JSON.Util.scanValueEnd(valueStart, srcEnd);`);
+                out.push(`  const valueEnd = JSON.Util.scanValueEnd<${resolvedType}>(valueStart, srcEnd);`);
                 out.push("  if (!valueEnd) break;");
                 if (fastPath) {
                     out.push(`  ${srcPtr} = changetype<nonnull<${resolvedType}>>(value).__DESERIALIZE_FAST<${resolvedType}>(valueStart, valueEnd, value);`);
@@ -1216,13 +1478,24 @@ export class JSONTransform extends Visitor {
                     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(`        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});`);
@@ -1243,7 +1516,7 @@ export class JSONTransform extends Visitor {
                     out.push("}");
                     return out;
                 }
-                out.push(`  ${srcPtr} = __deserializeArrayField_SWAR<${resolvedType}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                out.push(`  ${srcPtr} = __deserializeArrayField_SWAR<nonnull<${resolvedType}>>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
                 out.push(`  if (!${srcPtr}) break;`);
                 if (member.node.type.isNullable) {
                     out.push("  }");
@@ -1264,6 +1537,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;");
             }
@@ -1273,6 +1547,29 @@ export class JSONTransform extends Visitor {
             return out;
         };
         indent = "  ";
+        const FAST_CHUNK_SIZE = 32;
+        const fastChunkMethods = [];
+        let fastChunkId = 0;
+        const chunkFastBlocks = (blocks, tag, callIndent) => {
+            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): usize {\n${body}\n  return srcStart;\n}`);
+                calls +=
+                    `${callIndent}srcStart = this.${name}(srcStart, srcEnd, dst);\n` +
+                        `${callIndent}if (srcStart == 0) break;\n`;
+            }
+            return calls;
+        };
+        const chunkFastBlocksOptional = (blocks, _tag, _callIndent, _needsKp) => {
+            return blocks.join("");
+        };
         DESERIALIZE_FAST += indent + "const start = srcStart;\n";
         DESERIALIZE_FAST += indent + "const dst = changetype<usize>(out);\n";
         DESERIALIZE_FAST += indent + "do {\n";
@@ -1282,6 +1579,7 @@ export class JSONTransform extends Visitor {
                 indent + "if (load<u16>(srcStart) !== 0x7b) break; // {\n";
             DESERIALIZE_FAST += indent + "srcStart += 2;\n";
             DESERIALIZE_FAST += indent + "let seenAny = false;\n\n";
+            const t1opt = [];
             for (let i = 0; i < this.schema.members.length; i++) {
                 const member = this.schema.members[i];
                 const key = JSON.stringify(member.alias || member.name);
@@ -1298,89 +1596,92 @@ export class JSONTransform extends Visitor {
                 const isOptional = member.flags.has(PropertyFlags.OmitNull) ||
                     member.flags.has(PropertyFlags.OmitIf);
                 if (!deserializerFirst.length || !deserializerNext.length) {
-                    DESERIALIZE_FAST += indent + "break;\n\n";
+                    t1opt.push(indent + "break;\n\n");
                     continue;
                 }
-                DESERIALIZE_FAST += indent + "if (!seenAny) {\n";
+                let blk = indent + "if (!seenAny) {\n";
                 indent += "  ";
-                DESERIALIZE_FAST +=
+                blk +=
                     indent +
                         `if ( // ${firstKeySection}\n${(indent += "  ")}${getComparisions(firstKeySection, "srcStart", "!=").join("\n" + indent + "|| ")}\n${(indent = indent.slice(0, -2))}) {\n`;
                 indent += "  ";
                 if (isOptional) {
-                    DESERIALIZE_FAST += indent + "// optional @omitnull field omitted\n";
+                    blk += indent + "// optional @omitnull field omitted\n";
                 }
                 else {
-                    DESERIALIZE_FAST += indent + "break;\n";
+                    blk += indent + "break;\n";
                 }
                 indent = indent.slice(0, -2);
-                DESERIALIZE_FAST += indent + "} else {\n";
+                blk += indent + "} else {\n";
                 indent += "  ";
                 if (!inlineStringValue)
-                    DESERIALIZE_FAST += indent + `srcStart += ${firstKeyOffset};\n`;
-                DESERIALIZE_FAST +=
+                    blk += indent + `srcStart += ${firstKeyOffset};\n`;
+                blk +=
                     indent +
                         `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${firstKeyOffset}` : "srcStart"}))) break;\n`;
-                DESERIALIZE_FAST +=
-                    indent + deserializerFirst.join("\n" + indent) + "\n";
-                DESERIALIZE_FAST += indent + "seenAny = true;\n";
+                blk += indent + deserializerFirst.join("\n" + indent) + "\n";
+                blk += indent + "seenAny = true;\n";
                 indent = indent.slice(0, -2);
-                DESERIALIZE_FAST += indent + "}\n";
+                blk += indent + "}\n";
                 indent = indent.slice(0, -2);
-                DESERIALIZE_FAST += indent + "} else {\n";
+                blk += indent + "} else {\n";
                 indent += "  ";
-                DESERIALIZE_FAST +=
+                blk +=
                     indent +
                         `if ( // ${nextKeySection}\n${(indent += "  ")}${getComparisions(nextKeySection, "srcStart", "!=").join("\n" + indent + "|| ")}\n${(indent = indent.slice(0, -2))}) {\n`;
                 indent += "  ";
                 if (isOptional) {
-                    DESERIALIZE_FAST += indent + "// optional @omitnull field omitted\n";
+                    blk += indent + "// optional @omitnull field omitted\n";
                 }
                 else {
-                    DESERIALIZE_FAST += indent + "break;\n";
+                    blk += indent + "break;\n";
                 }
                 indent = indent.slice(0, -2);
-                DESERIALIZE_FAST += indent + "} else {\n";
+                blk += indent + "} else {\n";
                 indent += "  ";
                 if (!inlineStringValue)
-                    DESERIALIZE_FAST += indent + `srcStart += ${nextKeyOffset};\n`;
-                DESERIALIZE_FAST +=
+                    blk += indent + `srcStart += ${nextKeyOffset};\n`;
+                blk +=
                     indent +
                         `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${nextKeyOffset}` : "srcStart"}))) break;\n`;
-                DESERIALIZE_FAST +=
-                    indent + deserializerNext.join("\n" + indent) + "\n";
+                blk += indent + deserializerNext.join("\n" + indent) + "\n";
                 indent = indent.slice(0, -2);
-                DESERIALIZE_FAST += indent + "}\n";
+                blk += indent + "}\n";
                 indent = indent.slice(0, -2);
-                DESERIALIZE_FAST += indent + "}\n\n";
+                blk += indent + "}\n\n";
+                t1opt.push(blk);
             }
+            DESERIALIZE_FAST += chunkFastBlocksOptional(t1opt, "T1O", indent, false);
         }
         else {
+            const t1blocks = [];
             for (let i = 0; i < this.schema.members.length; i++) {
                 const member = this.schema.members[i];
                 const key = JSON.stringify(member.alias || member.name);
                 if (key.length <= 2)
                     throw new Error("Key cannot be empty!");
                 const keySection = (i == 0 ? "{" : ",") + key + ":";
-                DESERIALIZE_FAST +=
-                    indent +
-                        `if ( // ${keySection}\n${(indent += "  ")}${getComparisions(keySection, "srcStart", "!=").join("\n" + indent + "|| ")}\n${(indent = indent.slice(0, -2))}) break;\n`;
+                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);
                 if (!inlineStringValue) {
-                    DESERIALIZE_FAST += indent + `srcStart += ${keyOffset};\n\n`;
+                    blk += indent + `srcStart += ${keyOffset};\n\n`;
                 }
                 const deserializer = getDeserializer(member.type, "srcStart", "dst", member, inlineStringValue ? keyOffset : 0, true);
                 if (!deserializer.length) {
-                    DESERIALIZE_FAST += indent + "break;\n\n";
+                    blk += indent + "break;\n\n";
+                    t1blocks.push(blk);
                     continue;
                 }
-                DESERIALIZE_FAST +=
+                blk +=
                     indent +
                         `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${keyOffset}` : "srcStart"}))) break;\n`;
-                DESERIALIZE_FAST += indent + deserializer.join("\n" + indent) + "\n\n";
+                blk += indent + deserializer.join("\n" + indent) + "\n\n";
+                t1blocks.push(blk);
             }
+            DESERIALIZE_FAST += chunkFastBlocks(t1blocks, "T1", indent);
         }
         DESERIALIZE_FAST +=
             indent + "if (load<u16>(srcStart) !== 0x7d) break; // }\n";
@@ -1399,31 +1700,32 @@ export class JSONTransform extends Visitor {
             DESERIALIZE_FAST += skip;
             DESERIALIZE_FAST += i2 + "if (load<u16>(srcStart) != 0x7b) break; // {\n";
             DESERIALIZE_FAST += i2 + "srcStart += 2;\n";
+            const t2blocks = [];
             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 keyBytes = key.length << 1;
-                DESERIALIZE_FAST += "\n";
-                DESERIALIZE_FAST += skip;
-                DESERIALIZE_FAST +=
+                let blk = "\n";
+                blk += skip;
+                blk +=
                     i2 +
                         `if ( // ${key}\n${i2}  ` +
                         getComparisions(key, "srcStart", "!=").join("\n" + i2 + "  || ") +
                         `\n${i2}) break;\n`;
-                DESERIALIZE_FAST += i2 + `srcStart += ${keyBytes};\n`;
-                DESERIALIZE_FAST += skip;
-                DESERIALIZE_FAST +=
-                    i2 + "if (load<u16>(srcStart) != 0x3a) break; // :\n";
-                DESERIALIZE_FAST += i2 + "srcStart += 2;\n";
-                DESERIALIZE_FAST += skip;
-                DESERIALIZE_FAST += i2 + tier2Desers[i].join("\n" + i2) + "\n";
+                blk += i2 + `srcStart += ${keyBytes};\n`;
+                blk += skip;
+                blk += i2 + "if (load<u16>(srcStart) != 0x3a) break; // :\n";
+                blk += i2 + "srcStart += 2;\n";
+                blk += skip;
+                blk += i2 + tier2Desers[i].join("\n" + i2) + "\n";
                 if (i < this.schema.members.length - 1) {
-                    DESERIALIZE_FAST += skip;
-                    DESERIALIZE_FAST +=
-                        i2 + "if (load<u16>(srcStart) != 0x2c) break; // ,\n";
-                    DESERIALIZE_FAST += i2 + "srcStart += 2;\n";
+                    blk += skip;
+                    blk += i2 + "if (load<u16>(srcStart) != 0x2c) break; // ,\n";
+                    blk += i2 + "srcStart += 2;\n";
                 }
+                t2blocks.push(blk);
             }
+            DESERIALIZE_FAST += chunkFastBlocks(t2blocks, "T2", i2);
             DESERIALIZE_FAST += "\n";
             DESERIALIZE_FAST += skip;
             DESERIALIZE_FAST += i2 + "if (load<u16>(srcStart) != 0x7d) break; // }\n";
@@ -1445,33 +1747,34 @@ export class JSONTransform extends Visitor {
             DESERIALIZE_FAST += i2 + "let kp: usize = 0;\n";
             if (multi)
                 DESERIALIZE_FAST += i2 + "let seenAny = false;\n";
+            const t2opt = [];
             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 keyBytes = key.length << 1;
-                DESERIALIZE_FAST += "\n";
-                DESERIALIZE_FAST +=
-                    i2 + "kp = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+                let blk = "\n";
+                blk += i2 + "kp = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
                 if (multi && i > 0) {
-                    DESERIALIZE_FAST +=
+                    blk +=
                         i2 +
                             "if (seenAny && load<u16>(kp) == 0x2c) kp = JSON.Util.skipWhitespace(kp + 2, srcEnd);\n";
                 }
-                DESERIALIZE_FAST +=
+                blk +=
                     i2 +
                         `if ( // ${key}\n${i2}  ` +
                         getComparisions(key, "kp", "==").join("\n" + i2 + "  && ") +
                         `\n${i2}) {\n`;
-                DESERIALIZE_FAST += i3 + `kp += ${keyBytes};\n`;
-                DESERIALIZE_FAST += i3 + "kp = JSON.Util.skipWhitespace(kp, srcEnd);\n";
-                DESERIALIZE_FAST += i3 + "if (load<u16>(kp) != 0x3a) break; // :\n";
-                DESERIALIZE_FAST +=
-                    i3 + "srcStart = JSON.Util.skipWhitespace(kp + 2, srcEnd);\n";
-                DESERIALIZE_FAST += i3 + tier2Desers[i].join("\n" + i3) + "\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 (multi)
-                    DESERIALIZE_FAST += i3 + "seenAny = true;\n";
-                DESERIALIZE_FAST += i2 + "}\n";
+                    blk += i3 + "seenAny = true;\n";
+                blk += i2 + "}\n";
+                t2opt.push(blk);
             }
+            DESERIALIZE_FAST += chunkFastBlocksOptional(t2opt, "T2O", i2, true);
             DESERIALIZE_FAST += "\n";
             DESERIALIZE_FAST +=
                 i2 + "srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
@@ -1498,7 +1801,7 @@ export class JSONTransform extends Visitor {
         DESERIALIZE += indent + "  let keyStart: usize = 0;\n";
         DESERIALIZE += indent + "  let keyEnd: usize = 0;\n";
         DESERIALIZE += indent + "  let isKey = false;\n";
-        if (!STRICT || sortedMembers.object.length || sortedMembers.array.length)
+        if (!STRICT || slowObjectMembers.length || slowArrayMembers.length)
             DESERIALIZE += indent + "  let depth: i32 = 0;\n";
         DESERIALIZE += indent + "  let lastIndex: usize = 0;\n\n";
         DESERIALIZE +=
@@ -1643,8 +1946,37 @@ export class JSONTransform extends Visitor {
                 DESERIALIZE += toMemCDecl(Math.max(...members.map((m) => (m.alias || m.name).length << 1)), "            ");
             }
         };
+        const getLazyRangeStore = (member, valueStart, valueEnd, prefix) => {
+            return (prefix +
+                `store<u64>(changetype<usize>(out), ((<u64>${valueStart}) << 32) | (<u64>(<u32>${valueEnd})), offsetof<this>(${JSON.stringify(member.name)}));\n`);
+        };
+        const getSlowValueStore = (member, valueStart, valueEnd, prefix) => {
+            if (member.flags.has(PropertyFlags.Lazy))
+                return getLazyRangeStore(member, valueStart, valueEnd, prefix);
+            return (prefix +
+                `store<${member.type}>(changetype<usize>(out), JSON.__deserialize<${member.type}>(${valueStart}, ${valueEnd}), offsetof<this>(${JSON.stringify(member.name)}));\n`);
+        };
+        const getSlowBooleanStore = (member, value, valueStart, valueEnd, prefix) => {
+            if (member.flags.has(PropertyFlags.Lazy))
+                return getLazyRangeStore(member, valueStart, valueEnd, prefix);
+            if (member.type.startsWith("JSON.Box<bool") ||
+                member.type.startsWith("JSON.Box<boolean") ||
+                member.type.startsWith("Box<bool") ||
+                member.type.startsWith("Box<boolean")) {
+                return (prefix +
+                    `store<${member.type}>(changetype<usize>(out), changetype<${member.type}>(JSON.Box.from<bool>(${value})), offsetof<this>(${JSON.stringify(member.name)}));\n`);
+            }
+            return (prefix +
+                `store<boolean>(changetype<usize>(out), ${value}, offsetof<this>(${JSON.stringify(member.name)}));\n`);
+        };
+        const getSlowNullStore = (member, valueStart, valueEnd, prefix) => {
+            if (member.flags.has(PropertyFlags.Lazy))
+                return getLazyRangeStore(member, valueStart, valueEnd, prefix);
+            return (prefix +
+                `store<usize>(changetype<usize>(out), 0, offsetof<this>(${JSON.stringify(member.name)}));\n`);
+        };
         let mbElse = "      ";
-        if (!STRICT || sortedMembers.string.length) {
+        if (!STRICT || slowStringMembers.length) {
             DESERIALIZE += mbElse + "if (code == 34) {\n";
             DESERIALIZE += "          lastIndex = srcStart;\n";
             DESERIALIZE += "          srcStart += 2;\n";
@@ -1657,7 +1989,7 @@ export class JSONTransform extends Visitor {
                     '              console.log("Value (string, ' +
                         ++id +
                         '): " + JSON.Util.ptrToStr(lastIndex, srcStart + 2));';
-            generateGroups(sortedMembers.string, (group) => {
+            generateGroups(slowStringMembers, (group) => {
                 generateConsts(group);
                 const first = group[0];
                 const fName = first.alias || first.name;
@@ -1669,15 +2001,7 @@ export class JSONTransform extends Visitor {
                         ") { // " +
                         fName +
                         "\n";
-                DESERIALIZE +=
-                    indent +
-                        "              store<" +
-                        first.type +
-                        ">(changetype<usize>(out), JSON.__deserialize<" +
-                        first.type +
-                        ">(lastIndex, srcStart + 2), offsetof<this>(" +
-                        JSON.stringify(first.name) +
-                        "));\n";
+                DESERIALIZE += getSlowValueStore(first, "lastIndex", "srcStart + 2", indent + "              ");
                 DESERIALIZE += indent + "              srcStart += 4;\n";
                 DESERIALIZE += indent + "              keyStart = 0;\n";
                 DESERIALIZE += indent + "              break;\n";
@@ -1693,15 +2017,7 @@ export class JSONTransform extends Visitor {
                             ") { // " +
                             memName +
                             "\n";
-                    DESERIALIZE +=
-                        indent +
-                            "              store<" +
-                            mem.type +
-                            ">(changetype<usize>(out), JSON.__deserialize<" +
-                            mem.type +
-                            ">(lastIndex, srcStart + 2), offsetof<this>(" +
-                            JSON.stringify(mem.name) +
-                            "));\n";
+                    DESERIALIZE += getSlowValueStore(mem, "lastIndex", "srcStart + 2", indent + "              ");
                     DESERIALIZE += indent + "              srcStart += 4;\n";
                     DESERIALIZE += indent + "              keyStart = 0;\n";
                     DESERIALIZE += indent + "              break;\n";
@@ -1728,7 +2044,7 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += "      }\n";
             mbElse = " else ";
         }
-        if (!STRICT || sortedMembers.number.length) {
+        if (!STRICT || slowNumberMembers.length) {
             DESERIALIZE += mbElse + "if (code - 48 <= 9 || code == 45) {\n";
             DESERIALIZE += "        lastIndex = srcStart;\n";
             DESERIALIZE += "        srcStart += 2;\n";
@@ -1741,7 +2057,7 @@ export class JSONTransform extends Visitor {
                     '              console.log("Value (number, ' +
                         ++id +
                         '): " + JSON.Util.ptrToStr(lastIndex, srcStart));';
-            generateGroups(sortedMembers.number, (group) => {
+            generateGroups(slowNumberMembers, (group) => {
                 generateConsts(group);
                 const first = group[0];
                 const fName = first.alias || first.name;
@@ -1759,15 +2075,7 @@ export class JSONTransform extends Visitor {
                         ") { // " +
                         fName +
                         "\n";
-                DESERIALIZE +=
-                    indent +
-                        "              store<" +
-                        first.type +
-                        ">(changetype<usize>(out), JSON.__deserialize<" +
-                        first.type +
-                        ">(lastIndex, srcStart), offsetof<this>(" +
-                        JSON.stringify(first.name) +
-                        "));\n";
+                DESERIALIZE += getSlowValueStore(first, "lastIndex", "srcStart", indent + "              ");
                 DESERIALIZE += indent + "              srcStart += 2;\n";
                 DESERIALIZE += indent + "              keyStart = 0;\n";
                 DESERIALIZE += indent + "              break;\n";
@@ -1789,15 +2097,7 @@ export class JSONTransform extends Visitor {
                             ") { // " +
                             memName +
                             "\n";
-                    DESERIALIZE +=
-                        indent +
-                            "              store<" +
-                            mem.type +
-                            ">(changetype<usize>(out), JSON.__deserialize<" +
-                            mem.type +
-                            ">(lastIndex, srcStart), offsetof<this>(" +
-                            JSON.stringify(mem.name) +
-                            "));\n";
+                    DESERIALIZE += getSlowValueStore(mem, "lastIndex", "srcStart", indent + "              ");
                     DESERIALIZE += indent + "              srcStart += 2;\n";
                     DESERIALIZE += indent + "              keyStart = 0;\n";
                     DESERIALIZE += indent + "              break;\n";
@@ -1824,7 +2124,7 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += "      }";
             mbElse = " else ";
         }
-        if (!STRICT || sortedMembers.object.length) {
+        if (!STRICT || slowObjectMembers.length) {
             DESERIALIZE += mbElse + "if (code == 123) {\n";
             DESERIALIZE += "        lastIndex = srcStart;\n";
             DESERIALIZE += "        depth++;\n";
@@ -1844,7 +2144,7 @@ export class JSONTransform extends Visitor {
                         ++id +
                         '): " + JSON.Util.ptrToStr(lastIndex, srcStart));';
             indent = "  ";
-            generateGroups(sortedMembers.object, (group) => {
+            generateGroups(slowObjectMembers, (group) => {
                 generateConsts(group);
                 const first = group[0];
                 const fName = first.alias || first.name;
@@ -1855,15 +2155,7 @@ export class JSONTransform extends Visitor {
                         ") { // " +
                         fName +
                         "\n";
-                DESERIALIZE +=
-                    indent +
-                        "              store<" +
-                        first.type +
-                        ">(changetype<usize>(out), JSON.__deserialize<" +
-                        first.type +
-                        ">(lastIndex, srcStart), offsetof<this>(" +
-                        JSON.stringify(first.name) +
-                        "));\n";
+                DESERIALIZE += getSlowValueStore(first, "lastIndex", "srcStart", indent + "              ");
                 DESERIALIZE += indent + "              keyStart = 0;\n";
                 DESERIALIZE += indent + "              break;\n";
                 DESERIALIZE += indent + "            }";
@@ -1877,15 +2169,7 @@ export class JSONTransform extends Visitor {
                             ") { // " +
                             memName +
                             "\n";
-                    DESERIALIZE +=
-                        indent +
-                            "              store<" +
-                            mem.type +
-                            ">(changetype<usize>(out), JSON.__deserialize<" +
-                            mem.type +
-                            ">(lastIndex, srcStart), offsetof<this>(" +
-                            JSON.stringify(mem.name) +
-                            "));\n";
+                    DESERIALIZE += getSlowValueStore(mem, "lastIndex", "srcStart", indent + "              ");
                     DESERIALIZE += indent + "              keyStart = 0;\n";
                     DESERIALIZE += indent + "              break;\n";
                     DESERIALIZE += indent + "            }";
@@ -1912,7 +2196,7 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += "      }";
             mbElse = " else ";
         }
-        if (!STRICT || sortedMembers.array.length) {
+        if (!STRICT || slowArrayMembers.length) {
             DESERIALIZE += mbElse + "if (code == 91) {\n";
             DESERIALIZE += "        lastIndex = srcStart;\n";
             DESERIALIZE += "        depth++;\n";
@@ -1932,7 +2216,7 @@ export class JSONTransform extends Visitor {
                         ++id +
                         '): " + JSON.Util.ptrToStr(lastIndex, srcStart));';
             indent = "  ";
-            generateGroups(sortedMembers.array, (group) => {
+            generateGroups(slowArrayMembers, (group) => {
                 generateConsts(group);
                 const first = group[0];
                 const fName = first.alias || first.name;
@@ -1944,15 +2228,7 @@ export class JSONTransform extends Visitor {
                         ") { // " +
                         fName +
                         "\n";
-                DESERIALIZE +=
-                    indent +
-                        "              store<" +
-                        first.type +
-                        ">(changetype<usize>(out), JSON.__deserialize<" +
-                        first.type +
-                        ">(lastIndex, srcStart), offsetof<this>(" +
-                        JSON.stringify(first.name) +
-                        "));\n";
+                DESERIALIZE += getSlowValueStore(first, "lastIndex", "srcStart", indent + "              ");
                 DESERIALIZE += indent + "              keyStart = 0;\n";
                 DESERIALIZE += indent + "              break;\n";
                 DESERIALIZE += indent + "            }";
@@ -1967,15 +2243,7 @@ export class JSONTransform extends Visitor {
                             ") { // " +
                             memName +
                             "\n";
-                    DESERIALIZE +=
-                        indent +
-                            "              store<" +
-                            mem.type +
-                            ">(changetype<usize>(out), JSON.__deserialize<" +
-                            mem.type +
-                            ">(lastIndex, srcStart), offsetof<this>(" +
-                            JSON.stringify(mem.name) +
-                            "));\n";
+                    DESERIALIZE += getSlowValueStore(mem, "lastIndex", "srcStart", indent + "              ");
                     DESERIALIZE += indent + "              keyStart = 0;\n";
                     DESERIALIZE += indent + "              break;\n";
                     DESERIALIZE += indent + "            }";
@@ -2002,7 +2270,7 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += "      }";
             mbElse = " else ";
         }
-        if (!STRICT || sortedMembers.boolean.length) {
+        if (!STRICT || slowBooleanMembers.length) {
             DESERIALIZE += mbElse + "if (code == 116) {\n";
             DESERIALIZE +=
                 "        if (load<u64>(srcStart) == 28429475166421108) {\n";
@@ -2012,7 +2280,7 @@ export class JSONTransform extends Visitor {
                     '              console.log("Value (bool, ' +
                         ++id +
                         '): " + JSON.Util.ptrToStr(lastIndex, srcStart - 8));';
-            generateGroups(sortedMembers.boolean, (group) => {
+            generateGroups(slowBooleanMembers, (group) => {
                 generateConsts(group);
                 const first = group[0];
                 const fName = first.alias || first.name;
@@ -2024,27 +2292,7 @@ export class JSONTransform extends Visitor {
                         ") { // " +
                         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";
-                }
-                else {
-                    DESERIALIZE +=
-                        indent +
-                            "            store<boolean>(changetype<usize>(out), true, offsetof<this>(" +
-                            JSON.stringify(first.name) +
-                            "));\n";
-                }
+                DESERIALIZE += getSlowBooleanStore(first, "true", "srcStart - 8", "srcStart", indent + "            ");
                 DESERIALIZE += indent + "            srcStart += 2;\n";
                 DESERIALIZE += indent + "            keyStart = 0;\n";
                 DESERIALIZE += indent + "            break;\n";
@@ -2060,27 +2308,7 @@ export class JSONTransform extends Visitor {
                             ") { // " +
                             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";
-                    }
-                    else {
-                        DESERIALIZE +=
-                            indent +
-                                "            store<boolean>(changetype<usize>(out), true, offsetof<this>(" +
-                                JSON.stringify(mem.name) +
-                                "));\n";
-                    }
+                    DESERIALIZE += getSlowBooleanStore(mem, "true", "srcStart - 8", "srcStart", indent + "            ");
                     DESERIALIZE += indent + "            srcStart += 2;\n";
                     DESERIALIZE += indent + "            keyStart = 0;\n";
                     DESERIALIZE += indent + "            break;\n";
@@ -2116,7 +2344,7 @@ export class JSONTransform extends Visitor {
                     '              console.log("Value (bool, ' +
                         ++id +
                         '): " + JSON.Util.ptrToStr(lastIndex, srcStart - 10));';
-            generateGroups(sortedMembers.boolean, (group) => {
+            generateGroups(slowBooleanMembers, (group) => {
                 generateConsts(group);
                 const first = group[0];
                 const fName = first.alias || first.name;
@@ -2128,27 +2356,7 @@ export class JSONTransform extends Visitor {
                         ") { // " +
                         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";
-                }
-                else {
-                    DESERIALIZE +=
-                        indent +
-                            "            store<boolean>(changetype<usize>(out), false, offsetof<this>(" +
-                            JSON.stringify(first.name) +
-                            "));\n";
-                }
+                DESERIALIZE += getSlowBooleanStore(first, "false", "srcStart - 10", "srcStart", indent + "            ");
                 DESERIALIZE += indent + "            srcStart += 2;\n";
                 DESERIALIZE += indent + "            keyStart = 0;\n";
                 DESERIALIZE += indent + "            break;\n";
@@ -2164,27 +2372,7 @@ export class JSONTransform extends Visitor {
                             ") { // " +
                             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";
-                    }
-                    else {
-                        DESERIALIZE +=
-                            indent +
-                                "            store<boolean>(changetype<usize>(out), false, offsetof<this>(" +
-                                JSON.stringify(mem.name) +
-                                "));\n";
-                    }
+                    DESERIALIZE += getSlowBooleanStore(mem, "false", "srcStart - 10", "srcStart", indent + "            ");
                     DESERIALIZE += indent + "            srcStart += 2;\n";
                     DESERIALIZE += indent + "            keyStart = 0;\n";
                     DESERIALIZE += indent + "            break;\n";
@@ -2209,7 +2397,7 @@ export class JSONTransform extends Visitor {
             DESERIALIZE += "\n      }";
             mbElse = " else ";
         }
-        if (!STRICT || sortedMembers.null.length) {
+        if (!STRICT || slowNullMembers.length) {
             DESERIALIZE += mbElse + "if (code == 110) {\n";
             DESERIALIZE +=
                 "        if (load<u64>(srcStart) == 30399761348886638) {\n";
@@ -2219,7 +2407,7 @@ export class JSONTransform extends Visitor {
                     '              console.log("Value (null, ' +
                         ++id +
                         '): " + JSON.Util.ptrToStr(lastIndex, srcStart - 8));';
-            generateGroups(sortedMembers.null, (group) => {
+            generateGroups(slowNullMembers, (group) => {
                 generateConsts(group);
                 const first = group[0];
                 const fName = first.alias || first.name;
@@ -2231,11 +2419,7 @@ export class JSONTransform extends Visitor {
                         ") { // " +
                         fName +
                         "\n";
-                DESERIALIZE +=
-                    indent +
-                        "            store<usize>(changetype<usize>(out), 0, offsetof<this>(" +
-                        JSON.stringify(first.name) +
-                        "));\n";
+                DESERIALIZE += getSlowNullStore(first, "srcStart - 8", "srcStart", indent + "            ");
                 DESERIALIZE += indent + "            srcStart += 2;\n";
                 DESERIALIZE += indent + "            keyStart = 0;\n";
                 DESERIALIZE += indent + "            break;\n";
@@ -2251,11 +2435,7 @@ export class JSONTransform extends Visitor {
                             ") { // " +
                             memName +
                             "\n";
-                    DESERIALIZE +=
-                        indent +
-                            "            store<usize>(changetype<usize>(out), 0, offsetof<this>(" +
-                            JSON.stringify(mem.name) +
-                            "));\n";
+                    DESERIALIZE += getSlowNullStore(mem, "srcStart - 8", "srcStart", indent + "            ");
                     DESERIALIZE += indent + "            srcStart += 2;\n";
                     DESERIALIZE += indent + "            keyStart = 0;\n";
                     DESERIALIZE += indent + "            break;\n";
@@ -2308,6 +2488,11 @@ 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
@@ -2334,6 +2519,13 @@ export class JSONTransform extends Visitor {
             DESERIALIZE_FAST_METHOD &&
             !node.members.find((v) => v.name.text == "__DESERIALIZE_FAST"))
             node.members.push(DESERIALIZE_FAST_METHOD);
+        if (useFastPath && !DESERIALIZE_CUSTOM) {
+            for (const chunk of fastChunkMethods) {
+                const chunkMethod = SimpleParser.parseClassMember(chunk, node);
+                if (!node.members.find((v) => v.name.text == chunkMethod.name.text))
+                    node.members.push(chunkMethod);
+            }
+        }
         super.visitClassDeclaration(node);
     }
     getSchema(name) {
@@ -2343,9 +2535,9 @@ export class JSONTransform extends Visitor {
             .find((s) => s.name == name) || 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);
@@ -2521,9 +2713,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)
@@ -2552,25 +2746,8 @@ var JSONMode;
     JSONMode[JSONMode["NAIVE"] = 2] = "NAIVE";
 })(JSONMode || (JSONMode = {}));
 let MODE = JSONMode.SWAR;
-function getCodegenMode(program) {
-    let mode = program.options.hasFeature(16)
-        ? JSONMode.SIMD
-        : JSONMode.SWAR;
-    if (process.env["JSON_MODE"]) {
-        switch (process.env["JSON_MODE"].toLowerCase().trim()) {
-            case "simd":
-                mode = JSONMode.SIMD;
-                break;
-            case "swar":
-                mode = JSONMode.SWAR;
-                break;
-            case "naive":
-                mode = JSONMode.NAIVE;
-                break;
-        }
-    }
-    return mode;
-}
+let MODE_TEXT = "SWAR";
+const STAGES = process.env["JSON_STAGES"] !== undefined;
 export default class Transformer extends Transform {
     afterInitialize(program) {
         if (program.options.hasFeature(16))
@@ -2591,6 +2768,21 @@ 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));
         if (JSON_CACHE_CONFIG.enabled) {
             program.registerConstantInteger("JSON_CACHE", Type.bool, i64_one);
@@ -2599,6 +2791,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;
@@ -2648,22 +2842,17 @@ export default class Transformer extends Transform {
                 writeFileSync(path.join(process.cwd(), this.baseDir, removeExtension(source.normalizedPath) + ".tmp.ts"), toString(source));
             }
         }
-    }
-}
-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;
+        for (const source of parser.sources) {
+            const p = source.internalPath;
+            if (p === "assembly/index" || p.endsWith("/json-as/assembly/index")) {
+                source.sourceKind = 2;
+            }
         }
-    });
+        if (STAGES)
+            console.log("[transform]: Finished generating " +
+                transformer.schemas.size +
+                " schemas");
+    }
 }
 function toU16(data, offset = 0) {
     return data.charCodeAt(offset + 0);
@@ -2808,6 +2997,92 @@ function sizeof(type) {
     else
         return 0;
 }
+function classLazyMode(node) {
+    const dec = node.decorators?.find((d) => {
+        const n = d.name.text;
+        return n === "json" || n === "serializable";
+    });
+    if (!dec || !dec.args || dec.args.length === 0)
+        return "none";
+    const arg = dec.args[0];
+    if (arg.kind !== NodeKind.Literal ||
+        arg.literalKind !== 6)
+        return "none";
+    const obj = arg;
+    for (let i = 0; i < obj.names.length; i++) {
+        if (obj.names[i].text !== "lazy")
+            continue;
+        const v = obj.values[i];
+        if (v.kind === NodeKind.Literal &&
+            v.literalKind === 2) {
+            const s = v.value;
+            if (s === "none" || s === "auto" || s === "all")
+                return s;
+        }
+        throwError(`@json lazy must be "none", "auto", or "all"`, v.range);
+    }
+    return "none";
+}
+const LAZY_AUTO_THRESHOLD = 10;
+function lazyTypeCost(type, source, parser) {
+    const base = stripNull(type);
+    if (isPrimitive(base) || isBoolean(base) || isEnum(base, source, parser))
+        return 1;
+    if (base === "Date")
+        return 4;
+    if (isString(base))
+        return 10;
+    if (base === "JSON.Value" ||
+        base === "Value" ||
+        base === "JSON.Obj" ||
+        base === "Obj" ||
+        base === "JSON.Arr" ||
+        base === "Arr" ||
+        base === "JSON.Raw" ||
+        base === "Raw")
+        return 15;
+    return 20;
+}
+function lazyAutoCost(type, source, parser) {
+    const direct = lazyTypeCost(type, source, parser);
+    if (direct < 20)
+        return direct;
+    const decl = source.getClass(stripNull(type));
+    if (!decl)
+        return 20;
+    let sum = 0;
+    for (let i = 0; i < decl.members.length; i++) {
+        const m = decl.members[i];
+        if (m.kind !== NodeKind.FieldDeclaration)
+            continue;
+        const fd = m;
+        if (fd.is(32) ||
+            fd.is(512) ||
+            fd.is(1024) ||
+            !fd.type)
+            continue;
+        sum += lazyTypeCost(toString(fd.type), source, parser);
+        if (sum >= LAZY_AUTO_THRESHOLD)
+            return sum;
+    }
+    return sum;
+}
+function lazyWrapperInner(typeNode) {
+    if (!typeNode || typeNode.kind !== NodeKind.NamedType)
+        return null;
+    const named = typeNode;
+    let seg = named.name;
+    while (seg.next)
+        seg = seg.next;
+    if (seg.identifier.text !== "Lazy")
+        return null;
+    if (!named.typeArguments || named.typeArguments.length !== 1)
+        return null;
+    let inner = toString(named.typeArguments[0]).trim();
+    if (named.isNullable && !inner.endsWith("null"))
+        inner += " | null";
+    return inner;
+}
 function estimatedSerializedByteSize(type, source, parser) {
     const trimmed = type.trim();
     const baseType = stripNull(trimmed);
@@ -2828,6 +3103,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" ||
@@ -2886,6 +3163,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: {
@@ -2905,4 +3197,3 @@ function getComparison(data) {
         }
     }
 }
-//# sourceMappingURL=index.js.map