@vobs/resource 0.1.0 → 0.3.0

package/dist/index.js

@@ -5,12 +5,30 @@
 import { signal } from '@vobs/reactivity';
 import { currentOwner, createRuntimeError } from '@vobs/runtime-core';
 const defaultCacheStore = new Map();
-// Cross-instance concurrent deduplication per key (contract §2): dedup tables are isolated per cache instance
-// (an SSR per-request cache gets per-request deduplication without cross-contamination; the default cache shares one table, matching historical behavior).
+const DEFAULT_CACHE_LIMIT = 100;
 const cacheInFlightTables = new WeakMap();
 let defaultKeyCounter = 0;
 /** Default key pattern (generated by a process-level counter, unstable across processes — SSR serialization must use explicit keys). */
 const DEFAULT_KEY_PATTERN = /^resource:\d+$/u;
+function readCache(cache, key) {
+    const entry = cache.get(key);
+    if (cache === defaultCacheStore && entry !== undefined && !isPromiseLike(entry)) {
+        defaultCacheStore.delete(key);
+        defaultCacheStore.set(key, entry);
+    }
+    return entry;
+}
+function writeCache(cache, key, entry) {
+    cache.set(key, entry);
+    if (cache !== defaultCacheStore)
+        return;
+    while (defaultCacheStore.size > DEFAULT_CACHE_LIMIT) {
+        const oldest = defaultCacheStore.keys().next().value;
+        if (oldest === undefined)
+            return;
+        defaultCacheStore.delete(oldest);
+    }
+}
 function inFlightTable(cache) {
     let table = cacheInFlightTables.get(cache);
     if (table === undefined) {
@@ -38,7 +56,7 @@ export function createResource(source, options = {}) {
     const data = signal(undefined);
     const error = signal(undefined);
     const loading = signal(false);
-    let controller;
+    let activeRequest;
     let fetchToken = 0;
     let disposed = false;
     let readyResolved = false;
@@ -55,7 +73,7 @@ export function createResource(source, options = {}) {
     const applySuccess = (value, token) => {
         if (disposed || token !== fetchToken)
             return;
-        cache.set(key, { data: value });
+        writeCache(cache, key, { data: value });
         data.value = value;
         error.value = undefined;
         loading.value = false;
@@ -75,11 +93,10 @@ export function createResource(source, options = {}) {
         markReady();
     };
     const run = async (token) => {
-        controller?.abort();
-        controller = new AbortController();
+        releaseActiveRequest();
         loading.value = true;
         // Sync hit (hydrated/pre-warmed cache): data is readable on the first frame of template rendering (contract §8 sync readiness).
-        const maybeCached = cache.get(key);
+        const maybeCached = readCache(cache, key);
         if (maybeCached !== undefined && !isPromiseLike(maybeCached)) {
             if (disposed || token !== fetchToken)
                 return;
@@ -91,7 +108,14 @@ export function createResource(source, options = {}) {
         }
         // Miss: a single await yields uniformly (a Promise awaits resolve / a sync value is wrapped in a resolved promise) —
         // if dispose or a new refetch runs during the yield, this run terminates (cancelled runs never call source, contract semantics).
-        const cached = await Promise.resolve(maybeCached);
+        let cached;
+        try {
+            cached = await Promise.resolve(maybeCached);
+        }
+        catch (failure) {
+            applyFailure(failure, token);
+            return;
+        }
         if (disposed || token !== fetchToken)
             return;
         if (cached !== undefined) {
@@ -101,20 +125,24 @@ export function createResource(source, options = {}) {
             markReady();
             return;
         }
-        let promise = inFlight.get(key);
-        if (promise === undefined) {
-            // Snapshot the signal: this.controller may have been set to undefined by dispose when the then-callback runs.
-            const requestSignal = controller.signal;
-            promise = Promise.resolve().then(() => source({ signal: requestSignal, key }));
-            inFlight.set(key, promise);
-            promise.then(() => {
-                inFlight.delete(key);
+        let request = inFlight.get(key);
+        if (request === undefined) {
+            const controller = new AbortController();
+            const promise = Promise.resolve().then(() => source({ signal: controller.signal, key }));
+            request = { controller, promise, consumers: 0 };
+            inFlight.set(key, request);
+            void promise.then(() => {
+                if (inFlight.get(key) === request)
+                    inFlight.delete(key);
             }, () => {
-                inFlight.delete(key);
+                if (inFlight.get(key) === request)
+                    inFlight.delete(key);
             });
         }
+        request.consumers += 1;
+        activeRequest = request;
         try {
-            const value = await promise;
+            const value = (await request.promise);
             if (disposed || token !== fetchToken)
                 return;
             applySuccess(value, token);
@@ -124,6 +152,23 @@ export function createResource(source, options = {}) {
                 return;
             applyFailure(failure, token);
         }
+        finally {
+            if (activeRequest === request)
+                releaseActiveRequest();
+        }
+    };
+    const releaseActiveRequest = () => {
+        const request = activeRequest;
+        if (request === undefined)
+            return;
+        activeRequest = undefined;
+        request.consumers -= 1;
+        if (request.consumers > 0)
+            return;
+        if (inFlight.get(key) === request) {
+            inFlight.delete(key);
+            request.controller.abort();
+        }
     };
     const refetch = () => {
         if (disposed) {
@@ -150,7 +195,7 @@ export function createResource(source, options = {}) {
             if (disposed)
                 return;
             data.value = next;
-            cache.set(key, { data: next });
+            writeCache(cache, key, { data: next });
             error.value = undefined;
         }
         catch (failure) {
@@ -165,13 +210,9 @@ export function createResource(source, options = {}) {
         if (disposed)
             return;
         disposed = true;
-        controller?.abort();
-        controller = undefined;
+        releaseActiveRequest();
         fetchToken += 1;
         loading.value = false;
-        // Clean the in-flight entry on cancellation: a pending promise that was aborted before source responded
-        // must not poison later requests for the same key (a new request would hang on a dead promise).
-        inFlight.delete(key);
         // Disposal counts as settle (SSR await on whenReady does not hang).
         markReady();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vobs/resource",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Declarative async data resources for vobs: fetch, cancel, cache, invalidate, refetch and mutation.",
   "type": "module",
   "publishConfig": {
@@ -18,8 +18,8 @@
   },
   "homepage": "https://github.com/vobsjs/vobs#readme",
   "dependencies": {
-    "@vobs/reactivity": "0.1.0",
-    "@vobs/runtime-core": "0.1.0"
+    "@vobs/reactivity": "0.3.0",
+    "@vobs/runtime-core": "0.3.0"
   },
   "files": [
     "dist"
@@ -36,6 +36,6 @@
   "main": "./dist/index.js",
   "sideEffects": false,
   "engines": {
-    "node": ">=20.19.0"
+    "node": ">=22.12.0"
   }
 }