@farm.js/core 0.1.16 → 0.1.17

package/dist/internal/production-runtime.cjs

@@ -2030,6 +2030,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;
@@ -2048,6 +2050,7 @@ var _FarmDataCache = class _FarmDataCache {
   configure(config = {}) {
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -2214,14 +2217,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));
     }
@@ -2232,6 +2233,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();
@@ -2317,23 +2319,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;
@@ -2374,7 +2385,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);
@@ -2419,18 +2430,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++;
       }
@@ -2438,10 +2440,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) {
@@ -2471,19 +2473,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)
@@ -4397,7 +4431,7 @@ function parseColonParam(segment) {
   };
 }
 __name(parseColonParam, "parseColonParam");
-function compilePathPattern(pattern) {
+function compilePathPattern(pattern, trailingSlash = false) {
   const params = [];
   const segments = pattern.split("/").filter(Boolean);
   if (segments.length === 0) {
@@ -4433,11 +4467,18 @@ function compilePathPattern(pattern) {
   });
   return {
     kind: "path",
-    regex: new RegExp(`^${parts.join("")}$`),
+    regex: new RegExp(`^${parts.join("")}${trailingSlash ? "/?" : ""}$`),
     params
   };
 }
 __name(compilePathPattern, "compilePathPattern");
+function compileMatcherPattern(pattern) {
+  if (typeof pattern === "string" && pattern !== "*" && !pattern.endsWith("(.*)")) {
+    return compilePathPattern(pattern, true);
+  }
+  return compilePattern(pattern);
+}
+__name(compileMatcherPattern, "compileMatcherPattern");
 function compilePattern(pattern) {
   if (pattern instanceof RegExp) {
     return { kind: "regexp", regex: pattern };
@@ -4457,7 +4498,7 @@ __name(compilePattern, "compilePattern");
 function compileMiddlewareConfig(config) {
   const compiled = {
     matcher: config.matcher ? toMatcherList(config.matcher).map(
-      (matcher) => typeof matcher === "function" ? matcher : compilePattern(matcher)
+      (matcher) => typeof matcher === "function" ? matcher : compileMatcherPattern(matcher)
     ) : void 0,
     exclude: config.exclude?.map(compilePattern)
   };
@@ -6180,6 +6221,7 @@ function manageFarmHtmlPreloads(html, config) {
       {
         index,
         kind,
+        href: readHtmlAttribute(element.value, "href"),
         highPriority: readHtmlAttribute(element.value, "fetchpriority")?.toLowerCase() === "high"
       }
     ] : [];
@@ -6203,6 +6245,7 @@ function manageFarmLinkHeaderPreloads(value, config) {
       {
         index,
         kind,
+        href: getLinkHeaderTarget(link),
         highPriority: getLinkHeaderParameter(link, "fetchpriority")?.toLowerCase() === "high"
       }
     ] : [];
@@ -6225,6 +6268,7 @@ function manageFarmDocumentPreloads(html, linkHeader, config) {
     candidates.push({
       index,
       kind,
+      href: readHtmlAttribute(element.value, "href"),
       highPriority: readHtmlAttribute(element.value, "fetchpriority")?.toLowerCase() === "high"
     });
   }
@@ -6234,6 +6278,7 @@ function manageFarmDocumentPreloads(html, linkHeader, config) {
     candidates.push({
       index: headerOffset + index,
       kind,
+      href: getLinkHeaderTarget(link),
       highPriority: getLinkHeaderParameter(link, "fetchpriority")?.toLowerCase() === "high"
     });
   }
@@ -6282,24 +6327,33 @@ function selectPreloadsWithinBudget(candidates, config) {
   const removed = /* @__PURE__ */ new Set();
   const warnings = [];
   for (const kind of ["image", "font"]) {
-    const matching = candidates.filter((candidate) => candidate.kind === kind);
+    const resources = /* @__PURE__ */ new Map();
+    for (const candidate of candidates) {
+      if (candidate.kind !== kind) continue;
+      const key = candidate.href ?? `#${candidate.index}`;
+      const hints = resources.get(key);
+      if (hints) hints.push(candidate);
+      else resources.set(key, [candidate]);
+    }
     const limit = kind === "image" ? config.maxImages : config.maxFonts;
-    if (matching.length <= limit) continue;
-    const retained = new Set(
-      [...matching].sort(
-        (left, right) => Number(right.highPriority) - Number(left.highPriority) || left.index - right.index
-      ).slice(0, limit).map((candidate) => candidate.index)
+    if (resources.size <= limit) continue;
+    const ranked = [...resources.values()].map((hints) => ({
+      hints,
+      index: hints[0].index,
+      highPriority: hints.some((hint) => hint.highPriority)
+    })).sort(
+      (left, right) => Number(right.highPriority) - Number(left.highPriority) || left.index - right.index
     );
     if (config.mode === "enforce") {
-      for (const candidate of matching) {
-        if (!retained.has(candidate.index)) removed.add(candidate.index);
+      for (const resource of ranked.slice(limit)) {
+        for (const hint of resource.hints) removed.add(hint.index);
       }
     }
     warnings.push({
       kind,
-      count: matching.length,
+      count: resources.size,
       budget: limit,
-      removed: config.mode === "enforce" ? matching.length - retained.size : 0
+      removed: config.mode === "enforce" ? resources.size - limit : 0
     });
   }
   return { removed, warnings };
@@ -6317,6 +6371,12 @@ function getLinkHeaderPreloadKind(link) {
   return normalizePreloadKind(getLinkHeaderParameter(link, "as"));
 }
 __name(getLinkHeaderPreloadKind, "getLinkHeaderPreloadKind");
+function getLinkHeaderTarget(link) {
+  const start = link.indexOf("<");
+  const end = link.indexOf(">", start + 1);
+  return start === -1 || end === -1 ? void 0 : link.slice(start + 1, end).trim();
+}
+__name(getLinkHeaderTarget, "getLinkHeaderTarget");
 function getLinkHeaderParameter(link, name) {
   const uriEnd = link.indexOf(">");
   if (uriEnd === -1) return void 0;

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

@@ -1,28 +1,28 @@
 export { _runWithAfterRequest } from '../after.mjs';
-export { m as mergeRouteRenderingDirectiveConfig } from '../route-rendering-CbAKr1TY.mjs';
+export { m as mergeRouteRenderingDirectiveConfig } from '../route-rendering-CeFBEAoZ.mjs';
 import { R as ResolvedFarmServerConfig } from '../workflows-CR9ex-gz.mjs';
 export { a as FarmServerConfig, b as bufferFarmRequestBody, c as cloneFarmRequestWithContext, d as createFarmNodeRequestAbortSignal, e as createFarmRequestBodyErrorResponse, m as matchesFarmIfNoneMatch, r as readFarmRequestBody, f as readNodeRequestBody, g as resolveFarmServerConfig } from '../workflows-CR9ex-gz.mjs';
-export { _ as _runWithCurrentRequest, g as getCurrentRequest, r as resolveFarmWebRequestOrigin } from '../request-DZkHYQ89.mjs';
-import { aw as APIRequestRuntime, w as FarmConfig, I as FarmContextFactoryInput } from '../client-plugins-CIPRtSsW.mjs';
-export { aH as applyFarmCspNonceToResponse, az as collectFarmLlmsTxtPages, ay as createFarmAgentRobots, aA as createFarmDefaultLlmsTxt, aB as createFarmLlmsMarkdownReader, ax as createFarmMetadataRouteResponse, aD as manageFarmDocumentPreloads, aE as manageFarmHtmlPreloads, aF as manageFarmLinkHeaderPreloads, aC as renderFarmLlmsFullTxt, aG as reportFarmPreloadWarnings, aI as resolveFarmSecurityConfig } from '../client-plugins-CIPRtSsW.mjs';
+export { _ as _runWithCurrentRequest, g as getCurrentRequest, r as resolveFarmWebRequestOrigin } from '../request-Cr53NRHr.mjs';
+import { aw as APIRequestRuntime, w as FarmConfig, I as FarmContextFactoryInput } from '../client-plugins-JXXmZliS.mjs';
+export { aH as applyFarmCspNonceToResponse, az as collectFarmLlmsTxtPages, ay as createFarmAgentRobots, aA as createFarmDefaultLlmsTxt, aB as createFarmLlmsMarkdownReader, ax as createFarmMetadataRouteResponse, aD as manageFarmDocumentPreloads, aE as manageFarmHtmlPreloads, aF as manageFarmLinkHeaderPreloads, aC as renderFarmLlmsFullTxt, aG as reportFarmPreloadWarnings, aI as resolveFarmSecurityConfig } from '../client-plugins-JXXmZliS.mjs';
 export { configureFarmCache, createFarmCacheKey, getFarmDataCache, normalizeRevalidatePath } from '../cache.mjs';
 import { g as FarmI18nUserConfig, R as ResolvedFarmI18nConfig } from '../types-Z0aotQ8w.mjs';
 export { c as createFarmLocaleCookie, g as getFarmLocaleVaryHeaders } from '../resolver-DhW0CqZN.mjs';
 import { F as FarmLocalePathConfig } from '../index-a-8Z5kZU.mjs';
 export { l as localizeFarmHref, a as localizeFarmPathname, s as stripFarmLocaleFromPathname } from '../index-a-8Z5kZU.mjs';
-export { a as addMetadataImageReference, b as addMetadataMarkdownAlternate, m as mergeMetadata, r as renderMetadataHead, c as resolveFarmNotFoundMetadata } from '../metadata-OMX6wFNf.mjs';
-export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner } from '../production-runtime-W3M0eNDV.mjs';
+export { a as addMetadataImageReference, b as addMetadataMarkdownAlternate, m as mergeMetadata, r as renderMetadataHead, c as resolveFarmNotFoundMetadata } from '../metadata-C1Z9vLbb.mjs';
+export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner } from '../production-runtime-jcrTlRTb.mjs';
 export { g as getFarmRedirectError, i as isFarmNotFoundError, a as isFarmRedirectError } from '../navigation-errors-Dvwpzaer.mjs';
 export { configureFarmObservability, emitFarmEvent, runWithFarmRequestSpan } from '../observability.mjs';
 export { f as createFarmInstrumentationLifecycle, r as resolveFarmInstrumentationRuntime } from '../instrumentation-runtime-CE06JLHZ.mjs';
 export { _setDefaultFarmThemeConfig, getTheme } from '../theme/server.mjs';
 import { c as FarmThemeRuntime, d as FarmThemeConfig, R as ResolvedFarmThemeConfig, a as FarmThemePreference } from '../types-DQnyD3VD.mjs';
 export { d as applyFarmBasePath, r as resolveFarmTrailingSlashRedirect, s as searchParamsToObject, b as setFarmBasePath, a as setFarmTrailingSlashPreference, c as stripFarmBasePath } from '../base-path-BU16ETmo.mjs';
-export { m as matchFarmPageRoute, p as parseRoutePath } from '../utils-5kQP1mFR.mjs';
+export { m as matchFarmPageRoute, p as parseRoutePath } from '../utils-uUxF0K0P.mjs';
 import 'node:http';
 import '../lifecycle-DK06VuKP.mjs';
-import '../route-C_eLaFTZ.mjs';
-import '../endpoint-Bu3XgeMK.mjs';
+import '../route-B0XrsrFk.mjs';
+import '../endpoint-DAc96i93.mjs';
 import '../renderer.mjs';
 import '../deployment.mjs';
 import 'http';

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

@@ -1,28 +1,28 @@
 export { _runWithAfterRequest } from '../after.js';
-export { m as mergeRouteRenderingDirectiveConfig } from '../route-rendering-BcLLPJgN.js';
+export { m as mergeRouteRenderingDirectiveConfig } from '../route-rendering-CWYd8Mv1.js';
 import { R as ResolvedFarmServerConfig } from '../workflows-CR9ex-gz.js';
 export { a as FarmServerConfig, b as bufferFarmRequestBody, c as cloneFarmRequestWithContext, d as createFarmNodeRequestAbortSignal, e as createFarmRequestBodyErrorResponse, m as matchesFarmIfNoneMatch, r as readFarmRequestBody, f as readNodeRequestBody, g as resolveFarmServerConfig } from '../workflows-CR9ex-gz.js';
-export { _ as _runWithCurrentRequest, g as getCurrentRequest, r as resolveFarmWebRequestOrigin } from '../request-G8JhKr4F.js';
-import { aw as APIRequestRuntime, w as FarmConfig, I as FarmContextFactoryInput } from '../client-plugins-CqVtZi5X.js';
-export { aH as applyFarmCspNonceToResponse, az as collectFarmLlmsTxtPages, ay as createFarmAgentRobots, aA as createFarmDefaultLlmsTxt, aB as createFarmLlmsMarkdownReader, ax as createFarmMetadataRouteResponse, aD as manageFarmDocumentPreloads, aE as manageFarmHtmlPreloads, aF as manageFarmLinkHeaderPreloads, aC as renderFarmLlmsFullTxt, aG as reportFarmPreloadWarnings, aI as resolveFarmSecurityConfig } from '../client-plugins-CqVtZi5X.js';
+export { _ as _runWithCurrentRequest, g as getCurrentRequest, r as resolveFarmWebRequestOrigin } from '../request-Dt2gNuQD.js';
+import { aw as APIRequestRuntime, w as FarmConfig, I as FarmContextFactoryInput } from '../client-plugins-C089bQhN.js';
+export { aH as applyFarmCspNonceToResponse, az as collectFarmLlmsTxtPages, ay as createFarmAgentRobots, aA as createFarmDefaultLlmsTxt, aB as createFarmLlmsMarkdownReader, ax as createFarmMetadataRouteResponse, aD as manageFarmDocumentPreloads, aE as manageFarmHtmlPreloads, aF as manageFarmLinkHeaderPreloads, aC as renderFarmLlmsFullTxt, aG as reportFarmPreloadWarnings, aI as resolveFarmSecurityConfig } from '../client-plugins-C089bQhN.js';
 export { configureFarmCache, createFarmCacheKey, getFarmDataCache, normalizeRevalidatePath } from '../cache.js';
 import { g as FarmI18nUserConfig, R as ResolvedFarmI18nConfig } from '../types-Z0aotQ8w.js';
 export { c as createFarmLocaleCookie, g as getFarmLocaleVaryHeaders } from '../resolver-PPEeiJ6M.js';
 import { F as FarmLocalePathConfig } from '../index-BWVfxIsO.js';
 export { l as localizeFarmHref, a as localizeFarmPathname, s as stripFarmLocaleFromPathname } from '../index-BWVfxIsO.js';
-export { a as addMetadataImageReference, b as addMetadataMarkdownAlternate, m as mergeMetadata, r as renderMetadataHead, c as resolveFarmNotFoundMetadata } from '../metadata-8g__AMPM.js';
-export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner } from '../production-runtime-BJh7o6Cr.js';
+export { a as addMetadataImageReference, b as addMetadataMarkdownAlternate, m as mergeMetadata, r as renderMetadataHead, c as resolveFarmNotFoundMetadata } from '../metadata-BcNJP4fq.js';
+export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner } from '../production-runtime-oKmC0WU-.js';
 export { g as getFarmRedirectError, i as isFarmNotFoundError, a as isFarmRedirectError } from '../navigation-errors-Dvwpzaer.js';
 export { configureFarmObservability, emitFarmEvent, runWithFarmRequestSpan } from '../observability.js';
 export { f as createFarmInstrumentationLifecycle, r as resolveFarmInstrumentationRuntime } from '../instrumentation-runtime-CE06JLHZ.js';
 export { _setDefaultFarmThemeConfig, getTheme } from '../theme/server.js';
 import { c as FarmThemeRuntime, d as FarmThemeConfig, R as ResolvedFarmThemeConfig, a as FarmThemePreference } from '../types-DQnyD3VD.js';
 export { d as applyFarmBasePath, r as resolveFarmTrailingSlashRedirect, s as searchParamsToObject, b as setFarmBasePath, a as setFarmTrailingSlashPreference, c as stripFarmBasePath } from '../base-path-BU16ETmo.js';
-export { m as matchFarmPageRoute, p as parseRoutePath } from '../utils-C4yrAhNc.js';
+export { m as matchFarmPageRoute, p as parseRoutePath } from '../utils-B0XJmG_b.js';
 import 'node:http';
 import '../lifecycle-DK06VuKP.js';
-import '../route-BxNJT447.js';
-import '../endpoint-kSAxE52R.js';
+import '../route-DOEpbyWZ.js';
+import '../endpoint-1zA994xL.js';
 import '../renderer.js';
 import '../deployment.js';
 import 'http';

package/dist/internal/production-runtime.mjs

@@ -1,7 +1,7 @@
 import {
   applyProductionMiddlewareHeaders,
   createProductionMiddlewareRunner
-} from "../chunk-KTGFMHET.mjs";
+} from "../chunk-N6UROPT7.mjs";
 import {
   createFarmInstrumentationLifecycle,
   resolveFarmInstrumentationRuntime
@@ -22,7 +22,7 @@ import {
   getDefaultErrorStatusText,
   renderFarmLocaleAlternateLinks,
   resolveDefaultErrorStatus
-} from "../chunk-7ZWL7XOU.mjs";
+} from "../chunk-76DG3LF3.mjs";
 import {
   mergeRouteRenderingDirectiveConfig
 } from "../chunk-DAO7JGTS.mjs";
@@ -47,8 +47,8 @@ import {
   renderFarmLlmsFullTxt,
   reportFarmPreloadWarnings,
   resolveFarmSecurityConfig
-} from "../chunk-Q3MDL7TM.mjs";
-import "../chunk-6SCB2MXB.mjs";
+} from "../chunk-ZCNJKLA2.mjs";
+import "../chunk-SXHV42UQ.mjs";
 import {
   farmSecretsMatch
 } from "../chunk-2UC36WAC.mjs";
@@ -60,7 +60,7 @@ import {
 import {
   _runWithMiddlewareContext,
   _runWithMiddlewareData
-} from "../chunk-NDD2YVGU.mjs";
+} from "../chunk-NRVGEI5I.mjs";
 import "../chunk-5TISYEQF.mjs";
 import {
   _runWithAPIRequestRuntime
@@ -112,7 +112,7 @@ import {
   createFarmCacheKey,
   getFarmDataCache,
   normalizeRevalidatePath
-} from "../chunk-IGO2HEV7.mjs";
+} from "../chunk-F6SJAKFJ.mjs";
 import "../chunk-4SIYUGRY.mjs";
 import "../chunk-C4NCTZLM.mjs";
 import {

package/dist/markdown.cjs

@@ -139,8 +139,16 @@ async function createMarkdownMirrorResponse(options) {
   if (!hasMarkdownExtension) {
     headersOut.set("Vary", "Accept");
   }
+  for (const token of pageResponse.headers.get("vary")?.split(",") ?? []) {
+    const name = token.trim();
+    if (name && name.toLowerCase() !== "accept") appendHeaderToken(headersOut, "Vary", name);
+  }
+  const pageCacheControl = pageResponse.headers.get("cache-control");
   const cache = target.route?.cache ?? options.config?.cache ?? false;
-  headersOut.set("Cache-Control", createMarkdownCacheHeader(cache));
+  headersOut.set(
+    "Cache-Control",
+    pageCacheControl && isPrivateCacheControl(pageCacheControl) ? pageCacheControl : createMarkdownCacheHeader(cache)
+  );
   return new Response(options.request.method === "HEAD" ? null : markdown, {
     status: pageResponse.status,
     headers: headersOut
@@ -370,6 +378,13 @@ function isHtmlResponse(response) {
   return contentType.includes("text/html");
 }
 __name(isHtmlResponse, "isHtmlResponse");
+function isPrivateCacheControl(value) {
+  return value.split(",").some((directive) => {
+    const name = directive.split("=", 1)[0].trim().toLowerCase();
+    return name === "private" || name === "no-store";
+  });
+}
+__name(isPrivateCacheControl, "isPrivateCacheControl");
 function createMarkdownCacheHeader(cache) {
   if (cache === false || cache <= 0) {
     return "no-store";

package/dist/markdown.mjs

@@ -13,7 +13,7 @@ import {
   requestAcceptsMarkdown,
   resolveMarkdownConfig,
   resolveMarkdownMirrorTarget
-} from "./chunk-6SCB2MXB.mjs";
+} from "./chunk-SXHV42UQ.mjs";
 import "./chunk-LPEX4YW6.mjs";
 export {
   FARM_MARKDOWN_CONTENT_TYPE,

package/dist/{metadata-8g__AMPM.d.ts → metadata-BcNJP4fq.d.ts}

@@ -1,4 +1,4 @@
-import { M as Metadata, s as FarmAgentJsonLd } from './client-plugins-CqVtZi5X.js';
+import { M as Metadata, s as FarmAgentJsonLd } from './client-plugins-C089bQhN.js';
 
 type MetadataImageKind = "opengraph" | "twitter";
 interface FarmMetadataImageReference {

package/dist/{metadata-OMX6wFNf.d.mts → metadata-C1Z9vLbb.d.mts}

@@ -1,4 +1,4 @@
-import { M as Metadata, s as FarmAgentJsonLd } from './client-plugins-CIPRtSsW.mjs';
+import { M as Metadata, s as FarmAgentJsonLd } from './client-plugins-JXXmZliS.mjs';
 
 type MetadataImageKind = "opengraph" | "twitter";
 interface FarmMetadataImageReference {

package/dist/middleware.cjs

@@ -1611,7 +1611,7 @@ function parseColonParam(segment) {
   };
 }
 __name(parseColonParam, "parseColonParam");
-function compilePathPattern(pattern) {
+function compilePathPattern(pattern, trailingSlash = false) {
   const params = [];
   const segments = pattern.split("/").filter(Boolean);
   if (segments.length === 0) {
@@ -1647,11 +1647,18 @@ function compilePathPattern(pattern) {
   });
   return {
     kind: "path",
-    regex: new RegExp(`^${parts.join("")}$`),
+    regex: new RegExp(`^${parts.join("")}${trailingSlash ? "/?" : ""}$`),
     params
   };
 }
 __name(compilePathPattern, "compilePathPattern");
+function compileMatcherPattern(pattern) {
+  if (typeof pattern === "string" && pattern !== "*" && !pattern.endsWith("(.*)")) {
+    return compilePathPattern(pattern, true);
+  }
+  return compilePattern(pattern);
+}
+__name(compileMatcherPattern, "compileMatcherPattern");
 function compilePattern(pattern) {
   if (pattern instanceof RegExp) {
     return { kind: "regexp", regex: pattern };
@@ -1671,7 +1678,7 @@ __name(compilePattern, "compilePattern");
 function compileMiddlewareConfig(config) {
   const compiled = {
     matcher: config.matcher ? toMatcherList(config.matcher).map(
-      (matcher) => typeof matcher === "function" ? matcher : compilePattern(matcher)
+      (matcher) => typeof matcher === "function" ? matcher : compileMatcherPattern(matcher)
     ) : void 0,
     exclude: config.exclude?.map(compilePattern)
   };

package/dist/middleware.d.mts

@@ -1,13 +1,13 @@
-import { ep as MiddlewareChain, eu as RateLimitStorage, ev as RateLimitStatus, ew as MemoryRateLimitStorageOptions, an as MiddlewareContext, ak as FarmMiddlewareConfig, el as MiddlewareFunction, am as MiddlewareConfig, u as MiddlewareProps } from './client-plugins-CIPRtSsW.mjs';
-export { eq as CookieJar, er as CookieOptions, ey as MiddlewareResult, eo as MiddlewareStore, ex as NextFunction, es as RateLimitConfig, et as RateLimitIncrementResult, aj as ReadonlyMiddlewareStore, em as RequestMiddleware, en as RequestMiddlewareContext } from './client-plugins-CIPRtSsW.mjs';
+import { ep as MiddlewareChain, eu as RateLimitStorage, ev as RateLimitStatus, ew as MemoryRateLimitStorageOptions, an as MiddlewareContext, ak as FarmMiddlewareConfig, el as MiddlewareFunction, am as MiddlewareConfig, u as MiddlewareProps } from './client-plugins-JXXmZliS.mjs';
+export { eq as CookieJar, er as CookieOptions, ey as MiddlewareResult, eo as MiddlewareStore, ex as NextFunction, es as RateLimitConfig, et as RateLimitIncrementResult, aj as ReadonlyMiddlewareStore, em as RequestMiddleware, en as RequestMiddlewareContext } from './client-plugins-JXXmZliS.mjs';
 import { IncomingMessage, ServerResponse } from 'http';
 import { ViteDevServer, Plugin } from 'vite';
 import { a as FarmServerConfig, R as ResolvedFarmServerConfig } from './workflows-CR9ex-gz.mjs';
 import { R as ResolvedFarmI18nConfig } from './types-Z0aotQ8w.mjs';
-export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue, m as matchesMiddlewareConfig } from './production-runtime-W3M0eNDV.mjs';
+export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue, m as matchesMiddlewareConfig } from './production-runtime-jcrTlRTb.mjs';
 import './lifecycle-DK06VuKP.mjs';
-import './route-C_eLaFTZ.mjs';
-import './endpoint-Bu3XgeMK.mjs';
+import './route-B0XrsrFk.mjs';
+import './endpoint-DAc96i93.mjs';
 import './cache.mjs';
 import './renderer.mjs';
 import './deployment.mjs';

package/dist/middleware.d.ts

@@ -1,13 +1,13 @@
-import { ep as MiddlewareChain, eu as RateLimitStorage, ev as RateLimitStatus, ew as MemoryRateLimitStorageOptions, an as MiddlewareContext, ak as FarmMiddlewareConfig, el as MiddlewareFunction, am as MiddlewareConfig, u as MiddlewareProps } from './client-plugins-CqVtZi5X.js';
-export { eq as CookieJar, er as CookieOptions, ey as MiddlewareResult, eo as MiddlewareStore, ex as NextFunction, es as RateLimitConfig, et as RateLimitIncrementResult, aj as ReadonlyMiddlewareStore, em as RequestMiddleware, en as RequestMiddlewareContext } from './client-plugins-CqVtZi5X.js';
+import { ep as MiddlewareChain, eu as RateLimitStorage, ev as RateLimitStatus, ew as MemoryRateLimitStorageOptions, an as MiddlewareContext, ak as FarmMiddlewareConfig, el as MiddlewareFunction, am as MiddlewareConfig, u as MiddlewareProps } from './client-plugins-C089bQhN.js';
+export { eq as CookieJar, er as CookieOptions, ey as MiddlewareResult, eo as MiddlewareStore, ex as NextFunction, es as RateLimitConfig, et as RateLimitIncrementResult, aj as ReadonlyMiddlewareStore, em as RequestMiddleware, en as RequestMiddlewareContext } from './client-plugins-C089bQhN.js';
 import { IncomingMessage, ServerResponse } from 'http';
 import { ViteDevServer, Plugin } from 'vite';
 import { a as FarmServerConfig, R as ResolvedFarmServerConfig } from './workflows-CR9ex-gz.js';
 import { R as ResolvedFarmI18nConfig } from './types-Z0aotQ8w.js';
-export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue, m as matchesMiddlewareConfig } from './production-runtime-BJh7o6Cr.js';
+export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue, m as matchesMiddlewareConfig } from './production-runtime-oKmC0WU-.js';
 import './lifecycle-DK06VuKP.js';
-import './route-BxNJT447.js';
-import './endpoint-kSAxE52R.js';
+import './route-DOEpbyWZ.js';
+import './endpoint-1zA994xL.js';
 import './cache.js';
 import './renderer.js';
 import './deployment.js';

package/dist/middleware.mjs

@@ -7,23 +7,23 @@ import {
   memoryRateLimitStorage,
   middleware,
   unwrapMiddleware
-} from "./chunk-EWDK36MM.mjs";
+} from "./chunk-A72YEUZ3.mjs";
 import {
   applyProductionMiddlewareHeaders,
   createProductionMiddlewareRunner,
   matchesMiddlewareConfig
-} from "./chunk-KTGFMHET.mjs";
+} from "./chunk-N6UROPT7.mjs";
 import {
   MiddlewareManager,
   createContext
-} from "./chunk-B76DT5Y6.mjs";
+} from "./chunk-57J3Y7Y3.mjs";
 import {
   _runWithMiddlewareContext,
   _runWithMiddlewareData,
   getMiddlewareContext,
   getMiddlewareData,
   getMiddlewareValue
-} from "./chunk-NDD2YVGU.mjs";
+} from "./chunk-NRVGEI5I.mjs";
 import "./chunk-5TISYEQF.mjs";
 import "./chunk-I2BHUNBU.mjs";
 import "./chunk-7GNWGLWB.mjs";

package/dist/{nitro-3N4ZXRYM.mjs → nitro-CVZ36JM5.mjs}

@@ -5,15 +5,15 @@ import {
   createFarmCronCloudflareConfig,
   mergeScheduledTasks,
   prepareFarmCronForNitro
-} from "./chunk-4L7SZOHZ.mjs";
+} from "./chunk-YHOCRI4H.mjs";
 import {
   createBundledEnv
-} from "./chunk-7HDZYYS4.mjs";
+} from "./chunk-4OOBRCJX.mjs";
 import {
   prepareFarmWorkflowsForNitro
-} from "./chunk-MUUZJLCI.mjs";
-import "./chunk-ONUEYC6N.mjs";
+} from "./chunk-EGJDUF4Q.mjs";
 import "./chunk-2UC36WAC.mjs";
+import "./chunk-ONUEYC6N.mjs";
 import {
   resolveFarmAPIServerBasePath
 } from "./chunk-I6XDAKWQ.mjs";