json-as 1.4.0 → 1.6.0

package/lib/as-bs.ts

@@ -40,15 +40,17 @@ export namespace bs {
    * Using bit shifts for efficiency: alpha = 1/8, so (1 - alpha) = 7/8
    * @param newSize - The new size to incorporate into the average
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline function updateTypicalSize(newSize: usize): void {
-    // EMA: typicalSize = (newSize >> 3) + typicalSize - (typicalSize >> 3)
-    // Simplified: typicalSize += (newSize - typicalSize) >> 3
-    typicalSize += (newSize - typicalSize) >> EMA_ALPHA_SHIFT;
+  function updateTypicalSize(newSize: usize): void {
+    // Keep the delta unsigned in both directions. `(newSize - typicalSize)`
+    // underflows when output shrinks because usize arithmetic wraps.
+    if (newSize >= typicalSize) {
+      typicalSize += (newSize - typicalSize) >> EMA_ALPHA_SHIFT;
+    } else {
+      typicalSize -= (typicalSize - newSize) >> EMA_ALPHA_SHIFT;
+    }
   }
 
-  // @ts-expect-error: @inline is a valid decorator
-  @inline function renewBuffer(newSize: usize): void {
+  function renewBuffer(newSize: usize): void {
     const oldPtr = buffer;
     const relOffset = offset - oldPtr;
     const newPtr = heap.realloc(oldPtr, newSize);
@@ -57,8 +59,7 @@ export namespace bs {
     bufferSize = newSize;
   }
 
-  // @ts-expect-error: @inline is a valid decorator
-  @inline function reserve(requiredSize: usize, extra: usize): void {
+  function reserve(requiredSize: usize, extra: usize): void {
     if (requiredSize <= bufferSize) return;
     // Grow aggressively (2x) to minimize realloc frequency in hot serialization paths.
     let next = bufferSize << 1;
@@ -67,12 +68,14 @@ export namespace bs {
     renewBuffer(next);
   }
 
-  // @ts-expect-error: @inline is a valid decorator
-  @inline function finalizeDynamicOutput(len: usize): void {
+  function finalizeDynamicOutput(len: usize): void {
     counter += 1;
-    updateTypicalSize(len);
-    if ((counter & SHRINK_EVERY_N_MASK) == 0 && bufferSize > typicalSize << 2) {
-      resize(u32(typicalSize << 1));
+    // Resizing is intentionally sampled. Updating an EMA on every tiny
+    // stringify used to put several integer ops on the hottest return path even
+    // though we only consult it once per 256 outputs.
+    if ((counter & SHRINK_EVERY_N_MASK) == 0) {
+      updateTypicalSize(len);
+      if (bufferSize > typicalSize << 2) resize(u32(typicalSize << 1));
     }
     offset = buffer;
     stackSize = 0;
@@ -83,8 +86,7 @@ export namespace bs {
   /**
    * Stores the state of the buffer, allowing further changes to be reset
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function saveState(): void {
+  export function saveState(): void {
     pauseOffsets.push(offset - buffer);
     pauseStackSizes.push(stackSize);
   }
@@ -93,8 +95,7 @@ export namespace bs {
    * 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-expect-error: @inline is a valid decorator
-  @inline export function loadState(): void {
+  export function loadState(): void {
     const length = pauseOffsets.length;
     if (length == 0) return;
     const index = length - 1;
@@ -109,10 +110,11 @@ export namespace bs {
    * serialize/deserialize op mid-flight: a partial run can leave `offset`
    * advanced and the pause stacks non-empty, which would corrupt the next op.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function reset(): void {
+  export function reset(): void {
     offset = buffer;
     stackSize = 0;
+    cacheOutput = 0;
+    cacheOutputLen = 0;
     pauseOffsets.length = 0;
     pauseStackSizes.length = 0;
   }
@@ -122,8 +124,7 @@ export namespace bs {
    * If necessary, reallocates the buffer to the exact new size.
    * @param size - The size to propose.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function ensureSize(size: u32): void {
+  export function ensureSize(size: u32): void {
     reserve(offset - buffer + usize(size), MIN_BUFFER_SIZE);
   }
 
@@ -132,8 +133,7 @@ export namespace bs {
    * If necessary, reallocates the buffer to the exact new size.
    * @param size - The size to propose.w
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function proposeSize(size: u32): void {
+  export function proposeSize(size: u32): void {
     stackSize += size;
     reserve(stackSize, 0);
   }
@@ -143,8 +143,7 @@ export namespace bs {
    * If necessary, reallocates the buffer to the exact new size.
    * @param size - The size to grow by.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function growSize(size: u32): void {
+  export function growSize(size: u32): void {
     stackSize += size;
     reserve(stackSize, MIN_BUFFER_SIZE);
   }
@@ -153,8 +152,7 @@ export namespace bs {
    * Resizes the buffer to the specified size.
    * @param newSize - The new buffer size.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function resize(newSize: u32): void {
+  export function resize(newSize: u32): void {
     const oldPtr = buffer;
     const relOffset = offset - oldPtr;
     const newPtr = heap.realloc(buffer, newSize);
@@ -168,8 +166,7 @@ export namespace bs {
    * finalization. Keeps enough capacity for the recent typical output size while
    * releasing clearly excess memory.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function shrink(): void {
+  export function shrink(): void {
     let next = typicalSize << 1;
     if (next < MIN_BUFFER_SIZE) next = MIN_BUFFER_SIZE;
     if (bufferSize > next) {
@@ -184,8 +181,20 @@ export namespace bs {
    * 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-expect-error: @inline is a valid decorator
-  @inline export function cpyOut<T>(): T {
+  export function cpyOut<T>(): T {
+    if (cacheOutput !== 0) {
+      // A nested/internal stringify can still cover its complete local output
+      // with a cached source slice when its saved offset is zero. Copy that
+      // slice and restore the caller's staging state just like the regular
+      // paused-buffer branch below.
+      // @ts-expect-error: __new is a runtime builtin
+      const _out = __new(cacheOutputLen, idof<T>());
+      memory.copy(_out, cacheOutput, cacheOutputLen);
+      cacheOutput = 0;
+      cacheOutputLen = 0;
+      bs.loadState();
+      return changetype<T>(_out);
+    }
     if (pauseOffsets.length == 0) {
       const len = offset - buffer;
       // @ts-expect-error: __new is a runtime builtin
@@ -214,8 +223,7 @@ export namespace bs {
    * Note: this restores only `offset`. Deserialization paths do not currently depend on
    * `stackSize`, which is tracked for serialization growth heuristics.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function sliceOut<T>(start: usize): T {
+  export function sliceOut<T>(start: usize): T {
     const sliceStart = buffer + start;
     const len = offset - sliceStart;
     // @ts-expect-error: __new is a runtime builtin
@@ -229,8 +237,7 @@ export namespace bs {
    * Copies the slice starting at a caller-provided relative buffer offset into a string field
    * and restores `offset` back to that slice start.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function toField(start: usize, dstFieldPtr: usize): void {
+  export function toField(start: usize, dstFieldPtr: usize): void {
     const sliceStart = buffer + start;
     const byteLength = <u32>(offset - sliceStart);
     if (byteLength == 0) {
@@ -265,8 +272,7 @@ export namespace bs {
    * adaptive buffer management - shrinks buffer when consistently oversized.
    * @returns The new object containing the buffer's content.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function out<T>(): T {
+  export function out<T>(): T {
     let out: usize;
     if (cacheOutput === 0) {
       const len = offset - buffer;
@@ -296,8 +302,7 @@ export namespace bs {
    * can pass an empty/uninitialized target on the first call. Mirrors the reuse
    * policy of `toField`, but for the top-level return value.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function outTo<T>(target: usize): T {
+  export function outTo<T>(target: usize): T {
     if (target < __heap_base) return out<T>();
     let len: usize;
     let src: usize;
@@ -309,7 +314,7 @@ export namespace bs {
       src = cacheOutput;
     }
     let dst = target;
-    if (changetype<OBJECT>(target - TOTAL_OVERHEAD).rtSize != len) {
+    if (changetype<OBJECT>(target - TOTAL_OVERHEAD).rtSize != <u32>len) {
       // @ts-expect-error: __renew is a runtime builtin
       dst = __renew(target, len);
     }
@@ -371,12 +376,9 @@ export namespace bs {
  * avoiding re-serialization of previously seen strings.
  */
 export namespace sc {
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export const ENTRY_KEY = offsetof<sc.Entry>("key");
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export const ENTRY_PTR = offsetof<sc.Entry>("ptr");
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export const ENTRY_LEN = offsetof<sc.Entry>("len");
+  export const ENTRY_KEY = offsetof<sc.Entry>("key");
+  export const ENTRY_PTR = offsetof<sc.Entry>("ptr");
+  export const ENTRY_LEN = offsetof<sc.Entry>("len");
 
   // @ts-expect-error: JSON_CACHE may not be defined. If so, it will default to false.
   export const CACHE_ENABLED: bool = isDefined(JSON_CACHE) ? JSON_CACHE : false;
@@ -425,8 +427,7 @@ export namespace sc {
    * Uses pointer address shifted right by 4 bits (aligned to 16-byte boundaries)
    * masked to fit within cache size.
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline
+
   export function indexFor(ptr: usize): usize {
     return (ptr >> 4) & CACHE_MASK;
   }
@@ -437,8 +438,7 @@ export namespace sc {
    * @param key - The string pointer to look up
    * @returns true if cache hit, false if cache miss
    */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline
+
   export function tryEmitCached(key: usize): bool {
     const e = unchecked(entries[indexFor(key)]);
     if (e.key == key) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "json-as",
-  "version": "1.4.0",
-  "author": "Jairus Tanaka",
+  "version": "1.6.0",
+  "author": "Jairus Tanaka <me@jairus.dev>",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/JairusSW/json-as.git"
@@ -11,15 +11,16 @@
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
     "@eslint/js": "^10.0.1",
-    "@types/node": "^25.9.1",
+    "@types/node": "^25.9.2",
     "as-heap-analyzer": "^1.2.0",
-    "as-test": "^1.6.0",
-    "assemblyscript": "^0.28.17",
+    "as-test": "github:JairusSW/as-test#332ae81bedeb68b98b824563c6efe7e050eaef4e",
+    "assemblyscript": "^0.28.18",
     "assemblyscript-json": "^1.1.0",
     "assemblyscript-prettier": "^3.0.4",
+    "canvas": "^3.2.3",
     "chartjs-node-canvas": "^5.0.0",
     "chartjs-plugin-datalabels": "^2.2.0",
-    "eslint": "^10.4.0",
+    "eslint": "^10.4.1",
     "fast-json-parse": "^1.0.3",
     "fast-json-stringify": "^6.4.0",
     "husky": "^9.1.7",
@@ -29,7 +30,8 @@
     "tinybench": "^6.0.2",
     "try-as": "^1.1.4",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.60.0"
+    "typescript-eslint": "^8.60.1",
+    "warpo": "^3.1.1"
   },
   "bugs": {
     "url": "https://github.com/JairusSW/json-as/issues"
@@ -46,6 +48,7 @@
     "Loredana Cirstea",
     "Accipiter Nisus",
     "Deon Groenewald",
+    "Guillermo Diez",
     "yoyo837"
   ],
   "description": "The only JSON library you'll need for AssemblyScript with SIMD and SWAR",
@@ -98,10 +101,16 @@
     "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:all": "bash ./scripts/bench-all.sh",
     "bench:as": "bash ./scripts/run-bench.as.sh",
     "bench:js": "bash ./scripts/run-bench.js.sh",
+    "bench:runtimes": "bash ./scripts/run-bench.runtimes.sh",
+    "bench:warpo": "bash ./scripts/run-bench.warpo.sh",
     "charts": "bun run charts:build && bun run charts:serve",
     "charts:build": "bash ./scripts/build-charts.sh",
+    "charts:runtimes": "bun ./scripts/build-chart-runtimes.ts",
+    "charts:warpo": "bun ./scripts/build-chart-warpo.ts",
+    "charts:rfc": "bun ./scripts/build-rfc-coverage.ts",
     "charts:publish": "bash ./scripts/publish-benchmarks.sh",
     "charts:serve": "serve ./build/charts/",
     "build:test": "JSON_DEBUG=0 JSON_WRITE=assembly/test.ts asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --enable simd --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
@@ -111,10 +120,15 @@
     "test:wasmer": "wasmer ./build/test.wasm",
     "build:transform": "tsc -p ./transform",
     "build:playground": "npm run build:transform && JSON_DEBUG=0 JSON_WRITE=assembly/playground.ts asc assembly/playground.ts --transform ./transform -o ./build/playground.wasm --textFile ./build/playground.wat --enable simd --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
+    "build:playground:nosimd": "npm run build:transform && JSON_DEBUG=0 JSON_WRITE=assembly/playground.ts asc assembly/playground.ts --transform ./transform -o ./build/playground.wasm --textFile ./build/playground.wat --disable simd --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
     "build:pg": "npm run build:playground",
     "run:playground": "wasmtime ./build/playground.wasm",
     "run:pg": "npm run run:playground",
     "playground": "npm run build:playground && npm run run:playground",
+    "playground:nosimd": "npm run build:playground:nosimd && npm run run:playground",
+    "build:playground:tmp": "asc assembly/playground.tmp.ts -o ./build/playground.tmp.wasm --textFile ./build/playground.tmp.wat -O3 --noAssert --uncheckedBehavior always --runtime incremental --enable bulk-memory --enable simd --use JSON_MODE=1 --exportStart start --exportRuntime",
+    "playground:tmp": "npm run build:playground:tmp && v8 --no-liftoff --module ./bench/runners/assemblyscript.js -- playground.tmp.wasm",
+    "pg:tmp": "npm run playground:tmp",
     "play": "npm run playground",
     "pg": "npm run playground",
     "bench:wasmer": "wasmer ./build/bench.wasm --llvm",
@@ -132,5 +146,8 @@
     "prepare": "husky"
   },
   "type": "module",
-  "types": "assembly/index.ts"
+  "types": "assembly/index.ts",
+  "dependencies": {
+    "xjb-as": "^0.1.0"
+  }
 }

package/transform/lib/index.d.ts

@@ -21,6 +21,12 @@ export declare class JSONTransform extends Visitor {
     private collectInheritedFieldMembers;
     visitClassDeclarationRef(node: ClassDeclaration): void;
     resolveType(type: string, source: Src, visited?: Set<string>): string;
+    private getDefaultSchema;
+    private getDefaultElementType;
+    private getDefaultExpressionJSON;
+    private getImplicitDefaultJSON;
+    private getDefaultObjectJSON;
+    private getDefaultMatcherSource;
     visitClassDeclaration(node: ClassDeclaration): void;
     getSchema(name: string): Schema | null;
     generateEmptyMethods(node: ClassDeclaration): void;