@farm.js/core 0.1.31 → 0.1.35

package/dist/{chunk-IV6CQY7O.mjs → chunk-MSSFIQGM.mjs}

@@ -150,16 +150,21 @@ function storageCacheAdapter(storage, options = {}) {
     throw new TypeError("storageCacheAdapter expects a compatible storage client.");
   }
   const base = normalizeCacheNamespace(options.base || "farm-cache");
-  const entryKey = /* @__PURE__ */ __name((key) => `${base}:entry:${key}`, "entryKey");
-  const tagKey = /* @__PURE__ */ __name((tag) => `${base}:tag:${tag}`, "tagKey");
+  const entryKey = /* @__PURE__ */ __name(async (key) => `${base}:entry:${await encodeStorageKeySegment(key)}`, "entryKey");
+  const tagKey = /* @__PURE__ */ __name(async (tag) => `${base}:tag:${await encodeStorageKeySegment(tag)}`, "tagKey");
   return {
     name: "storage",
-    get: /* @__PURE__ */ __name((key) => storage.getItem(entryKey(key)), "get"),
+    get: /* @__PURE__ */ __name(async (key) => storage.getItem(await entryKey(key)), "get"),
     set: /* @__PURE__ */ __name(async (key, entry) => {
-      await storage.setItem(entryKey(key), entry);
+      const ttlMs = getFarmCacheEntryTtlMs(entry);
+      if (ttlMs === void 0) {
+        await storage.setItem(await entryKey(key), entry);
+      } else {
+        await storage.setItem(await entryKey(key), entry, { ttl: Math.ceil(ttlMs / 1e3) });
+      }
     }, "set"),
     delete: /* @__PURE__ */ __name(async (key) => {
-      await storage.removeItem(entryKey(key));
+      await storage.removeItem(await entryKey(key));
     }, "delete"),
     clear: storage.clear ? async () => {
       await storage.clear(base);
@@ -167,7 +172,7 @@ function storageCacheAdapter(storage, options = {}) {
     getTagVersions: /* @__PURE__ */ __name(async (tags) => {
       const versions = await Promise.all(
         tags.map(async (tag) => {
-          const value = await storage.getItem(tagKey(tag));
+          const value = await storage.getItem(await tagKey(tag));
           return [tag, normalizeAdapterVersion(value)];
         })
       );
@@ -176,7 +181,7 @@ function storageCacheAdapter(storage, options = {}) {
     invalidateTags: /* @__PURE__ */ __name(async (tags) => {
       await Promise.all(
         tags.map(async (tag) => {
-          const key = tagKey(tag);
+          const key = await tagKey(tag);
           const current = normalizeAdapterVersion(await storage.getItem(key));
           await storage.setItem(key, Math.max(Date.now(), current + 1));
         })
@@ -185,6 +190,35 @@ function storageCacheAdapter(storage, options = {}) {
   };
 }
 __name(storageCacheAdapter, "storageCacheAdapter");
+var MAX_STORAGE_KEY_SEGMENT_LENGTH = 200;
+async function encodeStorageKeySegment(value) {
+  let encoded;
+  try {
+    encoded = encodeURIComponent(value);
+  } catch {
+  }
+  if (encoded !== void 0 && encoded.length <= MAX_STORAGE_KEY_SEGMENT_LENGTH) return encoded;
+  const digest = await crypto.subtle.digest(
+    "SHA-256",
+    new TextEncoder().encode(JSON.stringify(value))
+  );
+  let hex = "";
+  for (const byte of new Uint8Array(digest)) hex += byte.toString(16).padStart(2, "0");
+  return `sha256:${hex}`;
+}
+__name(encodeStorageKeySegment, "encodeStorageKeySegment");
+var MIN_STALE_RETENTION_MS = 6e4;
+function getFarmCacheEntryExpiresAt(createdAt, revalidate, now = Date.now()) {
+  if (typeof revalidate !== "number") return void 0;
+  const revalidateMs = revalidate * 1e3;
+  return Math.max(createdAt + revalidateMs, now) + Math.max(revalidateMs, MIN_STALE_RETENTION_MS);
+}
+__name(getFarmCacheEntryExpiresAt, "getFarmCacheEntryExpiresAt");
+function getFarmCacheEntryTtlMs(entry, now = Date.now()) {
+  if (typeof entry.expiresAt !== "number" || !Number.isFinite(entry.expiresAt)) return void 0;
+  return Math.max(1, Math.ceil(entry.expiresAt - now));
+}
+__name(getFarmCacheEntryTtlMs, "getFarmCacheEntryTtlMs");
 var _FarmDataCache = class _FarmDataCache {
   constructor(config = {}) {
     this.entries = /* @__PURE__ */ new Map();
@@ -287,11 +321,20 @@ var _FarmDataCache = class _FarmDataCache {
     const namespace = this.namespace;
     const entry = await adapter.get(`${namespace}:entry:${key}`);
     if (generation !== this.generation) return void 0;
-    if (!entry) {
-      emitFarmEvent({ type: "cache.miss", key });
+    if (!entry || isForeignAdapterEntry(entry, key)) {
+      emitFarmEvent({ type: "cache.miss", key, ...entry ? { reason: "key-mismatch" } : {} });
       return void 0;
     }
     assertFarmCacheEntry(entry, key);
+    if (typeof entry.expiresAt === "number" && entry.expiresAt <= (options.now ?? Date.now())) {
+      emitFarmEvent({ type: "cache.miss", key, reason: "expired" });
+      try {
+        await adapter.delete(`${namespace}:entry:${key}`);
+      } catch (error) {
+        emitFarmEvent({ type: "cache.error", key, operation: "delete", error });
+      }
+      return void 0;
+    }
     const stale = await this.isAdapterEntryStale(entry, options.now, adapter, namespace);
     if (generation !== this.generation) return void 0;
     if (stale) {
@@ -352,14 +395,17 @@ var _FarmDataCache = class _FarmDataCache {
     const revalidate = normalizeRevalidate(options.revalidate);
     const tags = normalizeCacheOptionsTags(options);
     const capturedVersions = tagVersions ?? await this.getAdapterTagVersions(Array.from(tags.values()));
+    const createdAt = options.createdAt ?? Date.now();
+    const expiresAt = getFarmCacheEntryExpiresAt(createdAt, revalidate);
     const entry = {
       key,
       value,
       tags: Array.from(tags),
       tagVersions: capturedVersions,
-      createdAt: options.createdAt ?? Date.now(),
+      createdAt,
       createdVersion: createdVersion ?? ++this.version,
-      revalidate
+      revalidate,
+      ...expiresAt === void 0 ? {} : { expiresAt }
     };
     if (this.local) {
       this.hydrateLocalEntry(entry);
@@ -561,8 +607,8 @@ var _FarmDataCache = class _FarmDataCache {
       if (generation !== this.generation) return void 0;
       const entry = await adapter.get(`${namespace}:entry:${key}`);
       if (generation !== this.generation) return void 0;
-      if (!entry) {
-        emitFarmEvent({ type: "cache.miss", key });
+      if (!entry || isForeignAdapterEntry(entry, key)) {
+        emitFarmEvent({ type: "cache.miss", key, ...entry ? { reason: "key-mismatch" } : {} });
         continue;
       }
       assertFarmCacheEntry(entry, key);
@@ -908,6 +954,10 @@ function normalizeCacheOptionsTags(options) {
   return tags;
 }
 __name(normalizeCacheOptionsTags, "normalizeCacheOptionsTags");
+function isForeignAdapterEntry(entry, expectedKey) {
+  return typeof entry === "object" && entry !== null && typeof entry.key === "string" && entry.key !== expectedKey;
+}
+__name(isForeignAdapterEntry, "isForeignAdapterEntry");
 function assertFarmCacheEntry(entry, expectedKey) {
   if (!entry || typeof entry !== "object" || entry.key !== expectedKey || !Array.isArray(entry.tags) || typeof entry.createdAt !== "number") {
     throw new TypeError(

package/dist/{chunk-KH7BN726.cjs → chunk-N4UOK6ZI.cjs}

@@ -59,8 +59,12 @@ function claimServerQueryKey(owner, key) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, claimServerQueryKey, "claimServerQueryKey");
 var RAW_SERVER_QUERY_SYMBOL = /* @__PURE__ */ Symbol.for("farm.server-query");
+function isFarmServerQueryBrowserRuntime() {
+  return typeof window !== "undefined" && typeof document !== "undefined";
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isFarmServerQueryBrowserRuntime, "isFarmServerQueryBrowserRuntime");
 function assertNotRawServerQueryInBrowser(query) {
-  if (typeof window === "undefined" || typeof document === "undefined") return;
+  if (!isFarmServerQueryBrowserRuntime()) return;
   if (!_optionalChain([query, 'optionalAccess', _ => _[RAW_SERVER_QUERY_SYMBOL]])) return;
   throw new Error(
     [
@@ -129,6 +133,7 @@ function createServerQueryCallKey(query, input) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createServerQueryCallKey, "createServerQueryCallKey");
 async function fetchServerQuery(query, input, options = {}) {
+  if (!isFarmServerQueryBrowserRuntime()) return query(input);
   const cache = _chunk63H6BKXGcjs.getFarmClientDataCache.call(void 0, );
   const provisionalKey = createServerQueryCallKey(query, input);
   const entry = cache.get(provisionalKey);
@@ -247,4 +252,5 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, normalizeServerQueryError, "normalizeServe
 
 
 
-exports.attachRevalidationListeners = attachRevalidationListeners; exports.beginFarmServerQueryAction = beginFarmServerQueryAction; exports.completeFarmServerQueryAction = completeFarmServerQueryAction; exports.shouldApplyFarmServerQueryActionResult = shouldApplyFarmServerQueryActionResult; exports.createServerQueryCallKey = createServerQueryCallKey; exports.fetchServerQuery = fetchServerQuery; exports.prefetchServerQuery = prefetchServerQuery;
+
+exports.attachRevalidationListeners = attachRevalidationListeners; exports.isFarmServerQueryBrowserRuntime = isFarmServerQueryBrowserRuntime; exports.beginFarmServerQueryAction = beginFarmServerQueryAction; exports.completeFarmServerQueryAction = completeFarmServerQueryAction; exports.shouldApplyFarmServerQueryActionResult = shouldApplyFarmServerQueryActionResult; exports.createServerQueryCallKey = createServerQueryCallKey; exports.fetchServerQuery = fetchServerQuery; exports.prefetchServerQuery = prefetchServerQuery;

package/dist/{chunk-JNGIWIY6.mjs → chunk-NPC7VWJE.mjs}

@@ -1,9 +1,9 @@
 import {
   readFarmI18nCatalogs
-} from "./chunk-FV45CKBC.mjs";
+} from "./chunk-QCFBDFRS.mjs";
 import {
   resolveFarmLocaleRequest
-} from "./chunk-IXUY2F5U.mjs";
+} from "./chunk-GCXWJJKH.mjs";
 import {
   _setFarmI18nSnapshotResolver
 } from "./chunk-C4NCTZLM.mjs";

package/dist/chunk-NRDBW4MP.mjs

@@ -0,0 +1,45 @@
+import {
+  __name
+} from "./chunk-LPEX4YW6.mjs";
+
+// src/client/client-reference.ts
+var CLIENT_REFERENCE = /* @__PURE__ */ Symbol.for("farm.isolated-hydration.client-reference");
+function markFarmClientReference(boundary, reference) {
+  Object.defineProperty(boundary, CLIENT_REFERENCE, { value: reference });
+}
+__name(markFarmClientReference, "markFarmClientReference");
+function getFarmClientReference(type) {
+  if (!type || typeof type !== "function" && typeof type !== "object") return void 0;
+  return type[CLIENT_REFERENCE];
+}
+__name(getFarmClientReference, "getFarmClientReference");
+var SERVER_TREE_UPDATES = /* @__PURE__ */ Symbol.for("farm.isolated-hydration.server-tree-updates");
+function getListeners() {
+  const shared = globalThis;
+  return shared[SERVER_TREE_UPDATES] ?? (shared[SERVER_TREE_UPDATES] = /* @__PURE__ */ new Set());
+}
+__name(getListeners, "getListeners");
+function subscribeFarmServerTreeUpdates(listener) {
+  const listeners = getListeners();
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
+__name(subscribeFarmServerTreeUpdates, "subscribeFarmServerTreeUpdates");
+function updateFarmServerTreeModule(reference, module) {
+  const listeners = globalThis[SERVER_TREE_UPDATES];
+  let updated = 0;
+  if (listeners) {
+    for (const listener of listeners) if (listener(reference, module)) updated++;
+  }
+  return updated;
+}
+__name(updateFarmServerTreeModule, "updateFarmServerTreeModule");
+
+export {
+  markFarmClientReference,
+  getFarmClientReference,
+  subscribeFarmServerTreeUpdates,
+  updateFarmServerTreeModule
+};

package/dist/{chunk-ILWLPEVO.mjs → chunk-NRSN7G7E.mjs}

@@ -1,9 +1,9 @@
 import {
   parseRequestCookieHeader
-} from "./chunk-5TISYEQF.mjs";
+} from "./chunk-JM5XPKWH.mjs";
 import {
   getCurrentRequest
-} from "./chunk-BSPQVJ4A.mjs";
+} from "./chunk-FDR64H6B.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";