@farm.js/core 0.1.38 → 0.1.40

package/dist/cache.d.mts

@@ -88,7 +88,8 @@ interface FarmCacheEntry<T = unknown> {
     revalidate?: number | false;
     /**
      * Epoch milliseconds after which no reader can use the entry, so shared
-     * storage may drop it. Set only for entries with a finite `revalidate`.
+     * storage may drop it. Set for entries with a finite `revalidate`, and for PPR shells
+     * stored through an adapter (see {@link PPR_SHELL_ADAPTER_TTL_SECONDS}).
      * Adapters with native expiry (Redis PX, unstorage `ttl`) should honor it.
      */
     expiresAt?: number;
@@ -163,6 +164,11 @@ interface StorageFarmCacheAdapterOptions {
  * their atomic increment/transaction primitives for tag invalidation.
  */
 declare function storageCacheAdapter(storage: FarmCacheStorage, options?: StorageFarmCacheAdapterOptions): FarmCacheAdapter;
+/**
+ * How long a PPR shell without `revalidate` stays in a shared cache adapter. Every query
+ * string variant stores its own shell, so without an expiry they would pile up forever.
+ */
+declare const PPR_SHELL_ADAPTER_TTL_SECONDS = 86400;
 interface GetFarmCacheEntryOptions {
     allowStale?: boolean;
     now?: number;
@@ -186,9 +192,19 @@ declare class FarmDataCache {
     private namespace;
     private local;
     private maxEntries;
+    private config;
+    /** PPR shells, kept apart so query-string variants never evict app entries. */
+    private shells?;
+    private isShellCache;
     private lease;
     constructor(config?: FarmCacheUserConfig);
     configure(config?: FarmCacheUserConfig): void;
+    /**
+     * Where PPR shells live: the same adapter and namespace, so path and tag invalidation
+     * reaches them, but their own in-memory LRU of `maxEntries`.
+     * @internal
+     */
+    get pprShellCache(): FarmDataCache;
     get adapterName(): string;
     get hasAdapter(): boolean;
     get size(): number;
@@ -201,6 +217,7 @@ declare class FarmDataCache {
     delete(key: string): boolean;
     deleteAsync(key: string): Promise<boolean>;
     clear(): void;
+    private resetLocal;
     clearAsync(): Promise<void>;
     isStale(entry: FarmCacheStaleEntry, now?: number): boolean;
     isStaleAsync(entry: FarmCacheEntry, now?: number): Promise<boolean>;
@@ -269,6 +286,10 @@ declare function configureFarmCache(config: FarmCacheUserConfig | undefined): vo
  * Values passed as call arguments already participate in the key and do not
  * need to be repeated in `keyParts`.
  *
+ * The result is shared by every request, so the function cannot read the
+ * request: `cookies()`, `headers()`, `getCspNonce()`, and `getCurrentRequest()`
+ * throw inside it. Read them outside and pass what you need as an argument.
+ *
  * @param fn The async function to memoize.
  * @param keyParts Extra values that identify this call site. Include every
  *   variable the function closes over that is not one of its arguments.
@@ -308,4 +329,4 @@ declare function createPathCacheTag(routePath: string): string;
 declare function createRouteDataCacheTag(key: RouteDataCacheKey): string;
 declare function normalizeRevalidatePath(routePath: string): string;
 
-export { type CacheKeyFactory, type DefinedCacheKey, type FarmCacheAdapter, type FarmCacheEntry, type FarmCacheInvalidationStreamOptions, type FarmCacheInvalidationTarget, type FarmCacheOptions, type FarmCacheSetOptions, type FarmCacheStorage, type FarmCacheUserConfig, type FarmClientCacheUserConfig, FarmDataCache, type GetFarmCacheEntryOptions, type InferCacheKeyData, type RevalidateTagProfile, type RouteDataCacheKey, type StorageFarmCacheAdapterOptions, applyFarmCacheInvalidationTargets, configureFarmCache, createFarmCacheInvalidationStream, createFarmCacheKey, createPathCacheTag, createRouteDataCacheKey, createRouteDataCacheTag, defineCacheKey, getFarmDataCache, invalidate, invalidateRouteData, normalizeRevalidatePath, revalidatePath, revalidateTag, storageCacheAdapter, unstable_cache, updateTag };
+export { type CacheKeyFactory, type DefinedCacheKey, type FarmCacheAdapter, type FarmCacheEntry, type FarmCacheInvalidationStreamOptions, type FarmCacheInvalidationTarget, type FarmCacheOptions, type FarmCacheSetOptions, type FarmCacheStorage, type FarmCacheUserConfig, type FarmClientCacheUserConfig, FarmDataCache, type GetFarmCacheEntryOptions, type InferCacheKeyData, PPR_SHELL_ADAPTER_TTL_SECONDS, type RevalidateTagProfile, type RouteDataCacheKey, type StorageFarmCacheAdapterOptions, applyFarmCacheInvalidationTargets, configureFarmCache, createFarmCacheInvalidationStream, createFarmCacheKey, createPathCacheTag, createRouteDataCacheKey, createRouteDataCacheTag, defineCacheKey, getFarmDataCache, invalidate, invalidateRouteData, normalizeRevalidatePath, revalidatePath, revalidateTag, storageCacheAdapter, unstable_cache, updateTag };

package/dist/cache.d.ts

@@ -88,7 +88,8 @@ interface FarmCacheEntry<T = unknown> {
     revalidate?: number | false;
     /**
      * Epoch milliseconds after which no reader can use the entry, so shared
-     * storage may drop it. Set only for entries with a finite `revalidate`.
+     * storage may drop it. Set for entries with a finite `revalidate`, and for PPR shells
+     * stored through an adapter (see {@link PPR_SHELL_ADAPTER_TTL_SECONDS}).
      * Adapters with native expiry (Redis PX, unstorage `ttl`) should honor it.
      */
     expiresAt?: number;
@@ -163,6 +164,11 @@ interface StorageFarmCacheAdapterOptions {
  * their atomic increment/transaction primitives for tag invalidation.
  */
 declare function storageCacheAdapter(storage: FarmCacheStorage, options?: StorageFarmCacheAdapterOptions): FarmCacheAdapter;
+/**
+ * How long a PPR shell without `revalidate` stays in a shared cache adapter. Every query
+ * string variant stores its own shell, so without an expiry they would pile up forever.
+ */
+declare const PPR_SHELL_ADAPTER_TTL_SECONDS = 86400;
 interface GetFarmCacheEntryOptions {
     allowStale?: boolean;
     now?: number;
@@ -186,9 +192,19 @@ declare class FarmDataCache {
     private namespace;
     private local;
     private maxEntries;
+    private config;
+    /** PPR shells, kept apart so query-string variants never evict app entries. */
+    private shells?;
+    private isShellCache;
     private lease;
     constructor(config?: FarmCacheUserConfig);
     configure(config?: FarmCacheUserConfig): void;
+    /**
+     * Where PPR shells live: the same adapter and namespace, so path and tag invalidation
+     * reaches them, but their own in-memory LRU of `maxEntries`.
+     * @internal
+     */
+    get pprShellCache(): FarmDataCache;
     get adapterName(): string;
     get hasAdapter(): boolean;
     get size(): number;
@@ -201,6 +217,7 @@ declare class FarmDataCache {
     delete(key: string): boolean;
     deleteAsync(key: string): Promise<boolean>;
     clear(): void;
+    private resetLocal;
     clearAsync(): Promise<void>;
     isStale(entry: FarmCacheStaleEntry, now?: number): boolean;
     isStaleAsync(entry: FarmCacheEntry, now?: number): Promise<boolean>;
@@ -269,6 +286,10 @@ declare function configureFarmCache(config: FarmCacheUserConfig | undefined): vo
  * Values passed as call arguments already participate in the key and do not
  * need to be repeated in `keyParts`.
  *
+ * The result is shared by every request, so the function cannot read the
+ * request: `cookies()`, `headers()`, `getCspNonce()`, and `getCurrentRequest()`
+ * throw inside it. Read them outside and pass what you need as an argument.
+ *
  * @param fn The async function to memoize.
  * @param keyParts Extra values that identify this call site. Include every
  *   variable the function closes over that is not one of its arguments.
@@ -308,4 +329,4 @@ declare function createPathCacheTag(routePath: string): string;
 declare function createRouteDataCacheTag(key: RouteDataCacheKey): string;
 declare function normalizeRevalidatePath(routePath: string): string;
 
-export { type CacheKeyFactory, type DefinedCacheKey, type FarmCacheAdapter, type FarmCacheEntry, type FarmCacheInvalidationStreamOptions, type FarmCacheInvalidationTarget, type FarmCacheOptions, type FarmCacheSetOptions, type FarmCacheStorage, type FarmCacheUserConfig, type FarmClientCacheUserConfig, FarmDataCache, type GetFarmCacheEntryOptions, type InferCacheKeyData, type RevalidateTagProfile, type RouteDataCacheKey, type StorageFarmCacheAdapterOptions, applyFarmCacheInvalidationTargets, configureFarmCache, createFarmCacheInvalidationStream, createFarmCacheKey, createPathCacheTag, createRouteDataCacheKey, createRouteDataCacheTag, defineCacheKey, getFarmDataCache, invalidate, invalidateRouteData, normalizeRevalidatePath, revalidatePath, revalidateTag, storageCacheAdapter, unstable_cache, updateTag };
+export { type CacheKeyFactory, type DefinedCacheKey, type FarmCacheAdapter, type FarmCacheEntry, type FarmCacheInvalidationStreamOptions, type FarmCacheInvalidationTarget, type FarmCacheOptions, type FarmCacheSetOptions, type FarmCacheStorage, type FarmCacheUserConfig, type FarmClientCacheUserConfig, FarmDataCache, type GetFarmCacheEntryOptions, type InferCacheKeyData, PPR_SHELL_ADAPTER_TTL_SECONDS, type RevalidateTagProfile, type RouteDataCacheKey, type StorageFarmCacheAdapterOptions, applyFarmCacheInvalidationTargets, configureFarmCache, createFarmCacheInvalidationStream, createFarmCacheKey, createPathCacheTag, createRouteDataCacheKey, createRouteDataCacheTag, defineCacheKey, getFarmDataCache, invalidate, invalidateRouteData, normalizeRevalidatePath, revalidatePath, revalidateTag, storageCacheAdapter, unstable_cache, updateTag };

package/dist/cache.mjs

@@ -1,5 +1,6 @@
 import {
   FarmDataCache,
+  PPR_SHELL_ADAPTER_TTL_SECONDS,
   applyFarmCacheInvalidationTargets,
   configureFarmCache,
   createFarmCacheInvalidationStream,
@@ -15,8 +16,8 @@ import {
   storageCacheAdapter,
   unstable_cache,
   updateTag
-} from "./chunk-MSSFIQGM.mjs";
-import "./chunk-FUZEBRP3.mjs";
+} from "./chunk-7VAJSSPG.mjs";
+import "./chunk-4GP3XZ4Z.mjs";
 import "./chunk-C4NCTZLM.mjs";
 import {
   createFarmCacheKey,
@@ -25,9 +26,11 @@ import {
 import {
   applyFarmCacheInvalidations
 } from "./chunk-4SIYUGRY.mjs";
+import "./chunk-Y6LRPO2K.mjs";
 import "./chunk-LPEX4YW6.mjs";
 export {
   FarmDataCache,
+  PPR_SHELL_ADAPTER_TTL_SECONDS,
   applyFarmCacheInvalidationTargets,
   applyFarmCacheInvalidations,
   configureFarmCache,

package/dist/{chunk-3UEVPCGW.mjs → chunk-2DMWQWNJ.mjs}

@@ -1,6 +1,6 @@
 import {
   applyFarmCacheInvalidationTargets
-} from "./chunk-MSSFIQGM.mjs";
+} from "./chunk-7VAJSSPG.mjs";
 import {
   isMultipartSchema
 } from "./chunk-EMLAPBEM.mjs";
@@ -50,6 +50,11 @@ function createEndpoint(pathOrOptions, optionsOrHandler, maybeHandler) {
   if (typeof handler !== "function") {
     throw new TypeError("createEndpoint requires a handler function");
   }
+  if (options.use !== void 0) {
+    throw new TypeError(
+      "createEndpoint does not support the `use` option. Move these functions to `middleware`: each receives the endpoint context and returns an object, true, false, or a Response."
+    );
+  }
   const middleware = normalizeEndpointMiddleware(options.middleware);
   const errors = normalizeEndpointErrors(options.errors);
   const error = createEndpointErrorHandler(errors);

package/dist/{chunk-ZXH4TS3F.cjs → chunk-2JG2LJDI.cjs}

@@ -3,65 +3,11 @@
 var _chunkAI7QMY7Ocjs = require('./chunk-AI7QMY7O.cjs');
 
 
-var _chunk6XWDE2P2cjs = require('./chunk-6XWDE2P2.cjs');
+var _chunkXVIEGKTTcjs = require('./chunk-XVIEGKTT.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 
-// src/middleware/server.ts
-var _async_hooks = require('async_hooks');
-var MIDDLEWARE_DATA_STORE_KEY = /* @__PURE__ */ Symbol.for("farm.middlewareDataStore");
-var MIDDLEWARE_CONTEXT_STORE_KEY = /* @__PURE__ */ Symbol.for("farm.middlewareContextStore");
-function getGlobalMiddlewareStore(key) {
-  const state = globalThis;
-  const existing = state[key];
-  if (existing instanceof _async_hooks.AsyncLocalStorage) {
-    return existing;
-  }
-  const store = new (0, _async_hooks.AsyncLocalStorage)();
-  state[key] = store;
-  return store;
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, getGlobalMiddlewareStore, "getGlobalMiddlewareStore");
-var middlewareStore = getGlobalMiddlewareStore(MIDDLEWARE_DATA_STORE_KEY);
-var middlewareContextStore = getGlobalMiddlewareStore(MIDDLEWARE_CONTEXT_STORE_KEY);
-function toMiddlewareMap(data) {
-  if (data instanceof Map) {
-    return new Map(data);
-  }
-  return new Map(Object.entries(data));
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, toMiddlewareMap, "toMiddlewareMap");
-function _clearCurrentMiddlewareData() {
-  middlewareStore.enterWith(/* @__PURE__ */ new Map());
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, _clearCurrentMiddlewareData, "_clearCurrentMiddlewareData");
-function _clearCurrentMiddlewareContext() {
-  middlewareContextStore.enterWith(/* @__PURE__ */ new Map());
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, _clearCurrentMiddlewareContext, "_clearCurrentMiddlewareContext");
-async function _runWithMiddlewareData(data, fn) {
-  return middlewareStore.run(toMiddlewareMap(data), fn);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, _runWithMiddlewareData, "_runWithMiddlewareData");
-async function _runWithMiddlewareContext(context, fn) {
-  return middlewareContextStore.run(toMiddlewareMap(context), fn);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, _runWithMiddlewareContext, "_runWithMiddlewareContext");
-function getMiddlewareData() {
-  return middlewareStore.getStore() || /* @__PURE__ */ new Map();
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, getMiddlewareData, "getMiddlewareData");
-function getMiddlewareValue(key) {
-  const data = getMiddlewareData();
-  return data.get(key);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, getMiddlewareValue, "getMiddlewareValue");
-function getMiddlewareContext() {
-  return middlewareContextStore.getStore() || /* @__PURE__ */ new Map();
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, getMiddlewareContext, "getMiddlewareContext");
-
 // src/middleware/cookie-header.ts
 function parseMiddlewareCookieHeader(cookieHeader) {
   const cookies = /* @__PURE__ */ Object.create(null);
@@ -112,7 +58,7 @@ function toWebRequest(ctx) {
   if (isWebRequest(ctx.request)) {
     return ctx.request;
   }
-  return _chunk6XWDE2P2cjs.createWebRequestFromFarmRequest.call(void 0, ctx.request, { origin: ctx.url.origin });
+  return _chunkXVIEGKTTcjs.createWebRequestFromFarmRequest.call(void 0, ctx.request, { origin: ctx.url.origin });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, toWebRequest, "toWebRequest");
 function createRequestMiddlewareContext(ctx) {
@@ -230,11 +176,4 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, normalizeMiddlewareModule, "normalizeMiddl
 
 
 
-
-
-
-
-
-
-
-exports._clearCurrentMiddlewareData = _clearCurrentMiddlewareData; exports._clearCurrentMiddlewareContext = _clearCurrentMiddlewareContext; exports._runWithMiddlewareData = _runWithMiddlewareData; exports._runWithMiddlewareContext = _runWithMiddlewareContext; exports.getMiddlewareData = getMiddlewareData; exports.getMiddlewareValue = getMiddlewareValue; exports.getMiddlewareContext = getMiddlewareContext; exports.parseMiddlewareCookieHeader = parseMiddlewareCookieHeader; exports.serializeMiddlewareCookie = serializeMiddlewareCookie; exports.serializeMiddlewareCookieDeletion = serializeMiddlewareCookieDeletion; exports.normalizeMiddlewareModule = normalizeMiddlewareModule;
+exports.parseMiddlewareCookieHeader = parseMiddlewareCookieHeader; exports.serializeMiddlewareCookie = serializeMiddlewareCookie; exports.serializeMiddlewareCookieDeletion = serializeMiddlewareCookieDeletion; exports.normalizeMiddlewareModule = normalizeMiddlewareModule;

package/dist/{chunk-QTXBII4Z.cjs → chunk-3TB5QGUW.cjs}

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkWEW2JVA4cjs = require('./chunk-WEW2JVA4.cjs');
+var _chunkD5IHNDHIcjs = require('./chunk-D5IHNDHI.cjs');
 
 
-var _chunkSGBJ247Qcjs = require('./chunk-SGBJ247Q.cjs');
+var _chunkD4ROBNTKcjs = require('./chunk-D4ROBNTK.cjs');
 
 
 var _chunkI57LW5VZcjs = require('./chunk-I57LW5VZ.cjs');
@@ -178,12 +178,12 @@ function createFarmDefaultSitemap(sources, options) {
   for (const source of sources) {
     const path = source.pattern;
     if (path.includes("[") || path.includes("(") || entries.has(path)) continue;
-    if (include.length && !include.some((pattern) => _chunkSGBJ247Qcjs.matchesFarmMarkdownRoutePattern.call(void 0, pattern, path))) {
+    if (include.length && !include.some((pattern) => _chunkD4ROBNTKcjs.matchesFarmMarkdownRoutePattern.call(void 0, pattern, path))) {
       continue;
     }
-    if (exclude.some((pattern) => _chunkSGBJ247Qcjs.matchesFarmMarkdownRoutePattern.call(void 0, pattern, path))) continue;
+    if (exclude.some((pattern) => _chunkD4ROBNTKcjs.matchesFarmMarkdownRoutePattern.call(void 0, pattern, path))) continue;
     const module = isRecord(source.module) ? source.module : void 0;
-    if (_chunkWEW2JVA4cjs.isFarmMetadataNoIndex.call(void 0, _optionalChain([module, 'optionalAccess', _2 => _2.metadata]))) continue;
+    if (_chunkD5IHNDHIcjs.isFarmMetadataNoIndex.call(void 0, _optionalChain([module, 'optionalAccess', _2 => _2.metadata]))) continue;
     if (_optionalChain([module, 'optionalAccess', _3 => _3.__farmRouteGuard])) continue;
     entries.set(path, {
       url: new URL(_chunkI57LW5VZcjs.applyFarmBasePath.call(void 0, path, options.basePath), base).href,