@farm.js/core 0.1.0-beta.1 → 0.1.0-beta.11

package/dist/internal/config-runtime.d.mts

@@ -1,6 +1,6 @@
-export { a4 as loadConfig, a3 as resolveConfig, a5 as resolveDeployConfig } from '../client-plugins-g4bzuCmo.mjs';
+export { a5 as loadConfig, a4 as resolveConfig, a6 as resolveDeployConfig } from '../client-plugins-jsk-ZLzJ.mjs';
 import { build, createServer, loadEnv } from 'vite';
-export { l as logger } from '../utils-DOXXivjL.mjs';
+export { l as logger } from '../utils-mYVkSOt2.mjs';
 import '../plugin-BJDf43dc.mjs';
 import 'react';
 import 'http';
@@ -18,7 +18,8 @@ import '../cron.mjs';
 import '../env.mjs';
 import '../server-action-security.mjs';
 import '../image-config-Duob7wER.mjs';
-import '../types-BH1lhg5G.mjs';
+import '../types-BMxWr97v.mjs';
+import '../cache.mjs';
 import '../route-runtime-DoOHzCAD.mjs';
 
 type FarmProductionViteBuilder = "rollup" | "rolldown";

package/dist/internal/config-runtime.d.ts

@@ -1,6 +1,6 @@
-export { a4 as loadConfig, a3 as resolveConfig, a5 as resolveDeployConfig } from '../client-plugins-BZnpeTGA.js';
+export { a5 as loadConfig, a4 as resolveConfig, a6 as resolveDeployConfig } from '../client-plugins-Bc5jHcNr.js';
 import { build, createServer, loadEnv } from 'vite';
-export { l as logger } from '../utils-DA1yo54_.js';
+export { l as logger } from '../utils-CA0z0c-2.js';
 import '../plugin-BJDf43dc.js';
 import 'react';
 import 'http';
@@ -18,7 +18,8 @@ import '../cron.js';
 import '../env.js';
 import '../server-action-security.js';
 import '../image-config-Duob7wER.js';
-import '../types-BH1lhg5G.js';
+import '../types-BMxWr97v.js';
+import '../cache.js';
 import '../route-runtime-DoOHzCAD.js';
 
 type FarmProductionViteBuilder = "rollup" | "rolldown";

package/dist/internal/config-runtime.mjs

@@ -5,28 +5,29 @@ import {
   loadConfig,
   resolveConfig,
   resolveDeployConfig
-} from "../chunk-UHE2TTLK.mjs";
+} from "../chunk-K5ZTUF22.mjs";
 import "../chunk-UVCIEUJC.mjs";
-import "../chunk-RSKVYESE.mjs";
+import "../chunk-RQ633A5I.mjs";
+import "../chunk-I4CUBGVF.mjs";
+import "../chunk-YW7OBE6Q.mjs";
 import "../chunk-74YTBPTY.mjs";
 import "../chunk-7MABZJIM.mjs";
-import "../chunk-OYXO65LI.mjs";
 import "../chunk-GY2STC2S.mjs";
-import "../chunk-LLC7BNXW.mjs";
-import "../chunk-S2XHZS7W.mjs";
-import "../chunk-Y2OJJD7R.mjs";
-import "../chunk-UREJA4GZ.mjs";
-import "../chunk-AGS7UJ52.mjs";
+import "../chunk-UB5UOSHB.mjs";
+import "../chunk-ZVWA4ZQ3.mjs";
+import "../chunk-7FBJLMQH.mjs";
+import "../chunk-XIVV5IWN.mjs";
+import "../chunk-GXASWWJU.mjs";
 import "../chunk-K4667E2Q.mjs";
 import "../chunk-QGOHVJ6J.mjs";
 import "../chunk-FQYDHKKU.mjs";
+import "../chunk-GQVGIUSN.mjs";
 import {
   logger
 } from "../chunk-J4FNJ5IU.mjs";
-import "../chunk-QM6VV26B.mjs";
-import "../chunk-JK25YEN6.mjs";
 import "../chunk-B232I2GP.mjs";
-import "../chunk-TXCFGOHW.mjs";
+import "../chunk-JK25YEN6.mjs";
+import "../chunk-RBRLLZL5.mjs";
 import "../chunk-CGILA3WO.mjs";
 export {
   loadConfig,

package/dist/internal/production-runtime.cjs

@@ -26,7 +26,9 @@ __export(production_runtime_exports, {
   _runWithMiddlewareContext: () => _runWithMiddlewareContext,
   _runWithMiddlewareData: () => _runWithMiddlewareData,
   addMetadataImageReference: () => addMetadataImageReference,
+  appendFarmLinkHeader: () => appendFarmLinkHeader,
   applyProductionMiddlewareHeaders: () => applyProductionMiddlewareHeaders,
+  configureFarmCache: () => configureFarmCache,
   configureFarmObservability: () => configureFarmObservability,
   createFarmCacheKey: () => createFarmCacheKey,
   createFarmLocaleCookie: () => createFarmLocaleCookie,
@@ -401,11 +403,51 @@ __name(formatError, "formatError");
 
 // src/cache.ts
 var _FarmDataCache = class _FarmDataCache {
-  constructor() {
+  constructor(config = {}) {
     this.entries = /* @__PURE__ */ new Map();
     this.inflight = /* @__PURE__ */ new Map();
     this.invalidatedTagVersions = /* @__PURE__ */ new Map();
     this.version = 0;
+    this.namespace = "farm";
+    this.local = true;
+    this.lease = {
+      enabled: true,
+      ttlMs: 1e4,
+      waitTimeoutMs: 1e4,
+      pollIntervalMs: 25
+    };
+    this.configure(config);
+  }
+  configure(config = {}) {
+    this.adapter = config.adapter;
+    this.namespace = normalizeCacheNamespace(config.namespace || "farm");
+    this.local = !config.adapter;
+    this.lease = config.lease === false ? { ...this.lease, enabled: false } : {
+      enabled: true,
+      ttlMs: normalizePositiveDuration(config.lease?.ttlMs, 1e4, "cache.lease.ttlMs"),
+      waitTimeoutMs: normalizePositiveDuration(
+        config.lease?.waitTimeoutMs,
+        1e4,
+        "cache.lease.waitTimeoutMs"
+      ),
+      pollIntervalMs: normalizePositiveDuration(
+        config.lease?.pollIntervalMs,
+        25,
+        "cache.lease.pollIntervalMs"
+      )
+    };
+    if (!this.local) {
+      this.entries.clear();
+      this.inflight.clear();
+      this.invalidatedTagVersions.clear();
+      this.version = 0;
+    }
+  }
+  get adapterName() {
+    return this.adapter?.name || (this.adapter ? "custom" : "memory");
+  }
+  get hasAdapter() {
+    return this.adapter !== void 0;
   }
   get size() {
     return this.entries.size;
@@ -441,6 +483,45 @@ var _FarmDataCache = class _FarmDataCache {
     });
     return this.toPublicEntry(entry);
   }
+  async getEntryAsync(key, options = {}) {
+    if (this.local) {
+      const localEntry = this.getEntry(key, options);
+      if (localEntry) return localEntry;
+    }
+    if (!this.adapter) {
+      return this.local ? void 0 : this.getEntry(key, options);
+    }
+    const entry = await this.adapter.get(this.createAdapterKey(key));
+    if (!entry) {
+      emitFarmEvent({ type: "cache.miss", key });
+      return void 0;
+    }
+    assertFarmCacheEntry(entry, key);
+    const stale = await this.isAdapterEntryStale(entry, options.now);
+    if (stale) {
+      emitFarmEvent({
+        type: "cache.stale",
+        key,
+        tags: [...entry.tags],
+        revalidate: entry.revalidate
+      });
+      if (!options.allowStale) {
+        emitFarmEvent({ type: "cache.miss", key, reason: "stale" });
+        return void 0;
+      }
+    }
+    emitFarmEvent({
+      type: "cache.hit",
+      key,
+      tags: [...entry.tags],
+      revalidate: entry.revalidate,
+      stale
+    });
+    if (this.local && !stale) {
+      this.hydrateLocalEntry(entry);
+    }
+    return { ...entry, key };
+  }
   set(key, value, options = {}) {
     const tags = /* @__PURE__ */ new Set();
     for (const tag of options.tags ?? []) {
@@ -453,6 +534,7 @@ var _FarmDataCache = class _FarmDataCache {
       key,
       value,
       tags,
+      tagVersions: void 0,
       createdAt: options.createdAt ?? Date.now(),
       createdVersion: ++this.version,
       revalidate: normalizeRevalidate(options.revalidate)
@@ -466,11 +548,45 @@ var _FarmDataCache = class _FarmDataCache {
     });
     return this.toPublicEntry(entry);
   }
+  async setAsync(key, value, options = {}, tagVersions) {
+    const tags = normalizeCacheOptionsTags(options);
+    const capturedVersions = tagVersions ?? await this.getAdapterTagVersions(Array.from(tags.values()));
+    const entry = {
+      key,
+      value,
+      tags: Array.from(tags),
+      tagVersions: capturedVersions,
+      createdAt: options.createdAt ?? Date.now(),
+      createdVersion: ++this.version,
+      revalidate: normalizeRevalidate(options.revalidate)
+    };
+    if (this.local) {
+      this.hydrateLocalEntry(entry);
+    }
+    if (this.adapter) {
+      await this.adapter.set(this.createAdapterKey(key), entry);
+    }
+    emitFarmEvent({
+      type: "cache.set",
+      key,
+      tags: [...entry.tags],
+      revalidate: entry.revalidate
+    });
+    return entry;
+  }
   delete(key) {
     const deleted = this.entries.delete(key);
     emitFarmEvent({ type: "cache.delete", key, deleted });
     return deleted;
   }
+  async deleteAsync(key) {
+    const deleted = this.entries.delete(key);
+    if (this.adapter) {
+      await this.adapter.delete(this.createAdapterKey(key));
+    }
+    emitFarmEvent({ type: "cache.delete", key, deleted: this.adapter ? true : deleted });
+    return this.adapter ? true : deleted;
+  }
   clear() {
     const count = this.entries.size;
     this.entries.clear();
@@ -479,6 +595,10 @@ var _FarmDataCache = class _FarmDataCache {
     this.version = 0;
     emitFarmEvent({ type: "cache.clear", count });
   }
+  async clearAsync() {
+    this.clear();
+    await this.adapter?.clear?.();
+  }
   isStale(entry, now = Date.now()) {
     if (typeof entry.revalidate === "number" && entry.revalidate > 0 && now - entry.createdAt >= entry.revalidate * 1e3) {
       return true;
@@ -491,6 +611,12 @@ var _FarmDataCache = class _FarmDataCache {
     }
     return false;
   }
+  async isStaleAsync(entry, now = Date.now()) {
+    if (this.adapter) {
+      return this.isAdapterEntryStale(entry, now);
+    }
+    return this.isStale(entry, now);
+  }
   revalidateTag(tag, options = {}) {
     const normalized = normalizeCacheTag(tag);
     const count = this.invalidateTag(normalized);
@@ -499,6 +625,15 @@ var _FarmDataCache = class _FarmDataCache {
     );
     return count;
   }
+  async revalidateTagAsync(tag, options = {}) {
+    const normalized = normalizeCacheTag(tag);
+    const count = this.invalidateTag(normalized);
+    await this.adapter?.invalidateTags?.([this.createAdapterTag(normalized)]);
+    emitFarmEvent(
+      options.source === "updateTag" ? { type: "cache.updateTag", tag: normalized, count } : { type: "cache.revalidateTag", tag: normalized, profile: options.profile, count }
+    );
+    return count;
+  }
   revalidatePath(routePath) {
     const normalizedPath = normalizeRevalidatePath(routePath);
     const pathTag = createPathCacheTag(normalizedPath);
@@ -515,8 +650,25 @@ var _FarmDataCache = class _FarmDataCache {
     }
     return count;
   }
+  async revalidatePathAsync(routePath) {
+    const normalizedPath = normalizeRevalidatePath(routePath);
+    const pathTag = createPathCacheTag(normalizedPath);
+    const pprCount = this.countEntriesForTags([pathTag, "ppr"]);
+    const count = this.invalidateTag(pathTag);
+    await this.adapter?.invalidateTags?.([this.createAdapterTag(pathTag)]);
+    emitFarmEvent({ type: "cache.revalidatePath", path: normalizedPath, count });
+    if (pprCount > 0) {
+      emitFarmEvent({
+        type: "ppr.shell.invalidated",
+        route: normalizedPath,
+        reason: "revalidatePath",
+        count: pprCount
+      });
+    }
+    return count;
+  }
   async getOrSet(key, producer, options = {}) {
-    const cached = this.getEntry(key);
+    const cached = await this.getEntryAsync(key);
     if (cached) {
       return cached.value;
     }
@@ -525,10 +677,8 @@ var _FarmDataCache = class _FarmDataCache {
       emitFarmEvent({ type: "cache.dedupe", key });
       return inflight;
     }
-    const promise = Promise.resolve().then(producer).then((value) => {
-      this.set(key, value, options);
-      return value;
-    }).catch((error) => {
+    const tags = Array.from(normalizeCacheOptionsTags(options));
+    const promise = this.fillCacheEntry(key, producer, options, tags).catch((error) => {
       emitFarmEvent({ type: "cache.error", key, operation: "set", error });
       throw error;
     }).finally(() => {
@@ -537,6 +687,40 @@ var _FarmDataCache = class _FarmDataCache {
     this.inflight.set(key, promise);
     return promise;
   }
+  async fillCacheEntry(key, producer, options, tags) {
+    const leaseKey = `${this.namespace}:lease:${key}`;
+    let leaseToken;
+    if (this.adapter?.acquireLease && this.adapter.releaseLease && this.lease.enabled) {
+      leaseToken = await this.adapter.acquireLease(leaseKey, this.lease.ttlMs);
+      if (!leaseToken) {
+        const shared = await this.waitForAdapterEntry(key);
+        if (shared) {
+          emitFarmEvent({ type: "cache.dedupe", key });
+          return shared.value;
+        }
+        leaseToken = await this.adapter.acquireLease(leaseKey, this.lease.ttlMs);
+      }
+    }
+    try {
+      const initialTagVersions = await this.getAdapterTagVersions(tags);
+      const value = await producer();
+      await this.setAsync(key, value, options, initialTagVersions);
+      return value;
+    } finally {
+      if (leaseToken && this.adapter?.releaseLease) {
+        await this.adapter.releaseLease(leaseKey, leaseToken);
+      }
+    }
+  }
+  async waitForAdapterEntry(key) {
+    const deadline = Date.now() + this.lease.waitTimeoutMs;
+    while (Date.now() < deadline) {
+      await delay(this.lease.pollIntervalMs);
+      const entry = await this.getEntryAsync(key);
+      if (entry) return entry;
+    }
+    return void 0;
+  }
   countEntriesForTag(tag) {
     let count = 0;
     for (const entry of this.entries.values()) {
@@ -564,11 +748,53 @@ var _FarmDataCache = class _FarmDataCache {
       key: entry.key,
       value: entry.value,
       tags: Array.from(entry.tags),
+      tagVersions: entry.tagVersions,
       createdAt: entry.createdAt,
       createdVersion: entry.createdVersion,
       revalidate: entry.revalidate
     };
   }
+  hydrateLocalEntry(entry) {
+    this.entries.set(entry.key, {
+      key: entry.key,
+      value: entry.value,
+      tags: new Set(entry.tags.map(normalizeCacheTag)),
+      tagVersions: entry.tagVersions,
+      createdAt: entry.createdAt,
+      createdVersion: entry.createdVersion ?? ++this.version,
+      revalidate: normalizeRevalidate(entry.revalidate)
+    });
+  }
+  createAdapterKey(key) {
+    return `${this.namespace}:entry:${key}`;
+  }
+  createAdapterTag(tag) {
+    return `${this.namespace}:tag:${tag}`;
+  }
+  async getAdapterTagVersions(tags) {
+    if (!this.adapter?.getTagVersions || tags.length === 0) return {};
+    const normalized = tags.map(normalizeCacheTag);
+    const physicalTags = normalized.map((tag) => this.createAdapterTag(tag));
+    const versions = await this.adapter.getTagVersions(physicalTags);
+    return Object.fromEntries(
+      normalized.map((tag, index) => [
+        tag,
+        normalizeAdapterVersion(versions[physicalTags[index]])
+      ])
+    );
+  }
+  async isAdapterEntryStale(entry, now = Date.now()) {
+    if (typeof entry.revalidate === "number" && entry.revalidate > 0 && now - entry.createdAt >= entry.revalidate * 1e3) {
+      return true;
+    }
+    const currentVersions = await this.getAdapterTagVersions(entry.tags);
+    for (const tag of entry.tags) {
+      if (normalizeAdapterVersion(currentVersions[tag]) > normalizeAdapterVersion(entry.tagVersions?.[tag])) {
+        return true;
+      }
+    }
+    return false;
+  }
 };
 __name(_FarmDataCache, "FarmDataCache");
 var FarmDataCache = _FarmDataCache;
@@ -581,6 +807,10 @@ function getFarmDataCache() {
   return sharedFarmDataCache;
 }
 __name(getFarmDataCache, "getFarmDataCache");
+function configureFarmCache(config) {
+  sharedFarmDataCache.configure(config);
+}
+__name(configureFarmCache, "configureFarmCache");
 function createPathCacheTag(routePath) {
   return `path:${normalizeRevalidatePath(routePath)}`;
 }
@@ -633,6 +863,52 @@ function normalizeCacheTag(tag) {
   return normalized;
 }
 __name(normalizeCacheTag, "normalizeCacheTag");
+function normalizeCacheNamespace(namespace) {
+  if (typeof namespace !== "string") {
+    throw new TypeError("Cache namespace must be a string.");
+  }
+  const normalized = namespace.trim().replace(/:+$/g, "");
+  if (!normalized) {
+    throw new Error("Cache namespace cannot be empty.");
+  }
+  return normalized;
+}
+__name(normalizeCacheNamespace, "normalizeCacheNamespace");
+function normalizeAdapterVersion(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
+}
+__name(normalizeAdapterVersion, "normalizeAdapterVersion");
+function normalizePositiveDuration(value, fallback, name) {
+  if (value === void 0) return fallback;
+  if (!Number.isFinite(value) || value <= 0) {
+    throw new TypeError(`${name} must be a positive number of milliseconds.`);
+  }
+  return Math.floor(value);
+}
+__name(normalizePositiveDuration, "normalizePositiveDuration");
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+__name(delay, "delay");
+function normalizeCacheOptionsTags(options) {
+  const tags = /* @__PURE__ */ new Set();
+  for (const tag of options.tags ?? []) {
+    tags.add(normalizeCacheTag(tag));
+  }
+  for (const routePath of options.paths ?? []) {
+    tags.add(createPathCacheTag(routePath));
+  }
+  return tags;
+}
+__name(normalizeCacheOptionsTags, "normalizeCacheOptionsTags");
+function assertFarmCacheEntry(entry, expectedKey) {
+  if (!entry || typeof entry !== "object" || entry.key !== expectedKey || !Array.isArray(entry.tags) || typeof entry.createdAt !== "number") {
+    throw new TypeError(
+      `Cache adapter returned an invalid entry for ${JSON.stringify(expectedKey)}.`
+    );
+  }
+}
+__name(assertFarmCacheEntry, "assertFarmCacheEntry");
 function getFunctionCacheIdentity(fn) {
   if (fn.name) {
     return `name:${fn.name}`;
@@ -776,7 +1052,7 @@ function mergeMetadata(base, next) {
 __name(mergeMetadata, "mergeMetadata");
 function addMetadataImageReference(metadata, reference) {
   if (reference.kind === "opengraph") {
-    const openGraph = { ...metadata.openGraph || {} };
+    const openGraph = { ...metadata.openGraph };
     if (!hasMetadataImages(openGraph.images) && !hasMetadataImages(openGraph.image)) {
       openGraph.images = [
         {
@@ -793,7 +1069,7 @@ function addMetadataImageReference(metadata, reference) {
       openGraph
     };
   }
-  const twitter = { ...metadata.twitter || {} };
+  const twitter = { ...metadata.twitter };
   if (!hasMetadataImages(twitter.images)) {
     twitter.images = [reference.href];
     twitter.card = twitter.card || "summary_large_image";
@@ -1528,7 +1804,7 @@ function matchRoutePath(pathname, middlewarePath) {
   if (!nestedMatch.matched) {
     return { matched: false };
   }
-  const params = { ...nestedMatch.params || {} };
+  const params = { ...nestedMatch.params };
   delete params.__farmRest;
   return {
     matched: true,
@@ -1865,6 +2141,19 @@ function withFarmRouteContext(props, context) {
   return props;
 }
 __name(withFarmRouteContext, "withFarmRouteContext");
+
+// src/nitro/production-runtime.ts
+function appendFarmLinkHeader(headers, value) {
+  const current = headers.get("Link");
+  if (!current) {
+    headers.set("Link", value);
+    return;
+  }
+  if (current !== value && !current.endsWith(`, ${value}`)) {
+    headers.set("Link", `${current}, ${value}`);
+  }
+}
+__name(appendFarmLinkHeader, "appendFarmLinkHeader");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   _runWithAfterRequest,
@@ -1872,7 +2161,9 @@ __name(withFarmRouteContext, "withFarmRouteContext");
   _runWithMiddlewareContext,
   _runWithMiddlewareData,
   addMetadataImageReference,
+  appendFarmLinkHeader,
   applyProductionMiddlewareHeaders,
+  configureFarmCache,
   configureFarmObservability,
   createFarmCacheKey,
   createFarmLocaleCookie,