@farm.js/core 0.1.16 → 0.1.17

package/dist/server-query-client.cjs

@@ -433,6 +433,8 @@ var _FarmDataCache = class _FarmDataCache {
   constructor(config = {}) {
     this.entries = /* @__PURE__ */ new Map();
     this.inflight = /* @__PURE__ */ new Map();
+    /** Local entries by tag, so tag counts and pruning never scan unrelated entries. */
+    this.entriesByTag = /* @__PURE__ */ new Map();
     this.invalidatedTagVersions = /* @__PURE__ */ new Map();
     this.activeGenerations = /* @__PURE__ */ new Set();
     this.version = 0;
@@ -451,6 +453,7 @@ var _FarmDataCache = class _FarmDataCache {
   configure(config = {}) {
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -617,14 +620,12 @@ var _FarmDataCache = class _FarmDataCache {
     return entry;
   }
   delete(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     emitFarmEvent({ type: "cache.delete", key, deleted });
     return deleted;
   }
   async deleteAsync(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     if (this.adapter) {
       await this.adapter.delete(this.createAdapterKey(key));
     }
@@ -635,6 +636,7 @@ var _FarmDataCache = class _FarmDataCache {
     const count = this.entries.size;
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -720,23 +722,32 @@ var _FarmDataCache = class _FarmDataCache {
       return cached.value;
     }
     const inflight = this.inflight.get(key);
-    if (inflight) {
+    if (inflight && !this.wasInvalidatedSince(inflight.tags, inflight.startVersion)) {
       emitFarmEvent({ type: "cache.dedupe", key });
-      return inflight;
+      return inflight.promise;
     }
     const tags = Array.from(normalizeCacheOptionsTags(options));
     const generation = this.generation;
+    const startVersion = this.version;
     const promise = this.fillCacheEntry(key, producer, options, tags, generation).catch((error) => {
       emitFarmEvent({ type: "cache.error", key, operation: "set", error });
       throw error;
     }).finally(() => {
-      if (this.inflight.get(key) === promise) {
+      if (this.inflight.get(key)?.promise === promise) {
         this.inflight.delete(key);
       }
     });
-    this.inflight.set(key, promise);
+    this.inflight.set(key, { promise, tags, startVersion });
     return promise;
   }
+  /** A fill that started before one of its tags was invalidated cannot satisfy later readers. */
+  wasInvalidatedSince(tags, version) {
+    for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion !== void 0 && invalidatedVersion > version) return true;
+    }
+    return false;
+  }
   async fillCacheEntry(key, producer, options, tags, generation) {
     const adapter = this.adapter;
     const namespace = this.namespace;
@@ -777,7 +788,7 @@ var _FarmDataCache = class _FarmDataCache {
       return value;
     } finally {
       this.activeGenerations.delete(activeGeneration);
-      this.pruneInvalidatedTagVersions();
+      this.pruneInvalidatedTagVersions(activeGeneration.tags);
       if (leaseToken && adapter?.releaseLease) {
         try {
           await adapter.releaseLease(leaseKey, leaseToken);
@@ -822,18 +833,9 @@ var _FarmDataCache = class _FarmDataCache {
     }
     return void 0;
   }
-  countEntriesForTag(tag) {
-    let count = 0;
-    for (const entry of this.entries.values()) {
-      if (entry.tags.has(tag)) {
-        count++;
-      }
-    }
-    return count;
-  }
   countEntriesForTags(tags) {
     let count = 0;
-    for (const entry of this.entries.values()) {
+    for (const entry of this.entriesByTag.get(tags[0]) ?? []) {
       if (tags.every((tag) => entry.tags.has(tag))) {
         count++;
       }
@@ -841,10 +843,10 @@ var _FarmDataCache = class _FarmDataCache {
     return count;
   }
   invalidateTag(normalizedTag) {
-    const count = this.countEntriesForTag(normalizedTag);
+    const count = this.entriesByTag.get(normalizedTag)?.size ?? 0;
     this.invalidatedTagVersions.delete(normalizedTag);
     this.invalidatedTagVersions.set(normalizedTag, ++this.version);
-    this.pruneInvalidatedTagVersions();
+    this.pruneInvalidatedTagVersions([normalizedTag]);
     return count;
   }
   toPublicEntry(entry) {
@@ -874,19 +876,51 @@ var _FarmDataCache = class _FarmDataCache {
     this.entries.set(key, entry);
   }
   storeLocalEntry(entry) {
-    this.entries.delete(entry.key);
+    const removed = [];
+    const replaced = this.detachLocalEntry(entry.key);
+    if (replaced) removed.push(replaced);
     this.entries.set(entry.key, entry);
+    for (const tag of entry.tags) {
+      let tagged = this.entriesByTag.get(tag);
+      if (!tagged) this.entriesByTag.set(tag, tagged = /* @__PURE__ */ new Set());
+      tagged.add(entry);
+    }
     while (this.entries.size > this.maxEntries) {
       const oldestKey = this.entries.keys().next().value;
       if (oldestKey === void 0) break;
-      this.entries.delete(oldestKey);
+      removed.push(this.detachLocalEntry(oldestKey));
     }
-    this.pruneInvalidatedTagVersions();
+    for (const removedEntry of removed) this.pruneInvalidatedTagVersions(removedEntry.tags);
   }
-  pruneInvalidatedTagVersions() {
-    tags: for (const [tag, invalidatedVersion] of this.invalidatedTagVersions) {
-      for (const entry of this.entries.values()) {
-        if (entry.tags.has(tag) && entry.createdVersion < invalidatedVersion) continue tags;
+  deleteLocalEntry(key) {
+    const entry = this.detachLocalEntry(key);
+    if (!entry) return false;
+    this.pruneInvalidatedTagVersions(entry.tags);
+    return true;
+  }
+  detachLocalEntry(key) {
+    const entry = this.entries.get(key);
+    if (!entry) return void 0;
+    this.entries.delete(key);
+    for (const tag of entry.tags) {
+      const tagged = this.entriesByTag.get(tag);
+      if (!tagged) continue;
+      tagged.delete(entry);
+      if (tagged.size === 0) this.entriesByTag.delete(tag);
+    }
+    return entry;
+  }
+  /**
+   * Drop invalidation versions that no local entry or active fill can be stale against.
+   * Callers pass only the tags whose dependents just changed, so the cost is bounded by
+   * the entries sharing those tags rather than by the whole cache.
+   */
+  pruneInvalidatedTagVersions(tags) {
+    tags: for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion === void 0) continue;
+      for (const entry of this.entriesByTag.get(tag) ?? []) {
+        if (entry.createdVersion < invalidatedVersion) continue tags;
       }
       for (const generation of this.activeGenerations) {
         if (generation.tags.has(tag) && generation.createdVersion < invalidatedVersion)

package/dist/server-query-client.d.mts

@@ -5,7 +5,7 @@ export { F as FarmServerQueryActionInvocation, b as beginFarmServerQueryAction,
 import './cache.mjs';
 import './server-fn.mjs';
 import './server-fn-error-DDh14a0V.mjs';
-import './endpoint-Bu3XgeMK.mjs';
+import './endpoint-DAc96i93.mjs';
 
 type UseServerQueryOptions = ServerQueryFetchOptions & {
     enabled?: boolean;

package/dist/server-query-client.d.ts

@@ -5,7 +5,7 @@ export { F as FarmServerQueryActionInvocation, b as beginFarmServerQueryAction,
 import './cache.js';
 import './server-fn.js';
 import './server-fn-error-DDh14a0V.js';
-import './endpoint-kSAxE52R.js';
+import './endpoint-1zA994xL.js';
 
 type UseServerQueryOptions = ServerQueryFetchOptions & {
     enabled?: boolean;

package/dist/server-query-client.mjs

@@ -1,17 +1,17 @@
 "use client";
 import {
   useServerQuery
-} from "./chunk-GSDIZACQ.mjs";
+} from "./chunk-FG5H2VCJ.mjs";
 import {
   beginFarmServerQueryAction,
   completeFarmServerQueryAction,
   fetchServerQuery,
   prefetchServerQuery,
   shouldApplyFarmServerQueryActionResult
-} from "./chunk-76MNRHTS.mjs";
-import "./chunk-HKLRP3BN.mjs";
+} from "./chunk-UUYF3CHN.mjs";
+import "./chunk-5SPPCN5J.mjs";
 import "./chunk-KGB5UXJJ.mjs";
-import "./chunk-IGO2HEV7.mjs";
+import "./chunk-F6SJAKFJ.mjs";
 import "./chunk-4SIYUGRY.mjs";
 import "./chunk-C4NCTZLM.mjs";
 import "./chunk-FUZEBRP3.mjs";

package/dist/server-query.cjs

@@ -459,6 +459,8 @@ var _FarmDataCache = class _FarmDataCache {
   constructor(config = {}) {
     this.entries = /* @__PURE__ */ new Map();
     this.inflight = /* @__PURE__ */ new Map();
+    /** Local entries by tag, so tag counts and pruning never scan unrelated entries. */
+    this.entriesByTag = /* @__PURE__ */ new Map();
     this.invalidatedTagVersions = /* @__PURE__ */ new Map();
     this.activeGenerations = /* @__PURE__ */ new Set();
     this.version = 0;
@@ -477,6 +479,7 @@ var _FarmDataCache = class _FarmDataCache {
   configure(config = {}) {
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -643,14 +646,12 @@ var _FarmDataCache = class _FarmDataCache {
     return entry;
   }
   delete(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     emitFarmEvent({ type: "cache.delete", key, deleted });
     return deleted;
   }
   async deleteAsync(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     if (this.adapter) {
       await this.adapter.delete(this.createAdapterKey(key));
     }
@@ -661,6 +662,7 @@ var _FarmDataCache = class _FarmDataCache {
     const count = this.entries.size;
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -746,23 +748,32 @@ var _FarmDataCache = class _FarmDataCache {
       return cached.value;
     }
     const inflight = this.inflight.get(key);
-    if (inflight) {
+    if (inflight && !this.wasInvalidatedSince(inflight.tags, inflight.startVersion)) {
       emitFarmEvent({ type: "cache.dedupe", key });
-      return inflight;
+      return inflight.promise;
     }
     const tags = Array.from(normalizeCacheOptionsTags(options));
     const generation = this.generation;
+    const startVersion = this.version;
     const promise = this.fillCacheEntry(key, producer, options, tags, generation).catch((error) => {
       emitFarmEvent({ type: "cache.error", key, operation: "set", error });
       throw error;
     }).finally(() => {
-      if (this.inflight.get(key) === promise) {
+      if (this.inflight.get(key)?.promise === promise) {
         this.inflight.delete(key);
       }
     });
-    this.inflight.set(key, promise);
+    this.inflight.set(key, { promise, tags, startVersion });
     return promise;
   }
+  /** A fill that started before one of its tags was invalidated cannot satisfy later readers. */
+  wasInvalidatedSince(tags, version) {
+    for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion !== void 0 && invalidatedVersion > version) return true;
+    }
+    return false;
+  }
   async fillCacheEntry(key, producer, options, tags, generation) {
     const adapter = this.adapter;
     const namespace = this.namespace;
@@ -803,7 +814,7 @@ var _FarmDataCache = class _FarmDataCache {
       return value;
     } finally {
       this.activeGenerations.delete(activeGeneration);
-      this.pruneInvalidatedTagVersions();
+      this.pruneInvalidatedTagVersions(activeGeneration.tags);
       if (leaseToken && adapter?.releaseLease) {
         try {
           await adapter.releaseLease(leaseKey, leaseToken);
@@ -848,18 +859,9 @@ var _FarmDataCache = class _FarmDataCache {
     }
     return void 0;
   }
-  countEntriesForTag(tag) {
-    let count = 0;
-    for (const entry of this.entries.values()) {
-      if (entry.tags.has(tag)) {
-        count++;
-      }
-    }
-    return count;
-  }
   countEntriesForTags(tags) {
     let count = 0;
-    for (const entry of this.entries.values()) {
+    for (const entry of this.entriesByTag.get(tags[0]) ?? []) {
       if (tags.every((tag) => entry.tags.has(tag))) {
         count++;
       }
@@ -867,10 +869,10 @@ var _FarmDataCache = class _FarmDataCache {
     return count;
   }
   invalidateTag(normalizedTag) {
-    const count = this.countEntriesForTag(normalizedTag);
+    const count = this.entriesByTag.get(normalizedTag)?.size ?? 0;
     this.invalidatedTagVersions.delete(normalizedTag);
     this.invalidatedTagVersions.set(normalizedTag, ++this.version);
-    this.pruneInvalidatedTagVersions();
+    this.pruneInvalidatedTagVersions([normalizedTag]);
     return count;
   }
   toPublicEntry(entry) {
@@ -900,19 +902,51 @@ var _FarmDataCache = class _FarmDataCache {
     this.entries.set(key, entry);
   }
   storeLocalEntry(entry) {
-    this.entries.delete(entry.key);
+    const removed = [];
+    const replaced = this.detachLocalEntry(entry.key);
+    if (replaced) removed.push(replaced);
     this.entries.set(entry.key, entry);
+    for (const tag of entry.tags) {
+      let tagged = this.entriesByTag.get(tag);
+      if (!tagged) this.entriesByTag.set(tag, tagged = /* @__PURE__ */ new Set());
+      tagged.add(entry);
+    }
     while (this.entries.size > this.maxEntries) {
       const oldestKey = this.entries.keys().next().value;
       if (oldestKey === void 0) break;
-      this.entries.delete(oldestKey);
+      removed.push(this.detachLocalEntry(oldestKey));
+    }
+    for (const removedEntry of removed) this.pruneInvalidatedTagVersions(removedEntry.tags);
+  }
+  deleteLocalEntry(key) {
+    const entry = this.detachLocalEntry(key);
+    if (!entry) return false;
+    this.pruneInvalidatedTagVersions(entry.tags);
+    return true;
+  }
+  detachLocalEntry(key) {
+    const entry = this.entries.get(key);
+    if (!entry) return void 0;
+    this.entries.delete(key);
+    for (const tag of entry.tags) {
+      const tagged = this.entriesByTag.get(tag);
+      if (!tagged) continue;
+      tagged.delete(entry);
+      if (tagged.size === 0) this.entriesByTag.delete(tag);
     }
-    this.pruneInvalidatedTagVersions();
+    return entry;
   }
-  pruneInvalidatedTagVersions() {
-    tags: for (const [tag, invalidatedVersion] of this.invalidatedTagVersions) {
-      for (const entry of this.entries.values()) {
-        if (entry.tags.has(tag) && entry.createdVersion < invalidatedVersion) continue tags;
+  /**
+   * Drop invalidation versions that no local entry or active fill can be stale against.
+   * Callers pass only the tags whose dependents just changed, so the cost is bounded by
+   * the entries sharing those tags rather than by the whole cache.
+   */
+  pruneInvalidatedTagVersions(tags) {
+    tags: for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion === void 0) continue;
+      for (const entry of this.entriesByTag.get(tag) ?? []) {
+        if (entry.createdVersion < invalidatedVersion) continue tags;
       }
       for (const generation of this.activeGenerations) {
         if (generation.tags.has(tag) && generation.createdVersion < invalidatedVersion)
@@ -1395,7 +1429,7 @@ function createServerFn(options) {
     try {
       input = await _parseServerFnSchema(options.input, rawInput, "input");
     } catch (cause) {
-      throw labelInputErrors ? new ServerFnInputError(cause) : cause;
+      throw labelInputErrors && isSchemaValidationFailure(cause) ? new ServerFnInputError(cause) : cause;
     }
     const executionContext = getServerActionExecutionContext();
     const request = executionContext?.request ?? _resolveCurrentRequest();
@@ -1615,9 +1649,17 @@ async function _parseServerFnSchema(schema, value, contract, owner = "createServ
   throw new TypeError(`${owner} ${contract} must provide parse, parseAsync, or safeParse`);
 }
 __name(_parseServerFnSchema, "_parseServerFnSchema");
+var schemaValidationFailures = /* @__PURE__ */ new WeakSet();
+function isSchemaValidationFailure(error) {
+  if (!error || typeof error !== "object") return false;
+  return schemaValidationFailures.has(error) || Array.isArray(error.issues);
+}
+__name(isSchemaValidationFailure, "isSchemaValidationFailure");
 function unwrapSafeParseResult(result) {
   if (result && typeof result === "object" && "success" in result && result.success === false) {
-    throw result.error;
+    const error = result.error;
+    if (error && typeof error === "object") schemaValidationFailures.add(error);
+    throw error;
   }
   if (result && typeof result === "object" && "success" in result && result.success === true) {
     return result.data;

package/dist/server-query.d.mts

@@ -1,7 +1,7 @@
 import { RouteDataCacheKey } from './cache.mjs';
 import { ServerFnContext, ServerFnSchema, AnyServerFnMiddleware, InferServerFnSchemaOutput, ServerFnMiddlewareContext, ServerFnMCPMetadata, ServerFnHandler, InferServerFnSchemaInput } from './server-fn.mjs';
 import './server-fn-error-DDh14a0V.mjs';
-import './endpoint-Bu3XgeMK.mjs';
+import './endpoint-DAc96i93.mjs';
 
 type MaybePromise<T> = T | Promise<T>;
 type ServerQueryStaleTime = number | false | `${number}${"ms" | "s" | "m" | "h"}`;

package/dist/server-query.d.ts

@@ -1,7 +1,7 @@
 import { RouteDataCacheKey } from './cache.js';
 import { ServerFnContext, ServerFnSchema, AnyServerFnMiddleware, InferServerFnSchemaOutput, ServerFnMiddlewareContext, ServerFnMCPMetadata, ServerFnHandler, InferServerFnSchemaInput } from './server-fn.js';
 import './server-fn-error-DDh14a0V.js';
-import './endpoint-kSAxE52R.js';
+import './endpoint-1zA994xL.js';
 
 type MaybePromise<T> = T | Promise<T>;
 type ServerQueryStaleTime = number | false | `${number}${"ms" | "s" | "m" | "h"}`;

package/dist/server-query.mjs

@@ -1,13 +1,13 @@
 import {
   FARM_SERVER_QUERY_SYMBOL,
   createServerQuery
-} from "./chunk-UQZPTIML.mjs";
-import "./chunk-VVTREAG5.mjs";
+} from "./chunk-WD5PNSOB.mjs";
+import "./chunk-WD4YXVLV.mjs";
 import "./chunk-KGB5UXJJ.mjs";
 import "./chunk-QCFFHV5H.mjs";
 import "./chunk-FP2INE7H.mjs";
 import "./chunk-XF7Q24PF.mjs";
-import "./chunk-IGO2HEV7.mjs";
+import "./chunk-F6SJAKFJ.mjs";
 import "./chunk-4SIYUGRY.mjs";
 import "./chunk-C4NCTZLM.mjs";
 import "./chunk-FUZEBRP3.mjs";