json-as 1.3.1 → 1.3.3

package/lib/as-bs.ts

@@ -1,5 +1,5 @@
 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
@@ -227,12 +227,14 @@ export namespace bs {
 
     const current = load<usize>(dstFieldPtr);
     let stringPtr: usize;
-    if (current != 0 && changetype<OBJECT>(current - TOTAL_OVERHEAD).rtSize == byteLength) {
-      stringPtr = current;
-    } else if (current != 0 && current != changetype<usize>("")) {
-      // @ts-expect-error: __renew is a runtime builtin
-      stringPtr = __renew(current, byteLength);
-      store<usize>(dstFieldPtr, stringPtr);
+    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>());
@@ -284,18 +286,21 @@ export namespace bs {
  *
  * Enable caching by setting the `JSON_CACHE` environment variable:
  * ```bash
- * JSON_CACHE=1 npx asc your-file.ts --transform json-as/transform
+ * JSON_CACHE=true npx asc your-file.ts --transform json-as/transform
  * ```
  *
- * ## Memory Configuration
+ * You can also configure cache size directly:
+ * - `JSON_CACHE=<int>` => bytes
+ * - `JSON_CACHE=<int>kb|mb|gb` => kilobits/megabits/gigabits
+ * - `JSON_CACHE=<int>KB|MB|GB` => kilobytes/megabytes/gigabytes
  *
- * The cache uses the following fixed memory allocations:
+ * ## Memory Configuration
  *
- * - **CACHE_SIZE** (4096 entries): Number of cache slots. Uses direct-mapped
- *   caching with pointer-based indexing. Collisions will evict previous entries.
- *   Memory usage: ~49KB (4096 * 12 bytes per entry)
+ * The cache uses a size budget from `JSON_CACHE` (or defaults to 1MB when
+ * enabled with `true/on/yes`):
  *
- * - **ARENA_SIZE** (1MB): Circular buffer for storing cached serialized strings.
+ * - **CACHE_SIZE**: Number of direct-mapped cache slots. Derived from budget.
+ * - **ARENA_SIZE**: Circular buffer for storing cached serialized strings.
  *   When full, wraps around and overwrites oldest entries. Larger values retain
  *   more cached data but consume more memory.
  *
@@ -322,16 +327,20 @@ export namespace sc {
   // @ts-expect-error: @inline is a valid decorator
   @inline export const ENTRY_LEN = offsetof<sc.Entry>("len");
 
-  /** Number of cache slots (power of 2 for efficient masking). Set to 0 when caching disabled. */
-  // @ts-expect-error: JSON_CACHE may not be defined. If so, it will default to 0.
-  export const CACHE_SIZE = isDefined(JSON_CACHE) ? 1024 : 0;
-  /** Bitmask for fast modulo operation on cache index */
-  export const CACHE_MASK = CACHE_SIZE - 1;
-
-  /** Size of the circular arena buffer for cached strings (1MB) */
-  export const ARENA_SIZE = 1 << 20;
+  // @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;
+  // @ts-expect-error: JSON_CACHE_SIZE may not be defined. If so, it will default to 1MB.
+  export const CACHE_BYTES: usize = isDefined(JSON_CACHE_SIZE) ? <usize>JSON_CACHE_SIZE : (1 << 20);
   /** Minimum serialized length to cache - smaller outputs aren't worth caching */
   export const MIN_CACHE_LEN: usize = 128;
+  /** Size of the circular arena buffer for cached strings */
+  export const ARENA_SIZE: usize = CACHE_BYTES >= MIN_CACHE_LEN ? CACHE_BYTES : MIN_CACHE_LEN;
+
+  /** Number of cache slots (power of 2 for efficient masking). Set to 0 when caching disabled. */
+  const CACHE_SIZE_BASE: i32 = CACHE_ENABLED ? i32((ARENA_SIZE >> 10) >= 1 ? (ARENA_SIZE >> 10) : 1) : 0;
+  export const CACHE_SIZE: usize = CACHE_ENABLED ? <usize>(1 << (32 - clz<i32>(CACHE_SIZE_BASE - 1))) : 0;
+  /** Bitmask for fast modulo operation on cache index */
+  export const CACHE_MASK: usize = CACHE_SIZE > 0 ? CACHE_SIZE - 1 : 0;
 
   /** Cache entry structure - stores pointer to string, cached output location, and length */
   @unmanaged
@@ -345,9 +354,9 @@ export namespace sc {
   }
 
   /** Static array of cache entries */
-  export const entries = new StaticArray<sc.Entry>(CACHE_SIZE);
+  export const entries = new StaticArray<sc.Entry>(i32(CACHE_SIZE));
   /** Circular buffer arena for storing cached serialized strings */
-  export const arena = new ArrayBuffer(ARENA_SIZE);
+  export const arena = new ArrayBuffer(i32(ARENA_SIZE));
   /** Current write position in the arena */
   export let arenaPtr: usize = changetype<usize>(arena);
   /** End boundary of the arena */
@@ -391,7 +400,9 @@ export namespace sc {
    * @param len - Length of serialized output
    */
   export function insertCached(str: usize, start: usize, len: usize): void {
+    if (!CACHE_ENABLED || ARENA_SIZE == 0) return;
     if (len < MIN_CACHE_LEN) return;
+    if (len > ARENA_SIZE) return;
     if (arenaPtr + len > arenaEnd) {
       // Wrap around to beginning of arena (circular buffer)
       arenaPtr = changetype<usize>(arena);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "author": "Jairus Tanaka",
   "repository": {
     "type": "git",
@@ -10,18 +10,19 @@
   "main": "transform/lib/index.js",
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
-    "@eslint/js": "^9.0.0",
-    "@types/node": "^25.0.10",
-    "as-test": "^1.0.1",
-    "assemblyscript": "^0.28.9",
-    "assemblyscript-prettier": "^3.0.1",
+    "@eslint/js": "^10.0.1",
+    "@types/node": "^25.6.0",
+    "as-test": "^1.0.7",
+    "assemblyscript": "^0.28.14",
+    "assemblyscript-prettier": "^3.0.4",
     "chartjs-node-canvas": "^5.0.0",
     "chartjs-plugin-datalabels": "^2.2.0",
-    "eslint": "^10.0.0",
-    "prettier": "3.8.1",
+    "eslint": "^10.2.0",
+    "prettier": "3.8.3",
+    "serve": "^14.2.6",
     "tinybench": "^6.0.0",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.0.0"
+    "typescript": "^6.0.2",
+    "typescript-eslint": "^8.58.2"
   },
   "bugs": {
     "url": "https://github.com/JairusSW/json-as/issues"
@@ -40,7 +41,7 @@
     "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/",
@@ -80,16 +81,23 @@
   },
   "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": "bun run charts:build && bun run charts:serve",
+    "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.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;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;IA0yCnD,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;IAuG9B,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;AAmJvC,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;IAghDnD,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;IAyBvD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAwDjC;AAoKD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9C"}