@farm.js/core 0.1.34 → 0.1.36

package/dist/{chunk-GNSDTTWZ.mjs → chunk-MKYBIIAQ.mjs}

@@ -16,11 +16,15 @@ import {
   readNodeRequestBody,
   resolveFarmServerConfig,
   setRequestContext
-} from "./chunk-XF7Q24PF.mjs";
+} from "./chunk-ZMMBIVQM.mjs";
 import {
   applyWebResponseHeaders,
   sendWebResponse
 } from "./chunk-Z2RZJZIZ.mjs";
+import {
+  createFarmAPIMiddlewarePathnames,
+  resolveFarmAPIServerBasePath
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   api,
   defineIntegrationAPIOperation
@@ -1577,10 +1581,12 @@ async function dispatchIntegrationRequest(runtime, request, options = {}) {
   const middleware = [...integration.middleware || []];
   const forwardedSetCookies = [];
   for (const entry of middleware) {
+    if (options.ranMiddleware?.has(entry)) continue;
     const params = resolveIntegrationMiddlewareParams(entry, pathname, runtime.config);
     if (!params) {
       continue;
     }
+    options.ranMiddleware?.add(entry);
     const handlerContext = createServerIntegrationHandlerContext({
       runtime,
       route: {
@@ -1845,6 +1851,7 @@ async function dispatchIntegrationRequests(integrations, runtime, request, optio
       request.clone(),
       {
         currentRequest: options.currentRequest,
+        ranMiddleware: options.ranMiddleware,
         onForwardedCookies: /* @__PURE__ */ __name((cookies) => setCookies.push(...cookies), "onForwardedCookies")
       }
     );
@@ -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,13 +2026,28 @@ 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 = matchesCompiledMiddlewareConfig(candidate, compiled, noMiddlewareContext);
     if (result.matched) return result.params ?? {};
   }
   return null;
 }
 __name(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 api2?.baseURL === "string" && typeof api2.basePath === "string" ? resolveFarmAPIServerBasePath(api2) : void 0;
+    toPathnames = createFarmAPIMiddlewarePathnames(serverBasePath);
+    integrationAPIPathnames.set(config, toPathnames);
+  }
+  return toPathnames;
+}
+__name(getIntegrationAPIPathnames, "getIntegrationAPIPathnames");
 function resolveIntegrationRoutePathname(pathname, config) {
   const basePath = typeof config?.basePath === "string" ? config.basePath : void 0;
   let routePathname = basePath ? stripFarmBasePath(pathname, basePath) : pathname;
@@ -2158,5 +2182,6 @@ export {
   matchRegisteredIntegrationRoute,
   getRegisteredIntegrationAPIManifest,
   dispatchIntegrationRequest,
-  dispatchIntegrationRequests
+  dispatchIntegrationRequests,
+  FARM_INTEGRATION_API_BASE_PATH_KEY
 };