@farm.js/core 0.1.30 → 0.1.34

package/dist/{chunk-GZYH4OER.mjs → chunk-HR5KPHC2.mjs}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-QCFFHV5H.mjs";
 import {
   applyFarmCacheInvalidationTargets
-} from "./chunk-IV6CQY7O.mjs";
+} from "./chunk-MSSFIQGM.mjs";
 import {
   getFarmRedirectError
 } from "./chunk-CBBLJMR5.mjs";

package/dist/{chunk-ZCU4NZ3M.cjs → chunk-IE7XCHH3.cjs}

@@ -2,7 +2,7 @@
 
 
 
-var _chunkKH7BN726cjs = require('./chunk-KH7BN726.cjs');
+var _chunkN4UOK6ZIcjs = require('./chunk-N4UOK6ZI.cjs');
 
 
 var _chunk63H6BKXGcjs = require('./chunk-63H6BKXG.cjs');
@@ -14,7 +14,7 @@ var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 var _react = require('react');
 function useServerQuery(query, input, options = {}) {
   const cache = _chunk63H6BKXGcjs.getFarmClientDataCache.call(void 0, );
-  const key = _chunkKH7BN726cjs.createServerQueryCallKey.call(void 0, query, input);
+  const key = _chunkN4UOK6ZIcjs.createServerQueryCallKey.call(void 0, query, input);
   const inputRef = _react.useRef.call(void 0, input);
   const optionsRef = _react.useRef.call(void 0, options);
   const mountedKeyRef = _react.useRef.call(void 0, void 0);
@@ -36,7 +36,7 @@ function useServerQuery(query, input, options = {}) {
   const run = _react.useCallback.call(void 0, 
     (force = false) => {
       pendingInvalidationRef.current = false;
-      return _chunkKH7BN726cjs.fetchServerQuery.call(void 0, query, inputRef.current, {
+      return _chunkN4UOK6ZIcjs.fetchServerQuery.call(void 0, query, inputRef.current, {
         ...optionsRef.current,
         force
       });
@@ -56,7 +56,7 @@ function useServerQuery(query, input, options = {}) {
   }, [cache, entry, key, options.enabled, run]);
   _react.useEffect.call(void 0, () => {
     if (options.enabled === false) return;
-    return _chunkKH7BN726cjs.attachRevalidationListeners.call(void 0, 
+    return _chunkN4UOK6ZIcjs.attachRevalidationListeners.call(void 0, 
       () => {
         if (cache.isStale(key)) void run().catch(() => void 0);
       },

package/dist/{chunk-I26CZYPV.cjs → chunk-IHNIDL6H.cjs}

@@ -11,7 +11,7 @@ var _chunkSOR334EBcjs = require('./chunk-SOR334EB.cjs');
 
 
 
-var _chunk2SDO73HKcjs = require('./chunk-2SDO73HK.cjs');
+var _chunkYWN746UScjs = require('./chunk-YWN746US.cjs');
 
 
 var _chunkNYJMY3JAcjs = require('./chunk-NYJMY3JA.cjs');
@@ -282,7 +282,7 @@ function createRouteModuleFromProgrammaticPage(route, rendererRuntime) {
     default: createProgrammaticPageComponent(route, rendererRuntime),
     ..._chunkSOR334EBcjs.normalizeFarmRouteRuntimeConfig.call(void 0, route, `Route "${route.path}"`)
   };
-  if (route.params || route.search || route.guard || route.data) {
+  if (route.params || route.search || hasProgrammaticServerProps(route)) {
     mod.__farmRouteSchemas = {
       params: route.params,
       search: getProgrammaticRouteSearchSchema(route.search)
@@ -346,7 +346,7 @@ function scanProgrammaticPagePaths(source) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, scanProgrammaticPagePaths, "scanProgrammaticPagePaths");
 function createProgrammaticPageComponent(route, rendererRuntime) {
-  if (!route.params && !route.search && !route.guard && !route.data && !route.pending && !route.error && !route.notFound) {
+  if (!route.params && !route.search && !hasProgrammaticServerProps(route) && !route.pending && !route.error && !route.notFound) {
     return route.component;
   }
   const createElement = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (...args) => {
@@ -391,7 +391,22 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
         createElement(PageContent, props)
       );
     }, "FarmProgrammaticPage");
-    return markFunctionComponent(FarmProgrammaticPage);
+    return markClientStrippedPage(
+      route,
+      markFunctionComponent(FarmProgrammaticPage)
+    );
+  }
+  if (getClientStrippedServerHooks(route)) {
+    const FarmProgrammaticClientPage = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, function FarmProgrammaticClientPage2(props) {
+      if (!isProgrammaticRoutePropsResolved(props)) {
+        throw createClientStrippedRouteError(route);
+      }
+      return createElement(Component, stripProgrammaticRoutePropsMarker(props));
+    }, "FarmProgrammaticClientPage");
+    return markClientStrippedPage(
+      route,
+      markFunctionComponent(FarmProgrammaticClientPage)
+    );
   }
   const FarmProgrammaticPageContent = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, async function FarmProgrammaticPageContent2(props) {
     try {
@@ -410,9 +425,34 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
       throw error;
     }
   }, "FarmProgrammaticPageContent");
-  return markFunctionComponent(FarmProgrammaticPageContent);
+  return markClientStrippedPage(
+    route,
+    markFunctionComponent(FarmProgrammaticPageContent)
+  );
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createProgrammaticPageComponent, "createProgrammaticPageComponent");
+function getClientStrippedServerHooks(route) {
+  const hooks = route.__farmServerHooks;
+  return Array.isArray(hooks) && hooks.length > 0 ? hooks : void 0;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getClientStrippedServerHooks, "getClientStrippedServerHooks");
+function createClientStrippedRouteError(route) {
+  return new Error(
+    `Route "${route.path}" resolves its ${getClientStrippedServerHooks(route).join(" and ")} on the server; the browser can only render it with server-resolved props.`
+  );
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, createClientStrippedRouteError, "createClientStrippedRouteError");
+function hasProgrammaticServerProps(route) {
+  return Boolean(route.guard || route.data || getClientStrippedServerHooks(route));
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, hasProgrammaticServerProps, "hasProgrammaticServerProps");
+function markClientStrippedPage(route, component) {
+  if (getClientStrippedServerHooks(route) && typeof component === "function") {
+    Object.defineProperty(component, "__farmServerProps", { value: true });
+  }
+  return component;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, markClientStrippedPage, "markClientStrippedPage");
 function readProgrammaticRouteProps(route, props, resources) {
   if (isProgrammaticRoutePropsResolved(props)) {
     return props;
@@ -479,6 +519,9 @@ async function resolveProgrammaticRouteProps(route, props) {
     props.path,
     route.path
   );
+  if (getClientStrippedServerHooks(route)) {
+    throw createClientStrippedRouteError(route);
+  }
   const routeContextValue = _chunk6QQDAAAZcjs.getFarmRouteContext.call(void 0, props);
   const pluginContext = props.context;
   const baseProps = {
@@ -529,7 +572,7 @@ async function resolveProgrammaticRouteData(route, dataHooks, context) {
   const cacheKey = _chunkNYJMY3JAcjs.createFarmCacheKey.call(void 0, ["route-data", routeDataKey]);
   const cacheOptions = {
     tags: [
-      _chunk2SDO73HKcjs.createRouteDataCacheTag.call(void 0, routeDataKey),
+      _chunkYWN746UScjs.createRouteDataCacheTag.call(void 0, routeDataKey),
       ...await resolveProgrammaticRouteDataKeys(dataHooks.tags, context)
     ],
     paths: [
@@ -538,7 +581,7 @@ async function resolveProgrammaticRouteData(route, dataHooks, context) {
     ],
     revalidate: normalizeProgrammaticRouteStaleTime(dataHooks.staleTime)
   };
-  return _chunk2SDO73HKcjs.getFarmDataCache.call(void 0, ).getOrSet(cacheKey, () => dataHooks.main(context), cacheOptions);
+  return _chunkYWN746UScjs.getFarmDataCache.call(void 0, ).getOrSet(cacheKey, () => dataHooks.main(context), cacheOptions);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, resolveProgrammaticRouteData, "resolveProgrammaticRouteData");
 async function resolveProgrammaticRouteDataKeys(input, context) {

package/dist/{chunk-2FQHH5SC.mjs → chunk-IHNMMXHV.mjs}

@@ -1,13 +1,19 @@
 import {
-  compileMiddlewareConfig,
-  compileMiddlewareRoute,
-  matchesMiddlewareConfig,
-  matchesMiddlewareRoute,
   normalizeMiddlewareModule,
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion
-} from "./chunk-NRVGEI5I.mjs";
+} from "./chunk-2NNMOPDN.mjs";
+import {
+  compileMiddlewareConfig,
+  compileMiddlewareRoute,
+  matchesMiddlewareConfig,
+  matchesMiddlewareConfigAt,
+  matchesMiddlewareRouteAt
+} from "./chunk-JG6DJF5A.mjs";
+import {
+  createFarmAPIMiddlewarePathnames
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   emitFarmEvent
 } from "./chunk-FUZEBRP3.mjs";
@@ -469,6 +475,7 @@ function createProductionMiddlewareRunner(options = {}) {
   const entries = [...configMiddleware.entries, ...fileMiddleware];
   const globalConfig = configMiddleware.globalConfig;
   if (globalConfig) compileMiddlewareConfig(globalConfig);
+  const toMiddlewarePathnames = createFarmAPIMiddlewarePathnames(options.apiBasePath);
   return /* @__PURE__ */ __name(async function runProductionMiddleware(request, requestOptions = {}) {
     if (!globalConfig && entries.length === 0) {
       return emptyResult(request);
@@ -481,10 +488,22 @@ function createProductionMiddlewareRunner(options = {}) {
     );
     let ctx = contextState.ctx;
     let currentRequest = contextState.getRequest();
-    const initialPathname = options.i18n?.enabled ? stripFarmLocaleFromPathname(ctx.pathname, options.i18n) : stripFarmBasePath(ctx.pathname, options.i18n?.basePath ?? "/");
+    const toRoutePathname = /* @__PURE__ */ __name((pathname) => options.i18n?.enabled ? stripFarmLocaleFromPathname(pathname, options.i18n) : stripFarmBasePath(pathname, options.i18n?.basePath ?? "/"), "toRoutePathname");
+    const initialRequestPathname = ctx.pathname;
+    const initialPathname = toRoutePathname(initialRequestPathname);
+    const matchPathnames = /* @__PURE__ */ __name((pathname, requestPathname) => options.rawPathRouting && requestPathname !== pathname ? [
+      .../* @__PURE__ */ new Set([
+        ...toMiddlewarePathnames(pathname),
+        ...toMiddlewarePathnames(requestPathname)
+      ])
+    ] : toMiddlewarePathnames(pathname), "matchPathnames");
     let parentData;
     if (globalConfig) {
-      const globalMatch = matchesMiddlewareConfig(initialPathname, globalConfig, ctx);
+      const globalMatch = matchesMiddlewareConfigAt(
+        matchPathnames(initialPathname, initialRequestPathname),
+        globalConfig,
+        ctx
+      );
       if (!globalMatch.matched) {
         return emptyResult(request);
       }
@@ -492,26 +511,32 @@ function createProductionMiddlewareRunner(options = {}) {
         ctx.params = { ...ctx.params, ...globalMatch.params };
       }
     }
-    const applicable = entries.map((entry) => ({
-      entry,
-      routeMatch: entry.source === "config" ? { matched: true } : matchesMiddlewareRoute(initialPathname, entry)
-    })).filter((candidate) => candidate.routeMatch.matched);
-    if (applicable.length === 0) {
-      return {
-        request: currentRequest,
-        response: null,
-        data: new Map(ctx.data),
-        context: new Map(ctx.locals),
-        headers: mapToHeaders(contextState.headers),
-        handled: false
-      };
+    const ran = /* @__PURE__ */ new Set();
+    function* applicableMiddleware() {
+      for (let pathname = initialPathname, requestPathname = initialRequestPathname, pass = 0; ; pass++) {
+        const pathnames = matchPathnames(pathname, requestPathname);
+        if (pass > 0 && globalConfig) {
+          if (!matchesMiddlewareConfigAt(pathnames, globalConfig, ctx).matched) return;
+        }
+        for (const entry of entries) {
+          if (ran.has(entry)) continue;
+          const routeMatch = entry.source === "config" ? { matched: true } : matchesMiddlewareRouteAt(pathnames, entry);
+          if (routeMatch.matched) yield { entry, routeMatch, pathname, pathnames };
+        }
+        const rewrittenRequestPathname = new URL(currentRequest.url).pathname;
+        const rewrittenPathname = toRoutePathname(rewrittenRequestPathname);
+        if (rewrittenPathname === pathname && rewrittenRequestPathname === requestPathname) return;
+        pathname = rewrittenPathname;
+        requestPathname = rewrittenRequestPathname;
+      }
     }
-    for (const candidate of applicable) {
-      const { entry, routeMatch } = candidate;
-      const configMatch = entry.config ? matchesMiddlewareConfig(initialPathname, entry.config, ctx) : { matched: true };
+    __name(applicableMiddleware, "applicableMiddleware");
+    for (const { entry, routeMatch, pathname, pathnames } of applicableMiddleware()) {
+      const configMatch = entry.config ? matchesMiddlewareConfigAt(pathnames, entry.config, ctx) : { matched: true };
       if (!configMatch.matched) {
         continue;
       }
+      ran.add(entry);
       if (parentData) {
         contextState = createWebMiddlewareContext(
           currentRequest,
@@ -530,7 +555,7 @@ function createProductionMiddlewareRunner(options = {}) {
       const middlewareStartTime = Date.now();
       const middlewareEvent = {
         route: entry.path,
-        pathname: initialPathname,
+        pathname,
         name: entry.filePath
       };
       emitFarmEvent({ type: "middleware.start", ...middlewareEvent });

package/dist/{chunk-VHJGDMCG.cjs → chunk-IWZKTWHZ.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
 
-var _chunk2SDO73HKcjs = require('./chunk-2SDO73HK.cjs');
+var _chunkYWN746UScjs = require('./chunk-YWN746US.cjs');
 
 
 var _chunkARJWXNQLcjs = require('./chunk-ARJWXNQL.cjs');
@@ -220,7 +220,7 @@ async function applyEndpointInvalidations(declaration, context, result) {
       "Endpoint invalidates must resolve to an array of { key }, { path }, or { tag } targets"
     );
   }
-  return _chunk2SDO73HKcjs.applyFarmCacheInvalidationTargets.call(void 0, targets);
+  return _chunkYWN746UScjs.applyFarmCacheInvalidationTargets.call(void 0, targets);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, applyEndpointInvalidations, "applyEndpointInvalidations");
 function createInitialEndpointContext(value) {

package/dist/{chunk-DGXN3L4D.mjs → chunk-JDPAKVS4.mjs}

@@ -6,10 +6,10 @@ import {
 } from "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteConflictError
-} from "./chunk-BXFWA23T.mjs";
+} from "./chunk-LMJ7VRHZ.mjs";
 import {
   findProgrammaticRouteFilesInDir
-} from "./chunk-LNZ7JZUS.mjs";
+} from "./chunk-UDNPLXW7.mjs";
 import {
   isFarmAPIRouteFileName
 } from "./chunk-CU625VAY.mjs";
@@ -20,7 +20,7 @@ import {
   matchAPIRouteAtBasePath,
   mergePluginAPIRoutes,
   resolveAPIRouteEndpoint
-} from "./chunk-X7WVQMIB.mjs";
+} from "./chunk-657WJNRY.mjs";
 import {
   isProgrammaticRoutesFileName
 } from "./chunk-EA5K5BKU.mjs";
@@ -44,7 +44,7 @@ import {
 } from "./chunk-Z2RZJZIZ.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-BSPQVJ4A.mjs";
+} from "./chunk-FDR64H6B.mjs";
 import {
   AmbiguousRouteError,
   assertUniqueRouteParameters,

package/dist/chunk-JG6DJF5A.mjs

@@ -0,0 +1,238 @@
+import {
+  canonicalizeRequestPathname
+} from "./chunk-CQ6OSQ3K.mjs";
+import {
+  __name
+} from "./chunk-LPEX4YW6.mjs";
+
+// src/middleware/matcher.ts
+var compiledConfigCache = /* @__PURE__ */ new WeakMap();
+var compiledRouteCache = /* @__PURE__ */ new WeakMap();
+function compileMiddlewareRoute(entry) {
+  const path = entry.path;
+  if (path === "/") return void 0;
+  const cached = compiledRouteCache.get(entry);
+  if (cached?.path === path) return cached;
+  const compiled = {
+    path,
+    exact: compilePattern(path),
+    nested: compilePattern(`${path}/:__farmRest*`)
+  };
+  compiledRouteCache.set(entry, compiled);
+  return compiled;
+}
+__name(compileMiddlewareRoute, "compileMiddlewareRoute");
+function matchesMiddlewareRoute(pathname, entry) {
+  const compiled = compileMiddlewareRoute(entry);
+  if (!compiled) return { matched: true };
+  const canonicalPathname = canonicalizeRequestPathname(pathname);
+  const exactMatch = matchPattern(compiled.exact, canonicalPathname);
+  if (exactMatch.matched) return exactMatch;
+  const nestedMatch = matchPattern(compiled.nested, canonicalPathname);
+  if (!nestedMatch.matched) return { matched: false };
+  const params = { ...nestedMatch.params };
+  delete params.__farmRest;
+  return { matched: true, params: Object.keys(params).length > 0 ? params : void 0 };
+}
+__name(matchesMiddlewareRoute, "matchesMiddlewareRoute");
+function matchesMiddlewareRouteAt(pathnames, entry) {
+  for (const pathname of pathnames) {
+    const match = matchesMiddlewareRoute(pathname, entry);
+    if (match.matched) return match;
+  }
+  return { matched: false };
+}
+__name(matchesMiddlewareRouteAt, "matchesMiddlewareRouteAt");
+function sameEntries(current, previous) {
+  return current === void 0 || previous === void 0 ? current === previous : current.length === previous.length && current.every((entry, index) => entry === previous[index]);
+}
+__name(sameEntries, "sameEntries");
+function toMatcherList(matcher) {
+  if (!matcher) return [];
+  return Array.isArray(matcher) ? matcher : [matcher];
+}
+__name(toMatcherList, "toMatcherList");
+function escapeRegex(value) {
+  return value.replace(/[|\\{}()[\]^$*+?.]/g, "\\$&");
+}
+__name(escapeRegex, "escapeRegex");
+function parseColonParam(segment) {
+  const raw = segment.slice(1);
+  const last = raw[raw.length - 1];
+  const modifier = last === "*" || last === "+" || last === "?" ? last : void 0;
+  return {
+    name: modifier ? raw.slice(0, -1) : raw,
+    modifier
+  };
+}
+__name(parseColonParam, "parseColonParam");
+function compilePathPattern(pattern, trailingSlash = false) {
+  const params = [];
+  const segments = pattern.split("/").filter(Boolean);
+  if (segments.length === 0) {
+    return { kind: "path", regex: /^\/$/, params };
+  }
+  const parts = segments.map((segment) => {
+    if (segment === "**") {
+      return "(?:/.*)?";
+    }
+    if (segment === "*") {
+      return "/[^/]+";
+    }
+    if (segment.startsWith(":")) {
+      const { name, modifier } = parseColonParam(segment);
+      params.push(name);
+      if (modifier === "*") {
+        return "(?:/(.*))?";
+      }
+      if (modifier === "+") {
+        return "/(.+)";
+      }
+      if (modifier === "?") {
+        return "(?:/([^/]+))?";
+      }
+      return "/([^/]+)";
+    }
+    if (segment.startsWith("[[...") && segment.endsWith("]]")) {
+      params.push(segment.slice(5, -2));
+      return "(?:/(.*))?";
+    }
+    if (segment.startsWith("[...") && segment.endsWith("]")) {
+      params.push(segment.slice(4, -1));
+      return "(?:/(.*))?";
+    }
+    if (segment.startsWith("[") && segment.endsWith("]")) {
+      params.push(segment.slice(1, -1));
+      return "/([^/]+)";
+    }
+    return `/${escapeRegex(segment).replace(/\\\*/g, "[^/]*")}`;
+  });
+  return {
+    kind: "path",
+    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 };
+  }
+  if (pattern === "*" || pattern === "/(.*)") {
+    return { kind: "all" };
+  }
+  if (pattern.endsWith("(.*)")) {
+    return {
+      kind: "subtree",
+      prefix: pattern.slice(0, -4).replace(/\/$/, "")
+    };
+  }
+  return compilePathPattern(pattern);
+}
+__name(compilePattern, "compilePattern");
+function compileMiddlewareConfig(config) {
+  const compiled = {
+    matcher: config.matcher ? toMatcherList(config.matcher).map(
+      (matcher) => typeof matcher === "function" ? matcher : compileMatcherPattern(matcher)
+    ) : void 0,
+    exclude: config.exclude?.map(compilePattern)
+  };
+  compiledConfigCache.set(config, {
+    compiled,
+    matcher: config.matcher,
+    matcherEntries: Array.isArray(config.matcher) ? config.matcher.slice() : void 0,
+    excludeEntries: config.exclude?.slice()
+  });
+  return compiled;
+}
+__name(compileMiddlewareConfig, "compileMiddlewareConfig");
+function matchPattern(pattern, pathname) {
+  if (pattern.kind === "all") {
+    return { matched: true };
+  }
+  if (pattern.kind === "subtree") {
+    return {
+      matched: pathname === pattern.prefix || pathname.startsWith(`${pattern.prefix}/`)
+    };
+  }
+  pattern.regex.lastIndex = 0;
+  const match = pattern.regex.exec(pathname);
+  if (!match) {
+    return { matched: false };
+  }
+  if (pattern.kind === "regexp") {
+    return {
+      matched: true,
+      params: match.groups ? { ...match.groups } : void 0
+    };
+  }
+  const values = {};
+  pattern.params.forEach((param, index) => {
+    values[param] = match[index + 1] || "";
+  });
+  return {
+    matched: true,
+    params: Object.keys(values).length > 0 ? values : void 0
+  };
+}
+__name(matchPattern, "matchPattern");
+function matchesCompiledMiddlewareConfig(pathname, config, ctx) {
+  let canonicalPathname;
+  const getCanonicalPathname = /* @__PURE__ */ __name(() => canonicalPathname ?? (canonicalPathname = canonicalizeRequestPathname(pathname)), "getCanonicalPathname");
+  if (config.exclude) {
+    for (const pattern of config.exclude) {
+      if (matchPattern(pattern, getCanonicalPathname()).matched) {
+        return { matched: false };
+      }
+    }
+  }
+  if (config.matcher) {
+    for (const matcher of config.matcher) {
+      if (typeof matcher === "function") {
+        if (matcher(ctx)) {
+          return { matched: true };
+        }
+        continue;
+      }
+      const result = matchPattern(matcher, getCanonicalPathname());
+      if (result.matched) {
+        return result;
+      }
+    }
+    return { matched: false };
+  }
+  return { matched: true };
+}
+__name(matchesCompiledMiddlewareConfig, "matchesCompiledMiddlewareConfig");
+function matchesMiddlewareConfig(pathname, config, ctx) {
+  const cached = compiledConfigCache.get(config);
+  const unchanged = cached && (Array.isArray(config.matcher) ? sameEntries(config.matcher, cached.matcherEntries) : config.matcher === cached.matcher) && sameEntries(config.exclude, cached.excludeEntries);
+  const compiled = unchanged ? cached.compiled : compileMiddlewareConfig(config);
+  return matchesCompiledMiddlewareConfig(pathname, compiled, ctx);
+}
+__name(matchesMiddlewareConfig, "matchesMiddlewareConfig");
+function matchesMiddlewareConfigAt(pathnames, config, ctx) {
+  for (const pathname of pathnames) {
+    const match = matchesMiddlewareConfig(pathname, config, ctx);
+    if (match.matched) return match;
+  }
+  return { matched: false };
+}
+__name(matchesMiddlewareConfigAt, "matchesMiddlewareConfigAt");
+
+export {
+  compileMiddlewareRoute,
+  matchesMiddlewareRoute,
+  matchesMiddlewareRouteAt,
+  compileMiddlewareConfig,
+  matchesCompiledMiddlewareConfig,
+  matchesMiddlewareConfig,
+  matchesMiddlewareConfigAt
+};

package/dist/{chunk-5TISYEQF.mjs → chunk-JM5XPKWH.mjs}

@@ -9,17 +9,23 @@ function parseRequestCookieHeader(header) {
     const separatorIndex = part.indexOf("=");
     if (separatorIndex === -1) {
       return {
-        name: decodeCookiePart(part),
+        name: decodeCookieName(part),
         value: ""
       };
     }
     return {
-      name: decodeCookiePart(part.slice(0, separatorIndex).trim()),
+      name: decodeCookieName(part.slice(0, separatorIndex).trim()),
       value: decodeCookiePart(part.slice(separatorIndex + 1).trim())
     };
   }).filter((cookie) => cookie.name.length > 0);
 }
 __name(parseRequestCookieHeader, "parseRequestCookieHeader");
+var RESERVED_PREFIX = /^__(host|secure)-/i;
+function decodeCookieName(raw) {
+  const decoded = decodeCookiePart(raw);
+  return RESERVED_PREFIX.test(decoded) && !RESERVED_PREFIX.test(raw) ? raw : decoded;
+}
+__name(decodeCookieName, "decodeCookieName");
 function decodeCookiePart(value) {
   try {
     return decodeURIComponent(value);
@@ -30,5 +36,6 @@ function decodeCookiePart(value) {
 __name(decodeCookiePart, "decodeCookiePart");
 
 export {
-  parseRequestCookieHeader
+  parseRequestCookieHeader,
+  decodeCookieName
 };

package/dist/{chunk-BJJATPEC.mjs → chunk-KN7K4VQN.mjs}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-CBBLJMR5.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-BSPQVJ4A.mjs";
+} from "./chunk-FDR64H6B.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-WPYFSQKK.cjs → chunk-KNBBQHO2.cjs}

@@ -25,6 +25,19 @@ function resolveFarmAPICanonicalPathname(pathname, serverBasePath = _chunkS3A45T
   return pathname;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, resolveFarmAPICanonicalPathname, "resolveFarmAPICanonicalPathname");
+function createFarmAPIMiddlewarePathnames(serverBasePath = _chunkS3A45T7Fcjs.DEFAULT_FARM_API_BASE_PATH) {
+  const basePath = _chunkS3A45T7Fcjs.normalizeFarmAPIBasePath.call(void 0, serverBasePath);
+  if (basePath === _chunkS3A45T7Fcjs.DEFAULT_FARM_API_BASE_PATH) return (pathname) => [pathname];
+  const prefix = _chunkS3A45T7Fcjs.DEFAULT_FARM_API_BASE_PATH;
+  return (pathname) => {
+    const canonical = resolveFarmAPICanonicalPathname(pathname, basePath);
+    if (canonical !== prefix && !canonical.startsWith(`${prefix}/`)) return [pathname];
+    const suffix = canonical.slice(prefix.length);
+    const publicPath = basePath === "/" ? suffix || "/" : `${basePath}${suffix}`;
+    return [.../* @__PURE__ */ new Set([pathname, canonical, publicPath])];
+  };
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, createFarmAPIMiddlewarePathnames, "createFarmAPIMiddlewarePathnames");
 function resolveFarmAPIServerRoutePath(routePath, serverBasePath = _chunkS3A45T7Fcjs.DEFAULT_FARM_API_BASE_PATH) {
   return _chunkS3A45T7Fcjs.resolveFarmAPIRequestURL.call(void 0, routePath, serverBasePath).pathname;
 }
@@ -34,4 +47,5 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, resolveFarmAPIServerRoutePath, "resolveFar
 
 
 
-exports.resolveFarmAPIServerBasePath = resolveFarmAPIServerBasePath; exports.resolveFarmAPICanonicalPathname = resolveFarmAPICanonicalPathname; exports.resolveFarmAPIServerRoutePath = resolveFarmAPIServerRoutePath;
+
+exports.resolveFarmAPIServerBasePath = resolveFarmAPIServerBasePath; exports.resolveFarmAPICanonicalPathname = resolveFarmAPICanonicalPathname; exports.createFarmAPIMiddlewarePathnames = createFarmAPIMiddlewarePathnames; exports.resolveFarmAPIServerRoutePath = resolveFarmAPIServerRoutePath;

package/dist/{chunk-XWAWFQFS.cjs → chunk-KXWRO25S.cjs}

@@ -6,7 +6,10 @@ var _chunkOI6CMLWXcjs = require('./chunk-OI6CMLWX.cjs');
 var _chunk7W3CPVXScjs = require('./chunk-7W3CPVXS.cjs');
 
 
-var _chunk5ZSWG4UXcjs = require('./chunk-5ZSWG4UX.cjs');
+var _chunkAI7QMY7Ocjs = require('./chunk-AI7QMY7O.cjs');
+
+
+var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -17,12 +20,12 @@ function _setDefaultFarmThemeConfig(config, basePath = "/") {
   defaultThemeConfig = _chunkOI6CMLWXcjs.resolveFarmThemeConfig.call(void 0, config, basePath);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, _setDefaultFarmThemeConfig, "_setDefaultFarmThemeConfig");
-function getTheme(request = _chunk5ZSWG4UXcjs.getCurrentRequestOrNull.call(void 0, )) {
+function getTheme(request = _chunkUXFQ3UDAcjs.getCurrentRequestOrNull.call(void 0, )) {
   if (!request) return defaultThemeConfig.default;
   return readFarmThemePreference(request, defaultThemeConfig);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, getTheme, "getTheme");
-function getThemeSnapshot(request = _chunk5ZSWG4UXcjs.getCurrentRequestOrNull.call(void 0, )) {
+function getThemeSnapshot(request = _chunkUXFQ3UDAcjs.getCurrentRequestOrNull.call(void 0, )) {
   const theme = request ? readFarmThemePreference(request, defaultThemeConfig) : defaultThemeConfig.default;
   return {
     theme,
@@ -42,7 +45,7 @@ function readCookie(cookieHeader, name) {
   for (const entry of cookieHeader.split(";")) {
     const separator = entry.indexOf("=");
     if (separator < 0) continue;
-    const key = decodeCookieValue(entry.slice(0, separator).trim());
+    const key = _chunkAI7QMY7Ocjs.decodeCookieName.call(void 0, entry.slice(0, separator).trim());
     if (key !== name) continue;
     return decodeCookieValue(entry.slice(separator + 1).trim());
   }