json-as 1.3.0 → 1.3.2

package/lib/as-bs.ts

@@ -1,9 +1,9 @@
 import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
-import { heap } from "memory";
+import { __heap_base, heap } from "memory";
 
 // Buffer management constants
 const SHRINK_EVERY_N_MASK: usize = 255; // check every 256 outputs
-const MIN_BUFFER_SIZE: usize = 128;
+const MIN_BUFFER_SIZE: usize = 1024;
 
 // Exponential moving average smoothing factor (0.0 to 1.0)
 // Higher values = more responsive to recent sizes, lower = more stable
@@ -26,8 +26,8 @@ export namespace bs {
   /** Proposed size of output */
   export let stackSize: usize = 0;
 
-  let pauseOffset: usize = 0;
-  let pauseStackSize: usize = 0;
+  let pauseOffsets = new Array<usize>();
+  let pauseStackSizes = new Array<usize>();
 
   // Exponential moving average of output sizes for adaptive buffer sizing
   // This provides smoother adaptation than simple averaging
@@ -50,10 +50,9 @@ export namespace bs {
   // @ts-expect-error: @inline is a valid decorator
   @inline function renewBuffer(newSize: usize): void {
     const oldPtr = buffer;
+    const relOffset = offset - oldPtr;
     const newPtr = heap.realloc(oldPtr, newSize);
-    const delta = newPtr - oldPtr;
-    offset += delta;
-    if (pauseOffset != 0) pauseOffset += delta;
+    offset = newPtr + relOffset;
     buffer = newPtr;
     bufferSize = newSize;
   }
@@ -81,24 +80,13 @@ export namespace bs {
 
   export let cacheOutput: usize = 0;
   export let cacheOutputLen: usize = 0;
-
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function digestArena(): void {
-    if (cacheOutput === 0) return;
-    const len = cacheOutputLen;
-    proposeSize(<u32>len);
-    memory.copy(offset, cacheOutput, len);
-    offset += len;
-    bs.cacheOutput = 0;
-    bs.cacheOutputLen = 0;
-  }
   /**
    * 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 {
-    pauseOffset = offset;
-    pauseStackSize = stackSize;
+    pauseOffsets.push(offset - buffer);
+    pauseStackSizes.push(stackSize);
   }
 
   /**
@@ -107,19 +95,13 @@ export namespace bs {
    */
   // @ts-expect-error: @inline is a valid 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-expect-error: @inline is a valid decorator
-  @inline export function resetState(): void {
-    offset = pauseOffset;
-    stackSize = pauseStackSize;
-    pauseOffset = 0;
+    const length = pauseOffsets.length;
+    if (length == 0) return;
+    const index = length - 1;
+    offset = buffer + unchecked(pauseOffsets[index]);
+    stackSize = unchecked(pauseStackSizes[index]);
+    pauseOffsets.length = index;
+    pauseStackSizes.length = index;
   }
 
   /**
@@ -161,13 +143,28 @@ export namespace bs {
   // @ts-expect-error: @inline is a valid decorator
   @inline export function resize(newSize: u32): void {
     const oldPtr = buffer;
+    const relOffset = offset - oldPtr;
     const newPtr = heap.realloc(buffer, newSize);
-    const delta = newPtr - oldPtr;
-    if (pauseOffset != 0) pauseOffset += delta;
     buffer = newPtr;
     bufferSize = newSize;
-    offset = buffer;
-    stackSize = 0;
+    offset = buffer + relOffset;
+  }
+
+  /**
+   * Shrinks the buffer using the same adaptive sizing policy as normal output
+   * 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 {
+    let next = typicalSize << 1;
+    if (next < MIN_BUFFER_SIZE) next = MIN_BUFFER_SIZE;
+    if (bufferSize > next) {
+      resize(u32(next));
+    } else {
+      offset = buffer;
+      stackSize = 0;
+    }
   }
 
   /**
@@ -176,13 +173,14 @@ export namespace bs {
    */
   // @ts-expect-error: @inline is a valid decorator
   @inline export function cpyOut<T>(): T {
-    if (pauseOffset == 0) {
+    if (pauseOffsets.length == 0) {
       const len = offset - buffer;
       // @ts-expect-error: __new is a runtime builtin
       const _out = __new(len, idof<T>());
       memory.copy(_out, buffer, len);
       return changetype<T>(_out);
     } else {
+      const pauseOffset = buffer + unchecked(pauseOffsets[pauseOffsets.length - 1]);
       const len = offset - pauseOffset;
       // @ts-expect-error: __new is a runtime builtin
       const _out = __new(len, idof<T>());
@@ -192,6 +190,62 @@ export namespace bs {
     }
   }
 
+
+  /**
+   * Copies the slice starting at a caller-provided relative buffer offset and restores
+   * `offset` back to that slice start.
+   *
+   * This is intended for deserializers that borrow `bs` as temporary scratch space and
+   * already know their local slice start as `bs.offset - bs.buffer`.
+   *
+   * 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 {
+    const sliceStart = buffer + start;
+    const len = offset - sliceStart;
+    // @ts-expect-error: __new is a runtime builtin
+    const _out = __new(len, idof<T>());
+    memory.copy(_out, sliceStart, len);
+    offset = sliceStart;
+    return changetype<T>(_out);
+  }
+
+  /**
+   * 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 {
+    const sliceStart = buffer + start;
+    const byteLength = <u32>(offset - sliceStart);
+    if (byteLength == 0) {
+      store<usize>(dstFieldPtr, changetype<usize>(""));
+      offset = sliceStart;
+      return;
+    }
+
+    const current = load<usize>(dstFieldPtr);
+    let stringPtr: usize;
+    if (current >= __heap_base) {
+      if (changetype<OBJECT>(current - TOTAL_OVERHEAD).rtSize == byteLength) {
+        stringPtr = current;
+      } else {
+        // @ts-expect-error: __renew is a runtime builtin
+        stringPtr = __renew(current, byteLength);
+        store<usize>(dstFieldPtr, stringPtr);
+      }
+    } else {
+      // @ts-expect-error: __new is a runtime builtin
+      stringPtr = __new(byteLength, idof<string>());
+      store<usize>(dstFieldPtr, stringPtr);
+    }
+
+    memory.copy(stringPtr, sliceStart, byteLength);
+    offset = sliceStart;
+  }
+
   /**
    * Copies the buffer's content to a new object of a specified type.
    * Uses exponential moving average to track typical output sizes for
@@ -220,38 +274,6 @@ export namespace bs {
     }
     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.
-   */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function view<T>(): T {
-    const len = offset - buffer;
-    // @ts-expect-error: __new is a runtime builtin
-    const _out = __new(len, idof<T>());
-    memory.copy(_out, buffer, len);
-    return changetype<T>(_out);
-  }
-
-  /**
-   * Copies the buffer's content to a given destination pointer.
-   * Uses exponential moving average for adaptive buffer sizing.
-   * @param dst - The destination pointer.
-   * @returns The destination pointer cast to the specified type.
-   */
-  // @ts-expect-error: @inline is a valid decorator
-  @inline export function outTo<T>(dst: usize): T {
-    const len = offset - buffer;
-    if (len != changetype<OBJECT>(dst - TOTAL_OVERHEAD).rtSize) {
-      // @ts-expect-error: __renew is a runtime builtin
-      dst = __renew(dst, len);
-    }
-    memory.copy(dst, buffer, len);
-
-    finalizeDynamicOutput(len);
-    return changetype<T>(dst);
-  }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "author": "Jairus Tanaka",
   "repository": {
     "type": "git",
@@ -12,13 +12,14 @@
     "@assemblyscript/wasi-shim": "^0.1.0",
     "@eslint/js": "^9.0.0",
     "@types/node": "^25.0.10",
-    "as-test": "^1.0.1",
+    "as-test": "^1.0.6",
     "assemblyscript": "^0.28.9",
     "assemblyscript-prettier": "^3.0.1",
     "chartjs-node-canvas": "^5.0.0",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eslint": "^10.0.0",
     "prettier": "3.8.1",
+    "serve": "^14.2.6",
     "tinybench": "^6.0.0",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.0.0"
@@ -40,7 +41,25 @@
     "Deon Groenewald"
   ],
   "description": "The only JSON library you'll need for AssemblyScript with SIMD and SWAR",
-  "homepage": "https://github.com/JairusSW/json-as#readme",
+  "homepage": "https://docs.jairus.dev/json-as",
+  "files": [
+    "assembly/custom/",
+    "assembly/deserialize/",
+    "assembly/globals/",
+    "assembly/serialize/",
+    "assembly/util/",
+    "assembly/index.ts",
+    "assembly/index.d.ts",
+    "assembly/types.ts",
+    "assembly/tsconfig.json",
+    "lib/as-bs.ts",
+    "transform/lib/",
+    "transform/package.json",
+    "index.ts",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE"
+  ],
   "keywords": [
     "assemblyscript",
     "json",
@@ -62,16 +81,22 @@
   },
   "scripts": {
     "ci": "act",
-    "test": "ast test --disable coverage --disable try-as",
-    "test:ci": "ast test --disable coverage --clean",
+    "test": "ast test --parallel",
+    "test:fast": "npm run build:transform && JSON_USE_FAST_PATH=1 ast test --parallel --mode swar,simd",
+    "fuzz": "ast fuzz",
+    "test:fuzz": "ast test --fuzz --parallel",
+    "test:ci": "ast test --parallel --clean",
+    "test:ci:fast": "JSON_USE_FAST_PATH=1 ast test --parallel --clean",
     "test:coverage": "ast test --enable coverage",
-    "bench": "npm run bench:as && npm run bench:js && ./build-charts.sh",
-    "bench:as": "bash ./run-bench.as.sh",
-    "bench:js": "bash ./run-bench.js.sh",
-    "bench:publish": "bash ./publish-benchmarks.sh",
+    "bench": "npm run bench:as && npm run bench:js && npm run charts:build",
+    "bench:as": "bash ./scripts/run-bench.as.sh",
+    "bench:js": "bash ./scripts/run-bench.js.sh",
+    "charts:build": "bash ./scripts/build-charts.sh",
+    "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",
     "build:tmp:test": "JSON_DEBUG=1 asc assembly/test.tmp.ts -o ./build/test.wasm --textFile ./build/test.wat --enable simd --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
-    "build:test:wine": "JSON_DEBUG=1 JSON_WRITE=assembly/test.ts NODE_SKIP_PLATFORM_CHECK=1 wine ~/.win-bin/node/node.exe ./node_modules/assemblyscript/bin/asc.js assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
+    "build:test:wine": "JSON_DEBUG=1 JSON_WRITE=assembly/test.ts NODE_SKIP_PLATFORM_CHECK=1 wineconsole --backend=curses ~/.win-bin/node/node.exe ./node_modules/assemblyscript/bin/asc.js assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --debug --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:wasmer": "wasmer ./build/test.wasm",
     "build:transform": "tsc -p ./transform",

package/transform/lib/index.d.ts

@@ -13,6 +13,7 @@ export declare class JSONTransform extends Visitor {
     imports: ImportStatement[];
     simdStatements: string[];
     visitedClasses: Set<string>;
+    private collectInheritedFieldMembers;
     visitClassDeclarationRef(node: ClassDeclaration): void;
     resolveType(type: string, source: Src, visited?: Set<string>): string;
     visitClassDeclaration(node: ClassDeclaration): void;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA4G,eAAe,EAA8G,MAAM,EAAE,OAAO,EAAS,MAAM,EAA6C,MAAM,uCAAuC,CAAC;AAC3X,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAK7D,OAAO,EAA2B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AA2BvC,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,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAYtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,cAAoB,GAAG,MAAM;IAsC3E,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAowCnD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAItC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA6ClD,oBAAoB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAIjD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI/B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAiH9B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,OAAe,GAAG,MAAM,EAAE;IA0BxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO;CAc3D;AA4BD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBvD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAwDjC;AAoKD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA4G,eAAe,EAA8G,MAAM,EAAE,OAAO,EAAS,MAAM,EAA6C,MAAM,uCAAuC,CAAC;AAC3X,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAK7D,OAAO,EAA2B,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAkFvC,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;IA6CpC,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAYtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,cAAoB,GAAG,MAAM;IAsC3E,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAy7CnD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAItC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA4ClD,oBAAoB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAIjD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI/B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IA+J9B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,OAAe,GAAG,MAAM,EAAE;IA0BxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO;CAc3D;AA4BD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBvD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAwDjC;AAoKD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9C"}