@farm.js/core 0.1.39 → 0.1.41

package/dist/{chunk-SKVTP5PR.mjs → chunk-JOW4HDJO.mjs}

@@ -3,65 +3,11 @@ import {
 } from "./chunk-JM5XPKWH.mjs";
 import {
   createWebRequestFromFarmRequest
-} from "./chunk-POSPE3IO.mjs";
+} from "./chunk-X3NGFVRF.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
 
-// src/middleware/server.ts
-import { AsyncLocalStorage } from "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 AsyncLocalStorage) {
-    return existing;
-  }
-  const store = new AsyncLocalStorage();
-  state[key] = store;
-  return store;
-}
-__name(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));
-}
-__name(toMiddlewareMap, "toMiddlewareMap");
-function _clearCurrentMiddlewareData() {
-  middlewareStore.enterWith(/* @__PURE__ */ new Map());
-}
-__name(_clearCurrentMiddlewareData, "_clearCurrentMiddlewareData");
-function _clearCurrentMiddlewareContext() {
-  middlewareContextStore.enterWith(/* @__PURE__ */ new Map());
-}
-__name(_clearCurrentMiddlewareContext, "_clearCurrentMiddlewareContext");
-async function _runWithMiddlewareData(data, fn) {
-  return middlewareStore.run(toMiddlewareMap(data), fn);
-}
-__name(_runWithMiddlewareData, "_runWithMiddlewareData");
-async function _runWithMiddlewareContext(context, fn) {
-  return middlewareContextStore.run(toMiddlewareMap(context), fn);
-}
-__name(_runWithMiddlewareContext, "_runWithMiddlewareContext");
-function getMiddlewareData() {
-  return middlewareStore.getStore() || /* @__PURE__ */ new Map();
-}
-__name(getMiddlewareData, "getMiddlewareData");
-function getMiddlewareValue(key) {
-  const data = getMiddlewareData();
-  return data.get(key);
-}
-__name(getMiddlewareValue, "getMiddlewareValue");
-function getMiddlewareContext() {
-  return middlewareContextStore.getStore() || /* @__PURE__ */ new Map();
-}
-__name(getMiddlewareContext, "getMiddlewareContext");
-
 // src/middleware/cookie-header.ts
 function parseMiddlewareCookieHeader(cookieHeader) {
   const cookies = /* @__PURE__ */ Object.create(null);
@@ -226,13 +172,6 @@ function normalizeMiddlewareModule(middlewareModule, routePath) {
 __name(normalizeMiddlewareModule, "normalizeMiddlewareModule");
 
 export {
-  _clearCurrentMiddlewareData,
-  _clearCurrentMiddlewareContext,
-  _runWithMiddlewareData,
-  _runWithMiddlewareContext,
-  getMiddlewareData,
-  getMiddlewareValue,
-  getMiddlewareContext,
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion,

package/dist/{chunk-6MVFL3R5.cjs → chunk-JR4QCLJY.cjs}

@@ -304,61 +304,6 @@ if (import.meta.hot) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, generateFarmDevIndicatorsClientRuntime, "generateFarmDevIndicatorsClientRuntime");
 
-// src/plugin-dependencies.ts
-function pluginShortName(name) {
-  return name.slice(Math.max(name.lastIndexOf(":"), name.lastIndexOf("/")) + 1);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, pluginShortName, "pluginShortName");
-function assertPluginDependencies(plugins, integrations) {
-  const integrationKeys = integrations && !Array.isArray(integrations) ? Object.keys(integrations) : [];
-  const matches = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (plugin, dependency) => plugin.name === dependency || pluginShortName(plugin.name) === dependency, "matches");
-  for (const plugin of plugins) {
-    if (plugin.dependsOn === void 0) continue;
-    if (!Array.isArray(plugin.dependsOn) || plugin.dependsOn.some((entry) => typeof entry !== "string" || entry.trim() === "")) {
-      throw new TypeError(
-        `Plugin "${plugin.name}" has an invalid \`dependsOn\`: list plugin names, such as ["teams"].`
-      );
-    }
-    for (const dependency of plugin.dependsOn) {
-      if (matches(plugin, dependency)) {
-        throw new Error(`Plugin "${plugin.name}" lists itself in \`dependsOn\`.`);
-      }
-      const found = plugins.some((candidate) => candidate !== plugin && matches(candidate, dependency)) || integrationKeys.includes(dependency);
-      if (!found) {
-        const configured = [
-          ...plugins.map((candidate) => candidate.name),
-          ...integrationKeys
-        ].filter((name) => name !== plugin.name);
-        throw new Error(
-          `Plugin "${plugin.name}" depends on "${dependency}", which is not configured. Add it to \`plugins\` (or \`integrations\`) in farm.config.${configured.length > 0 ? ` Configured: ${configured.join(", ")}.` : ""}`
-        );
-      }
-    }
-  }
-  const state = /* @__PURE__ */ new Map();
-  const path3 = [];
-  const visit = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (plugin) => {
-    if (state.get(plugin) === "done") return;
-    if (state.get(plugin) === "visiting") {
-      const cycle = [...path3.slice(path3.indexOf(plugin)), plugin].map(
-        (entry) => pluginShortName(entry.name)
-      );
-      throw new Error(`Plugins depend on each other in a cycle: ${cycle.join(" \u2192 ")}.`);
-    }
-    state.set(plugin, "visiting");
-    path3.push(plugin);
-    for (const dependency of _nullishCoalesce(plugin.dependsOn, () => ( []))) {
-      for (const candidate of plugins) {
-        if (candidate !== plugin && matches(candidate, dependency)) visit(candidate);
-      }
-    }
-    path3.pop();
-    state.set(plugin, "done");
-  }, "visit");
-  for (const plugin of plugins) visit(plugin);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, assertPluginDependencies, "assertPluginDependencies");
-
 // src/utils/source-dir.ts
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var FARM_PROJECT_SOURCE_DIRS = /* @__PURE__ */ Symbol.for("farm.projectSourceDirs");
@@ -501,6 +446,4 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, validateFarmAuthConfig, "validateFarmAuthC
 
 
 
-
-
-exports.setFarmProjectSourceDir = setFarmProjectSourceDir; exports.getFarmProjectSourceDir = getFarmProjectSourceDir; exports.resolveFarmDevIndicatorsConfig = resolveFarmDevIndicatorsConfig; exports.generateFarmDevIndicatorsClientRuntime = generateFarmDevIndicatorsClientRuntime; exports.resolveFarmAuthConfig = resolveFarmAuthConfig; exports.resolveFarmAuthIntegration = resolveFarmAuthIntegration; exports.pluginShortName = pluginShortName; exports.assertPluginDependencies = assertPluginDependencies;
+exports.setFarmProjectSourceDir = setFarmProjectSourceDir; exports.getFarmProjectSourceDir = getFarmProjectSourceDir; exports.resolveFarmDevIndicatorsConfig = resolveFarmDevIndicatorsConfig; exports.generateFarmDevIndicatorsClientRuntime = generateFarmDevIndicatorsClientRuntime; exports.resolveFarmAuthConfig = resolveFarmAuthConfig; exports.resolveFarmAuthIntegration = resolveFarmAuthIntegration;

package/dist/{chunk-CGBDNNSM.cjs → chunk-KEXK442I.cjs}

@@ -1,6 +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 _chunkKIIMAWOJcjs = require('./chunk-KIIMAWOJ.cjs');
+var _chunkUNJZGVPUcjs = require('./chunk-UNJZGVPU.cjs');
+
+
+var _chunk5NAVKJCZcjs = require('./chunk-5NAVKJCZ.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -122,7 +125,7 @@ ${negotiatedFormat}`;
           return entry;
         });
       }
-      return createOptimizedImageResponse(request, optimized, config);
+      return createOptimizedImageResponse(request, optimized);
     } catch (error) {
       if (!(error instanceof FarmImageRequestError) && !isAbortError(error)) {
         try {
@@ -352,14 +355,18 @@ async function fetchImageSource(initialUrl, requestOrigin, trustedLocalOrigin, c
   let currentUrl = initialUrl;
   for (let redirectCount = 0; ; redirectCount += 1) {
     throwIfAborted(signal);
-    const sourceFetcher = currentUrl.origin === trustedLocalOrigin ? fetcher : _nullishCoalesce(fetchRemote, () => ( fetcher));
+    const isTrustedLocal = currentUrl.origin === trustedLocalOrigin;
+    const sourceFetcher = isTrustedLocal ? fetcher : _nullishCoalesce(fetchRemote, () => ( fetcher));
     const response = await sourceFetcher(currentUrl, {
       method: "GET",
       redirect: "manual",
       signal,
       headers: {
         accept: "image/avif,image/webp,image/*,*/*;q=0.8",
-        "user-agent": "Farm.js Image Optimizer"
+        "user-agent": "Farm.js Image Optimizer",
+        // This server fetching from itself arrives from a loopback address.
+        // Mark it so the app sees an anonymous visitor, not a trusted local one.
+        ...isTrustedLocal ? { [FARM_IMAGE_SOURCE_HEADER]: getFarmImageSourceToken() } : {}
       }
     });
     if (![301, 302, 303, 307, 308].includes(response.status)) {
@@ -398,6 +405,19 @@ async function fetchImageSource(initialUrl, requestOrigin, trustedLocalOrigin, c
   }
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, fetchImageSource, "fetchImageSource");
+var FARM_IMAGE_SOURCE_HEADER = "x-farm-image-source";
+var FARM_IMAGE_SOURCE_TOKEN = /* @__PURE__ */ Symbol.for("farm.image.sourceToken");
+function getFarmImageSourceToken() {
+  const state = globalThis;
+  return _nullishCoalesce(state[FARM_IMAGE_SOURCE_TOKEN], () => ( (state[FARM_IMAGE_SOURCE_TOKEN] = globalThis.crypto.randomUUID())));
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getFarmImageSourceToken, "getFarmImageSourceToken");
+function _withFarmImageSourceClientAddress(request, context) {
+  const token = globalThis[FARM_IMAGE_SOURCE_TOKEN];
+  if (!token || request.headers.get(FARM_IMAGE_SOURCE_HEADER) !== token) return context;
+  return { ...context, clientAddress: _chunkUNJZGVPUcjs.FARM_ANONYMOUS_CLIENT_ADDRESS };
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, _withFarmImageSourceClientAddress, "_withFarmImageSourceClientAddress");
 function resolveTrustedLocalOrigin(configured) {
   const value = typeof configured === "function" ? configured() : configured;
   if (!value) return void 0;
@@ -532,12 +552,23 @@ function validateTransformedResult(result, config) {
   if (!contentType || contentType === "image/svg+xml" && !config.dangerouslyAllowSVG) {
     throw new Error("The image transformer returned an unsupported content type");
   }
+  if (detectImageContentType(result.body) !== contentType) {
+    throw new Error("The image transformer returned bytes that do not match their content type");
+  }
   result.contentType = contentType;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, validateTransformedResult, "validateTransformedResult");
+var OPTIMIZED_IMAGE_TYPES = /* @__PURE__ */ new Set([
+  "image/png",
+  "image/jpeg",
+  "image/gif",
+  "image/webp",
+  "image/avif",
+  "image/svg+xml"
+]);
 function normalizeImageContentType(value) {
   const type = _nullishCoalesce(_optionalChain([value, 'optionalAccess', _10 => _10.split, 'call', _11 => _11(";", 1), 'access', _12 => _12[0], 'access', _13 => _13.trim, 'call', _14 => _14(), 'access', _15 => _15.toLowerCase, 'call', _16 => _16()]), () => ( ""));
-  return type.startsWith("image/") ? type : "";
+  return OPTIMIZED_IMAGE_TYPES.has(type) ? type : "";
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, normalizeImageContentType, "normalizeImageContentType");
 function matchesRemoteSource(url, config) {
@@ -570,7 +601,7 @@ function matchesHostname(hostname, pattern) {
   return normalizedHostname === normalizedPattern;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, matchesHostname, "matchesHostname");
-function createOptimizedImageResponse(request, image, config) {
+function createOptimizedImageResponse(request, image) {
   const headers = new Headers({
     "cache-control": image.cacheControl,
     "content-type": image.contentType,
@@ -578,12 +609,12 @@ function createOptimizedImageResponse(request, image, config) {
     "content-disposition": "inline",
     etag: image.etag,
     vary: "Accept",
-    "x-content-type-options": "nosniff"
+    "x-content-type-options": "nosniff",
+    // Every optimized image, not only SVG: if a response is ever rendered as a
+    // document, it still cannot run script or load anything.
+    "content-security-policy": "default-src 'none'; sandbox"
   });
-  if (image.contentType === "image/svg+xml" && config.dangerouslyAllowSVG) {
-    headers.set("content-security-policy", "default-src 'none'; sandbox");
-  }
-  if (_chunkKIIMAWOJcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), image.etag)) {
+  if (_chunk5NAVKJCZcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), image.etag)) {
     headers.delete("content-length");
     return new Response(null, { status: 304, headers });
   }
@@ -661,4 +692,5 @@ var FarmImageMemoryCache = _FarmImageMemoryCache;
 
 
 
-exports.FarmImageRequestError = FarmImageRequestError; exports.createFarmImageHandler = createFarmImageHandler; exports.createCloudflareImageTransformer = createCloudflareImageTransformer; exports.selectOutputFormat = selectOutputFormat; exports.isPrivateImageAddress = isPrivateImageAddress;
+
+exports.FarmImageRequestError = FarmImageRequestError; exports.createFarmImageHandler = createFarmImageHandler; exports.createCloudflareImageTransformer = createCloudflareImageTransformer; exports.selectOutputFormat = selectOutputFormat; exports.isPrivateImageAddress = isPrivateImageAddress; exports._withFarmImageSourceClientAddress = _withFarmImageSourceClientAddress;

package/dist/{chunk-FUCSUGDM.cjs → chunk-KF6VDJH7.cjs}

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
 
 
-var _chunk6V4TDWECcjs = require('./chunk-6V4TDWEC.cjs');
+var _chunkCGVPXIRNcjs = require('./chunk-CGVPXIRN.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -30,7 +30,7 @@ function findProgrammaticRouteFiles(root, srcDir = "src") {
 _chunkS3JO3N4Hcjs.__name.call(void 0, findProgrammaticRouteFiles, "findProgrammaticRouteFiles");
 function findProgrammaticRouteFilesInDir(srcRoot) {
   const files = [];
-  for (const fileName of _chunk6V4TDWECcjs.PROGRAMMATIC_ROUTE_FILE_NAMES) {
+  for (const fileName of _chunkCGVPXIRNcjs.PROGRAMMATIC_ROUTE_FILE_NAMES) {
     const filePath = _path.join.call(void 0, srcRoot, fileName);
     if (_fs.existsSync.call(void 0, filePath)) {
       files.push(filePath);
@@ -47,7 +47,7 @@ async function discoverProgrammaticRoutePaths(root, srcDir = "src") {
   ]);
   for (const filePath of files) {
     const source = _fs.readFileSync.call(void 0, filePath, "utf8");
-    for (const routePath of _chunk6V4TDWECcjs.scanProgrammaticPagePaths.call(void 0, source)) {
+    for (const routePath of _chunkCGVPXIRNcjs.scanProgrammaticPagePaths.call(void 0, source)) {
       paths.add(routePath);
     }
   }

package/dist/{chunk-EA5K5BKU.mjs → chunk-KNHBTJP6.mjs}

@@ -442,6 +442,18 @@ function parseRouteSegment(segment) {
   return { segment, isDynamic: false, isOptional: false, isCatchAll: false };
 }
 __name(parseRouteSegment, "parseRouteSegment");
+var PROGRAMMATIC_ROUTE_SOURCE = /* @__PURE__ */ Symbol.for("farm.routes.source");
+var TRACK_PROGRAMMATIC_ROUTE_SOURCES = /* @__PURE__ */ Symbol.for("farm.routes.trackSources");
+function trackProgrammaticRouteSources() {
+  globalThis[TRACK_PROGRAMMATIC_ROUTE_SOURCES] = true;
+}
+__name(trackProgrammaticRouteSources, "trackProgrammaticRouteSources");
+function getProgrammaticRouteDefinitionSource(route) {
+  if (!route || typeof route !== "object") return void 0;
+  const source = route[PROGRAMMATIC_ROUTE_SOURCE];
+  return source && typeof source === "object" && Array.isArray(source.stacks) ? source : void 0;
+}
+__name(getProgrammaticRouteDefinitionSource, "getProgrammaticRouteDefinitionSource");
 
 export {
   extractProgrammaticPageCallPathLiterals,
@@ -451,5 +463,10 @@ export {
   createProgrammaticRouteModuleId,
   parseProgrammaticRouteModuleId,
   parseProgrammaticRoutePath,
-  scanProgrammaticPagePaths
+  scanProgrammaticPagePaths,
+  normalizeProgrammaticRoutePath,
+  PROGRAMMATIC_ROUTE_SOURCE,
+  TRACK_PROGRAMMATIC_ROUTE_SOURCES,
+  trackProgrammaticRouteSources,
+  getProgrammaticRouteDefinitionSource
 };

package/dist/{chunk-MVL2RAJW.mjs → chunk-KYN5ODF6.mjs}

@@ -1,6 +1,6 @@
 import {
   emitFarmEvent
-} from "./chunk-FUZEBRP3.mjs";
+} from "./chunk-4GP3XZ4Z.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-LMPAPBUA.cjs → chunk-L6A26QT5.cjs}

@@ -1,33 +1,36 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } 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 _chunkM7MKQXAFcjs = require('./chunk-M7MKQXAF.cjs');
 
+var _chunk6BWKJ6QScjs = require('./chunk-6BWKJ6QS.cjs');
 
 
 
 
-var _chunkZXH4TS3Fcjs = require('./chunk-ZXH4TS3F.cjs');
 
+var _chunkNBPNUQYOcjs = require('./chunk-NBPNUQYO.cjs');
 
 
 
 
 
-var _chunkUPJLHLJUcjs = require('./chunk-UPJLHLJU.cjs');
+
+var _chunkALPWLT27cjs = require('./chunk-ALPWLT27.cjs');
 
 
 var _chunkM2L4MYDQcjs = require('./chunk-M2L4MYDQ.cjs');
 
 
+var _chunkVQDBNVOOcjs = require('./chunk-VQDBNVOO.cjs');
+
 
-var _chunkSHLXACIOcjs = require('./chunk-SHLXACIO.cjs');
+var _chunkPJ42JESYcjs = require('./chunk-PJ42JESY.cjs');
 
 
 var _chunk5QIKR7RRcjs = require('./chunk-5QIKR7RR.cjs');
 
 
-var _chunkE3UK5IIBcjs = require('./chunk-E3UK5IIB.cjs');
+var _chunkGS3WR5HXcjs = require('./chunk-GS3WR5HX.cjs');
 
 
 var _chunkUQZ4AYTHcjs = require('./chunk-UQZ4AYTH.cjs');
@@ -41,7 +44,7 @@ var _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
 var _chunkOX6O6WVAcjs = require('./chunk-OX6O6WVA.cjs');
 
 
-var _chunk6XWDE2P2cjs = require('./chunk-6XWDE2P2.cjs');
+var _chunkZTP3BJG6cjs = require('./chunk-ZTP3BJG6.cjs');
 
 
 var _chunkBIDYX3SLcjs = require('./chunk-BIDYX3SL.cjs');
@@ -57,7 +60,7 @@ var _CookieJarImpl = class _CookieJarImpl {
   constructor(req, res) {
     this.req = req;
     this.res = res;
-    this.cookies = _chunkZXH4TS3Fcjs.parseMiddlewareCookieHeader.call(void 0, req.headers.cookie);
+    this.cookies = _chunkNBPNUQYOcjs.parseMiddlewareCookieHeader.call(void 0, req.headers.cookie);
     const existing = res.getHeader("Set-Cookie");
     this.setCookies = Array.isArray(existing) ? existing.map(String) : existing === void 0 ? [] : [String(existing)];
   }
@@ -66,13 +69,13 @@ var _CookieJarImpl = class _CookieJarImpl {
   }
   set(name, value, options = {}) {
     this.cookies[name] = value;
-    const cookieString = _chunkZXH4TS3Fcjs.serializeMiddlewareCookie.call(void 0, name, value, options);
+    const cookieString = _chunkNBPNUQYOcjs.serializeMiddlewareCookie.call(void 0, name, value, options);
     this.setCookies.push(cookieString);
     this.res.setHeader("Set-Cookie", this.setCookies);
   }
   delete(name, options = {}) {
     delete this.cookies[name];
-    this.setCookies.push(_chunkZXH4TS3Fcjs.serializeMiddlewareCookieDeletion.call(void 0, name, options));
+    this.setCookies.push(_chunkNBPNUQYOcjs.serializeMiddlewareCookieDeletion.call(void 0, name, options));
     this.res.setHeader("Set-Cookie", this.setCookies);
   }
   getAll() {
@@ -82,7 +85,7 @@ var _CookieJarImpl = class _CookieJarImpl {
 _chunkS3JO3N4Hcjs.__name.call(void 0, _CookieJarImpl, "CookieJarImpl");
 var CookieJarImpl = _CookieJarImpl;
 function createContext(req, res, viteServer, parent, server, toRoutePathname) {
-  const url = _chunk6XWDE2P2cjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([server, 'optionalAccess', _ => _.trustProxy]) });
+  const url = _chunkZTP3BJG6cjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([server, 'optionalAccess', _ => _.trustProxy]) });
   const headers = /* @__PURE__ */ new Map();
   const data = _optionalChain([parent, 'optionalAccess', _2 => _2.data]) ? new Map(parent.data) : /* @__PURE__ */ new Map();
   const locals = _optionalChain([parent, 'optionalAccess', _3 => _3.locals]) ? new Map(parent.locals) : /* @__PURE__ */ new Map();
@@ -106,7 +109,7 @@ function createContext(req, res, viteServer, parent, server, toRoutePathname) {
     response: res,
     url,
     pathname: url.pathname,
-    routePathname: _chunkUPJLHLJUcjs.toMiddlewareRoutePathname.call(void 0, url.pathname, toRoutePathname),
+    routePathname: _chunkALPWLT27cjs.toMiddlewareRoutePathname.call(void 0, url.pathname, toRoutePathname),
     searchParams: url.searchParams,
     method: req.method || "GET",
     params: {},
@@ -142,7 +145,7 @@ function createContext(req, res, viteServer, parent, server, toRoutePathname) {
       const newUrl = new URL(rewriteUrl, ctx.url);
       ctx.url = newUrl;
       ctx.pathname = newUrl.pathname;
-      ctx.routePathname = _chunkUPJLHLJUcjs.toMiddlewareRoutePathname.call(void 0, newUrl.pathname, toRoutePathname);
+      ctx.routePathname = _chunkALPWLT27cjs.toMiddlewareRoutePathname.call(void 0, newUrl.pathname, toRoutePathname);
       ctx.searchParams = newUrl.searchParams;
       ctx.route = newUrl.pathname;
       req.url = rewriteUrl;
@@ -194,38 +197,6 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, createContext, "createContext");
 // src/middleware/manager.ts
 var _fs = require('fs'); var fs = _interopRequireWildcard(_fs);
 var _path = require('path'); var path = _interopRequireWildcard(_path);
-
-// src/middleware/path.ts
-function appendMiddlewareRoutePath(routePath, directoryName) {
-  const marker = _chunkM7MKQXAFcjs.parseInterceptionMarker.call(void 0, directoryName);
-  if (marker) {
-    const owner = routePath.split("/").filter(Boolean);
-    const parts = [
-      ...marker.root ? [] : owner.slice(0, Math.max(0, owner.length - marker.up)),
-      ...marker.remainder ? [marker.remainder] : []
-    ];
-    return `/${parts.join("/")}`;
-  }
-  if (directoryName.startsWith("(") && directoryName.endsWith(")") || _chunkM7MKQXAFcjs.isRouteSlotSegment.call(void 0, directoryName)) {
-    return routePath;
-  }
-  return routePath === "/" ? `/${directoryName}` : `${routePath}/${directoryName}`;
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, appendMiddlewareRoutePath, "appendMiddlewareRoutePath");
-function appendMiddlewareDirectory(directory, directoryName) {
-  return directory === "" ? directoryName : `${directory}/${directoryName}`;
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, appendMiddlewareDirectory, "appendMiddlewareDirectory");
-function countSegments(value) {
-  return value.split("/").filter(Boolean).length;
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, countSegments, "countSegments");
-function compareMiddlewareRouteLocations(left, right) {
-  return countSegments(left.path) - countSegments(right.path) || left.path.localeCompare(right.path) || countSegments(left.directory) - countSegments(right.directory) || left.directory.localeCompare(right.directory);
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, compareMiddlewareRouteLocations, "compareMiddlewareRouteLocations");
-
-// src/middleware/manager.ts
 function isMiddlewareResponse(value) {
   return value instanceof Response;
 }
@@ -249,7 +220,7 @@ var _MiddlewareManager = class _MiddlewareManager {
     for (const [index, entry] of entries.entries()) {
       const handlers = this.getConfigHandlers(entry);
       const middlewareConfig = this.toMiddlewareConfig(entry);
-      _chunkUPJLHLJUcjs.compileMiddlewareConfig.call(void 0, middlewareConfig);
+      _chunkALPWLT27cjs.compileMiddlewareConfig.call(void 0, middlewareConfig);
       if (handlers.length === 0) {
         this.globalConfig = middlewareConfig;
         continue;
@@ -272,11 +243,11 @@ var _MiddlewareManager = class _MiddlewareManager {
       const discovered = [];
       await this.discoverInDirectory(appDir, "/", "", discovered);
       for (const entry of discovered) {
-        _chunkUPJLHLJUcjs.compileMiddlewareRoute.call(void 0, entry.middleware);
+        _chunkALPWLT27cjs.compileMiddlewareRoute.call(void 0, entry.middleware);
         middlewareByDirectory.set(entry.location.directory, entry);
       }
     }
-    this.middleware = Array.from(middlewareByDirectory.values()).sort((left, right) => compareMiddlewareRouteLocations(left.location, right.location)).map((entry) => entry.middleware);
+    this.middleware = Array.from(middlewareByDirectory.values()).sort((left, right) => _chunk6BWKJ6QScjs.compareMiddlewareRouteLocations.call(void 0, left.location, right.location)).map((entry) => entry.middleware);
     if (process.env.FARM_VERBOSE && this.middleware.length > 0) {
       _chunk5QIKR7RRcjs.logger.success(`Discovered ${this.middleware.length} middleware files`);
       for (const mw of this.middleware) {
@@ -303,8 +274,8 @@ var _MiddlewareManager = class _MiddlewareManager {
       if (entry.isDirectory() && !entry.name.startsWith(".")) {
         await this.discoverInDirectory(
           path.join(dir, entry.name),
-          appendMiddlewareRoutePath(routePath, entry.name),
-          appendMiddlewareDirectory(directory, entry.name),
+          _chunk6BWKJ6QScjs.appendMiddlewareRoutePath.call(void 0, routePath, entry.name),
+          _chunk6BWKJ6QScjs.appendMiddlewareDirectory.call(void 0, directory, entry.name),
           discovered
         );
       }
@@ -330,19 +301,19 @@ var _MiddlewareManager = class _MiddlewareManager {
     try {
       let module;
       if (this.viteServer) {
-        module = await _chunkSHLXACIOcjs.loadFarmDevModule.call(void 0, this.viteServer, filePath);
+        module = await _chunkPJ42JESYcjs.loadFarmDevModule.call(void 0, this.viteServer, filePath);
       } else {
         module = await import(
           /* @vite-ignore */
-          _chunkSHLXACIOcjs.toFileModuleUrl.call(void 0, filePath)
+          _chunkVQDBNVOOcjs.toFileModuleUrl.call(void 0, filePath)
         );
       }
-      const normalized = _chunkZXH4TS3Fcjs.normalizeMiddlewareModule.call(void 0, module, routePath);
+      const normalized = _chunkNBPNUQYOcjs.normalizeMiddlewareModule.call(void 0, module, routePath);
       if (!normalized) {
         throw new Error("must export a default handler or a named middleware handler");
       }
       if (normalized.config) {
-        _chunkUPJLHLJUcjs.compileMiddlewareConfig.call(void 0, normalized.config);
+        _chunkALPWLT27cjs.compileMiddlewareConfig.call(void 0, normalized.config);
       }
       return {
         path: routePath,
@@ -359,7 +330,7 @@ var _MiddlewareManager = class _MiddlewareManager {
    * Execute middleware for a request
    */
   async execute(req, res) {
-    const url = _chunk6XWDE2P2cjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([this, 'access', _6 => _6.server, 'optionalAccess', _7 => _7.trustProxy]) });
+    const url = _chunkZTP3BJG6cjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([this, 'access', _6 => _6.server, 'optionalAccess', _7 => _7.trustProxy]) });
     const pathname = url.pathname;
     const toRoutePathname = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (value) => _optionalChain([this, 'access', _8 => _8.i18n, 'optionalAccess', _9 => _9.enabled]) ? _chunkBIDYX3SLcjs.stripFarmLocaleFromPathname.call(void 0, value, this.i18n) : _chunkI57LW5VZcjs.stripFarmBasePath.call(void 0, value, _nullishCoalesce(_optionalChain([this, 'access', _10 => _10.i18n, 'optionalAccess', _11 => _11.basePath]), () => ( "/"))), "toRoutePathname");
     const routePathname = toRoutePathname(pathname);
@@ -381,7 +352,7 @@ var _MiddlewareManager = class _MiddlewareManager {
       ...this.configMiddleware.map((mw) => ({ mw, routeMatch: { matched: true } })),
       ...this.middleware.map((mw) => ({
         mw,
-        routeMatch: _chunkUPJLHLJUcjs.matchesMiddlewareRouteAt.call(void 0, toMiddlewarePathnames(routePathname), mw)
+        routeMatch: _chunkALPWLT27cjs.matchesMiddlewareRouteAt.call(void 0, toMiddlewarePathnames(routePathname), mw)
       })).filter((entry) => entry.routeMatch.matched)
     ];
     if (applicable.length === 0) {
@@ -407,17 +378,17 @@ var _MiddlewareManager = class _MiddlewareManager {
       for (; ; ) {
         for (const entry of pass) yield { ...entry, pathname: passPathname };
         const rewrittenPathname = toRoutePathname(
-          _chunk6XWDE2P2cjs.resolveFarmRequestURL.call(void 0, req, { trustProxy }).pathname
+          _chunkZTP3BJG6cjs.resolveFarmRequestURL.call(void 0, req, { trustProxy }).pathname
         );
         if (rewrittenPathname === passPathname) return;
         passPathname = rewrittenPathname;
         const passPathnames = toMiddlewarePathnames(passPathname);
-        if (globalConfig && !_chunkUPJLHLJUcjs.matchesMiddlewareConfigAt.call(void 0, passPathnames, globalConfig, ctx).matched) {
+        if (globalConfig && !_chunkALPWLT27cjs.matchesMiddlewareConfigAt.call(void 0, passPathnames, globalConfig, ctx).matched) {
           return;
         }
         pass = allMiddleware.filter((mw) => !ran.has(mw)).map((mw) => ({
           mw,
-          routeMatch: mw.source === "config" ? { matched: true } : _chunkUPJLHLJUcjs.matchesMiddlewareRouteAt.call(void 0, passPathnames, mw)
+          routeMatch: mw.source === "config" ? { matched: true } : _chunkALPWLT27cjs.matchesMiddlewareRouteAt.call(void 0, passPathnames, mw)
         })).filter((entry) => entry.routeMatch.matched);
       }
     }
@@ -449,7 +420,7 @@ var _MiddlewareManager = class _MiddlewareManager {
         pathname,
         name: mw.filePath
       };
-      _chunkE3UK5IIBcjs.emitFarmEvent.call(void 0, { type: "middleware.start", ...middlewareEvent });
+      _chunkGS3WR5HXcjs.emitFarmEvent.call(void 0, { type: "middleware.start", ...middlewareEvent });
       try {
         let handlerIndex = 0;
         let returnedResponse;
@@ -475,7 +446,7 @@ var _MiddlewareManager = class _MiddlewareManager {
               }
             }
           }
-          _chunkE3UK5IIBcjs.emitFarmEvent.call(void 0, {
+          _chunkGS3WR5HXcjs.emitFarmEvent.call(void 0, {
             type: "middleware.shortCircuit",
             ...middlewareEvent,
             status: response.status
@@ -484,20 +455,20 @@ var _MiddlewareManager = class _MiddlewareManager {
           return true;
         }
         if (ctx._handled || res.headersSent || res.writableEnded) {
-          _chunkE3UK5IIBcjs.emitFarmEvent.call(void 0, {
+          _chunkGS3WR5HXcjs.emitFarmEvent.call(void 0, {
             type: "middleware.shortCircuit",
             ...middlewareEvent,
             status: res.statusCode
           });
           return true;
         }
-        _chunkE3UK5IIBcjs.emitFarmEvent.call(void 0, {
+        _chunkGS3WR5HXcjs.emitFarmEvent.call(void 0, {
           type: "middleware.complete",
           ...middlewareEvent,
           durationMs: Date.now() - middlewareStartTime
         });
       } catch (error) {
-        _chunkE3UK5IIBcjs.emitFarmEvent.call(void 0, 
+        _chunkGS3WR5HXcjs.emitFarmEvent.call(void 0, 
           _chunkOX6O6WVAcjs.isFarmRedirectError.call(void 0, error) || _chunkOX6O6WVAcjs.isFarmNotFoundError.call(void 0, error) ? {
             type: "middleware.shortCircuit",
             ...middlewareEvent,
@@ -528,7 +499,7 @@ var _MiddlewareManager = class _MiddlewareManager {
    * Check if pathname matches middleware config
    */
   matchesConfig(pathname, config, ctx) {
-    return _chunkUPJLHLJUcjs.matchesMiddlewareConfigAt.call(void 0, this.toMiddlewarePathnames(pathname), config, ctx);
+    return _chunkALPWLT27cjs.matchesMiddlewareConfigAt.call(void 0, this.toMiddlewarePathnames(pathname), config, ctx);
   }
   /**
    * Reload middleware (for HMR)
@@ -563,7 +534,4 @@ var MiddlewareManager = _MiddlewareManager;
 
 
 
-
-
-
-exports.createContext = createContext; exports.appendMiddlewareRoutePath = appendMiddlewareRoutePath; exports.appendMiddlewareDirectory = appendMiddlewareDirectory; exports.compareMiddlewareRouteLocations = compareMiddlewareRouteLocations; exports.MiddlewareManager = MiddlewareManager;
+exports.createContext = createContext; exports.MiddlewareManager = MiddlewareManager;