json-as 1.1.7 → 1.1.9

package/assembly/index.ts

@@ -515,6 +515,12 @@ export namespace JSON {
     }
   }
 
+  /**
+   * Serializes JSON data but writes directly to the buffer.
+   * Should only be used if you know what you are doing.
+   * @param src - T
+   * @returns void
+   */
   export function __serialize<T>(src: T): void {
     if (isBoolean<T>()) {
       serializeBool(src as bool);
@@ -565,6 +571,14 @@ export namespace JSON {
     }
   }
 
+  /**
+   * Deserializes JSON data directly from the buffer.
+   * Should only be used if you know what you are doing.
+   * @param srcStart - usize
+   * @param srcEnd - usize
+   * @param dst - usize
+   * @returns void
+   */
   export function __deserialize<T>(srcStart: usize, srcEnd: usize, dst: usize = 0): T {
     if (isBoolean<T>()) {
       // @ts-ignore: type
@@ -625,6 +639,127 @@ export namespace JSON {
       return changetype<string>(out);
     }
   }
+  /**
+   * Methods for use when using JSON methods inside another JSON method or custom serializer/deserializer.
+   */
+  export namespace internal {
+    /**
+     * Serializes JSON data. Don't use this directly, use `JSON.stringify` instead.
+     * @param data - T
+     * @param out - string | null
+     * @returns - string
+     */
+    // @ts-ignore: inline
+    @inline export function stringify<T>(data: T, out: string | null = null): string {
+      if (isBoolean<T>()) {
+        if (out) {
+          if (<bool>data == true) {
+            out = changetype<string>(__renew(changetype<usize>(out), 8));
+            store<u64>(changetype<usize>(out), 28429475166421108);
+          } else {
+            out = changetype<string>(__renew(changetype<usize>(out), 10));
+            store<u64>(changetype<usize>(out), 32370086184550502);
+            store<u16>(changetype<usize>(out), 101, 8);
+          }
+          return out;
+        }
+        return data ? "true" : "false";
+      } else if (isInteger<T>() && !isSigned<T>() && nameof<T>() == "usize" && data == 0) {
+        if (out) {
+          out = changetype<string>(__renew(changetype<usize>(out), 8));
+          store<u64>(changetype<usize>(out), 30399761348886638);
+          return out;
+        }
+        return NULL_WORD;
+      } else if (isInteger<T>(data)) {
+        if (out) {
+          out = changetype<string>(__renew(changetype<usize>(out), sizeof<T>() << 3));
+
+          // @ts-ignore
+          const bytes = itoa_buffered(changetype<usize>(out), data) << 1;
+          return (out = changetype<string>(__renew(changetype<usize>(out), bytes)));
+        }
+        return data.toString();
+      } else if (isFloat<T>(data)) {
+        if (out) {
+          out = changetype<string>(__renew(changetype<usize>(out), 64));
+
+          // @ts-ignore
+          const bytes = dtoa_buffered(changetype<usize>(out), data) << 1;
+          return (out = changetype<string>(__renew(changetype<usize>(out), bytes)));
+        }
+        return data.toString();
+        // @ts-ignore: Function is generated by transform
+      } else if (isNullable<T>() && changetype<usize>(data) == <usize>0) {
+        if (out) {
+          out = changetype<string>(__renew(changetype<usize>(out), 8));
+          store<u64>(changetype<usize>(out), 30399761348886638);
+          return out;
+        }
+        return NULL_WORD;
+        // @ts-ignore
+      } else if (isString<nonnull<T>>()) {
+        // if (out) {
+        //   out = changetype<string>(__renew(changetype<usize>(out), bytes(data) + 4));
+        //   // const oldSize = bs.byteLength;
+        //   const oldBuf = bs.buffer;
+        //   const newSize = bytes(data) + 4;
+        //   const newBuf = __new(newSize, idof<string>());
+        //   bs.setBuffer(newBuf);
+        //   serializeString(changetype<string>(data));
+        //   bs.setBuffer(oldBuf);
+        //   return changetype<string>(newBuf);
+        // }
+        // if (ASC_FEATURE_SIMD) {
+        //   serializeString_SIMD(data as string);
+        // } else {
+        bs.saveState();
+        serializeString(data as string);
+        // }
+        return bs.cpyOut<string>();
+        // @ts-ignore: Supplied by transform
+      } else if (isDefined(data.__SERIALIZE)) {
+        bs.saveState();
+        // @ts-ignore
+        inline.always(data.__SERIALIZE(changetype<usize>(data)));
+        return bs.cpyOut<string>();
+        // @ts-ignore: Supplied by transform
+      } else if (data instanceof Date) {
+        out = out ? changetype<string>(__renew(changetype<usize>(out), 52)) : changetype<string>(__new(52, idof<string>()));
+
+        store<u16>(changetype<usize>(out), QUOTE);
+        memory.copy(changetype<usize>(out) + 2, changetype<usize>(data.toISOString()), 48);
+        store<u16>(changetype<usize>(out), QUOTE, 50);
+        return changetype<string>(out);
+      } else if (data instanceof Array) {
+        bs.saveState();
+        // @ts-ignore
+        inline.always(serializeArray(changetype<nonnull<T>>(data)));
+        return bs.cpyOut<string>();
+      } else if (data instanceof Map) {
+        bs.saveState();
+        // @ts-ignore
+        inline.always(serializeMap(changetype<nonnull<T>>(data)));
+        return bs.cpyOut<string>();
+      } else if (data instanceof JSON.Raw) {
+        bs.saveState();
+        serializeRaw(data);
+        return bs.cpyOut<string>();
+      } else if (data instanceof JSON.Value) {
+        bs.saveState();
+        inline.always(serializeArbitrary(data));
+        return bs.cpyOut<string>();
+      } else if (data instanceof JSON.Obj) {
+        bs.saveState();
+        inline.always(serializeObject(data));
+        return bs.cpyOut<string>();
+      } else if (data instanceof JSON.Box) {
+        return JSON.internal.stringify(data.value);
+      } else {
+        throw new Error(`Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`);
+      }
+    }
+  }
 }
 
 // @ts-ignore: decorator

package/assembly/test.ts

@@ -1,218 +1,57 @@
 import { JSON } from ".";
-import { bytes } from "./util";
-
-@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,
+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
+    }
   },
-  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"}');
+  "service_tier": "default",
+  "system_fingerprint": "fp_34a54ae93c"
+}`;
 
-console.log("a5: " + JSON.stringify(a5));
+  const output = JSON.parse<OpenAIChatOutput>(str);
 
-const a6 = JSON.parse<JSON.Obj>('{"x":1.5,"y":5.4,"z":9.8,"obj":{"foo":"bar"}}');
+  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 ("")
+});
 
-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
+class OpenAIChatOutput {
+  id!: string;
+  object!: string;
+  model!: string;
+  system_fingerprint!: string;
 }
-
-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())

package/index.ts

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

package/lib/as-bs.ts

@@ -16,6 +16,39 @@ export namespace bs {
   /** Proposed size of output */
   export let stackSize: usize = 0;
 
+  let pauseOffset: usize = 0;
+  let pauseStackSize: usize = 0;
+
+  /**
+   * Stores the state of the buffer, allowing further changes to be reset
+   */
+  // @ts-ignore: decorator
+  @inline export function saveState(): void {
+    pauseOffset = offset;
+    pauseStackSize = stackSize;
+  }
+
+  /**
+   * Resets the buffer to the state it was in when `pause()` was called.
+   * This allows for changes made after the pause to be discarded.
+   */
+  // @ts-ignore: decorator
+  @inline export function loadState(): void {
+    offset = pauseOffset;
+    stackSize = pauseStackSize;
+  }
+
+  /**
+   * Resets the buffer to the state it was in when `pause()` was called.
+   * This allows for changes made after the pause to be discarded.
+   */
+  // @ts-ignore: decorator
+  @inline export function resetState(): void {
+    offset = pauseOffset;
+    stackSize = pauseStackSize;
+    pauseOffset = 0;
+  }
+
   /**
    * Proposes that the buffer size is should be greater than or equal to the proposed size.
    * If necessary, reallocates the buffer to the exact new size.
@@ -85,6 +118,28 @@ export namespace bs {
     stackSize = 0;
   }
 
+  /**
+   * Copies the buffer's content to a new object of a specified type. Does not shrink the buffer.
+   * @returns The new object containing the buffer's content.
+   */
+  // @ts-ignore: Decorator valid here
+  @inline export function cpyOut<T>(): T {
+    if (pauseOffset == 0) {
+      const len = offset - changetype<usize>(buffer);
+      // @ts-ignore: exists
+      const _out = __new(len, idof<T>());
+      memory.copy(_out, changetype<usize>(buffer), len);
+      return changetype<T>(_out);
+    } else {
+      const len = offset - pauseOffset;
+      // @ts-ignore: exists
+      const _out = __new(len, idof<T>());
+      memory.copy(_out, pauseOffset, len);
+      bs.loadState();
+      return changetype<T>(_out);
+    }
+  }
+
   /**
    * Copies the buffer's content to a new object of a specified type.
    * @returns The new object containing the buffer's content.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "author": "Jairus Tanaka",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
@@ -19,7 +19,7 @@
     "test": "bash ./run-tests.sh",
     "bench:as": "bash ./run-bench.as.sh",
     "bench:js": "bash ./run-bench.js.sh",
-    "build:test": "rm -rf ./build/ && JSON_STRICT=true JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
+    "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
     "build:test:simd": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0 --enable simd --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:wasmer": "wasmer ./build/test.wasm",