@farm.js/core 0.1.31 → 0.1.35

package/dist/{chunk-VUMAE7NC.mjs → chunk-6TJOML4E.mjs}

@@ -1,13 +1,19 @@
 import {
-  compileMiddlewareConfig,
-  compileMiddlewareRoute,
-  matchesMiddlewareConfig,
-  matchesMiddlewareRoute,
+  isRouteSlotSegment,
+  parseInterceptionMarker
+} from "./chunk-RHAZ22ZN.mjs";
+import {
   normalizeMiddlewareModule,
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion
-} from "./chunk-NRVGEI5I.mjs";
+} from "./chunk-2NNMOPDN.mjs";
+import {
+  compileMiddlewareConfig,
+  compileMiddlewareRoute,
+  matchesMiddlewareConfigAt,
+  matchesMiddlewareRouteAt
+} from "./chunk-JG6DJF5A.mjs";
 import {
   createCliColors
 } from "./chunk-I2BHUNBU.mjs";
@@ -18,6 +24,9 @@ import {
 import {
   logger
 } from "./chunk-KI3MESHB.mjs";
+import {
+  createFarmAPIMiddlewarePathnames
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   emitFarmEvent
 } from "./chunk-FUZEBRP3.mjs";
@@ -31,7 +40,7 @@ import {
 } from "./chunk-CBBLJMR5.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-BSPQVJ4A.mjs";
+} from "./chunk-FDR64H6B.mjs";
 import {
   stripFarmLocaleFromPathname
 } from "./chunk-L3KT7IXV.mjs";
@@ -185,12 +194,33 @@ import * as path from "path";
 
 // src/middleware/path.ts
 function appendMiddlewareRoutePath(routePath, directoryName) {
-  if (directoryName.startsWith("(") && directoryName.endsWith(")")) {
+  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;
   }
   return routePath === "/" ? `/${directoryName}` : `${routePath}/${directoryName}`;
 }
 __name(appendMiddlewareRoutePath, "appendMiddlewareRoutePath");
+function appendMiddlewareDirectory(directory, directoryName) {
+  return directory === "" ? directoryName : `${directory}/${directoryName}`;
+}
+__name(appendMiddlewareDirectory, "appendMiddlewareDirectory");
+function countSegments(value) {
+  return value.split("/").filter(Boolean).length;
+}
+__name(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);
+}
+__name(compareMiddlewareRouteLocations, "compareMiddlewareRouteLocations");
 
 // src/middleware/manager.ts
 function isMiddlewareResponse(value) {
@@ -198,13 +228,14 @@ function isMiddlewareResponse(value) {
 }
 __name(isMiddlewareResponse, "isMiddlewareResponse");
 var _MiddlewareManager = class _MiddlewareManager {
-  constructor(appDir, viteServer, config, i18n, server) {
+  constructor(appDir, viteServer, config, i18n, server, apiBasePath) {
     this.middleware = [];
     this.configMiddleware = [];
     this.appDirs = Array.isArray(appDir) ? [...appDir] : [appDir];
     this.viteServer = viteServer;
     this.i18n = i18n;
     this.server = server;
+    this.toMiddlewarePathnames = createFarmAPIMiddlewarePathnames(apiBasePath);
     this.configure(config);
   }
   configure(config) {
@@ -233,21 +264,16 @@ var _MiddlewareManager = class _MiddlewareManager {
    * Discover all middleware.ts files
    */
   async discover() {
-    const middlewareByPath = /* @__PURE__ */ new Map();
+    const middlewareByDirectory = /* @__PURE__ */ new Map();
     for (const appDir of this.appDirs) {
       const discovered = [];
-      await this.discoverInDirectory(appDir, "/", discovered);
-      for (const middleware of discovered) {
-        compileMiddlewareRoute(middleware);
-        middlewareByPath.set(middleware.path, middleware);
+      await this.discoverInDirectory(appDir, "/", "", discovered);
+      for (const entry of discovered) {
+        compileMiddlewareRoute(entry.middleware);
+        middlewareByDirectory.set(entry.location.directory, entry);
       }
     }
-    this.middleware = Array.from(middlewareByPath.values());
-    this.middleware.sort((a, b) => {
-      const depthA = a.path.split("/").filter(Boolean).length;
-      const depthB = b.path.split("/").filter(Boolean).length;
-      return depthA - depthB;
-    });
+    this.middleware = Array.from(middlewareByDirectory.values()).sort((left, right) => compareMiddlewareRouteLocations(left.location, right.location)).map((entry) => entry.middleware);
     if (process.env.FARM_VERBOSE && this.middleware.length > 0) {
       logger.success(`Discovered ${this.middleware.length} middleware files`);
       for (const mw of this.middleware) {
@@ -258,7 +284,7 @@ var _MiddlewareManager = class _MiddlewareManager {
   /**
    * Recursively discover middleware files
    */
-  async discoverInDirectory(dir, routePath, discovered) {
+  async discoverInDirectory(dir, routePath, directory, discovered) {
     if (!fs.existsSync(dir)) {
       return;
     }
@@ -266,15 +292,18 @@ var _MiddlewareManager = class _MiddlewareManager {
     if (middlewareFile) {
       const middleware = await this.loadMiddleware(middlewareFile, routePath);
       if (middleware) {
-        discovered.push(middleware);
+        discovered.push({ location: { path: routePath, directory }, middleware });
       }
     }
     const entries = fs.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      if (entry.isDirectory() && !entry.name.startsWith(".") && !entry.name.startsWith("_")) {
-        const subPath = path.join(dir, entry.name);
-        const subRoutePath = appendMiddlewareRoutePath(routePath, entry.name);
-        await this.discoverInDirectory(subPath, subRoutePath, discovered);
+      if (entry.isDirectory() && !entry.name.startsWith(".")) {
+        await this.discoverInDirectory(
+          path.join(dir, entry.name),
+          appendMiddlewareRoutePath(routePath, entry.name),
+          appendMiddlewareDirectory(directory, entry.name),
+          discovered
+        );
       }
     }
   }
@@ -329,7 +358,9 @@ var _MiddlewareManager = class _MiddlewareManager {
   async execute(req, res) {
     const url = resolveFarmRequestURL(req, { trustProxy: this.server?.trustProxy });
     const pathname = url.pathname;
-    const routePathname = this.i18n?.enabled ? stripFarmLocaleFromPathname(pathname, this.i18n) : stripFarmBasePath(pathname, this.i18n?.basePath ?? "/");
+    const toRoutePathname = /* @__PURE__ */ __name((value) => this.i18n?.enabled ? stripFarmLocaleFromPathname(value, this.i18n) : stripFarmBasePath(value, this.i18n?.basePath ?? "/"), "toRoutePathname");
+    const routePathname = toRoutePathname(pathname);
+    const toMiddlewarePathnames = this.toMiddlewarePathnames;
     const method = req.method || "GET";
     const startTime = Date.now();
     let parentData;
@@ -345,7 +376,10 @@ var _MiddlewareManager = class _MiddlewareManager {
     }
     const applicable = [
       ...this.configMiddleware.map((mw) => ({ mw, routeMatch: { matched: true } })),
-      ...this.middleware.map((mw) => ({ mw, routeMatch: matchesMiddlewareRoute(routePathname, mw) })).filter((entry) => entry.routeMatch.matched)
+      ...this.middleware.map((mw) => ({
+        mw,
+        routeMatch: matchesMiddlewareRouteAt(toMiddlewarePathnames(routePathname), mw)
+      })).filter((entry) => entry.routeMatch.matched)
     ];
     if (applicable.length === 0) {
       return false;
@@ -360,12 +394,37 @@ var _MiddlewareManager = class _MiddlewareManager {
       pc.dim(` (${(Date.now() - startTime).toFixed(2)}ms)`)
     ].join(" ");
     console.log(log);
-    for (const entry of applicable) {
-      const { mw, routeMatch } = entry;
-      const configMatch = mw.config ? this.matchesConfig(routePathname, mw.config, ctx) : { matched: true };
+    const ran = /* @__PURE__ */ new Set();
+    const allMiddleware = [...this.configMiddleware, ...this.middleware];
+    const globalConfig = this.globalConfig;
+    const trustProxy = this.server?.trustProxy;
+    function* applicableMiddleware() {
+      let passPathname = routePathname;
+      let pass = applicable;
+      for (; ; ) {
+        for (const entry of pass) yield { ...entry, pathname: passPathname };
+        const rewrittenPathname = toRoutePathname(
+          resolveFarmRequestURL(req, { trustProxy }).pathname
+        );
+        if (rewrittenPathname === passPathname) return;
+        passPathname = rewrittenPathname;
+        const passPathnames = toMiddlewarePathnames(passPathname);
+        if (globalConfig && !matchesMiddlewareConfigAt(passPathnames, globalConfig, ctx).matched) {
+          return;
+        }
+        pass = allMiddleware.filter((mw) => !ran.has(mw)).map((mw) => ({
+          mw,
+          routeMatch: mw.source === "config" ? { matched: true } : matchesMiddlewareRouteAt(passPathnames, mw)
+        })).filter((entry) => entry.routeMatch.matched);
+      }
+    }
+    __name(applicableMiddleware, "applicableMiddleware");
+    for (const { mw, routeMatch, pathname: passPathname } of applicableMiddleware()) {
+      const configMatch = mw.config ? this.matchesConfig(passPathname, mw.config, ctx) : { matched: true };
       if (!configMatch.matched) {
         continue;
       }
+      ran.add(mw);
       if (routeMatch.params) {
         ctx.params = { ...ctx.params, ...routeMatch.params };
       }
@@ -466,7 +525,7 @@ var _MiddlewareManager = class _MiddlewareManager {
    * Check if pathname matches middleware config
    */
   matchesConfig(pathname, config, ctx) {
-    return matchesMiddlewareConfig(pathname, config, ctx);
+    return matchesMiddlewareConfigAt(this.toMiddlewarePathnames(pathname), config, ctx);
   }
   /**
    * Reload middleware (for HMR)
@@ -501,5 +560,7 @@ var MiddlewareManager = _MiddlewareManager;
 export {
   createContext,
   appendMiddlewareRoutePath,
+  appendMiddlewareDirectory,
+  compareMiddlewareRouteLocations,
   MiddlewareManager
 };

package/dist/{chunk-3ATMYLLJ.mjs → chunk-6WCPV6G2.mjs}

@@ -9,7 +9,7 @@ import {
   createFarmRequestBodyErrorResponse,
   readFarmRequestBody,
   resolveFarmServerConfig
-} from "./chunk-XF7Q24PF.mjs";
+} from "./chunk-Y7RKTKYI.mjs";
 import {
   toPosixPath
 } from "./chunk-KI3MESHB.mjs";

package/dist/{chunk-FYRBX5IY.cjs → chunk-73MC7ZL6.cjs}

@@ -1,6 +1,6 @@
 "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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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 _chunkX7KZBF63cjs = require('./chunk-X7KZBF63.cjs');
+var _chunkEFCQPQMGcjs = require('./chunk-EFCQPQMG.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -11,7 +11,7 @@ var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _url = require('url');
 async function createFarmMarkdownRouteModuleFromFile(filePath, options = {}) {
   const source = await _promises.readFile.call(void 0, filePath, "utf8");
-  return _chunkX7KZBF63cjs.createFarmMarkdownRouteModule.call(void 0, {
+  return _chunkEFCQPQMGcjs.createFarmMarkdownRouteModule.call(void 0, {
     source,
     filePath,
     components: options.components,

package/dist/chunk-75RZHGLS.cjs

@@ -0,0 +1,135 @@
+"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 _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
+
+
+var _chunkG7HXGLECcjs = require('./chunk-G7HXGLEC.cjs');
+
+
+var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
+
+// src/mcp-catalog.ts
+var CATALOGS = /* @__PURE__ */ Symbol.for("farm.mcp.catalogs");
+function catalogs() {
+  const state = globalThis;
+  return _nullishCoalesce(state[CATALOGS], () => ( (state[CATALOGS] = /* @__PURE__ */ new Map())));
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, catalogs, "catalogs");
+function _listFarmMCPCatalogs() {
+  return [...catalogs().values()];
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, _listFarmMCPCatalogs, "_listFarmMCPCatalogs");
+function _publishFarmMCPCatalog(server, tools, details) {
+  const entry = { server, tools, ...details ? { details } : {} };
+  catalogs().set(server.path, entry);
+  return () => {
+    if (catalogs().get(server.path) === entry) catalogs().delete(server.path);
+  };
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, _publishFarmMCPCatalog, "_publishFarmMCPCatalog");
+var SERVERS = /* @__PURE__ */ Symbol.for("farm.mcp.servers");
+function registeredServers() {
+  const state = globalThis;
+  return _nullishCoalesce(state[SERVERS], () => ( (state[SERVERS] = /* @__PURE__ */ new Map())));
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, registeredServers, "registeredServers");
+function _listFarmRegisteredMCPServers() {
+  return [...registeredServers().values()];
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, _listFarmRegisteredMCPServers, "_listFarmRegisteredMCPServers");
+function registerFarmMCPServer(server) {
+  const entry = validateFarmMCPServerRegistration(server);
+  const key = _nullishCoalesce(entry.path, () => ( entry.url));
+  registeredServers().set(key, entry);
+  return () => {
+    if (registeredServers().get(key) === entry) registeredServers().delete(key);
+  };
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, registerFarmMCPServer, "registerFarmMCPServer");
+function validateFarmMCPServerRegistration(server) {
+  if (!server || typeof server !== "object") {
+    throw new TypeError("registerFarmMCPServer expects a server object.");
+  }
+  const text = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (key, required) => {
+    const value = server[key];
+    if (value === void 0 && !required) return void 0;
+    if (typeof value !== "string" || !value.trim()) {
+      throw new TypeError(`registerFarmMCPServer ${key} must be a non-empty string.`);
+    }
+    return value.trim();
+  }, "text");
+  const name = text("name", true);
+  const version = text("version", true);
+  const title = text("title", false);
+  const description = text("description", false);
+  const { path, url } = server;
+  if (path === void 0 === (url === void 0)) {
+    throw new TypeError("registerFarmMCPServer takes exactly one of path and url.");
+  }
+  let endpoint;
+  if (path !== void 0) {
+    if (typeof path !== "string" || !/^\/(?!\/)[^?#\\\s]*$/.test(path) || path.split("/").some((segment) => segment === "." || segment === "..")) {
+      throw new TypeError(
+        "registerFarmMCPServer path must be an absolute app path without a query, hash, or dot segments."
+      );
+    }
+    endpoint = { path: path.length > 1 ? path.replace(/\/+$/, "") : path };
+  } else {
+    let parsed;
+    try {
+      parsed = typeof url === "string" ? new URL(url) : void 0;
+    } catch (e) {
+      parsed = void 0;
+    }
+    if (!parsed || parsed.protocol !== "https:" && parsed.protocol !== "http:" || parsed.username || parsed.password || parsed.search || parsed.hash) {
+      throw new TypeError(
+        "registerFarmMCPServer url must be an absolute http(s) URL without credentials, a query, or a hash."
+      );
+    }
+    endpoint = { url: `${parsed.origin}${parsed.pathname.replace(/\/+$/, "")}` };
+  }
+  const { protocolVersions } = server;
+  if (protocolVersions !== void 0 && (!Array.isArray(protocolVersions) || protocolVersions.some((version2) => typeof version2 !== "string" || !version2.trim()))) {
+    throw new TypeError("registerFarmMCPServer protocolVersions must be non-empty strings.");
+  }
+  return Object.freeze({
+    name,
+    version,
+    ...title ? { title } : {},
+    ...description ? { description } : {},
+    ..._optionalChain([protocolVersions, 'optionalAccess', _ => _.length]) ? { protocolVersions: Object.freeze([...protocolVersions]) } : {},
+    ...endpoint
+  });
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, validateFarmMCPServerRegistration, "validateFarmMCPServerRegistration");
+function _findFarmMCPEndpointTool(method, pathname, serverBasePath) {
+  const upperMethod = method.toUpperCase();
+  for (const { server, tools } of catalogs().values()) {
+    const routes = /* @__PURE__ */ new Map();
+    for (const tool of tools) {
+      if (tool.kind === "endpoint" && tool.method === upperMethod) {
+        routes.set(tool.path, { path: tool.path, name: tool.name });
+      }
+    }
+    if (routes.size === 0) continue;
+    const canonical = serverBasePath ? _chunkKNBBQHO2cjs.resolveFarmAPICanonicalPathname.call(void 0, pathname, serverBasePath) : pathname;
+    const match = _chunkG7HXGLECcjs.matchAPIRoute.call(void 0, routes, canonical);
+    if (match) {
+      return {
+        name: match.route.name,
+        endpoint: _chunkKNBBQHO2cjs.resolveFarmAPIServerRoutePath.call(void 0, server.path, serverBasePath)
+      };
+    }
+  }
+  return void 0;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, _findFarmMCPEndpointTool, "_findFarmMCPEndpointTool");
+
+
+
+
+
+
+
+exports._listFarmMCPCatalogs = _listFarmMCPCatalogs; exports._publishFarmMCPCatalog = _publishFarmMCPCatalog; exports._listFarmRegisteredMCPServers = _listFarmRegisteredMCPServers; exports.registerFarmMCPServer = registerFarmMCPServer; exports._findFarmMCPEndpointTool = _findFarmMCPEndpointTool;

package/dist/{chunk-QZRVZSPN.cjs → chunk-77GNHH2Z.cjs}

@@ -12,7 +12,7 @@ var _chunkDVM4FKZLcjs = require('./chunk-DVM4FKZL.cjs');
 var _chunkOX6O6WVAcjs = require('./chunk-OX6O6WVA.cjs');
 
 
-var _chunk5ZSWG4UXcjs = require('./chunk-5ZSWG4UX.cjs');
+var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -41,7 +41,7 @@ function createRedirectsPlugin(redirects, {
       if (overrideBeforeRequest) {
         await overrideBeforeRequest(req, res, context);
       }
-      const url = _chunk5ZSWG4UXcjs.resolveFarmRequestURL.call(void 0, req);
+      const url = _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req);
       const routePath = _chunkDVM4FKZLcjs.resolveConfigRoutePathname.call(void 0, url.pathname, i18n);
       const pathname = routePath.pathname;
       for (const { redirect, pattern } of compiledRedirects) {
@@ -153,7 +153,7 @@ function createHeadersPlugin(headers, {
       if (overrideBeforeRequest) {
         await overrideBeforeRequest(req, res, context);
       }
-      const url = _chunk5ZSWG4UXcjs.resolveFarmRequestURL.call(void 0, req);
+      const url = _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req);
       const pathname = _chunkDVM4FKZLcjs.resolveConfigRoutePathname.call(void 0, url.pathname, i18n).pathname;
       const matchedHeaders = compiledHeaders.filter(({ pattern }) => pattern.regex.test(pathname)).map(({ config }) => config.headers);
       applyResponseHeaders(res, matchedHeaders);

package/dist/{chunk-FXUUWYAX.cjs → chunk-7GLPRTTF.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 _chunkOMVAU7NTcjs = require('./chunk-OMVAU7NT.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -217,6 +217,7 @@ function parseIpv6Hextets(value) {
     if (!octets) return null;
     tail = [octets[0] << 8 | octets[1], octets[2] << 8 | octets[3]];
     text = text.slice(0, lastColon);
+    if (text.endsWith(":")) text += ":";
     if (text === "") return null;
   }
   const compressionParts = text.split("::");
@@ -264,6 +265,15 @@ function isPrivateImageAddress(address) {
     if (embedsIpv4 && (h6 !== 0 || h7 !== 0)) {
       return isPrivateIpv4([h6 >> 8, h6 & 255, h7 >> 8, h7 & 255]);
     }
+    if (h0 === 100 && h1 === 65435) {
+      if (h2 === 1) return true;
+      if (h2 === 0 && h3 === 0 && h4 === 0 && h5 === 0) {
+        return isPrivateIpv4([h6 >> 8, h6 & 255, h7 >> 8, h7 & 255]);
+      }
+    }
+    if (h0 === 8194) {
+      return isPrivateIpv4([h1 >> 8, h1 & 255, h2 >> 8, h2 & 255]);
+    }
     if (zeroPrefix && h4 === 0 && h5 === 0 && h6 === 0 && (h7 === 0 || h7 === 1)) return true;
     if ((h0 & 65024) === 64512) return true;
     if ((h0 & 65472) === 65152) return true;
@@ -573,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 (_chunkOMVAU7NTcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), image.etag)) {
     headers.delete("content-length");
     return new Response(null, { status: 304, headers });
   }

package/dist/{chunk-A777V5WU.cjs → chunk-7L5V3KQO.cjs}

@@ -27,7 +27,7 @@ var _chunkE2ROOWQCcjs = require('./chunk-E2ROOWQC.cjs');
 var _chunkJSROZYYOcjs = require('./chunk-JSROZYYO.cjs');
 
 
-var _chunkZ5HIWVDPcjs = require('./chunk-Z5HIWVDP.cjs');
+var _chunkFTFYRMQQcjs = require('./chunk-FTFYRMQQ.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -119,7 +119,7 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, withTimeout, "withTimeout");
 var formatSeconds = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (ms) => ms < 1e3 ? `${ms}ms` : `${Number((ms / 1e3).toFixed(1))}s`, "formatSeconds");
 function collectSchemaOwners(config) {
   const owners = [];
-  const integrationSchemas = _chunkZ5HIWVDPcjs.getIntegrationSchemas.call(void 0, config.integrations);
+  const integrationSchemas = _chunkFTFYRMQQcjs.getIntegrationSchemas.call(void 0, config.integrations);
   let integrationClient;
   for (const [name, schema] of Object.entries(integrationSchemas)) {
     owners.push({

package/dist/{chunk-4ZQQL4IU.mjs → chunk-AHGECQEW.mjs}

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

package/dist/{chunk-RG3ZOTG5.cjs → chunk-AI7QMY7O.cjs}

@@ -9,17 +9,23 @@ function parseRequestCookieHeader(header) {
     const separatorIndex = part.indexOf("=");
     if (separatorIndex === -1) {
       return {
-        name: decodeCookiePart(part),
+        name: decodeCookieName(part),
         value: ""
       };
     }
     return {
-      name: decodeCookiePart(part.slice(0, separatorIndex).trim()),
+      name: decodeCookieName(part.slice(0, separatorIndex).trim()),
       value: decodeCookiePart(part.slice(separatorIndex + 1).trim())
     };
   }).filter((cookie) => cookie.name.length > 0);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, parseRequestCookieHeader, "parseRequestCookieHeader");
+var RESERVED_PREFIX = /^__(host|secure)-/i;
+function decodeCookieName(raw) {
+  const decoded = decodeCookiePart(raw);
+  return RESERVED_PREFIX.test(decoded) && !RESERVED_PREFIX.test(raw) ? raw : decoded;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, decodeCookieName, "decodeCookieName");
 function decodeCookiePart(value) {
   try {
     return decodeURIComponent(value);
@@ -31,4 +37,5 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, decodeCookiePart, "decodeCookiePart");
 
 
 
-exports.parseRequestCookieHeader = parseRequestCookieHeader;
+
+exports.parseRequestCookieHeader = parseRequestCookieHeader; exports.decodeCookieName = decodeCookieName;

package/dist/{chunk-YMCXWPWK.mjs → chunk-BCMSYSN2.mjs}

@@ -52,6 +52,9 @@ function resolveFarmI18nConfig(input, options = {}) {
   if (sameSite !== "lax" && sameSite !== "strict" && sameSite !== "none") {
     throw new Error('i18n.cookie.sameSite must be "lax", "strict", or "none".');
   }
+  if (sameSite === "none" && input.cookie?.secure === false) {
+    throw new Error('i18n.cookie.secure cannot be false when i18n.cookie.sameSite is "none".');
+  }
   const direction = {};
   for (const [rawLocale, value] of Object.entries(input.direction || {})) {
     const locale = canonicalizeLocale(rawLocale);
@@ -82,7 +85,7 @@ function resolveFarmI18nConfig(input, options = {}) {
       ),
       path: normalizeCookiePath(input.cookie?.path),
       sameSite,
-      secure: input.cookie?.secure ?? options.mode === "production"
+      secure: input.cookie?.secure ?? (sameSite === "none" || options.mode === "production")
     },
     direction
   };

package/dist/{chunk-I6XDAKWQ.mjs → chunk-BTHHUD7Q.mjs}

@@ -25,6 +25,19 @@ function resolveFarmAPICanonicalPathname(pathname, serverBasePath = DEFAULT_FARM
   return pathname;
 }
 __name(resolveFarmAPICanonicalPathname, "resolveFarmAPICanonicalPathname");
+function createFarmAPIMiddlewarePathnames(serverBasePath = DEFAULT_FARM_API_BASE_PATH) {
+  const basePath = normalizeFarmAPIBasePath(serverBasePath);
+  if (basePath === DEFAULT_FARM_API_BASE_PATH) return (pathname) => [pathname];
+  const prefix = DEFAULT_FARM_API_BASE_PATH;
+  return (pathname) => {
+    const canonical = resolveFarmAPICanonicalPathname(pathname, basePath);
+    if (canonical !== prefix && !canonical.startsWith(`${prefix}/`)) return [pathname];
+    const suffix = canonical.slice(prefix.length);
+    const publicPath = basePath === "/" ? suffix || "/" : `${basePath}${suffix}`;
+    return [.../* @__PURE__ */ new Set([pathname, canonical, publicPath])];
+  };
+}
+__name(createFarmAPIMiddlewarePathnames, "createFarmAPIMiddlewarePathnames");
 function resolveFarmAPIServerRoutePath(routePath, serverBasePath = DEFAULT_FARM_API_BASE_PATH) {
   return resolveFarmAPIRequestURL(routePath, serverBasePath).pathname;
 }
@@ -33,5 +46,6 @@ __name(resolveFarmAPIServerRoutePath, "resolveFarmAPIServerRoutePath");
 export {
   resolveFarmAPIServerBasePath,
   resolveFarmAPICanonicalPathname,
+  createFarmAPIMiddlewarePathnames,
   resolveFarmAPIServerRoutePath
 };

package/dist/{chunk-LI2LMOLR.mjs → chunk-C35ZBVRD.mjs}

@@ -1,3 +1,7 @@
+import {
+  markFarmClientReference,
+  updateFarmServerTreeModule
+} from "./chunk-NRDBW4MP.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
@@ -109,6 +113,11 @@ function createFarmIsolatedClientBoundary(ReactRuntime, Component, moduleReferen
   }
   __name(FarmIsolatedClientBoundary, "FarmIsolatedClientBoundary");
   FarmIsolatedClientBoundary.displayName = `FarmIsolated(${Component.displayName || Component.name || exportName})`;
+  markFarmClientReference(FarmIsolatedClientBoundary, {
+    reference: moduleReference,
+    exportName,
+    Component
+  });
   return FarmIsolatedClientBoundary;
 }
 __name(createFarmIsolatedClientBoundary, "createFarmIsolatedClientBoundary");
@@ -300,7 +309,7 @@ function createFarmIsolatedHydrationRuntime(options) {
   __name(hydrate, "hydrate");
   function updateModule(reference, module) {
     const originals = module.__farm_client_boundary_originals__;
-    let updated = 0;
+    let updated = updateFarmServerTreeModule(reference, module);
     for (const [container, record] of roots) {
       if (record.reference !== reference) continue;
       const Component = originals?.[record.exportName];
@@ -355,7 +364,7 @@ function createFarmIsolatedHydrationRuntime(options) {
 }
 __name(createFarmIsolatedHydrationRuntime, "createFarmIsolatedHydrationRuntime");
 function createFarmServerPageBoundary(ReactRuntime, runtime) {
-  return /* @__PURE__ */ __name(function FarmServerPage(props) {
+  return /* @__PURE__ */ __name(function FarmServerPage({ as = "div", ...props }) {
     const ref = ReactRuntime.useRef(null);
     const html = props.dangerouslySetInnerHTML.__html;
     ReactRuntime.useLayoutEffect(() => {
@@ -376,7 +385,7 @@ function createFarmServerPageBoundary(ReactRuntime, runtime) {
         });
       };
     }, [html]);
-    return ReactRuntime.createElement("div", { ...props, ref });
+    return ReactRuntime.createElement(as, { ...props, ref });
   }, "FarmServerPage");
 }
 __name(createFarmServerPageBoundary, "createFarmServerPageBoundary");

package/dist/chunk-C4SPBWFM.cjs

@@ -0,0 +1,26 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
+
+// src/client/navigation-url.ts
+var FARM_NAVIGATION_PROTOCOLS = /* @__PURE__ */ new Set(["http:", "https:", "mailto:", "tel:"]);
+function isFarmBlockedNavigationURL(url) {
+  if (FARM_NAVIGATION_PROTOCOLS.has(url.protocol)) return false;
+  console.error(`[Farm.js] Blocked navigation to a ${url.protocol} URL as a security precaution.`);
+  return true;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isFarmBlockedNavigationURL, "isFarmBlockedNavigationURL");
+function isFarmExternalNavigationURL(url, currentOrigin) {
+  return url.protocol !== "http:" && url.protocol !== "https:" || url.origin !== currentOrigin;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isFarmExternalNavigationURL, "isFarmExternalNavigationURL");
+function resolveFarmNavigationURL(href, documentUrl) {
+  return new URL(href, documentUrl);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, resolveFarmNavigationURL, "resolveFarmNavigationURL");
+
+
+
+
+
+exports.isFarmBlockedNavigationURL = isFarmBlockedNavigationURL; exports.isFarmExternalNavigationURL = isFarmExternalNavigationURL; exports.resolveFarmNavigationURL = resolveFarmNavigationURL;

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

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