@farm.js/core 0.1.34 → 0.1.36

package/dist/{chunk-YQVSHTMR.mjs → chunk-AJQTP4OO.mjs}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-5WI2S4CO.mjs";
 import {
   matchesFarmIfNoneMatch
-} from "./chunk-XF7Q24PF.mjs";
+} from "./chunk-ZMMBIVQM.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-TA5G2HWD.cjs → chunk-AO6RYU5N.cjs}

@@ -6,7 +6,7 @@ var _chunk4PPEPOZZcjs = require('./chunk-4PPEPOZZ.cjs');
 var _chunkMQ3H6LT5cjs = require('./chunk-MQ3H6LT5.cjs');
 
 
-var _chunkMIDIZJZCcjs = require('./chunk-MIDIZJZC.cjs');
+var _chunkFO427P6Icjs = require('./chunk-FO427P6I.cjs');
 
 
 var _chunkSJNMVDDFcjs = require('./chunk-SJNMVDDF.cjs');
@@ -20,7 +20,7 @@ var _chunk2CQ74SP6cjs = require('./chunk-2CQ74SP6.cjs');
 
 
 
-var _chunkG26MUMKLcjs = require('./chunk-G26MUMKL.cjs');
+var _chunkS6VYG6XUcjs = require('./chunk-S6VYG6XU.cjs');
 
 
 var _chunk6V4TDWECcjs = require('./chunk-6V4TDWEC.cjs');
@@ -28,13 +28,13 @@ var _chunk6V4TDWECcjs = require('./chunk-6V4TDWEC.cjs');
 
 
 
-var _chunkEM6SBQKMcjs = require('./chunk-EM6SBQKM.cjs');
+var _chunkKIIMAWOJcjs = require('./chunk-KIIMAWOJ.cjs');
 
 
 var _chunkM2L4MYDQcjs = require('./chunk-M2L4MYDQ.cjs');
 
 
-var _chunkBMWDEBXOcjs = require('./chunk-BMWDEBXO.cjs');
+var _chunkSHLXACIOcjs = require('./chunk-SHLXACIO.cjs');
 
 
 
@@ -58,7 +58,7 @@ var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 function farmApiPlugin(options = {}) {
   const srcDir = _nullishCoalesce(options.srcDir, () => ( "src"));
   const debug = _nullishCoalesce(options.debug, () => ( false));
-  const bodySizeLimit = _chunkEM6SBQKMcjs.resolveFarmServerConfig.call(void 0, {
+  const bodySizeLimit = _chunkKIIMAWOJcjs.resolveFarmServerConfig.call(void 0, {
     bodySizeLimit: options.bodySizeLimit
   }).bodySizeLimit;
   const basePath = options.basePath;
@@ -110,7 +110,7 @@ function farmApiPlugin(options = {}) {
     const existing = apiRoutesCache.get(routePath);
     const existingFile = _optionalChain([endpointSources, 'access', _ => _.get, 'call', _2 => _2(routePath), 'optionalAccess', _3 => _3.get, 'call', _4 => _4(normalizedMethod)]);
     if (existingFile) {
-      throw new (0, _chunkMIDIZJZCcjs.APIRouteConflictError)(routePath, normalizedMethod, existingFile, filePath);
+      throw new (0, _chunkFO427P6Icjs.APIRouteConflictError)(routePath, normalizedMethod, existingFile, filePath);
     }
     if (existing) {
       if (!existing.methods.includes(normalizedMethod)) {
@@ -186,8 +186,11 @@ function farmApiPlugin(options = {}) {
   const createRouter = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, async () => {
     const plugins = options.plugins ? await (_nullishCoalesce(routePlugins, () => ( (routePlugins = Promise.resolve(options.plugins({ root: projectRoot })))))) : [];
     pluginMergedRoutes = plugins.length ? new Map(
-      _chunkG26MUMKLcjs.mergePluginAPIRoutes.call(void 0, [...apiRoutesCache.values()], plugins, void 0, {
-        bodySizeLimit
+      _chunkS6VYG6XUcjs.mergePluginAPIRoutes.call(void 0, [...apiRoutesCache.values()], plugins, void 0, {
+        bodySizeLimit,
+        // A plugin calling an app endpoint (an MCP tool, say) goes back through this server,
+        // so the middleware that guards the endpoint's path runs for it.
+        dispatch: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (request) => fetch(request, { redirect: "manual" }), "dispatch")
       }).map((route) => [route.path, route])
     ) : null;
     const totalEndpoints = Array.from(servedRoutes().values()).reduce(
@@ -200,7 +203,7 @@ function farmApiPlugin(options = {}) {
         const url = new URL(request.url);
         const method = request.method.toUpperCase();
         const pathname = url.pathname;
-        const match = _chunkG26MUMKLcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), pathname, basePath);
+        const match = _chunkS6VYG6XUcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), pathname, basePath);
         if (!match) {
           return new Response(JSON.stringify({ error: "Not Found" }), {
             status: 404,
@@ -208,18 +211,18 @@ function farmApiPlugin(options = {}) {
           });
         }
         const { route, params } = match;
-        const endpoint = _chunkG26MUMKLcjs.resolveAPIRouteEndpoint.call(void 0, route, method);
+        const endpoint = _chunkS6VYG6XUcjs.resolveAPIRouteEndpoint.call(void 0, route, method);
         if (!endpoint) {
           return new Response(JSON.stringify({ error: "Method Not Allowed" }), {
             status: 405,
             headers: {
-              Allow: _chunkG26MUMKLcjs.getAllowedAPIRouteMethods.call(void 0, route).join(", "),
+              Allow: _chunkS6VYG6XUcjs.getAllowedAPIRouteMethods.call(void 0, route).join(", "),
               "Content-Type": "application/json"
             }
           });
         }
         try {
-          return await _chunkG26MUMKLcjs.invokeAPIRouteEndpoint.call(void 0, endpoint, request, params, bodySizeLimit);
+          return await _chunkS6VYG6XUcjs.invokeAPIRouteEndpoint.call(void 0, endpoint, request, params, bodySizeLimit);
         } catch (error) {
           return new Response(JSON.stringify({ error: error.message || "Internal Server Error" }), {
             status: 500,
@@ -264,10 +267,10 @@ function farmApiPlugin(options = {}) {
           try {
             const relativePath = path.relative(apiDir, path.dirname(filePath));
             const routePath = "/api/" + (relativePath === "." ? "" : relativePath.replace(/\\/g, "/"));
-            const routeModule = await _chunkBMWDEBXOcjs.loadFarmDevModule.call(void 0, server, filePath);
+            const routeModule = await _chunkSHLXACIOcjs.loadFarmDevModule.call(void 0, server, filePath);
             const endpoints = {};
             const availableMethods = [];
-            for (const method of _chunkG26MUMKLcjs.API_ROUTE_METHODS) {
+            for (const method of _chunkS6VYG6XUcjs.API_ROUTE_METHODS) {
               if (routeModule[method]) {
                 availableMethods.push(method);
                 endpoints[method] = routeModule[method];
@@ -280,7 +283,7 @@ function farmApiPlugin(options = {}) {
               log(`API route discovered: ${availableMethods.join(", ")} ${routePath}`);
             }
           } catch (e) {
-            if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+            if (e instanceof _chunkFO427P6Icjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
             log(`API route load failed at ${filePath}: ${e.message}`);
           }
         }
@@ -296,7 +299,7 @@ function farmApiPlugin(options = {}) {
         for (const routesFile of routesFiles) {
           if (fs.existsSync(routesFile)) {
             try {
-              const routesModule = await _chunkBMWDEBXOcjs.loadFarmDevModule.call(void 0, server, routesFile);
+              const routesModule = await _chunkSHLXACIOcjs.loadFarmDevModule.call(void 0, server, routesFile);
               for (const [exportName, exportValue] of Object.entries(routesModule)) {
                 const endpoint = exportValue;
                 if (endpoint && endpoint.__path) {
@@ -307,7 +310,7 @@ function farmApiPlugin(options = {}) {
                 }
               }
             } catch (e) {
-              if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+              if (e instanceof _chunkFO427P6Icjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
               log(`Root routes.ts load failed: ${e.message}`);
             }
             break;
@@ -322,7 +325,7 @@ function farmApiPlugin(options = {}) {
         const { getProgrammaticRouteManifest } = await import("./routes.cjs");
         for (const routeFile of routeFiles) {
           try {
-            const routesModule = await _chunkBMWDEBXOcjs.loadFarmDevModule.call(void 0, 
+            const routesModule = await _chunkSHLXACIOcjs.loadFarmDevModule.call(void 0, 
               server,
               _chunk5QIKR7RRcjs.toViteModuleId.call(void 0, routeFile, server.config.root)
             );
@@ -338,7 +341,7 @@ function farmApiPlugin(options = {}) {
               }
             }
           } catch (e) {
-            if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+            if (e instanceof _chunkFO427P6Icjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
             log(`Programmatic routes file load failed at ${routeFile}: ${e.message}`);
           }
         }
@@ -390,7 +393,7 @@ function farmApiPlugin(options = {}) {
           const pathname = url.split("?")[0];
           const method = req.method || "GET";
           if (discoveryPromise) await waitForDiscovery();
-          if (!_chunkG26MUMKLcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), pathname, basePath)) {
+          if (!_chunkS6VYG6XUcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), pathname, basePath)) {
             return next();
           }
           if (!apiRouterHandler) {
@@ -411,7 +414,7 @@ function farmApiPlugin(options = {}) {
             }
             const currentUrl = req.url || url;
             const currentPathname = currentUrl.split("?")[0];
-            if (currentPathname !== pathname && !_chunkG26MUMKLcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), currentPathname, basePath)) {
+            if (currentPathname !== pathname && !_chunkS6VYG6XUcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), currentPathname, basePath)) {
               return next();
             }
             const fullUrl = _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req);
@@ -423,7 +426,7 @@ function farmApiPlugin(options = {}) {
             }
             let body;
             if (method !== "GET" && method !== "HEAD") {
-              body = await _chunkEM6SBQKMcjs.readNodeRequestBody.call(void 0, req, bodySizeLimit);
+              body = await _chunkKIIMAWOJcjs.readNodeRequestBody.call(void 0, req, bodySizeLimit);
             }
             const request = new Request(fullUrl, {
               method,
@@ -438,7 +441,7 @@ function farmApiPlugin(options = {}) {
             logResponse(method, currentPathname, response.status, duration);
             await _chunkUQZ4AYTHcjs.sendWebResponse.call(void 0, res, response);
           } catch (error) {
-            const bodyErrorResponse = _chunkEM6SBQKMcjs.createFarmRequestBodyErrorResponse.call(void 0, error);
+            const bodyErrorResponse = _chunkKIIMAWOJcjs.createFarmRequestBodyErrorResponse.call(void 0, error);
             if (bodyErrorResponse) {
               await _chunkUQZ4AYTHcjs.sendWebResponse.call(void 0, res, bodyErrorResponse);
               return;
@@ -487,7 +490,7 @@ function farmApiPlugin(options = {}) {
         if (await _optionalChain([recoverFailedDiscovery, 'optionalCall', _9 => _9()])) return [];
         const previousState = snapshotRouteState();
         try {
-          const routesModule = await _chunkBMWDEBXOcjs.loadFarmDevModule.call(void 0, server, file);
+          const routesModule = await _chunkSHLXACIOcjs.loadFarmDevModule.call(void 0, server, file);
           removeEndpointsFromFile(file);
           for (const [exportName, exportValue] of Object.entries(routesModule)) {
             const endpoint = exportValue;
@@ -515,7 +518,7 @@ function farmApiPlugin(options = {}) {
           log(`API router recreated`);
         } catch (e) {
           restoreRouteState(previousState);
-          if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+          if (e instanceof _chunkFO427P6Icjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
           log(`Root routes.ts HMR failed: ${e.message}`);
         }
         return [];
@@ -540,10 +543,10 @@ function farmApiPlugin(options = {}) {
             log(`API route file removed: ${routePath}`);
             return [];
           }
-          const routeModule = await _chunkBMWDEBXOcjs.loadFarmDevModule.call(void 0, server, file);
+          const routeModule = await _chunkSHLXACIOcjs.loadFarmDevModule.call(void 0, server, file);
           removeEndpointsFromFile(file);
           const availableMethods = [];
-          for (const method of _chunkG26MUMKLcjs.API_ROUTE_METHODS) {
+          for (const method of _chunkS6VYG6XUcjs.API_ROUTE_METHODS) {
             if (!routeModule[method]) continue;
             availableMethods.push(method);
             addEndpoint(routePath, file, method, routeModule[method]);
@@ -553,7 +556,7 @@ function farmApiPlugin(options = {}) {
           log(`API router recreated`);
         } catch (e) {
           restoreRouteState(previousState);
-          if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+          if (e instanceof _chunkFO427P6Icjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
           log(`API route HMR failed: ${e.message}`);
         }
         return [];

package/dist/{chunk-MOKLYNHV.cjs → chunk-BO36SELV.cjs}

@@ -4,7 +4,7 @@
 
 
 
-var _chunkT5CERMEHcjs = require('./chunk-T5CERMEH.cjs');
+var _chunkT5OJPTVNcjs = require('./chunk-T5OJPTVN.cjs');
 
 
 var _chunkYWN746UScjs = require('./chunk-YWN746US.cjs');
@@ -70,13 +70,13 @@ async function _invokeServerFunction(value, input, request) {
     throw new TypeError("Expected a function created with createServerFn or createServerQuery");
   }
   try {
-    const data = await _chunkT5CERMEHcjs.runWithServerActionRequest.call(void 0, request, () => runner.run(input));
+    const data = await _chunkT5OJPTVNcjs.runWithServerActionRequest.call(void 0, request, () => runner.run(input));
     return { ok: true, data };
   } catch (error) {
     if (error instanceof ServerFnInputError) {
       return { ok: false, reason: "input", error: error.cause };
     }
-    if (_chunkT5CERMEHcjs.isServerFnFailure.call(void 0, error)) return { ok: false, reason: "failure", failure: error };
+    if (_chunkT5OJPTVNcjs.isServerFnFailure.call(void 0, error)) return { ok: false, reason: "failure", failure: error };
     const redirect = _chunkOX6O6WVAcjs.getFarmRedirectError.call(void 0, error);
     if (redirect) {
       return { ok: false, reason: "redirect", url: redirect.url, status: redirect.status };
@@ -117,9 +117,9 @@ function createServerFn(options) {
     } catch (cause) {
       throw labelInputErrors && isSchemaValidationFailure(cause) ? new ServerFnInputError(cause) : cause;
     }
-    const executionContext = _chunkT5CERMEHcjs.getServerActionExecutionContext.call(void 0, );
+    const executionContext = _chunkT5OJPTVNcjs.getServerActionExecutionContext.call(void 0, );
     const request = _nullishCoalesce(_optionalChain([executionContext, 'optionalAccess', _ => _.request]), () => ( _chunkU4KT7QP3cjs._resolveCurrentRequest.call(void 0, )));
-    const signal = _nullishCoalesce(_nullishCoalesce(_optionalChain([executionContext, 'optionalAccess', _2 => _2.signal]), () => ( _optionalChain([request, 'optionalAccess', _3 => _3.signal]))), () => ( _chunkT5CERMEHcjs.getServerActionSignal.call(void 0, )));
+    const signal = _nullishCoalesce(_nullishCoalesce(_optionalChain([executionContext, 'optionalAccess', _2 => _2.signal]), () => ( _optionalChain([request, 'optionalAccess', _3 => _3.signal]))), () => ( _chunkT5OJPTVNcjs.getServerActionSignal.call(void 0, )));
     const handlerContext = {
       input,
       rawInput,
@@ -245,7 +245,7 @@ function createServerFnErrorHandler(definitions) {
       throw new TypeError(`Server function error "${code}" is not declared`);
     }
     const parsed = parseServerFnFailureData(code, definition.data, data);
-    throw new (0, _chunkT5CERMEHcjs.ServerFnFailure)(code, parsed, {
+    throw new (0, _chunkT5OJPTVNcjs.ServerFnFailure)(code, parsed, {
       status: definition.status,
       message: _nullishCoalesce(definition.message, () => ( "Server function failed"))
     });

package/dist/{chunk-7Y6ZNFPX.mjs → chunk-BPOF5U4N.mjs}

@@ -1,6 +1,7 @@
 import {
-  isRouteSlotSegment
-} from "./chunk-UBO4SGH4.mjs";
+  isRouteSlotSegment,
+  parseInterceptionMarker
+} from "./chunk-RHAZ22ZN.mjs";
 import {
   normalizeMiddlewareModule,
   parseMiddlewareCookieHeader,
@@ -19,19 +20,19 @@ import {
 import {
   loadFarmDevModule,
   toFileModuleUrl
-} from "./chunk-43FMW62B.mjs";
+} from "./chunk-KMTGADN3.mjs";
 import {
   logger
 } from "./chunk-KI3MESHB.mjs";
-import {
-  createFarmAPIMiddlewarePathnames
-} from "./chunk-BTHHUD7Q.mjs";
 import {
   emitFarmEvent
 } from "./chunk-FUZEBRP3.mjs";
 import {
   sendWebResponse
 } from "./chunk-Z2RZJZIZ.mjs";
+import {
+  createFarmAPIMiddlewarePathnames
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   getFarmRedirectError,
   isFarmNotFoundError,
@@ -193,6 +194,15 @@ import * as path from "path";
 
 // src/middleware/path.ts
 function appendMiddlewareRoutePath(routePath, directoryName) {
+  const marker = parseInterceptionMarker(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(")") || isRouteSlotSegment(directoryName)) {
     return routePath;
   }
@@ -287,7 +297,7 @@ var _MiddlewareManager = class _MiddlewareManager {
     }
     const entries = fs.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      if (entry.isDirectory() && !entry.name.startsWith(".") && !entry.name.startsWith("_")) {
+      if (entry.isDirectory() && !entry.name.startsWith(".")) {
         await this.discoverInDirectory(
           path.join(dir, entry.name),
           appendMiddlewareRoutePath(routePath, entry.name),

package/dist/{chunk-JHWOVJ3M.mjs → chunk-BUGNQIHC.mjs}

@@ -190,6 +190,7 @@ function createFarmConfigResolutionPlugin(options) {
   };
 }
 __name(createFarmConfigResolutionPlugin, "createFarmConfigResolutionPlugin");
+var FARM_CONFIG_ROOT = /* @__PURE__ */ Symbol.for("farm.configRoot");
 async function loadFarmConfigFile(configPath, options) {
   const { transform } = await import("rolldown/utils");
   const cacheRoot = path.resolve(options.cacheRoot || options.root);
@@ -207,6 +208,9 @@ async function loadFarmConfigFile(configPath, options) {
     plugins: [createFarmConfigResolutionPlugin({ transform })]
   });
   const moduleUrl = `${pathToFileURL(modulePath).href}?t=${Date.now()}`;
+  const configRootState = globalThis;
+  const previousConfigRoot = configRootState[FARM_CONFIG_ROOT];
+  configRootState[FARM_CONFIG_ROOT] = cacheRoot;
   try {
     const loaded = await import(
       /* @vite-ignore */
@@ -218,6 +222,7 @@ async function loadFarmConfigFile(configPath, options) {
     }
     return config;
   } finally {
+    configRootState[FARM_CONFIG_ROOT] = previousConfigRoot;
     await unlink(modulePath).catch(() => void 0);
   }
 }

package/dist/{chunk-TDFPACVX.cjs → chunk-CBJJH36A.cjs}

@@ -16,7 +16,7 @@ var _chunkZ2HLU4IXcjs = require('./chunk-Z2HLU4IX.cjs');
 
 
 
-var _chunkEM6SBQKMcjs = require('./chunk-EM6SBQKM.cjs');
+var _chunkKIIMAWOJcjs = require('./chunk-KIIMAWOJ.cjs');
 
 
 
@@ -24,6 +24,10 @@ var _chunkUQZ4AYTHcjs = require('./chunk-UQZ4AYTH.cjs');
 
 
 
+var _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
+
+
+
 var _chunkNZKJGRB3cjs = require('./chunk-NZKJGRB3.cjs');
 
 
@@ -839,9 +843,9 @@ function createIntegrationPlugin(integrationKey, integration) {
         if (!bodyLoaded) {
           bodyLoaded = true;
           if (req.method && req.method !== "GET" && req.method !== "HEAD") {
-            requestBody = await _chunkEM6SBQKMcjs.readNodeRequestBody.call(void 0, 
+            requestBody = await _chunkKIIMAWOJcjs.readNodeRequestBody.call(void 0, 
               req,
-              _chunkEM6SBQKMcjs.resolveFarmServerConfig.call(void 0, context.config.server).bodySizeLimit
+              _chunkKIIMAWOJcjs.resolveFarmServerConfig.call(void 0, context.config.server).bodySizeLimit
             );
           }
         }
@@ -851,7 +855,7 @@ function createIntegrationPlugin(integrationKey, integration) {
         try {
           return createWebRequest(req, fullUrl, await getRequestBody());
         } catch (error) {
-          const response = _chunkEM6SBQKMcjs.createFarmRequestBodyErrorResponse.call(void 0, error);
+          const response = _chunkKIIMAWOJcjs.createFarmRequestBodyErrorResponse.call(void 0, error);
           if (!response) throw error;
           await _chunkUQZ4AYTHcjs.sendWebResponse.call(void 0, res, response);
           return null;
@@ -1558,12 +1562,12 @@ function createFormInput(formData) {
 _chunkS3JO3N4Hcjs.__name.call(void 0, createFormInput, "createFormInput");
 async function dispatchIntegrationRequest(runtime, request, options = {}) {
   try {
-    request = await _chunkEM6SBQKMcjs.bufferFarmRequestBody.call(void 0, 
+    request = await _chunkKIIMAWOJcjs.bufferFarmRequestBody.call(void 0, 
       request,
-      _chunkEM6SBQKMcjs.resolveFarmServerConfig.call(void 0, runtime.config.server).bodySizeLimit
+      _chunkKIIMAWOJcjs.resolveFarmServerConfig.call(void 0, runtime.config.server).bodySizeLimit
     );
   } catch (error) {
-    const response = _chunkEM6SBQKMcjs.createFarmRequestBodyErrorResponse.call(void 0, error);
+    const response = _chunkKIIMAWOJcjs.createFarmRequestBodyErrorResponse.call(void 0, error);
     if (response) return response;
     throw error;
   }
@@ -1577,10 +1581,12 @@ async function dispatchIntegrationRequest(runtime, request, options = {}) {
   const middleware = [...integration.middleware || []];
   const forwardedSetCookies = [];
   for (const entry of middleware) {
+    if (_optionalChain([options, 'access', _24 => _24.ranMiddleware, 'optionalAccess', _25 => _25.has, 'call', _26 => _26(entry)])) continue;
     const params = resolveIntegrationMiddlewareParams(entry, pathname, runtime.config);
     if (!params) {
       continue;
     }
+    _optionalChain([options, 'access', _27 => _27.ranMiddleware, 'optionalAccess', _28 => _28.add, 'call', _29 => _29(entry)]);
     const handlerContext = createServerIntegrationHandlerContext({
       runtime,
       route: {
@@ -1819,7 +1825,7 @@ async function dispatchIntegrationRequest(runtime, request, options = {}) {
     }
   }
   if (forwardedSetCookies.length > 0) {
-    _optionalChain([options, 'access', _24 => _24.onForwardedCookies, 'optionalCall', _25 => _25(forwardedSetCookies)]);
+    _optionalChain([options, 'access', _30 => _30.onForwardedCookies, 'optionalCall', _31 => _31(forwardedSetCookies)]);
   }
   return null;
 }
@@ -1845,6 +1851,7 @@ async function dispatchIntegrationRequests(integrations, runtime, request, optio
       request.clone(),
       {
         currentRequest: options.currentRequest,
+        ranMiddleware: options.ranMiddleware,
         onForwardedCookies: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (cookies) => setCookies.push(...cookies), "onForwardedCookies")
       }
     );
@@ -1931,38 +1938,38 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, createServerIntegrationHandlerContext, "cr
 function createServerIntegrationRequestContextStore(request, currentRequest) {
   return {
     get(key) {
-      const requestValue = _chunkEM6SBQKMcjs.getRequestContext.call(void 0, request, key);
+      const requestValue = _chunkKIIMAWOJcjs.getRequestContext.call(void 0, request, key);
       if (requestValue !== void 0) {
         return requestValue;
       }
       if (currentRequest) {
-        return _chunkEM6SBQKMcjs.getRequestContext.call(void 0, currentRequest, key);
+        return _chunkKIIMAWOJcjs.getRequestContext.call(void 0, currentRequest, key);
       }
       return void 0;
     },
     set(key, value, options) {
-      _chunkEM6SBQKMcjs.setRequestContext.call(void 0, request, key, value, options);
+      _chunkKIIMAWOJcjs.setRequestContext.call(void 0, request, key, value, options);
       if (currentRequest) {
-        _chunkEM6SBQKMcjs.setRequestContext.call(void 0, currentRequest, key, value, options);
+        _chunkKIIMAWOJcjs.setRequestContext.call(void 0, currentRequest, key, value, options);
       }
     },
     has(key) {
-      return _chunkEM6SBQKMcjs.hasRequestContext.call(void 0, request, key) || !!currentRequest && _chunkEM6SBQKMcjs.hasRequestContext.call(void 0, currentRequest, key);
+      return _chunkKIIMAWOJcjs.hasRequestContext.call(void 0, request, key) || !!currentRequest && _chunkKIIMAWOJcjs.hasRequestContext.call(void 0, currentRequest, key);
     },
     delete(key) {
-      const deletedRequest = _chunkEM6SBQKMcjs.deleteRequestContext.call(void 0, request, key);
-      const deletedCurrent = currentRequest ? _chunkEM6SBQKMcjs.deleteRequestContext.call(void 0, currentRequest, key) : false;
+      const deletedRequest = _chunkKIIMAWOJcjs.deleteRequestContext.call(void 0, request, key);
+      const deletedCurrent = currentRequest ? _chunkKIIMAWOJcjs.deleteRequestContext.call(void 0, currentRequest, key) : false;
       return deletedRequest || deletedCurrent;
     },
     clear() {
-      _chunkEM6SBQKMcjs.clearRequestContext.call(void 0, request);
+      _chunkKIIMAWOJcjs.clearRequestContext.call(void 0, request);
       if (currentRequest) {
-        _chunkEM6SBQKMcjs.clearRequestContext.call(void 0, currentRequest);
+        _chunkKIIMAWOJcjs.clearRequestContext.call(void 0, currentRequest);
       }
     },
     snapshot(options) {
-      const merged = currentRequest ? _chunkEM6SBQKMcjs.getRequestContextSnapshot.call(void 0, currentRequest, options) : /* @__PURE__ */ new Map();
-      const requestSnapshot = _chunkEM6SBQKMcjs.getRequestContextSnapshot.call(void 0, request, options);
+      const merged = currentRequest ? _chunkKIIMAWOJcjs.getRequestContextSnapshot.call(void 0, currentRequest, options) : /* @__PURE__ */ new Map();
+      const requestSnapshot = _chunkKIIMAWOJcjs.getRequestContextSnapshot.call(void 0, request, options);
       for (const [key, value] of requestSnapshot) {
         merged.set(key, value);
       }
@@ -2006,8 +2013,10 @@ function resolveIntegrationMiddlewareParams(entry, pathname, config) {
   const params = resolveMatcherParams(entry.matcher, pathname);
   if (params || !entry.matcher) return params;
   const routePathname = resolveIntegrationRoutePathname(pathname, config);
-  if (routePathname !== pathname) {
-    const routeParams = resolveMatcherParams(entry.matcher, routePathname);
+  const candidates = [.../* @__PURE__ */ new Set([pathname, ...getIntegrationAPIPathnames(config)(routePathname)])];
+  for (const candidate of candidates) {
+    if (candidate === pathname) continue;
+    const routeParams = resolveMatcherParams(entry.matcher, candidate);
     if (routeParams) return routeParams;
   }
   let compiled = compiledIntegrationGuards.get(entry);
@@ -2017,17 +2026,32 @@ function resolveIntegrationMiddlewareParams(entry, pathname, config) {
     });
     compiledIntegrationGuards.set(entry, compiled);
   }
-  for (const candidate of routePathname === pathname ? [pathname] : [pathname, routePathname]) {
+  for (const candidate of candidates) {
     const result = _chunkZ2HLU4IXcjs.matchesCompiledMiddlewareConfig.call(void 0, candidate, compiled, noMiddlewareContext);
     if (result.matched) return _nullishCoalesce(result.params, () => ( {}));
   }
   return null;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, resolveIntegrationMiddlewareParams, "resolveIntegrationMiddlewareParams");
+var FARM_INTEGRATION_API_BASE_PATH_KEY = "__farmAPIServerBasePath";
+var integrationAPIPathnames = /* @__PURE__ */ new WeakMap();
+function getIntegrationAPIPathnames(config) {
+  if (!config) return (pathname) => [pathname];
+  let toPathnames = integrationAPIPathnames.get(config);
+  if (!toPathnames) {
+    const recorded = config[FARM_INTEGRATION_API_BASE_PATH_KEY];
+    const api2 = config.api;
+    const serverBasePath = typeof recorded === "string" ? recorded : typeof _optionalChain([api2, 'optionalAccess', _32 => _32.baseURL]) === "string" && typeof api2.basePath === "string" ? _chunkKNBBQHO2cjs.resolveFarmAPIServerBasePath.call(void 0, api2) : void 0;
+    toPathnames = _chunkKNBBQHO2cjs.createFarmAPIMiddlewarePathnames.call(void 0, serverBasePath);
+    integrationAPIPathnames.set(config, toPathnames);
+  }
+  return toPathnames;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getIntegrationAPIPathnames, "getIntegrationAPIPathnames");
 function resolveIntegrationRoutePathname(pathname, config) {
-  const basePath = typeof _optionalChain([config, 'optionalAccess', _26 => _26.basePath]) === "string" ? config.basePath : void 0;
+  const basePath = typeof _optionalChain([config, 'optionalAccess', _33 => _33.basePath]) === "string" ? config.basePath : void 0;
   let routePathname = basePath ? _chunkI57LW5VZcjs.stripFarmBasePath.call(void 0, pathname, basePath) : pathname;
-  const i18n = _optionalChain([config, 'optionalAccess', _27 => _27.i18n]);
+  const i18n = _optionalChain([config, 'optionalAccess', _34 => _34.i18n]);
   if (i18n && Array.isArray(i18n.locales) && i18n.locales.length > 0) {
     routePathname = _chunkBIDYX3SLcjs.resolveFarmLocalePath.call(void 0, routePathname, {
       locales: i18n.locales,
@@ -2159,4 +2183,5 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, normalizeMatcher, "normalizeMatcher");
 
 
 
-exports.getFarmPluginIntegrationContext = getFarmPluginIntegrationContext; exports.FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY = FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY; exports.FARM_INTEGRATION_SET_COOKIES_KEY = FARM_INTEGRATION_SET_COOKIES_KEY; exports.forwardIntegrationSetCookies = forwardIntegrationSetCookies; exports.defineIntegrationSchema = defineIntegrationSchema; exports.getFarmIntegrationPluginServerRuntime = getFarmIntegrationPluginServerRuntime; exports.getFarmIntegrationPluginOwner = getFarmIntegrationPluginOwner; exports.createIntegrationRoute = createIntegrationRoute; exports.integrationRoute = integrationRoute; exports.defineIntegration = defineIntegration; exports.isFarmIntegration = isFarmIntegration; exports.resolveIntegrationPlugins = resolveIntegrationPlugins; exports.getIntegrationProviders = getIntegrationProviders; exports.isFarmIntegrationProviderComponentReference = isFarmIntegrationProviderComponentReference; exports.getIntegrationDocumentNavigationMatchers = getIntegrationDocumentNavigationMatchers; exports.getIntegrationSchemas = getIntegrationSchemas; exports.getRegisteredIntegrationRuntime = getRegisteredIntegrationRuntime; exports.getRegisteredIntegrations = getRegisteredIntegrations; exports.getRegisteredIntegrationSchemas = getRegisteredIntegrationSchemas; exports.matchIntegrationRoute = matchIntegrationRoute; exports.matchRegisteredIntegrationRoute = matchRegisteredIntegrationRoute; exports.getRegisteredIntegrationAPIManifest = getRegisteredIntegrationAPIManifest; exports.dispatchIntegrationRequest = dispatchIntegrationRequest; exports.dispatchIntegrationRequests = dispatchIntegrationRequests;
+
+exports.getFarmPluginIntegrationContext = getFarmPluginIntegrationContext; exports.FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY = FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY; exports.FARM_INTEGRATION_SET_COOKIES_KEY = FARM_INTEGRATION_SET_COOKIES_KEY; exports.forwardIntegrationSetCookies = forwardIntegrationSetCookies; exports.defineIntegrationSchema = defineIntegrationSchema; exports.getFarmIntegrationPluginServerRuntime = getFarmIntegrationPluginServerRuntime; exports.getFarmIntegrationPluginOwner = getFarmIntegrationPluginOwner; exports.createIntegrationRoute = createIntegrationRoute; exports.integrationRoute = integrationRoute; exports.defineIntegration = defineIntegration; exports.isFarmIntegration = isFarmIntegration; exports.resolveIntegrationPlugins = resolveIntegrationPlugins; exports.getIntegrationProviders = getIntegrationProviders; exports.isFarmIntegrationProviderComponentReference = isFarmIntegrationProviderComponentReference; exports.getIntegrationDocumentNavigationMatchers = getIntegrationDocumentNavigationMatchers; exports.getIntegrationSchemas = getIntegrationSchemas; exports.getRegisteredIntegrationRuntime = getRegisteredIntegrationRuntime; exports.getRegisteredIntegrations = getRegisteredIntegrations; exports.getRegisteredIntegrationSchemas = getRegisteredIntegrationSchemas; exports.matchIntegrationRoute = matchIntegrationRoute; exports.matchRegisteredIntegrationRoute = matchRegisteredIntegrationRoute; exports.getRegisteredIntegrationAPIManifest = getRegisteredIntegrationAPIManifest; exports.dispatchIntegrationRequest = dispatchIntegrationRequest; exports.dispatchIntegrationRequests = dispatchIntegrationRequests; exports.FARM_INTEGRATION_API_BASE_PATH_KEY = FARM_INTEGRATION_API_BASE_PATH_KEY;

package/dist/{chunk-VKNHTSAP.cjs → chunk-CGBDNNSM.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(); } } 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 _chunkEM6SBQKMcjs = require('./chunk-EM6SBQKM.cjs');
+var _chunkKIIMAWOJcjs = require('./chunk-KIIMAWOJ.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -583,7 +583,7 @@ function createOptimizedImageResponse(request, image, config) {
   if (image.contentType === "image/svg+xml" && config.dangerouslyAllowSVG) {
     headers.set("content-security-policy", "default-src 'none'; sandbox");
   }
-  if (_chunkEM6SBQKMcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), image.etag)) {
+  if (_chunkKIIMAWOJcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), image.etag)) {
     headers.delete("content-length");
     return new Response(null, { status: 304, headers });
   }