@farm.js/core 0.1.36 → 0.1.37

package/dist/{chunk-BPMATOP2.cjs → chunk-5BXGGEC7.cjs}

@@ -3,14 +3,15 @@
 
 
 
-var _chunk3BU22U3Mcjs = require('./chunk-3BU22U3M.cjs');
+var _chunkG2TEB74Scjs = require('./chunk-G2TEB74S.cjs');
 
 
 
 
 
 
-var _chunkZ2HLU4IXcjs = require('./chunk-Z2HLU4IX.cjs');
+
+var _chunk4GWRFP22cjs = require('./chunk-4GWRFP22.cjs');
 
 
 var _chunkE3UK5IIBcjs = require('./chunk-E3UK5IIB.cjs');
@@ -82,19 +83,19 @@ var WebResponseHeaderMap = _WebResponseHeaderMap;
 var _WebCookieJar = class _WebCookieJar {
   constructor(request, headers) {
     this.headers = headers;
-    this.cookies = _chunk3BU22U3Mcjs.parseMiddlewareCookieHeader.call(void 0, request.headers.get("cookie"));
+    this.cookies = _chunkG2TEB74Scjs.parseMiddlewareCookieHeader.call(void 0, request.headers.get("cookie"));
   }
   get(name) {
     return this.cookies[name];
   }
   set(name, value, options = {}) {
     this.cookies[name] = value;
-    const cookieString = _chunk3BU22U3Mcjs.serializeMiddlewareCookie.call(void 0, name, value, options);
+    const cookieString = _chunkG2TEB74Scjs.serializeMiddlewareCookie.call(void 0, name, value, options);
     this.headers.appendSetCookie(cookieString);
   }
   delete(name, options = {}) {
     delete this.cookies[name];
-    this.headers.appendSetCookie(_chunk3BU22U3Mcjs.serializeMiddlewareCookieDeletion.call(void 0, name, options));
+    this.headers.appendSetCookie(_chunkG2TEB74Scjs.serializeMiddlewareCookieDeletion.call(void 0, name, options));
   }
   getAll() {
     return { ...this.cookies };
@@ -260,7 +261,7 @@ function createHandledResponse(body, init, headers) {
   return new Response(body, { ...init, headers: responseHeaders });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, 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: _chunk4GWRFP22cjs.toMiddlewareRoutePathname.call(void 0, 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 = _chunk4GWRFP22cjs.toMiddlewareRoutePathname.call(void 0, nextUrl.pathname, toRoutePathname);
       ctx.searchParams = nextUrl.searchParams;
       ctx.route = nextUrl.pathname;
     },
@@ -375,7 +378,7 @@ function createWebMiddlewareContext(request, parent, trustProxy = false, clientA
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createWebMiddlewareContext, "createWebMiddlewareContext");
 function matchesMiddlewareConfig2(pathname, config, ctx) {
-  return _chunkZ2HLU4IXcjs.matchesMiddlewareConfig.call(void 0, pathname, config, ctx);
+  return _chunk4GWRFP22cjs.matchesMiddlewareConfig.call(void 0, pathname, config, ctx);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, matchesMiddlewareConfig2, "matchesMiddlewareConfig");
 function getConfigHandlers(entry) {
@@ -408,7 +411,7 @@ function normalizeConfigMiddleware(config) {
       globalConfig = middlewareConfig;
       continue;
     }
-    _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, middlewareConfig);
+    _chunk4GWRFP22cjs.compileMiddlewareConfig.call(void 0, middlewareConfig);
     entries.push({
       path: "/",
       filePath: `farm.config.ts#middleware-${index}`,
@@ -423,11 +426,11 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, normalizeConfigMiddleware, "normalizeConfi
 function normalizeFileMiddleware(modules = []) {
   const entries = [];
   for (const moduleEntry of modules) {
-    const normalized = _chunk3BU22U3Mcjs.normalizeMiddlewareModule.call(void 0, moduleEntry.module, moduleEntry.path);
+    const normalized = _chunkG2TEB74Scjs.normalizeMiddlewareModule.call(void 0, moduleEntry.module, moduleEntry.path);
     if (!normalized) {
       continue;
     }
-    if (normalized.config) _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, normalized.config);
+    if (normalized.config) _chunk4GWRFP22cjs.compileMiddlewareConfig.call(void 0, normalized.config);
     entries.push({
       path: moduleEntry.path,
       filePath: moduleEntry.filePath || moduleEntry.path,
@@ -471,24 +474,25 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, emptyResult, "emptyResult");
 function createProductionMiddlewareRunner(options = {}) {
   const configMiddleware = normalizeConfigMiddleware(options.config);
   const fileMiddleware = normalizeFileMiddleware(options.modules);
-  for (const entry of fileMiddleware) _chunkZ2HLU4IXcjs.compileMiddlewareRoute.call(void 0, entry);
+  for (const entry of fileMiddleware) _chunk4GWRFP22cjs.compileMiddlewareRoute.call(void 0, entry);
   const entries = [...configMiddleware.entries, ...fileMiddleware];
   const globalConfig = configMiddleware.globalConfig;
-  if (globalConfig) _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, globalConfig);
+  if (globalConfig) _chunk4GWRFP22cjs.compileMiddlewareConfig.call(void 0, globalConfig);
   const toMiddlewarePathnames = _chunkKNBBQHO2cjs.createFarmAPIMiddlewarePathnames.call(void 0, options.apiBasePath);
   return /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, async function runProductionMiddleware(request, requestOptions = {}) {
     if (!globalConfig && entries.length === 0) {
       return emptyResult(request);
     }
+    const toRoutePathname = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (pathname) => _optionalChain([options, 'access', _15 => _15.i18n, 'optionalAccess', _16 => _16.enabled]) ? _chunkBIDYX3SLcjs.stripFarmLocaleFromPathname.call(void 0, pathname, options.i18n) : _chunkI57LW5VZcjs.stripFarmBasePath.call(void 0, pathname, _nullishCoalesce(_optionalChain([options, 'access', _17 => _17.i18n, 'optionalAccess', _18 => _18.basePath]), () => ( "/"))), "toRoutePathname");
     let contextState = createWebMiddlewareContext(
       request,
       void 0,
-      _optionalChain([options, 'access', _15 => _15.server, 'optionalAccess', _16 => _16.trustProxy]) === true,
-      requestOptions.clientAddress
+      _optionalChain([options, 'access', _19 => _19.server, 'optionalAccess', _20 => _20.trustProxy]) === true,
+      requestOptions.clientAddress,
+      toRoutePathname
     );
     let ctx = contextState.ctx;
     let currentRequest = contextState.getRequest();
-    const toRoutePathname = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (pathname) => _optionalChain([options, 'access', _17 => _17.i18n, 'optionalAccess', _18 => _18.enabled]) ? _chunkBIDYX3SLcjs.stripFarmLocaleFromPathname.call(void 0, pathname, options.i18n) : _chunkI57LW5VZcjs.stripFarmBasePath.call(void 0, pathname, _nullishCoalesce(_optionalChain([options, 'access', _19 => _19.i18n, 'optionalAccess', _20 => _20.basePath]), () => ( "/"))), "toRoutePathname");
     const initialRequestPathname = ctx.pathname;
     const initialPathname = toRoutePathname(initialRequestPathname);
     const matchPathnames = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (pathname, requestPathname) => options.rawPathRouting && requestPathname !== pathname ? [
@@ -499,7 +503,7 @@ function createProductionMiddlewareRunner(options = {}) {
     ] : toMiddlewarePathnames(pathname), "matchPathnames");
     let parentData;
     if (globalConfig) {
-      const globalMatch = _chunkZ2HLU4IXcjs.matchesMiddlewareConfigAt.call(void 0, 
+      const globalMatch = _chunk4GWRFP22cjs.matchesMiddlewareConfigAt.call(void 0, 
         matchPathnames(initialPathname, initialRequestPathname),
         globalConfig,
         ctx
@@ -516,11 +520,11 @@ function createProductionMiddlewareRunner(options = {}) {
       for (let pathname = initialPathname, requestPathname = initialRequestPathname, pass = 0; ; pass++) {
         const pathnames = matchPathnames(pathname, requestPathname);
         if (pass > 0 && globalConfig) {
-          if (!_chunkZ2HLU4IXcjs.matchesMiddlewareConfigAt.call(void 0, pathnames, globalConfig, ctx).matched) return;
+          if (!_chunk4GWRFP22cjs.matchesMiddlewareConfigAt.call(void 0, pathnames, globalConfig, ctx).matched) return;
         }
         for (const entry of entries) {
           if (ran.has(entry)) continue;
-          const routeMatch = entry.source === "config" ? { matched: true } : _chunkZ2HLU4IXcjs.matchesMiddlewareRouteAt.call(void 0, pathnames, entry);
+          const routeMatch = entry.source === "config" ? { matched: true } : _chunk4GWRFP22cjs.matchesMiddlewareRouteAt.call(void 0, pathnames, entry);
           if (routeMatch.matched) yield { entry, routeMatch, pathname, pathnames };
         }
         const rewrittenRequestPathname = new URL(currentRequest.url).pathname;
@@ -532,7 +536,7 @@ function createProductionMiddlewareRunner(options = {}) {
     }
     _chunkS3JO3N4Hcjs.__name.call(void 0, applicableMiddleware, "applicableMiddleware");
     for (const { entry, routeMatch, pathname, pathnames } of applicableMiddleware()) {
-      const configMatch = entry.config ? _chunkZ2HLU4IXcjs.matchesMiddlewareConfigAt.call(void 0, pathnames, entry.config, ctx) : { matched: true };
+      const configMatch = entry.config ? _chunk4GWRFP22cjs.matchesMiddlewareConfigAt.call(void 0, pathnames, entry.config, ctx) : { matched: true };
       if (!configMatch.matched) {
         continue;
       }
@@ -542,7 +546,8 @@ function createProductionMiddlewareRunner(options = {}) {
           currentRequest,
           parentData,
           _optionalChain([options, 'access', _21 => _21.server, 'optionalAccess', _22 => _22.trustProxy]) === true,
-          requestOptions.clientAddress
+          requestOptions.clientAddress,
+          toRoutePathname
         );
         ctx = contextState.ctx;
       }

package/dist/{chunk-JNUWCDTF.cjs → chunk-5D2JIPLH.cjs}

@@ -29,7 +29,7 @@ var _chunkPSV6XKPOcjs = require('./chunk-PSV6XKPO.cjs');
 var _chunkM7MKQXAFcjs = require('./chunk-M7MKQXAF.cjs');
 
 
-var _chunkSJNMVDDFcjs = require('./chunk-SJNMVDDF.cjs');
+var _chunkFUCSUGDMcjs = require('./chunk-FUCSUGDM.cjs');
 
 
 var _chunkUFDAAQFXcjs = require('./chunk-UFDAAQFX.cjs');
@@ -736,7 +736,7 @@ async function createRouteTypeDeclarations(options, outPath) {
         }
       }
     }
-    for (const route of await _chunkSJNMVDDFcjs.discoverProgrammaticRoutePaths.call(void 0, source.root, source.srcDir)) {
+    for (const route of await _chunkFUCSUGDMcjs.discoverProgrammaticRoutePaths.call(void 0, source.root, source.srcDir)) {
       patterns.add(route);
       routeModulePatterns.add(route);
     }

package/dist/{chunk-AHGECQEW.mjs → chunk-666CKENS.mjs}

@@ -1,7 +1,7 @@
 import {
   compiledFarmI18nMessages,
   getFarmI18nClientState
-} from "./chunk-F2SE2VDO.mjs";
+} from "./chunk-IHQIOZLC.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-BO36SELV.cjs → chunk-6LGFV2CQ.cjs}

@@ -13,7 +13,7 @@ var _chunkYWN746UScjs = require('./chunk-YWN746US.cjs');
 var _chunkOX6O6WVAcjs = require('./chunk-OX6O6WVA.cjs');
 
 
-var _chunkU4KT7QP3cjs = require('./chunk-U4KT7QP3.cjs');
+var _chunkOW67PDDScjs = require('./chunk-OW67PDDS.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -118,7 +118,7 @@ function createServerFn(options) {
       throw labelInputErrors && isSchemaValidationFailure(cause) ? new ServerFnInputError(cause) : cause;
     }
     const executionContext = _chunkT5OJPTVNcjs.getServerActionExecutionContext.call(void 0, );
-    const request = _nullishCoalesce(_optionalChain([executionContext, 'optionalAccess', _ => _.request]), () => ( _chunkU4KT7QP3cjs._resolveCurrentRequest.call(void 0, )));
+    const request = _nullishCoalesce(_optionalChain([executionContext, 'optionalAccess', _ => _.request]), () => ( _chunkOW67PDDScjs._resolveCurrentRequestForApp.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,