json-as 1.1.8 → 1.1.9

package/assembly/index.ts

@@ -424,7 +424,7 @@ export namespace JSON {
     // @ts-ignore: type
     private storage: Map<string, JSON.Value> = new Map<string, JSON.Value>();
 
-    constructor() { }
+    constructor() {}
 
     // @ts-ignore: decorator
     @inline get size(): i32 {
@@ -626,7 +626,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;

package/assembly/test.ts

@@ -1,292 +1,57 @@
 import { JSON } from ".";
-import { bytes } from "./util";
+import { expect, it } from "./__tests__/lib";
+
+it("should parse", () => {
+  const str = `{
+  "id": "chatcmpl-BbvlnP0ESWa8OForeEjt7AkoIuh3Q",
+  "object": "chat.completion",
+  "created": 1748379903,
+  "model": "gpt-4o-mini-2024-07-18",
+  "choices": [
+    {
+      "index": 0,
+      "message": {
+        "role": "assistant",
+        "content": "Hello! How can I assist you today?",
+        "refusal": null,
+        "annotations": []
+      },
+      "logprobs": null,
+      "finish_reason": "stop"
+    }
+  ],
+  "usage": {
+    "prompt_tokens": 15,
+    "completion_tokens": 9,
+    "total_tokens": 24,
+    "prompt_tokens_details": {
+      "cached_tokens": 0,
+      "audio_tokens": 0
+    },
+    "completion_tokens_details": {
+      "reasoning_tokens": 0,
+      "audio_tokens": 0,
+      "accepted_prediction_tokens": 0,
+      "rejected_prediction_tokens": 0
+    }
+  },
+  "service_tier": "default",
+  "system_fingerprint": "fp_34a54ae93c"
+}`;
+
+  const output = JSON.parse<OpenAIChatOutput>(str);
+
+  expect(output.id).toBe("chatcmpl-BbvlnP0ESWa8OForeEjt7AkoIuh3Q");
+  expect(output.object).toBe("chat.completion");
+  expect(output.model).toBe("gpt-4o-mini-2024-07-18");
+  expect(output.system_fingerprint).toBe("fp_34a54ae93c"); // fails ("")
+});
 
-// @json
-// class Obj {
-//   public a: string = "hello";
-//   public b: string = "world";
-//   public 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[];
-//   // Drop in a code block, function, or expression that evaluates to a boolean
-//   @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 dataSize = bytes(data);
-
-//     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 = "";
-// }
-
-// 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,
-// };
-
-// const a1 = JSON.stringify("\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000a\u000b\u000c\u000d\u000e\u000f\u000f\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f");
-// // console.log("Bytes    " + bytes(a1).toString());
-// console.log("a1: " + a1);
-
-// const obj = new Obj();
-// const a2 = JSON.stringify(obj);
-// // console.log("Bytes    " + bytes(a2).toString());
-// console.log("a2: " + a2);
-
-// const a3 = JSON.stringify(player);
-// // console.log("Bytes    " + bytes(a3).toString());
-// console.log("a3: " + a3);
-
-// const a4 = new JSON.Obj();
-
-// a4.set("x", 1.5);
-// a4.set("y", 5.4);
-// a4.set("z", 9.8);
-// a4.set("obj", obj);
-// a4.set<boolean>("bool", false);
-
-// console.log("a4: " + JSON.stringify(a4));
-
-// const a5 = JSON.parse<JSON.Obj>('{"foo":"bar"}');
-
-// console.log("a5: " + JSON.stringify(a5));
-
-// const a6 = JSON.parse<JSON.Obj>('{"x":1.5,"y":5.4,"z":9.8,"obj":{"foo":"bar"}}');
-
-// console.log("a6: " + JSON.stringify(a6));
-
-// const a7 = JSON.parse<JSON.Value[]>('["string",true,3.14,{"x":1.0,"y":2.0,"z":3.0},[1,2,3,true]]');
-
-// console.log("a7: " + JSON.stringify(a7));
-
-// const a8 = JSON.stringify(["hello", JSON.stringify("world"), "working?"]);
-
-// console.log("a8: " + a8);
-
-// const a9 = JSON.stringify<JSON.Raw>(JSON.Raw.from('"hello world"'));
-
-// console.log("a9: " + a9);
-
-// const m10 = new Map<string, JSON.Raw>();
-// m10.set("hello", new JSON.Raw('"world"'));
-// m10.set("pos", new JSON.Raw('{"x":1.0,"y":2.0,"z":3.0}'));
-
-// const a10 = JSON.stringify(m10);
-
-// console.log("a10: " + a10);
-
-// const a11 = JSON.parse<JSON.Obj>('  {  "x"  :  3.4  ,  "y"   :   1.2    ,  "z"  :  8.3   }     ');
-
-// console.log("a11: " + JSON.stringify(a11));
-
-// const a12 = JSON.parse<InnerObj<ObjWithBracketString>>('{"obj":{"data":"hello} world"}}');
-
-// console.log("a12: " + JSON.stringify(a12));
-
-// const a13 = JSON.stringify<JSON.Obj>(new JSON.Obj());
-
-// console.log("a13: " + a13);
-
-// const a14 = JSON.stringify(new Point());
-// console.log("a14: " + a14);
-
-// const a15 = JSON.parse<Point>(a14);
-// console.log("a15: " + JSON.stringify(a15));
-
-// const a16 = JSON.stringify(new NewPoint(1.0, 2.0));
-// console.log("a16: " + a16);
-
-// const a17 = JSON.parse<NewPoint>(a16);
-// console.log("a17: " + JSON.stringify(a17));
-
-// const a18 = JSON.parse<JSON.Obj[]>('[{"x":1.0,"y":2.0,"z":3.0},{"x":4.0,"y":5.0,"z":6.0},{"x":7.0,"y":8.0,"z":9.0}]');
-// console.log("a18: " + JSON.stringify(a18));
-
-// const a19 = JSON.stringify<JSON.Obj[]>(a18);
-// console.log("a19: " + a19);
-
-// const a20 = JSON.parse<JSON.Box<f64>[]>("[1.3,4.7,9.5]");
-// console.log("a20: " + JSON.stringify(a20));
-
-// const a21 = JSON.stringify<JSON.Box<f64>[]>(a20);
-// console.log("a21: " + a21);
-
-// const a22 = JSON.parse<Foo>('{"id":"0xb8","firstName":"Jairus","lastName":"Tanaka"}');
-// console.log("a22: " + JSON.stringify(a22));
-
-
-// @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]; // e.g. 0 = password, 1 = OTP
-//   record: string = "ICP 12345678";
-//   regCompanyAudit: i32 = 2;
-//   regCompanyPipeline: i32[] = [101, 102, 103];
-//   regPwdLimit: i32 = 8; // min password length
-//   serverTime: i64 = 1650000000000; // dummy timestamp
-//   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; // e.g. 1 = modern, 0 = legacy
-// }
-
-// const a23 = JSON.stringify(new SrvInfo());
-// console.log("a23: " + a23);
-
-// const a24 = '{"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}';
-// console.log("a25: " + (a24 == a23).toString());
-
-// const a26 = JSON.parse<SrvInfo>(a23);
-// console.log("a26: " + JSON.stringify(a26));
-
-// console.log("a27: " + (JSON.stringify(a26) == a23).toString())
-import {
-  bs
-} from "../lib/as-bs"
 
 @json
-class GenericEnum<T> {
-  private tag: string = ""
-  private value: T | null = null
-
-  constructor() {
-    this.tag = ""
-    this.value = null
-  }
-
-  static create<T>(tag: string, value: T): GenericEnum<T> {
-    const item = new GenericEnum<T>()
-    item.tag = tag
-    item.value = value
-    return item
-  }
-
-  getTag(): string {
-    return this.tag
-  }
-
-  getValue(): T | null {
-    return this.value
-  }
-  @serializer
-  serialize<T>(self: GenericEnum<T>): string {
-    const tagJson = JSON.stringify(self.tag);
-    const valueJson = JSON.stringify(self.value);
-    return `{${tagJson}:${valueJson}}`
-  }
-  @deserializer
-  deserialize(data: string): GenericEnum<T> {
-    const parsed = JSON.parse<Map<string, JSON.Raw>>(data);
-    const result = new GenericEnum<T>();
-
-    const keys = parsed.keys();
-    const values = parsed.values();
-
-    result.tag = keys[0];
-    result.value = JSON.parse<T>(values[0].data);
-
-    return result;
-  }
+class OpenAIChatOutput {
+  id!: string;
+  object!: string;
+  model!: string;
+  system_fingerprint!: string;
 }
-
-@json
-class Node<T> {
-  name: string
-  id: u32
-  data: T
-
-  constructor() {
-    this.name = ""
-    this.id = 0
-    this.data = changetype<T>(0);
-  }
-}
-
-const enumValue = GenericEnum.create<string>("success", "Hello World")
-
-const node = new Node<GenericEnum<string>>();
-node.name = "test-node";
-node.id = 42;
-node.data = enumValue;
-
-const serialized = JSON.stringify(node);
-console.log("Serialized Node: " + serialized);
-
-const deserialized = JSON.parse<JSON.Obj>(serialized)
-console.log("Deserialized Node: " + JSON.stringify(deserialized));

package/index.ts

@@ -1 +1 @@
-export { JSON } from "./assembly/index";
+export { JSON } from "./assembly/index";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "author": "Jairus Tanaka",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",