json-as 1.3.7 → 1.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "author": "Jairus Tanaka",
   "repository": {
     "type": "git",
@@ -11,21 +11,22 @@
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
     "@eslint/js": "^10.0.1",
-    "@types/node": "^25.6.2",
-    "as-test": "^1.1.10",
+    "@types/node": "^25.9.1",
+    "as-heap-analyzer": "^1.2.0",
+    "as-test": "^1.5.2",
     "assemblyscript": "^0.28.17",
     "assemblyscript-prettier": "^3.0.4",
     "chartjs-node-canvas": "^5.0.0",
     "chartjs-plugin-datalabels": "^2.2.0",
-    "eslint": "^10.3.0",
+    "eslint": "^10.4.0",
     "husky": "^9.1.7",
     "json-as": "./",
     "prettier": "3.8.3",
     "serve": "^14.2.6",
-    "tinybench": "^6.0.1",
-    "try-as": "^1.0.1",
+    "tinybench": "^6.0.2",
+    "try-as": "^1.1.2",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.59.2"
+    "typescript-eslint": "^8.60.0"
   },
   "bugs": {
     "url": "https://github.com/JairusSW/json-as/issues"
@@ -85,13 +86,14 @@
   },
   "scripts": {
     "ci": "act",
-    "test": "ast test --parallel",
-    "test:transform": "node transform/__tests__/normalize-base-rel.test.mjs",
-    "test:fast": "npm run build:transform && JSON_USE_FAST_PATH=1 ast test --parallel --mode swar,simd",
+    "test": "ast test --parallel --enable try-as",
+    "test:rfc": "ast test --config rfc.config.json --parallel --enable try-as",
+    "test:transform": "node transform/__tests__/normalize-base-rel.test.mjs && node transform/__tests__/compute-base-rel.test.mjs && node transform/__tests__/resolve-imports.test.mjs",
+    "test:fast": "npm run build:transform && JSON_USE_FAST_PATH=1 ast test --parallel --mode swar,simd --enable try-as",
     "fuzz": "ast fuzz",
     "test:fuzz": "ast test --fuzz --parallel",
-    "test:ci": "ast test --parallel --clean",
-    "test:coverage": "ast test --enable coverage",
+    "test:ci": "ast test --parallel --clean --enable try-as",
+    "test:coverage": "ast test --enable coverage --enable try-as",
     "bench": "bash -c 'bash ./scripts/run-bench.as.sh \"$@\" && { arg=\"${1:-}\"; if [ -z \"$arg\" ] || [ \"${arg#custom/}\" = \"$arg\" ]; then bash ./scripts/run-bench.js.sh \"$@\"; fi; } && bash ./scripts/build-charts.sh' --",
     "bench:as": "bash ./scripts/run-bench.as.sh",
     "bench:js": "bash ./scripts/run-bench.js.sh",
@@ -111,7 +113,6 @@
     "lint:fix": "eslint . --fix --no-warn-ignored",
     "commitmsg:verify": "bash ./scripts/commit-msg.sh",
     "precommit:verify": "bash ./scripts/pre-commit.sh",
-    "prepush:verify": "bash ./scripts/pre-push.sh",
     "typecheck": "tsc -p ./transform --noEmit",
     "clean": "rm -rf build/ transform/lib/",
     "prebuild": "npm run clean",

package/transform/lib/index.d.ts

@@ -3,6 +3,10 @@ import { Transform } from "assemblyscript/dist/transform.js";
 import { Schema, SourceSet, Src } from "./types.js";
 import { Visitor } from "./visitor.js";
 export declare function normalizeJsonAsBaseRel(baseRel: string): string;
+export declare function computeImportBaseRel(fromDir: string, packageDir: string, p?: {
+    relative(from: string, to: string): string;
+    sep: string;
+}): string;
 export declare class JSONTransform extends Visitor {
     static SN: JSONTransform;
     program: Program;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAOhB,eAAe,EAOf,MAAM,EACN,OAAO,EAEP,MAAM,EAIP,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAA2B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAsCvC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAY9D;AAgND,qBAAa,aAAc,SAAQ,OAAO;IACxC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAuB;IAExC,OAAO,EAAG,OAAO,CAAC;IAClB,OAAO,EAAG,MAAM,CAAC;IACjB,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAA+B;IAC7D,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,SAAS,CAAmB;IACrC,OAAO,EAAE,eAAe,EAAE,CAAM;IAChC,cAAc,EAAE,MAAM,EAAE,CAAM;IAE9B,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAqB;IAEvD,OAAO,CAAC,4BAA4B;IA2DpC,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAiBtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,cAAoB,GAAG,MAAM;IA4C3E,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA68EnD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAQtC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA8DlD,oBAAoB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAIjD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI/B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAmrB9B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,OAAe,GAAG,MAAM,EAAE;IAuDxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO;CA8C3D;AA8BD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BvD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAqEjC;AAqRD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAOhB,eAAe,EAOf,MAAM,EACN,OAAO,EAEP,MAAM,EAIP,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAA2B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAsCvC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAY9D;AAsBD,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,CAAC,GAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAS,GACpE,MAAM,CAIR;AAgND,qBAAa,aAAc,SAAQ,OAAO;IACxC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAuB;IAExC,OAAO,EAAG,OAAO,CAAC;IAClB,OAAO,EAAG,MAAM,CAAC;IACjB,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAA+B;IAC7D,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,SAAS,CAAmB;IACrC,OAAO,EAAE,eAAe,EAAE,CAAM;IAChC,cAAc,EAAE,MAAM,EAAE,CAAM;IAE9B,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAqB;IAEvD,OAAO,CAAC,4BAA4B;IA2DpC,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAiBtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,cAAoB,GAAG,MAAM;IA4C3E,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAwkFnD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAQtC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA8DlD,oBAAoB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAIjD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI/B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAyN9B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,OAAe,GAAG,MAAM,EAAE;IAuDxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO;CA8C3D;AA8BD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BvD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAqEjC;AAqRD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9C"}

package/transform/lib/index.js

@@ -1,6 +1,6 @@
 import { Node, Type, } from "assemblyscript/dist/assemblyscript.js";
 import { Transform } from "assemblyscript/dist/transform.js";
-import { readFileSync, writeFileSync } from "fs";
+import { writeFileSync } from "fs";
 import * as path from "path";
 import { fileURLToPath } from "url";
 import { CustomTransform } from "./linkers/custom.js";
@@ -32,6 +32,9 @@ export function normalizeJsonAsBaseRel(baseRel) {
     }
     return baseRel;
 }
+export function computeImportBaseRel(fromDir, packageDir, p = path) {
+    return normalizeJsonAsBaseRel(path.posix.join(...p.relative(fromDir, packageDir).split(p.sep)));
+}
 function envFlagDefaultTrue(value) {
     if (!value)
         return true;
@@ -937,9 +940,7 @@ export class JSONTransform extends Visitor {
         const SIGNED_INTEGER_TYPES = ["i8", "i16", "i32", "i64", "isize"];
         const FLOAT_TYPES = ["f32", "f64"];
         const INTEGER_TYPES = [...UNSIGNED_INTEGER_TYPES, ...SIGNED_INTEGER_TYPES];
-        const STRING_FIELD_DESERIALIZER = codegenMode === JSONMode.SIMD
-            ? "deserializeStringField_SIMD"
-            : "deserializeStringField_SWAR";
+        const STRING_FIELD_DESERIALIZER = "__deserializeStringField";
         const getArrayValueType = (type) => {
             if (!type.startsWith("Array<") && !type.startsWith("StaticArray<"))
                 return null;
@@ -953,8 +954,8 @@ export class JSONTransform extends Visitor {
             const valuePtr = keyOffset ? `${srcPtr} + ${keyOffset}` : srcPtr;
             if (INTEGER_TYPES.includes(resolvedType)) {
                 const helper = SIGNED_INTEGER_TYPES.includes(resolvedType)
-                    ? "deserializeIntegerField"
-                    : "deserializeUnsignedField";
+                    ? "__deserializeIntegerField"
+                    : "__deserializeUnsignedField";
                 out.push(`${srcPtr} = ${helper}<${resolvedType}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
             }
             else if (["string", "String"].includes(resolvedType)) {
@@ -965,7 +966,7 @@ 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});`);
+                out.push(`  ${srcPtr} = ${STRING_FIELD_DESERIALIZER}<${member.type}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
                 if (member.node.type.isNullable) {
                     out.push("  }");
                 }
@@ -1083,7 +1084,7 @@ export class JSONTransform extends Visitor {
                 out.push("} else break;");
             }
             else if (FLOAT_TYPES.includes(resolvedType)) {
-                out.push(`${srcPtr} = deserializeFloatField<${resolvedType}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                out.push(`${srcPtr} = __deserializeFloatField<${resolvedType}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
             }
             else if (resolvedSchema && !resolvedSchema.custom) {
                 if (fastPath) {
@@ -1135,6 +1136,10 @@ export class JSONTransform extends Visitor {
             }
             else if (resolvedType.startsWith("Array<")) {
                 const valueType = getArrayValueType(resolvedType);
+                const rawInner = resolvedType
+                    .slice(resolvedType.indexOf("<") + 1, -1)
+                    .trim();
+                const elementNullable = stripNull(rawInner) !== rawInner;
                 out.push("{");
                 if (member.node.type.isNullable) {
                     out.push(`  if (load<u64>(${valuePtr}) == 30399761348886638) {`);
@@ -1151,13 +1156,27 @@ export class JSONTransform extends Visitor {
                     out.push("  }");
                     out.push("  let index = 0;");
                     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(`    ${srcPtr} += 2;`);
                     out.push("  } else while (true) {");
-                    out.push('    if (index >= value.length) value.push("");');
-                    out.push(`    ${srcPtr} = ${STRING_FIELD_DESERIALIZER}<${valueType}>(${srcPtr}, srcEnd, value.dataStart + ((<usize>index) << alignof<${valueType}>()));`);
+                    out.push(`    ${srcPtr} = JSON.Util.skipWhitespace(${srcPtr}, srcEnd);`);
+                    if (elementNullable) {
+                        out.push(`    if (index >= value.length) value.push(changetype<${valueType} | null>(0));`);
+                        out.push(`    if (load<u64>(${srcPtr}) == 30399761348886638) {`);
+                        out.push(`      store<usize>(value.dataStart + ((<usize>index) << alignof<${valueType}>()), 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("    }");
+                    }
+                    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("    index++;");
+                    out.push(`    ${srcPtr} = JSON.Util.skipWhitespace(${srcPtr}, srcEnd);`);
                     out.push(`    const code = load<u16>(${srcPtr});`);
                     out.push("    if (code == 0x2c) {");
                     out.push(`      ${srcPtr} += 2;`);
@@ -1186,6 +1205,7 @@ export class JSONTransform extends Visitor {
                     out.push("  }");
                     out.push("  let index = 0;");
                     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(`    ${srcPtr} += 2;`);
@@ -1204,6 +1224,7 @@ export class JSONTransform extends Visitor {
                     out.push(`    ${srcPtr} = changetype<nonnull<${valueType}>>(item).__DESERIALIZE_FAST<${valueType}>(${srcPtr}, srcEnd, item);`);
                     out.push(`    if (!${srcPtr}) break;`);
                     out.push("    index++;");
+                    out.push(`    ${srcPtr} = JSON.Util.skipWhitespace(${srcPtr}, srcEnd);`);
                     out.push(`    const code = load<u16>(${srcPtr});`);
                     out.push("    if (code == 0x2c) {");
                     out.push(`      ${srcPtr} += 2;`);
@@ -1222,63 +1243,23 @@ export class JSONTransform extends Visitor {
                     out.push("}");
                     return out;
                 }
-                out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
-                out.push(`  if (changetype<usize>(value) == 0) {`);
-                out.push(`    value = changetype<${resolvedType}>(instantiate<nonnull<${resolvedType}>>());`);
-                out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
-                out.push("  }");
-                out.push(`  if (load<u16>(${valuePtr}) == 0x5b && load<u16>(${valuePtr}, 2) == 0x5d) {`);
-                out.push("    value.length = 0;");
-                out.push(`    ${srcPtr} = ${valuePtr} + 4;`);
-                out.push("  } else {");
-                out.push(`    ${srcPtr} = deserializeArrayInto_SWAR<${resolvedType}>(${valuePtr}, srcEnd, value);`);
-                out.push(`    if (!${srcPtr}) break;`);
-                out.push("  }");
+                out.push(`  ${srcPtr} = __deserializeArrayField_SWAR<${resolvedType}>(${valuePtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                out.push(`  if (!${srcPtr}) break;`);
                 if (member.node.type.isNullable) {
                     out.push("  }");
                 }
                 out.push("}");
             }
             else if (resolvedType.startsWith("Map<")) {
-                if (member.node.type.isNullable) {
-                    out.push(`${srcPtr} = deserializeMapField<${resolvedType}>(${srcPtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
-                }
-                else if (fastPath) {
-                    out.push("{");
-                    out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
-                    out.push("  if (changetype<usize>(value) == 0) {");
-                    out.push(`    value = new ${resolvedType}();`);
-                    out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
-                    out.push("  }");
-                    out.push(`  ${srcPtr} = deserializeMapInto<${resolvedType}>(${srcPtr}, srcEnd, value);`);
-                    out.push("}");
-                }
-                else {
-                    out.push(`${srcPtr} = deserializeMapInto<${resolvedType}>(${srcPtr}, srcEnd, load<${resolvedType}>(${outPtr}, ${fieldOffset}));`);
-                }
+                out.push(`${srcPtr} = __deserializeMapField<${resolvedType}>(${srcPtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
                 out.push(`if (!${srcPtr}) break;`);
             }
             else if (resolvedType.startsWith("Set<")) {
-                if (member.node.type.isNullable) {
-                    out.push(`${srcPtr} = deserializeSetField<${resolvedType}>(${srcPtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
-                }
-                else if (fastPath) {
-                    out.push("{");
-                    out.push(`  let value = load<${resolvedType}>(${outPtr}, ${fieldOffset});`);
-                    out.push("  if (changetype<usize>(value) == 0) {");
-                    out.push(`    value = new ${resolvedType}();`);
-                    out.push(`    store<${resolvedType}>(${outPtr}, value, ${fieldOffset});`);
-                    out.push("  }");
-                    out.push(`  ${srcPtr} = deserializeSetInto<${resolvedType}>(${srcPtr}, srcEnd, value);`);
-                    out.push("}");
-                }
-                else {
-                    out.push(`${srcPtr} = deserializeSetInto<${resolvedType}>(${srcPtr}, srcEnd, load<${resolvedType}>(${outPtr}, ${fieldOffset}));`);
-                }
+                out.push(`${srcPtr} = __deserializeSetField<${resolvedType}>(${srcPtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
                 out.push(`if (!${srcPtr}) break;`);
             }
             else if (resolvedType.startsWith("StaticArray<")) {
-                out.push(`${srcPtr} = deserializeStaticArrayField<${resolvedType}>(${srcPtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
+                out.push(`${srcPtr} = __deserializeStaticArrayField<${resolvedType}>(${srcPtr}, srcEnd, ${outPtr}, ${fieldOffset});`);
                 out.push(`if (!${srcPtr}) break;`);
             }
             else if (resolvedType == "JSON.Value" ||
@@ -1337,6 +1318,9 @@ export class JSONTransform extends Visitor {
                 indent += "  ";
                 if (!inlineStringValue)
                     DESERIALIZE_FAST += indent + `srcStart += ${firstKeyOffset};\n`;
+                DESERIALIZE_FAST +=
+                    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";
@@ -1360,6 +1344,9 @@ export class JSONTransform extends Visitor {
                 indent += "  ";
                 if (!inlineStringValue)
                     DESERIALIZE_FAST += indent + `srcStart += ${nextKeyOffset};\n`;
+                DESERIALIZE_FAST +=
+                    indent +
+                        `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${nextKeyOffset}` : "srcStart"}))) break;\n`;
                 DESERIALIZE_FAST +=
                     indent + deserializerNext.join("\n" + indent) + "\n";
                 indent = indent.slice(0, -2);
@@ -1389,6 +1376,9 @@ export class JSONTransform extends Visitor {
                     DESERIALIZE_FAST += indent + "break;\n\n";
                     continue;
                 }
+                DESERIALIZE_FAST +=
+                    indent +
+                        `if (JSON.Util.isSpace(load<u16>(${inlineStringValue ? `srcStart + ${keyOffset}` : "srcStart"}))) break;\n`;
                 DESERIALIZE_FAST += indent + deserializer.join("\n" + indent) + "\n\n";
             }
         }
@@ -1398,6 +1388,98 @@ export class JSONTransform extends Visitor {
         DESERIALIZE_FAST += indent + "return srcStart;\n";
         indent = indent.slice(0, -2);
         DESERIALIZE_FAST += indent + "} while (false);\n\n";
+        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) {
+            const i1 = "  ";
+            const i2 = "    ";
+            const skip = i2 + "srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+            DESERIALIZE_FAST += i1 + "srcStart = start;\n";
+            DESERIALIZE_FAST += i1 + "do {\n";
+            DESERIALIZE_FAST += skip;
+            DESERIALIZE_FAST += i2 + "if (load<u16>(srcStart) != 0x7b) break; // {\n";
+            DESERIALIZE_FAST += i2 + "srcStart += 2;\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 keyBytes = key.length << 1;
+                DESERIALIZE_FAST += "\n";
+                DESERIALIZE_FAST += skip;
+                DESERIALIZE_FAST +=
+                    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";
+                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";
+                }
+            }
+            DESERIALIZE_FAST += "\n";
+            DESERIALIZE_FAST += skip;
+            DESERIALIZE_FAST += i2 + "if (load<u16>(srcStart) != 0x7d) break; // }\n";
+            DESERIALIZE_FAST += i2 + "srcStart += 2;\n";
+            DESERIALIZE_FAST += i2 + "return srcStart;\n";
+            DESERIALIZE_FAST += i1 + "} while (false);\n\n";
+        }
+        else if (tier2Ok && supportsFastOptionalPath) {
+            const multi = this.schema.members.length > 1;
+            const i1 = "  ";
+            const i2 = "    ";
+            const i3 = "      ";
+            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 kp: usize = 0;\n";
+            if (multi)
+                DESERIALIZE_FAST += i2 + "let seenAny = 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 keyBytes = key.length << 1;
+                DESERIALIZE_FAST += "\n";
+                DESERIALIZE_FAST +=
+                    i2 + "kp = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+                if (multi && i > 0) {
+                    DESERIALIZE_FAST +=
+                        i2 +
+                            "if (seenAny && load<u16>(kp) == 0x2c) kp = JSON.Util.skipWhitespace(kp + 2, srcEnd);\n";
+                }
+                DESERIALIZE_FAST +=
+                    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";
+                if (multi)
+                    DESERIALIZE_FAST += i3 + "seenAny = true;\n";
+                DESERIALIZE_FAST += i2 + "}\n";
+            }
+            DESERIALIZE_FAST += "\n";
+            DESERIALIZE_FAST +=
+                i2 + "srcStart = JSON.Util.skipWhitespace(srcStart, srcEnd);\n";
+            DESERIALIZE_FAST += i2 + "if (load<u16>(srcStart) != 0x7d) break; // }\n";
+            DESERIALIZE_FAST += i2 + "srcStart += 2;\n";
+            DESERIALIZE_FAST += i2 + "return srcStart;\n";
+            DESERIALIZE_FAST += i1 + "} while (false);\n\n";
+        }
         if (THROW_FAST_PATH) {
             DESERIALIZE_FAST +=
                 indent + "const failAt = srcStart ? srcStart : start;\n";
@@ -1462,6 +1544,10 @@ export class JSONTransform extends Visitor {
         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) => {
@@ -2294,48 +2380,11 @@ export class JSONTransform extends Visitor {
         const bsImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "bs" || d.name.text == "bs"));
         const jsonImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "JSON" || d.name.text == "JSON"));
         const atoiImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "atoi" || d.name.text == "atoi"));
-        const deserializeIntegerFieldImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeIntegerField" ||
-            d.name.text == "deserializeIntegerField"));
-        const deserializeUnsignedFieldImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeUnsignedField" ||
-            d.name.text == "deserializeUnsignedField"));
-        const deserializeFloatFieldImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeFloatField" ||
-            d.name.text == "deserializeFloatField"));
         const scanValueEndImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "scanValueEnd" || d.name.text == "scanValueEnd"));
-        const deserializeArrayField_SWARImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeArrayField_SWAR" ||
-            d.name.text == "deserializeArrayField_SWAR"));
-        const deserializeArrayInto_SWARImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeArrayInto_SWAR" ||
-            d.name.text == "deserializeArrayInto_SWAR"));
-        const deserializeMapFieldImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeMapField" ||
-            d.name.text == "deserializeMapField"));
-        const deserializeMapIntoImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeMapInto" ||
-            d.name.text == "deserializeMapInto"));
-        const deserializeSetFieldImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeSetField" ||
-            d.name.text == "deserializeSetField"));
-        const deserializeSetIntoImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeSetInto" ||
-            d.name.text == "deserializeSetInto"));
-        const deserializeStaticArrayFieldImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeStaticArrayField" ||
-            d.name.text == "deserializeStaticArrayField"));
-        const deserializeStringFieldSWARImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeStringField_SWAR" ||
-            d.name.text == "deserializeStringField_SWAR"));
-        const deserializeStringFieldSIMDImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "deserializeStringField_SIMD" ||
-            d.name.text == "deserializeStringField_SIMD"));
-        const sourceText = readFileSync(fromPath).toString();
-        const hasLocalDeserializeIntegerField = /\bdeserializeIntegerField\b/.test(sourceText);
-        const hasLocalDeserializeUnsignedField = /\bdeserializeUnsignedField\b/.test(sourceText);
-        const hasLocalDeserializeFloatField = /\bdeserializeFloatField\b/.test(sourceText);
+        const fieldHelpersImport = this.imports.find((i) => i.declarations?.find((d) => d.name.text == "__deserializeStringField"));
+        const sourceText = node.text;
         const hasLocalScanValueEnd = /\bscanValueEnd\b/.test(sourceText);
-        const hasLocaldeserializeArrayField_SWAR = /\bdeserializeArrayField_SWAR\b/.test(sourceText);
-        const hasLocaldeserializeArrayInto_SWAR = /\bdeserializeArrayInto_SWAR\b/.test(sourceText);
-        const hasLocaldeserializeMapField = /\bdeserializeMapField\b/.test(sourceText);
-        const hasLocaldeserializeMapInto = /\bdeserializeMapInto\b/.test(sourceText);
-        const hasLocaldeserializeSetField = /\bdeserializeSetField\b/.test(sourceText);
-        const hasLocaldeserializeSetInto = /\bdeserializeSetInto\b/.test(sourceText);
-        const hasLocaldeserializeStaticArrayField = /\bdeserializeStaticArrayField\b/.test(sourceText);
-        const hasLocalDeserializeStringFieldSWAR = /\bdeserializeStringField_SWAR\b/.test(sourceText);
-        const hasLocalDeserializeStringFieldSIMD = /\bdeserializeStringField_SIMD\b/.test(sourceText);
-        const baseRel = normalizeJsonAsBaseRel(path.posix.join(...path
-            .relative(path.dirname(fromPath), path.join(baseDir))
-            .split(path.sep)));
+        const baseRel = computeImportBaseRel(path.dirname(fromPath), path.join(baseDir));
         if (!bsImport) {
             const replaceNode = Node.createImportStatement([
                 Node.createImportDeclaration(Node.createIdentifierExpression("bs", node.range, false), null, node.range),
@@ -2372,42 +2421,6 @@ export class JSONTransform extends Visitor {
                     node.range.source.normalizedPath +
                     "\n");
         }
-        if (!deserializeIntegerFieldImport && !hasLocalDeserializeIntegerField) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeIntegerField", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "index", "integer"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (!deserializeUnsignedFieldImport && !hasLocalDeserializeUnsignedField) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeUnsignedField", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "index", "unsigned"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (!deserializeFloatFieldImport && !hasLocalDeserializeFloatField) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeFloatField", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "simple", "float"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
         if (!scanValueEndImport && !hasLocalScanValueEnd) {
             const replaceNode = Node.createImportStatement([
                 Node.createImportDeclaration(Node.createIdentifierExpression("scanValueEnd", node.range, false), null, node.range),
@@ -2420,114 +2433,18 @@ export class JSONTransform extends Visitor {
                     node.range.source.normalizedPath +
                     "\n");
         }
-        if (!deserializeArrayField_SWARImport &&
-            !hasLocaldeserializeArrayField_SWAR) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeArrayField_SWAR", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "simple", "array"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (!deserializeArrayInto_SWARImport &&
-            !hasLocaldeserializeArrayInto_SWAR) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeArrayInto_SWAR", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "swar", "array"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (!deserializeMapFieldImport && !hasLocaldeserializeMapField) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeMapField", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "simple", "map"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (!deserializeMapIntoImport && !hasLocaldeserializeMapInto) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeMapInto", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "simple", "map"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (!deserializeSetFieldImport && !hasLocaldeserializeSetField) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeSetField", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "simple", "set"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (!deserializeSetIntoImport && !hasLocaldeserializeSetInto) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeSetInto", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "simple", "set"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (!deserializeStaticArrayFieldImport &&
-            !hasLocaldeserializeStaticArrayField) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeStaticArrayField", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "simple", "staticarray"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        const codegenMode = getCodegenMode(this.program);
-        if (codegenMode !== JSONMode.SIMD &&
-            !deserializeStringFieldSWARImport &&
-            !hasLocalDeserializeStringFieldSWAR) {
-            const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeStringField_SWAR", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "swar", "string"), node.range), node.range);
-            node.range.source.statements.unshift(replaceNode);
-            if (DEBUG > 0)
-                console.log("Added import: " +
-                    toString(replaceNode) +
-                    " to " +
-                    node.range.source.normalizedPath +
-                    "\n");
-        }
-        if (codegenMode === JSONMode.SIMD &&
-            !deserializeStringFieldSIMDImport &&
-            !hasLocalDeserializeStringFieldSIMD) {
+        if (!fieldHelpersImport) {
+            const fieldHelper = (real, alias) => Node.createImportDeclaration(Node.createIdentifierExpression(real, node.range, false), Node.createIdentifierExpression(alias, node.range, false), node.range);
             const replaceNode = Node.createImportStatement([
-                Node.createImportDeclaration(Node.createIdentifierExpression("deserializeStringField_SIMD", node.range, false), null, node.range),
-            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize", "simd", "string"), node.range), node.range);
+                fieldHelper("deserializeIntegerField", "__deserializeIntegerField"),
+                fieldHelper("deserializeUnsignedField", "__deserializeUnsignedField"),
+                fieldHelper("deserializeFloatField", "__deserializeFloatField"),
+                fieldHelper("deserializeStringField", "__deserializeStringField"),
+                fieldHelper("deserializeArrayField_SWAR", "__deserializeArrayField_SWAR"),
+                fieldHelper("deserializeMapField", "__deserializeMapField"),
+                fieldHelper("deserializeSetField", "__deserializeSetField"),
+                fieldHelper("deserializeStaticArrayField", "__deserializeStaticArrayField"),
+            ], Node.createStringLiteralExpression(path.posix.join(baseRel, "assembly", "deserialize"), node.range), node.range);
             node.range.source.statements.unshift(replaceNode);
             if (DEBUG > 0)
                 console.log("Added import: " +