@farm.js/core 0.1.35 → 0.1.37

package/dist/{chunk-IHNMMXHV.mjs → chunk-FGRYBX5X.mjs}

@@ -3,20 +3,21 @@ import {
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion
-} from "./chunk-2NNMOPDN.mjs";
+} from "./chunk-J3ANCZKA.mjs";
 import {
   compileMiddlewareConfig,
   compileMiddlewareRoute,
   matchesMiddlewareConfig,
   matchesMiddlewareConfigAt,
-  matchesMiddlewareRouteAt
-} from "./chunk-JG6DJF5A.mjs";
-import {
-  createFarmAPIMiddlewarePathnames
-} from "./chunk-BTHHUD7Q.mjs";
+  matchesMiddlewareRouteAt,
+  toMiddlewareRoutePathname
+} from "./chunk-HZFM2LWQ.mjs";
 import {
   emitFarmEvent
 } from "./chunk-FUZEBRP3.mjs";
+import {
+  createFarmAPIMiddlewarePathnames
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   _withFarmResponseHeaders
 } from "./chunk-Z3HATSKO.mjs";
@@ -260,7 +261,7 @@ function createHandledResponse(body, init, headers) {
   return new Response(body, { ...init, headers: responseHeaders });
 }
 __name(createHandledResponse, "createHandledResponse");
-function createWebMiddlewareContext(request, parent, trustProxy = false, clientAddress) {
+function createWebMiddlewareContext(request, parent, trustProxy = false, clientAddress, toRoutePathname) {
   let currentRequest = withNodeRequestShape(request, trustProxy, clientAddress);
   let handledResponse = null;
   const url = new URL(currentRequest.url);
@@ -281,6 +282,7 @@ function createWebMiddlewareContext(request, parent, trustProxy = false, clientA
     response: responseShim.response,
     url,
     pathname: url.pathname,
+    routePathname: toMiddlewareRoutePathname(url.pathname, toRoutePathname),
     searchParams: url.searchParams,
     method: currentRequest.method || "GET",
     params: {},
@@ -323,6 +325,7 @@ function createWebMiddlewareContext(request, parent, trustProxy = false, clientA
       ctx.request = currentRequest;
       ctx.url = nextUrl;
       ctx.pathname = nextUrl.pathname;
+      ctx.routePathname = toMiddlewareRoutePathname(nextUrl.pathname, toRoutePathname);
       ctx.searchParams = nextUrl.searchParams;
       ctx.route = nextUrl.pathname;
     },
@@ -480,15 +483,16 @@ function createProductionMiddlewareRunner(options = {}) {
     if (!globalConfig && entries.length === 0) {
       return emptyResult(request);
     }
+    const toRoutePathname = /* @__PURE__ */ __name((pathname) => options.i18n?.enabled ? stripFarmLocaleFromPathname(pathname, options.i18n) : stripFarmBasePath(pathname, options.i18n?.basePath ?? "/"), "toRoutePathname");
     let contextState = createWebMiddlewareContext(
       request,
       void 0,
       options.server?.trustProxy === true,
-      requestOptions.clientAddress
+      requestOptions.clientAddress,
+      toRoutePathname
     );
     let ctx = contextState.ctx;
     let currentRequest = contextState.getRequest();
-    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 ? [
@@ -542,7 +546,8 @@ function createProductionMiddlewareRunner(options = {}) {
           currentRequest,
           parentData,
           options.server?.trustProxy === true,
-          requestOptions.clientAddress
+          requestOptions.clientAddress,
+          toRoutePathname
         );
         ctx = contextState.ctx;
       }

package/dist/{chunk-D227TIEN.cjs → chunk-FWE7LEQC.cjs}

@@ -1,7 +1,7 @@
 "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 _chunkFFFW3OQ7cjs = require('./chunk-FFFW3OQ7.cjs');
+var _chunkS6FJO323cjs = require('./chunk-S6FJO323.cjs');
 
 
 var _chunkR5A5KNVXcjs = require('./chunk-R5A5KNVX.cjs');
@@ -9,7 +9,7 @@ var _chunkR5A5KNVXcjs = require('./chunk-R5A5KNVX.cjs');
 
 
 
-var _chunkC4SPBWFMcjs = require('./chunk-C4SPBWFM.cjs');
+var _chunkJEZO6VURcjs = require('./chunk-JEZO6VUR.cjs');
 
 
 var _chunkJ7FSKED3cjs = require('./chunk-J7FSKED3.cjs');
@@ -227,12 +227,12 @@ var _SPARouter = class _SPARouter {
       viewTransition = false,
       refresh = false
     } = options;
-    const url = _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href);
-    if (_chunkC4SPBWFMcjs.isFarmBlockedNavigationURL.call(void 0, url)) return;
+    const url = _chunkJEZO6VURcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href);
+    if (_chunkJEZO6VURcjs.isFarmBlockedNavigationURL.call(void 0, url)) return;
     const pathname = url.pathname;
     const search = url.search;
     const fullPath = pathname + search;
-    if (_chunkC4SPBWFMcjs.isFarmExternalNavigationURL.call(void 0, url, window.location.origin) || _chunkFFFW3OQ7cjs.isFarmLocaleChangeHref.call(void 0, url.toString()) || this.options.shouldUseDocumentNavigation(pathname)) {
+    if (_chunkJEZO6VURcjs.isFarmExternalNavigationURL.call(void 0, url, window.location.origin) || _chunkS6FJO323cjs.isFarmLocaleChangeHref.call(void 0, url.toString()) || this.options.shouldUseDocumentNavigation(pathname)) {
       this.cancelActiveNavigation();
       if (replace) window.location.replace(url.toString());
       else window.location.assign(url.toString());
@@ -336,9 +336,9 @@ var _SPARouter = class _SPARouter {
    */
   async prefetch(href) {
     if (this.destroyed) return;
-    if (_chunkFFFW3OQ7cjs.isFarmLocaleChangeHref.call(void 0, href)) return;
-    const url = _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href);
-    if (_chunkC4SPBWFMcjs.isFarmExternalNavigationURL.call(void 0, url, window.location.origin)) return;
+    if (_chunkS6FJO323cjs.isFarmLocaleChangeHref.call(void 0, href)) return;
+    const url = _chunkJEZO6VURcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href);
+    if (_chunkJEZO6VURcjs.isFarmExternalNavigationURL.call(void 0, url, window.location.origin)) return;
     if (this.options.shouldUseDocumentNavigation(url.pathname)) return;
     const fullPath = url.pathname + url.search;
     const interceptFrom = window.location.pathname + window.location.search;
@@ -497,7 +497,7 @@ var _SPARouter = class _SPARouter {
     this.writePageState(action, readPageState(), href, false);
   }
   async commitNavigation(options) {
-    const historyUrl = _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, 
+    const historyUrl = _chunkJEZO6VURcjs.resolveFarmNavigationURL.call(void 0, 
       options.pageData.canonicalPath || options.fullPath,
       window.location.href
     );
@@ -519,13 +519,13 @@ var _SPARouter = class _SPARouter {
       window.history.pushState(historyState, "", historyPath);
     }
     this.currentHistoryIndex = nextHistoryIndex;
-    const resolvedHistoryUrl = _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, historyPath, window.location.href);
+    const resolvedHistoryUrl = _chunkJEZO6VURcjs.resolveFarmNavigationURL.call(void 0, historyPath, window.location.href);
     this.currentHistoryPath = resolvedHistoryUrl.pathname + resolvedHistoryUrl.search;
     this.currentHistoryHash = resolvedHistoryUrl.hash;
     this.currentInterceptFrom = historyState[FARM_INTERCEPT_FROM_KEY];
     notifyRouterHistoryChange();
     this.updateDocumentMetadata(options.pageData.metadata);
-    _chunkFFFW3OQ7cjs._hydrateFarmI18n.call(void 0, options.pageData.i18n);
+    _chunkS6FJO323cjs._hydrateFarmI18n.call(void 0, options.pageData.i18n);
     if (this.onNavigate) {
       await this.onNavigate(options.pageData);
     }
@@ -757,7 +757,7 @@ var _SPARouter = class _SPARouter {
       }
       if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
       this.updateDocumentMetadata(pageData.metadata);
-      _chunkFFFW3OQ7cjs._hydrateFarmI18n.call(void 0, pageData.i18n);
+      _chunkS6FJO323cjs._hydrateFarmI18n.call(void 0, pageData.i18n);
       if (this.onNavigate) {
         await this.onNavigate(pageData);
       }
@@ -872,7 +872,7 @@ var _SPARouter = class _SPARouter {
   }
   writePageState(action, state, href, notify = true) {
     if (typeof window === "undefined") return;
-    const url = href ? _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href).toString() : window.location.href;
+    const url = href ? _chunkJEZO6VURcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href).toString() : window.location.href;
     const parsedUrl = new URL(url);
     const nextPath = parsedUrl.pathname + parsedUrl.search;
     const historyPath = nextPath + parsedUrl.hash;

package/dist/{chunk-3BU22U3M.cjs → chunk-G2TEB74S.cjs}

@@ -3,7 +3,7 @@
 var _chunkAI7QMY7Ocjs = require('./chunk-AI7QMY7O.cjs');
 
 
-var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
+var _chunkNICDYKBScjs = require('./chunk-NICDYKBS.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -112,7 +112,7 @@ function toWebRequest(ctx) {
   if (isWebRequest(ctx.request)) {
     return ctx.request;
   }
-  return _chunkUXFQ3UDAcjs.createWebRequestFromFarmRequest.call(void 0, ctx.request, { origin: ctx.url.origin });
+  return _chunkNICDYKBScjs.createWebRequestFromFarmRequest.call(void 0, ctx.request, { origin: ctx.url.origin });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, toWebRequest, "toWebRequest");
 function createRequestMiddlewareContext(ctx) {
@@ -123,6 +123,9 @@ function createRequestMiddlewareContext(ctx) {
     get pathname() {
       return ctx.pathname;
     },
+    get routePathname() {
+      return ctx.routePathname;
+    },
     get searchParams() {
       return ctx.searchParams;
     },

package/dist/{chunk-G5RT7EXW.mjs → chunk-HEVMCTSR.mjs}

@@ -15,7 +15,7 @@ import {
   DEFAULT_FARM_SERVER_BODY_SIZE_LIMIT,
   bufferFarmRequestBody,
   createFarmRequestBodyErrorResponse
-} from "./chunk-Y7RKTKYI.mjs";
+} from "./chunk-ZMMBIVQM.mjs";
 import {
   resolveFarmAPICanonicalPathname
 } from "./chunk-BTHHUD7Q.mjs";
@@ -34,7 +34,7 @@ import {
 } from "./chunk-4SIYUGRY.mjs";
 import {
   _runWithCurrentRequest
-} from "./chunk-FDR64H6B.mjs";
+} from "./chunk-3KGDJLJK.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
@@ -66,7 +66,7 @@ function mergePluginAPIRoutes(existing, plugins, expected, options = {}) {
       endpoints: { ...route.endpoints }
     });
   }
-  const api = createPluginLocalAPI(existing, options.bodySizeLimit);
+  const api = createPluginLocalAPI(existing, options.bodySizeLimit, options.dispatch);
   for (const definition of resolvePluginRoutes(plugins, { api })) {
     registerAPIRouteShape(shapes, definition.path, `plugin:${definition.path}`, "app");
     let route = routes.get(definition.path);
@@ -101,7 +101,18 @@ ${actualSignature || "(none)"}`
   return result;
 }
 __name(mergePluginAPIRoutes, "mergePluginAPIRoutes");
-function createPluginLocalAPI(routes, bodySizeLimit) {
+var DISPATCH_DROPPED_HEADERS = [
+  "accept-encoding",
+  "connection",
+  "content-length",
+  "keep-alive",
+  "proxy-connection",
+  "te",
+  "trailer",
+  "transfer-encoding",
+  "upgrade"
+];
+function createPluginLocalAPI(routes, bodySizeLimit, dispatch) {
   const endpoints = /* @__PURE__ */ new Map();
   for (const route of routes) {
     for (const method of route.methods) {
@@ -119,8 +130,12 @@ function createPluginLocalAPI(routes, bodySizeLimit) {
         }),
         output: endpoint.__output,
         mcp: endpoint.__mcp === true ? true : endpoint.__mcp ? Object.freeze({ ...endpoint.__mcp }) : void 0,
-        invoke(request, params = {}) {
-          return invokeAPIRouteEndpoint(endpoint, request, { ...params }, bodySizeLimit);
+        async invoke(request, params = {}) {
+          if (!dispatch)
+            return invokeAPIRouteEndpoint(endpoint, request, { ...params }, bodySizeLimit);
+          const headers = new Headers(request.headers);
+          for (const name of DISPATCH_DROPPED_HEADERS) headers.delete(name);
+          return dispatch(new Request(request, { headers }));
         }
       });
       endpoints.set(`${normalizedMethod} ${route.path}`, descriptor);

package/dist/{chunk-W7LF2J2S.mjs → chunk-HMRSWN47.mjs}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-SAXPH6G5.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-FDR64H6B.mjs";
+} from "./chunk-3KGDJLJK.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-JG6DJF5A.mjs → chunk-HZFM2LWQ.mjs}

@@ -183,6 +183,25 @@ function matchPattern(pattern, pathname) {
   };
 }
 __name(matchPattern, "matchPattern");
+function withRoutePathname(ctx, routePathname) {
+  return new Proxy(ctx, {
+    get(target, key) {
+      return key === "pathname" || key === "routePathname" ? routePathname : Reflect.get(target, key, target);
+    }
+  });
+}
+__name(withRoutePathname, "withRoutePathname");
+function matchesMiddlewarePredicate(predicate, ctx, getRoutePathname = () => ctx.routePathname) {
+  if (predicate(ctx)) return true;
+  const routePathname = getRoutePathname();
+  if (routePathname === void 0 || routePathname === ctx.pathname) return false;
+  return Boolean(predicate(withRoutePathname(ctx, routePathname)));
+}
+__name(matchesMiddlewarePredicate, "matchesMiddlewarePredicate");
+function toMiddlewareRoutePathname(pathname, toRoutePathname = (value) => value) {
+  return canonicalizeRequestPathname(toRoutePathname(pathname));
+}
+__name(toMiddlewareRoutePathname, "toMiddlewareRoutePathname");
 function matchesCompiledMiddlewareConfig(pathname, config, ctx) {
   let canonicalPathname;
   const getCanonicalPathname = /* @__PURE__ */ __name(() => canonicalPathname ?? (canonicalPathname = canonicalizeRequestPathname(pathname)), "getCanonicalPathname");
@@ -196,7 +215,7 @@ function matchesCompiledMiddlewareConfig(pathname, config, ctx) {
   if (config.matcher) {
     for (const matcher of config.matcher) {
       if (typeof matcher === "function") {
-        if (matcher(ctx)) {
+        if (matchesMiddlewarePredicate(matcher, ctx, getCanonicalPathname)) {
           return { matched: true };
         }
         continue;
@@ -232,6 +251,8 @@ export {
   matchesMiddlewareRoute,
   matchesMiddlewareRouteAt,
   compileMiddlewareConfig,
+  matchesMiddlewarePredicate,
+  toMiddlewareRoutePathname,
   matchesCompiledMiddlewareConfig,
   matchesMiddlewareConfig,
   matchesMiddlewareConfigAt

package/dist/{chunk-UAORZ7QA.mjs → chunk-IAIYV4RZ.mjs}

@@ -4,13 +4,13 @@ import {
   _runServerFunctionForCaller,
   createServerFn,
   createServerFunctionDescriptor
-} from "./chunk-Q3VLETLE.mjs";
+} from "./chunk-RRMVL6CJ.mjs";
 import {
   createFarmServerQueryResult
 } from "./chunk-KGB5UXJJ.mjs";
 import {
   getServerActionExecutionContext
-} from "./chunk-SMHH4VDG.mjs";
+} from "./chunk-4WVJLURN.mjs";
 import {
   createRouteDataCacheTag,
   getFarmDataCache

package/dist/{chunk-F2SE2VDO.mjs → chunk-IHQIOZLC.mjs}

@@ -1,6 +1,6 @@
 import {
   resolveFarmNavigationURL
-} from "./chunk-5SJWVY6R.mjs";
+} from "./chunk-QHSH7IH4.mjs";
 import {
   getActiveFarmI18nSnapshot
 } from "./chunk-C4NCTZLM.mjs";

package/dist/{chunk-2NNMOPDN.mjs → chunk-J3ANCZKA.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-JM5XPKWH.mjs";
 import {
   createWebRequestFromFarmRequest
-} from "./chunk-FDR64H6B.mjs";
+} from "./chunk-3KGDJLJK.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
@@ -123,6 +123,9 @@ function createRequestMiddlewareContext(ctx) {
     get pathname() {
       return ctx.pathname;
     },
+    get routePathname() {
+      return ctx.routePathname;
+    },
     get searchParams() {
       return ctx.searchParams;
     },

package/dist/{chunk-C4SPBWFM.cjs → chunk-JEZO6VUR.cjs}

@@ -10,6 +10,14 @@ function isFarmBlockedNavigationURL(url) {
   return true;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, isFarmBlockedNavigationURL, "isFarmBlockedNavigationURL");
+function isFarmScriptURL(href) {
+  try {
+    return new URL(href, "http://farm.invalid").protocol === "javascript:";
+  } catch (e) {
+    return false;
+  }
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isFarmScriptURL, "isFarmScriptURL");
 function isFarmExternalNavigationURL(url, currentOrigin) {
   return url.protocol !== "http:" && url.protocol !== "https:" || url.origin !== currentOrigin;
 }
@@ -23,4 +31,5 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, resolveFarmNavigationURL, "resolveFarmNavi
 
 
 
-exports.isFarmBlockedNavigationURL = isFarmBlockedNavigationURL; exports.isFarmExternalNavigationURL = isFarmExternalNavigationURL; exports.resolveFarmNavigationURL = resolveFarmNavigationURL;
+
+exports.isFarmBlockedNavigationURL = isFarmBlockedNavigationURL; exports.isFarmScriptURL = isFarmScriptURL; exports.isFarmExternalNavigationURL = isFarmExternalNavigationURL; exports.resolveFarmNavigationURL = resolveFarmNavigationURL;

package/dist/{chunk-SC2WYWPF.mjs → chunk-JPNFPAZ4.mjs}

@@ -7,13 +7,13 @@ import {
   notifyHistoryChange,
   readPageState,
   subscribeHistoryChange
-} from "./chunk-XCMCS4DA.mjs";
+} from "./chunk-ND2CWPOD.mjs";
 import {
   getFarmI18nClientState
-} from "./chunk-F2SE2VDO.mjs";
+} from "./chunk-IHQIOZLC.mjs";
 import {
   _resolveCurrentRequest
-} from "./chunk-IZY3V5XW.mjs";
+} from "./chunk-S3VWVTVA.mjs";
 import {
   stripFarmLocaleFromPathname
 } from "./chunk-L3KT7IXV.mjs";

package/dist/{chunk-F6Z3Y5KL.mjs → chunk-K3SAEIM3.mjs}

@@ -1,6 +1,9 @@
 import {
   MiddlewareManager
-} from "./chunk-6TJOML4E.mjs";
+} from "./chunk-NFMDCAOS.mjs";
+import {
+  matchesMiddlewarePredicate
+} from "./chunk-HZFM2LWQ.mjs";
 import {
   resolveFarmI18nConfig
 } from "./chunk-BCMSYSN2.mjs";
@@ -210,7 +213,7 @@ var _MiddlewareChainImpl = class _MiddlewareChainImpl {
    */
   when(condition, fn) {
     const conditionalMiddleware = /* @__PURE__ */ __name(async (ctx, next) => {
-      const shouldRun = typeof condition === "function" ? condition(ctx) : condition;
+      const shouldRun = typeof condition === "function" ? matchesMiddlewarePredicate(condition, ctx) : condition;
       if (!shouldRun) {
         return next();
       }