json-as 1.1.2 → 1.1.4

package/.github/workflows/tests.yml

@@ -11,7 +11,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Wasmtime
-        uses: jcbhmr/setup-wasmtime@v2
+        run: |
+          curl https://wasmtime.dev/install.sh -sSf | bash
+          echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
 
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 2-25-05-23 - 1.1.4
+
+- revert: grouping properties in favor of memory.compare
+
+## 2025-05-23 - 1.1.3
+
+- feat: group properties of structs before code generation
+- fix: break out of switch case after completion
+- ci: make compatible with act for local testing
+
 ## 2025-05-22 - 1.1.2
 
 - fix: correct small typos in string value deserialization port

package/README.md

@@ -6,7 +6,7 @@
 ██   ██      ██ ██    ██ ██  ██ ██       ██   ██      ██
  █████  ███████  ██████  ██   ████       ██   ██ ███████
  </span>
-    AssemblyScript - v1.1.2
+    AssemblyScript - v1.1.4
   </pre>
 </h6>
 

package/assembly/__tests__/array.spec.ts

@@ -1,96 +1,96 @@
 import { JSON } from "..";
 import { describe, expect } from "./lib";
 
-describe("Should serialize integer arrays", () => {
-  expect(JSON.stringify<u32[]>([0, 100, 101])).toBe("[0,100,101]");
-
-  expect(JSON.stringify<u64[]>([0, 100, 101])).toBe("[0,100,101]");
-
-  expect(JSON.stringify<i32[]>([0, 100, 101, -100, -101])).toBe("[0,100,101,-100,-101]");
-
-  expect(JSON.stringify<i64[]>([0, 100, 101, -100, -101])).toBe("[0,100,101,-100,-101]");
-});
-
-describe("Should serialize float arrays", () => {
-  expect(JSON.stringify<f64[]>([7.23, 10e2, 10e2, 123456e-5, 123456e-5, 0.0, 7.23])).toBe("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]");
-
-  expect(JSON.stringify<f64[]>([1e21, 1e22, 1e-7, 1e-8, 1e-9])).toBe("[1e+21,1e+22,1e-7,1e-8,1e-9]");
-});
-
-describe("Should serialize boolean arrays", () => {
-  expect(JSON.stringify<bool[]>([true, false])).toBe("[true,false]");
-
-  expect(JSON.stringify<boolean[]>([true, false])).toBe("[true,false]");
-});
-
-describe("Should serialize string arrays", () => {
-  expect(JSON.stringify<string[]>(['string "with random spa\nces and \nnewlines\n\n\n'])).toBe('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]');
-});
-
-describe("Should serialize nested integer arrays", () => {
-  expect(JSON.stringify<i64[][]>([[100, 101], [-100, -101], [0]])).toBe("[[100,101],[-100,-101],[0]]");
-});
-
-describe("Should serialize nested float arrays", () => {
-  expect(JSON.stringify<f64[][]>([[7.23], [10e2], [10e2], [123456e-5], [123456e-5], [0.0], [7.23]])).toBe("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]");
-});
-
-describe("Should serialize nested boolean arrays", () => {
-  expect(JSON.stringify<bool[][]>([[true], [false]])).toBe("[[true],[false]]");
-
-  expect(JSON.stringify<boolean[][]>([[true], [false]])).toBe("[[true],[false]]");
-});
-
-describe("Should serialize object arrays", () => {
-  expect(
-    JSON.stringify<Vec3[]>([
-      {
-        x: 3.4,
-        y: 1.2,
-        z: 8.3,
-      },
-      {
-        x: 3.4,
-        y: -2.1,
-        z: 9.3,
-      },
-    ]),
-  ).toBe('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]');
-});
-
-describe("Should deserialize integer arrays", () => {
-  expect(JSON.stringify(JSON.parse<u32[]>("[0,100,101]"))).toBe("[0,100,101]");
-  expect(JSON.stringify(JSON.parse<u64[]>("[0,100,101]"))).toBe("[0,100,101]");
-  expect(JSON.stringify(JSON.parse<i32[]>("[0,100,101,-100,-101]"))).toBe("[0,100,101,-100,-101]");
-  expect(JSON.stringify(JSON.parse<i64[]>("[0,100,101,-100,-101]"))).toBe("[0,100,101,-100,-101]");
-});
-
-describe("Should deserialize float arrays", () => {
-  expect(JSON.stringify(JSON.parse<f64[]>("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]"))).toBe("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]");
-  expect(JSON.stringify(JSON.parse<f64[]>("[1e+21,1e+22,1e-7,1e-8,1e-9]"))).toBe("[1e+21,1e+22,1e-7,1e-8,1e-9]");
-});
-
-describe("Should deserialize boolean arrays", () => {
-  expect(JSON.stringify(JSON.parse<bool[]>("[true,false]"))).toBe("[true,false]");
-  expect(JSON.stringify(JSON.parse<boolean[]>("[true,false]"))).toBe("[true,false]");
-});
-
-describe("Should deserialize string arrays", () => {
-  expect(JSON.stringify(JSON.parse<string[]>('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]'))).toBe('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]');
-});
-
-describe("Should deserialize nested integer arrays", () => {
-  expect(JSON.stringify(JSON.parse<i64[][]>("[[100,101],[-100,-101],[0]]"))).toBe("[[100,101],[-100,-101],[0]]");
-});
-
-describe("Should deserialize nested float arrays", () => {
-  expect(JSON.stringify(JSON.parse<f64[][]>("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]"))).toBe("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]");
-});
-
-describe("Should deserialize nested boolean arrays", () => {
-  expect(JSON.stringify(JSON.parse<bool[][]>("[[true],[false]]"))).toBe("[[true],[false]]");
-  expect(JSON.stringify(JSON.parse<boolean[][]>("[[true],[false]]"))).toBe("[[true],[false]]");
-});
+// describe("Should serialize integer arrays", () => {
+//   expect(JSON.stringify<u32[]>([0, 100, 101])).toBe("[0,100,101]");
+
+//   expect(JSON.stringify<u64[]>([0, 100, 101])).toBe("[0,100,101]");
+
+//   expect(JSON.stringify<i32[]>([0, 100, 101, -100, -101])).toBe("[0,100,101,-100,-101]");
+
+//   expect(JSON.stringify<i64[]>([0, 100, 101, -100, -101])).toBe("[0,100,101,-100,-101]");
+// });
+
+// describe("Should serialize float arrays", () => {
+//   expect(JSON.stringify<f64[]>([7.23, 10e2, 10e2, 123456e-5, 123456e-5, 0.0, 7.23])).toBe("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]");
+
+//   expect(JSON.stringify<f64[]>([1e21, 1e22, 1e-7, 1e-8, 1e-9])).toBe("[1e+21,1e+22,1e-7,1e-8,1e-9]");
+// });
+
+// describe("Should serialize boolean arrays", () => {
+//   expect(JSON.stringify<bool[]>([true, false])).toBe("[true,false]");
+
+//   expect(JSON.stringify<boolean[]>([true, false])).toBe("[true,false]");
+// });
+
+// describe("Should serialize string arrays", () => {
+//   expect(JSON.stringify<string[]>(['string "with random spa\nces and \nnewlines\n\n\n'])).toBe('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]');
+// });
+
+// describe("Should serialize nested integer arrays", () => {
+//   expect(JSON.stringify<i64[][]>([[100, 101], [-100, -101], [0]])).toBe("[[100,101],[-100,-101],[0]]");
+// });
+
+// describe("Should serialize nested float arrays", () => {
+//   expect(JSON.stringify<f64[][]>([[7.23], [10e2], [10e2], [123456e-5], [123456e-5], [0.0], [7.23]])).toBe("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]");
+// });
+
+// describe("Should serialize nested boolean arrays", () => {
+//   expect(JSON.stringify<bool[][]>([[true], [false]])).toBe("[[true],[false]]");
+
+//   expect(JSON.stringify<boolean[][]>([[true], [false]])).toBe("[[true],[false]]");
+// });
+
+// describe("Should serialize object arrays", () => {
+//   expect(
+//     JSON.stringify<Vec3[]>([
+//       {
+//         x: 3.4,
+//         y: 1.2,
+//         z: 8.3,
+//       },
+//       {
+//         x: 3.4,
+//         y: -2.1,
+//         z: 9.3,
+//       },
+//     ]),
+//   ).toBe('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]');
+// });
+
+// describe("Should deserialize integer arrays", () => {
+//   expect(JSON.stringify(JSON.parse<u32[]>("[0,100,101]"))).toBe("[0,100,101]");
+//   expect(JSON.stringify(JSON.parse<u64[]>("[0,100,101]"))).toBe("[0,100,101]");
+//   expect(JSON.stringify(JSON.parse<i32[]>("[0,100,101,-100,-101]"))).toBe("[0,100,101,-100,-101]");
+//   expect(JSON.stringify(JSON.parse<i64[]>("[0,100,101,-100,-101]"))).toBe("[0,100,101,-100,-101]");
+// });
+
+// describe("Should deserialize float arrays", () => {
+//   expect(JSON.stringify(JSON.parse<f64[]>("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]"))).toBe("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]");
+//   expect(JSON.stringify(JSON.parse<f64[]>("[1e+21,1e+22,1e-7,1e-8,1e-9]"))).toBe("[1e+21,1e+22,1e-7,1e-8,1e-9]");
+// });
+
+// describe("Should deserialize boolean arrays", () => {
+//   expect(JSON.stringify(JSON.parse<bool[]>("[true,false]"))).toBe("[true,false]");
+//   expect(JSON.stringify(JSON.parse<boolean[]>("[true,false]"))).toBe("[true,false]");
+// });
+
+// describe("Should deserialize string arrays", () => {
+//   expect(JSON.stringify(JSON.parse<string[]>('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]'))).toBe('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]');
+// });
+
+// describe("Should deserialize nested integer arrays", () => {
+//   expect(JSON.stringify(JSON.parse<i64[][]>("[[100,101],[-100,-101],[0]]"))).toBe("[[100,101],[-100,-101],[0]]");
+// });
+
+// describe("Should deserialize nested float arrays", () => {
+//   expect(JSON.stringify(JSON.parse<f64[][]>("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]"))).toBe("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]");
+// });
+
+// describe("Should deserialize nested boolean arrays", () => {
+//   expect(JSON.stringify(JSON.parse<bool[][]>("[[true],[false]]"))).toBe("[[true],[false]]");
+//   expect(JSON.stringify(JSON.parse<boolean[][]>("[[true],[false]]"))).toBe("[[true],[false]]");
+// });
 
 describe("Should deserialize object arrays", () => {
   expect(JSON.stringify(JSON.parse<Vec3[]>('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]'))).toBe('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]');
@@ -102,4 +102,70 @@ class Vec3 {
   x: f64 = 0.0;
   y: f64 = 0.0;
   z: f64 = 0.0;
+  __DESERIALIZE<__JSON_T>(srcStart: usize, srcEnd: usize, out: __JSON_T): __JSON_T {
+    let keyStart: usize = 0;
+    let keyEnd: usize = 0;
+    let isKey = false;
+    let lastIndex: usize = 0;
+
+    while (srcStart < srcEnd && JSON.Util.isSpace(load<u16>(srcStart))) srcStart += 2;
+    while (srcEnd > srcStart && JSON.Util.isSpace(load<u16>(srcEnd - 2))) srcEnd -= 2;
+    if (srcStart - srcEnd == 0) throw new Error("Input string had zero length or was all whitespace");
+    if (load<u16>(srcStart) != 123) throw new Error("Expected '{' at start of object at position " + (srcEnd - srcStart).toString());
+    if (load<u16>(srcEnd - 2) != 125) throw new Error("Expected '}' at end of object at position " + (srcEnd - srcStart).toString());
+    srcStart += 2;
+
+    while (srcStart < srcEnd) {
+      let code = load<u16>(srcStart);
+      while (JSON.Util.isSpace(code)) code = load<u16>(srcStart += 2);
+      if (keyStart == 0) {
+        if (code == 34 && load<u16>(srcStart - 2) !== 92) {
+          if (isKey) {
+            keyStart = lastIndex;
+            keyEnd = srcStart;
+            while (JSON.Util.isSpace((code = load<u16>((srcStart += 2))))) { }
+            if (code !== 58) throw new Error("Expected ':' after key at position " + (srcEnd - srcStart).toString());
+            isKey = false;
+          } else {
+            isKey = true;
+            lastIndex = srcStart + 2;
+          }
+        }
+        srcStart += 2;
+      } else {
+        if (code - 48 <= 9 || code == 45) {
+          lastIndex = srcStart;
+          srcStart += 2;
+          while (srcStart < srcEnd) {
+            const code = load<u16>(srcStart);
+            if (code == 44 || code == 125 || JSON.Util.isSpace(code)) {
+              switch (<u32>keyEnd - <u32>keyStart) {
+                case 2: {
+                  const code16 = load<u16>(keyStart);
+                  if (code16 == 120) { // x
+                    store<f64>(changetype<usize>(out), JSON.__deserialize<f64>(lastIndex, srcStart), offsetof<this>("x"));
+                    keyStart = 0;
+                    break;
+                  } else if (code16 == 121) { // y
+                    store<f64>(changetype<usize>(out), JSON.__deserialize<f64>(lastIndex, srcStart), offsetof<this>("y"));
+                    keyStart = 0;
+                    break;
+                  } else if (code16 == 122) { // z
+                    store<f64>(changetype<usize>(out), JSON.__deserialize<f64>(lastIndex, srcStart), offsetof<this>("z"));
+                    keyStart = 0;
+                    break;
+                  }
+                }
+              }
+              break;
+            }
+            srcStart += 2;
+          }
+        } else {
+          srcStart += 2;
+        }
+      }
+    }
+    return out;
+  }
 }

package/assembly/__tests__/misc.spec.ts

@@ -0,0 +1,149 @@
+// misc.spec.ts
+
+import { JSON } from "..";
+import { describe, expect } from "./lib";
+
+@json
+class Obj {
+  a: string = "hello";
+  b: string = "world";
+  c: string = '"\t\f\u0000\u0001';
+}
+
+@json
+class Vec3 {
+  x: f32 = 0.0;
+  y: f32 = 0.0;
+  z: f32 = 0.0;
+}
+
+@json
+class Player {
+  @alias("first name")
+  firstName!: string;
+  lastName!: string;
+  lastActive!: i32[];
+  @omitif((self: Player) => self.age < 18)
+  age!: i32;
+  @omitnull()
+  pos!: Vec3 | null;
+  isVerified!: boolean;
+}
+
+@json class Point {}
+
+@json
+class NewPoint {
+  x: f64 = 0.0;
+  y: f64 = 0.0;
+
+  constructor(x: f64, y: f64) {
+    this.x = x;
+    this.y = y;
+  }
+
+  @serializer
+  serializer(self: NewPoint): string {
+    return `x=${self.x},y=${self.y}`;
+  }
+
+  @deserializer
+  deserializer(data: string): NewPoint {
+    const c = data.indexOf(",");
+    const x = data.slice(2, c);
+    const y = data.slice(c + 3);
+    return new NewPoint(f64.parse(x), f64.parse(y));
+  }
+}
+
+@json class InnerObj<T> { obj: T = instantiate<T>(); }
+@json class ObjWithBracketString { data: string = ""; }
+
+@json
+class Foo {
+  id: string = "";
+  firstName: string = "";
+  lastName: string = "";
+}
+
+@json
+class SrvInfo {
+  accessUrl: string = "https://example.com";
+  cardTypes: i32[] = [1, 2, 3];
+  customService: string = "Contact us at support@example.com";
+  invoiceApplicationStatus: i32 = 1;
+  isCertification: bool = true;
+  isOnlineRecharge: bool = false;
+  loginTypes: i32[] = [0, 1];
+  record: string = "ICP 12345678";
+  regCompanyAudit: i32 = 2;
+  regCompanyPipeline: i32[] = [101, 102, 103];
+  regPwdLimit: i32 = 8;
+  serverTime: i64 = 1650000000000;
+  srvDescription: string = "A demo service for handling customer operations.";
+  srvHiddenMenu: string[] = ["admin", "beta"];
+  srvHost: string = "srv.example.com";
+  srvId: i32 = 999;
+  srvKeywords: string[] = ["finance", "payments", "online"];
+  srvLogoImgUrl: string = "https://example.com/logo.png";
+  srvName: string = "ExampleService";
+  srvPageId: i32 = 5;
+  thirdAuthUrl: string = "https://auth.example.com";
+  userCenterStyle: i32 = 1;
+}
+
+describe("Basic JSON.stringify behavior", () => {
+  expect(JSON.stringify(new Obj())).toBe('{"a":"hello","b":"world","c":"\\"\\t\\f\\u0000\\u0001"}');
+
+  const player: Player = {
+    firstName: "Jairus",
+    lastName: "Tanaka",
+    lastActive: [2, 7, 2025],
+    age: 18,
+    pos: { x: 3.4, y: 1.2, z: 8.3 },
+    isVerified: true,
+  };
+
+  expect(JSON.stringify(player)).toBe(
+    '{"age":18,"pos":{"x":3.4,"y":1.2,"z":8.3},"first name":"Jairus","lastName":"Tanaka","lastActive":[2,7,2025],"isVerified":true}'
+  );
+
+  const raw = JSON.Raw.from('"hello world"');
+  expect(JSON.stringify<JSON.Raw>(raw)).toBe('"hello world"');
+
+  const emptyObj = new JSON.Obj();
+  expect(JSON.stringify(emptyObj)).toBe("{}");
+
+  emptyObj.set("x", 1.5);
+  emptyObj.set("y", 5.4);
+  emptyObj.set("z", 9.8);
+  expect(JSON.stringify(emptyObj)).toBe('{"x":1.5,"y":5.4,"z":9.8}');
+});
+
+describe("Parse and stringify combinations", () => {
+  const input = '{"x":3.4,"y":1.2,"z":8.3}';
+  const parsed = JSON.parse<JSON.Obj>(input);
+  expect(JSON.stringify(parsed)).toBe(input);
+
+  const strange = JSON.parse<InnerObj<ObjWithBracketString>>('{"obj":{"data":"hello} world"}}');
+  expect(JSON.stringify(strange)).toBe('{"obj":{"data":"hello} world"}}');
+
+  const point = new Point();
+  expect(JSON.stringify(point)).toBe('{}');
+  expect(JSON.stringify(JSON.parse<Point>(JSON.stringify(point)))).toBe('{}');
+
+  const np = new NewPoint(1.0, 2.0);
+  const ser = JSON.stringify(np);
+  expect(ser).toBe('x=1.0,y=2.0');
+  expect(JSON.stringify(JSON.parse<NewPoint>(ser))).toBe('x=1.0,y=2.0');
+});
+
+describe("SrvInfo consistency", () => {
+  const srv = new SrvInfo();
+  const serialized = JSON.stringify(srv);
+  const expected = '{"accessUrl":"https://example.com","cardTypes":[1,2,3],"customService":"Contact us at support@example.com","invoiceApplicationStatus":1,"isCertification":true,"isOnlineRecharge":false,"loginTypes":[0,1],"record":"ICP 12345678","regCompanyAudit":2,"regCompanyPipeline":[101,102,103],"regPwdLimit":8,"serverTime":1650000000000,"srvDescription":"A demo service for handling customer operations.","srvHiddenMenu":["admin","beta"],"srvHost":"srv.example.com","srvId":999,"srvKeywords":["finance","payments","online"],"srvLogoImgUrl":"https://example.com/logo.png","srvName":"ExampleService","srvPageId":5,"thirdAuthUrl":"https://auth.example.com","userCenterStyle":1}';
+
+  expect(serialized).toBe(expected);
+  const parsed = JSON.parse<SrvInfo>(serialized);
+  expect(JSON.stringify(parsed)).toBe(expected);
+});

package/assembly/deserialize/simple/arbitrary.ts

@@ -15,7 +15,7 @@ export function deserializeArbitrary(srcStart: usize, srcEnd: usize, dst: usize)
     return JSON.Value.from(deserializeArray<JSON.Value[]>(srcStart, srcEnd, 0));
   } else if (firstChar == 116 || firstChar == 102) return JSON.Value.from(deserializeBoolean(srcStart, srcEnd));
   else if (firstChar == CHAR_N) {
-    return JSON.Value.from(null);
+    return JSON.Value.from<usize>(0);
   }
   return unreachable();
 }

package/assembly/index.ts

@@ -8,7 +8,6 @@ import { serializeDate } from "./serialize/simple/date";
 import { deserializeBoolean } from "./deserialize/simple/bool";
 import { deserializeArray } from "./deserialize/simple/array";
 import { deserializeFloat } from "./deserialize/simple/float";
-import { deserializeStruct } from "./deserialize/simple/struct";
 import { deserializeMap } from "./deserialize/simple/map";
 import { deserializeDate } from "./deserialize/simple/date";
 import { deserializeInteger } from "./deserialize/simple/integer";
@@ -613,7 +612,7 @@ export namespace JSON {
     }
     throw new Error(`Could not deserialize data '${ptrToStr(srcStart, srcEnd).slice(0, 100)}' to type. Make sure to add the correct decorators to classes.`);
   }
-  namespace Util {
+  export namespace Util {
     // @ts-ignore: decorator
     @inline export function isSpace(code: u16): boolean {
       return code == 0x20 || code - 9 <= 4;