@farm.js/core 0.1.30 → 0.1.34

package/dist/{chunk-3FCFQP5V.cjs → chunk-TA5G2HWD.cjs}

@@ -6,10 +6,10 @@ var _chunk4PPEPOZZcjs = require('./chunk-4PPEPOZZ.cjs');
 var _chunkMQ3H6LT5cjs = require('./chunk-MQ3H6LT5.cjs');
 
 
-var _chunkEXLKRR4Ucjs = require('./chunk-EXLKRR4U.cjs');
+var _chunkMIDIZJZCcjs = require('./chunk-MIDIZJZC.cjs');
 
 
-var _chunkSUIBNSNOcjs = require('./chunk-SUIBNSNO.cjs');
+var _chunkSJNMVDDFcjs = require('./chunk-SJNMVDDF.cjs');
 
 
 var _chunk2CQ74SP6cjs = require('./chunk-2CQ74SP6.cjs');
@@ -20,7 +20,7 @@ var _chunk2CQ74SP6cjs = require('./chunk-2CQ74SP6.cjs');
 
 
 
-var _chunkPZNCMPJFcjs = require('./chunk-PZNCMPJF.cjs');
+var _chunkG26MUMKLcjs = require('./chunk-G26MUMKL.cjs');
 
 
 var _chunk6V4TDWECcjs = require('./chunk-6V4TDWEC.cjs');
@@ -44,7 +44,7 @@ var _chunk5QIKR7RRcjs = require('./chunk-5QIKR7RR.cjs');
 var _chunkUQZ4AYTHcjs = require('./chunk-UQZ4AYTH.cjs');
 
 
-var _chunk5ZSWG4UXcjs = require('./chunk-5ZSWG4UX.cjs');
+var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
 
 
 
@@ -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, _chunkEXLKRR4Ucjs.APIRouteConflictError)(routePath, normalizedMethod, existingFile, filePath);
+      throw new (0, _chunkMIDIZJZCcjs.APIRouteConflictError)(routePath, normalizedMethod, existingFile, filePath);
     }
     if (existing) {
       if (!existing.methods.includes(normalizedMethod)) {
@@ -186,7 +186,7 @@ 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(
-      _chunkPZNCMPJFcjs.mergePluginAPIRoutes.call(void 0, [...apiRoutesCache.values()], plugins, void 0, {
+      _chunkG26MUMKLcjs.mergePluginAPIRoutes.call(void 0, [...apiRoutesCache.values()], plugins, void 0, {
         bodySizeLimit
       }).map((route) => [route.path, route])
     ) : null;
@@ -200,7 +200,7 @@ function farmApiPlugin(options = {}) {
         const url = new URL(request.url);
         const method = request.method.toUpperCase();
         const pathname = url.pathname;
-        const match = _chunkPZNCMPJFcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), pathname, basePath);
+        const match = _chunkG26MUMKLcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), pathname, basePath);
         if (!match) {
           return new Response(JSON.stringify({ error: "Not Found" }), {
             status: 404,
@@ -208,18 +208,18 @@ function farmApiPlugin(options = {}) {
           });
         }
         const { route, params } = match;
-        const endpoint = _chunkPZNCMPJFcjs.resolveAPIRouteEndpoint.call(void 0, route, method);
+        const endpoint = _chunkG26MUMKLcjs.resolveAPIRouteEndpoint.call(void 0, route, method);
         if (!endpoint) {
           return new Response(JSON.stringify({ error: "Method Not Allowed" }), {
             status: 405,
             headers: {
-              Allow: _chunkPZNCMPJFcjs.getAllowedAPIRouteMethods.call(void 0, route).join(", "),
+              Allow: _chunkG26MUMKLcjs.getAllowedAPIRouteMethods.call(void 0, route).join(", "),
               "Content-Type": "application/json"
             }
           });
         }
         try {
-          return await _chunkPZNCMPJFcjs.invokeAPIRouteEndpoint.call(void 0, endpoint, request, params, bodySizeLimit);
+          return await _chunkG26MUMKLcjs.invokeAPIRouteEndpoint.call(void 0, endpoint, request, params, bodySizeLimit);
         } catch (error) {
           return new Response(JSON.stringify({ error: error.message || "Internal Server Error" }), {
             status: 500,
@@ -267,7 +267,7 @@ function farmApiPlugin(options = {}) {
             const routeModule = await _chunkBMWDEBXOcjs.loadFarmDevModule.call(void 0, server, filePath);
             const endpoints = {};
             const availableMethods = [];
-            for (const method of _chunkPZNCMPJFcjs.API_ROUTE_METHODS) {
+            for (const method of _chunkG26MUMKLcjs.API_ROUTE_METHODS) {
               if (routeModule[method]) {
                 availableMethods.push(method);
                 endpoints[method] = routeModule[method];
@@ -280,7 +280,7 @@ function farmApiPlugin(options = {}) {
               log(`API route discovered: ${availableMethods.join(", ")} ${routePath}`);
             }
           } catch (e) {
-            if (e instanceof _chunkEXLKRR4Ucjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+            if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
             log(`API route load failed at ${filePath}: ${e.message}`);
           }
         }
@@ -307,7 +307,7 @@ function farmApiPlugin(options = {}) {
                 }
               }
             } catch (e) {
-              if (e instanceof _chunkEXLKRR4Ucjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+              if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
               log(`Root routes.ts load failed: ${e.message}`);
             }
             break;
@@ -317,7 +317,7 @@ function farmApiPlugin(options = {}) {
       const discoverProgrammaticRoutes = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, async () => {
         const path = await import("path");
         const srcRoot = path.join(server.config.root, srcDir);
-        const routeFiles = _chunkSUIBNSNOcjs.findProgrammaticRouteFilesInDir.call(void 0, srcRoot);
+        const routeFiles = _chunkSJNMVDDFcjs.findProgrammaticRouteFilesInDir.call(void 0, srcRoot);
         if (routeFiles.length === 0) return;
         const { getProgrammaticRouteManifest } = await import("./routes.cjs");
         for (const routeFile of routeFiles) {
@@ -338,7 +338,7 @@ function farmApiPlugin(options = {}) {
               }
             }
           } catch (e) {
-            if (e instanceof _chunkEXLKRR4Ucjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+            if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
             log(`Programmatic routes file load failed at ${routeFile}: ${e.message}`);
           }
         }
@@ -390,7 +390,7 @@ function farmApiPlugin(options = {}) {
           const pathname = url.split("?")[0];
           const method = req.method || "GET";
           if (discoveryPromise) await waitForDiscovery();
-          if (!_chunkPZNCMPJFcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), pathname, basePath)) {
+          if (!_chunkG26MUMKLcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), pathname, basePath)) {
             return next();
           }
           if (!apiRouterHandler) {
@@ -411,10 +411,10 @@ function farmApiPlugin(options = {}) {
             }
             const currentUrl = req.url || url;
             const currentPathname = currentUrl.split("?")[0];
-            if (currentPathname !== pathname && !_chunkPZNCMPJFcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), currentPathname, basePath)) {
+            if (currentPathname !== pathname && !_chunkG26MUMKLcjs.matchAPIRouteAtBasePath.call(void 0, servedRoutes(), currentPathname, basePath)) {
               return next();
             }
-            const fullUrl = _chunk5ZSWG4UXcjs.resolveFarmRequestURL.call(void 0, req);
+            const fullUrl = _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req);
             const headers = new Headers();
             for (const [key, value] of Object.entries(req.headers)) {
               if (value) {
@@ -515,7 +515,7 @@ function farmApiPlugin(options = {}) {
           log(`API router recreated`);
         } catch (e) {
           restoreRouteState(previousState);
-          if (e instanceof _chunkEXLKRR4Ucjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+          if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
           log(`Root routes.ts HMR failed: ${e.message}`);
         }
         return [];
@@ -543,7 +543,7 @@ function farmApiPlugin(options = {}) {
           const routeModule = await _chunkBMWDEBXOcjs.loadFarmDevModule.call(void 0, server, file);
           removeEndpointsFromFile(file);
           const availableMethods = [];
-          for (const method of _chunkPZNCMPJFcjs.API_ROUTE_METHODS) {
+          for (const method of _chunkG26MUMKLcjs.API_ROUTE_METHODS) {
             if (!routeModule[method]) continue;
             availableMethods.push(method);
             addEndpoint(routePath, file, method, routeModule[method]);
@@ -553,7 +553,7 @@ function farmApiPlugin(options = {}) {
           log(`API router recreated`);
         } catch (e) {
           restoreRouteState(previousState);
-          if (e instanceof _chunkEXLKRR4Ucjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
+          if (e instanceof _chunkMIDIZJZCcjs.APIRouteConflictError || e instanceof _chunkNO3WWW3Ncjs.AmbiguousRouteError) throw e;
           log(`API route HMR failed: ${e.message}`);
         }
         return [];

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

@@ -1,12 +1,10 @@
 "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 _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 _chunkG643DQCHcjs = require('./chunk-G643DQCH.cjs');
 
 
 
-var _chunkSVRTJOUFcjs = require('./chunk-SVRTJOUF.cjs');
-
-
-var _chunkG643DQCHcjs = require('./chunk-G643DQCH.cjs');
+var _chunkZ2HLU4IXcjs = require('./chunk-Z2HLU4IX.cjs');
 
 
 
@@ -36,6 +34,12 @@ var _chunkDVM4FKZLcjs = require('./chunk-DVM4FKZL.cjs');
 var _chunkUS2QVW3Ecjs = require('./chunk-US2QVW3E.cjs');
 
 
+var _chunkBIDYX3SLcjs = require('./chunk-BIDYX3SL.cjs');
+
+
+var _chunkI57LW5VZcjs = require('./chunk-I57LW5VZ.cjs');
+
+
 
 
 
@@ -44,56 +48,6 @@ var _chunkNO3WWW3Ncjs = require('./chunk-NO3WWW3N.cjs');
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 
-// src/integration-request-security.ts
-function resolveIntegrationAllowedOrigins(values, label) {
-  return Object.freeze((_nullishCoalesce(values, () => ( []))).map((value) => _chunkSVRTJOUFcjs.normalizeAllowedOriginPattern.call(void 0, value, label)));
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, resolveIntegrationAllowedOrigins, "resolveIntegrationAllowedOrigins");
-function validateIntegrationRequestOrigin(request, policy = {}) {
-  const allowedOrigins = _nullishCoalesce(policy.allowedOrigins, () => ( []));
-  const requireOriginMetadata = _nullishCoalesce(policy.requireOriginMetadata, () => ( true));
-  const fetchSite = _optionalChain([request, 'access', _ => _.headers, 'access', _2 => _2.get, 'call', _3 => _3("sec-fetch-site"), 'optionalAccess', _4 => _4.trim, 'call', _5 => _5(), 'access', _6 => _6.toLowerCase, 'call', _7 => _7()]);
-  const source = _chunkSVRTJOUFcjs.getRequestSourceOrigin.call(void 0, request);
-  if (!source.ok) {
-    return { ok: false, reason: source.reason };
-  }
-  if (source.origin === null) {
-    if (fetchSite === "same-origin") {
-      return { ok: true };
-    }
-    if (requireOriginMetadata) {
-      return { ok: false, reason: fetchSite === "cross-site" ? "cross-site" : "missing-origin" };
-    }
-    return fetchSite === "cross-site" ? { ok: false, reason: "cross-site" } : { ok: true };
-  }
-  const requestUrl = new URL(request.url);
-  const matchesConfiguredOrigin = allowedOrigins.some(
-    (pattern) => _chunkSVRTJOUFcjs.matchesAllowedOrigin.call(void 0, source.origin, pattern)
-  );
-  const matchesRequest = source.origin === requestUrl.origin || _chunkSVRTJOUFcjs.matchesHostHeader.call(void 0, source.origin, request);
-  if (!matchesRequest && !matchesConfiguredOrigin) {
-    return { ok: false, reason: "cross-site" };
-  }
-  if (fetchSite === "cross-site" && !matchesConfiguredOrigin) {
-    return { ok: false, reason: "cross-site" };
-  }
-  return { ok: true };
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, validateIntegrationRequestOrigin, "validateIntegrationRequestOrigin");
-function describeIntegrationOriginRejection(reason) {
-  switch (reason) {
-    case "missing-origin":
-      return "Request is missing same-origin metadata.";
-    case "opaque-origin":
-      return "Opaque origins are not allowed.";
-    case "invalid-origin":
-      return "Invalid request origin.";
-    case "cross-site":
-      return "Cross-site request was rejected.";
-  }
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, describeIntegrationOriginRejection, "describeIntegrationOriginRejection");
-
 // src/plugin-integration-context.ts
 var FARM_PLUGIN_INTEGRATION_CONTEXT = /* @__PURE__ */ Symbol.for("@farm.js/core/plugin-integration-context");
 function setFarmPluginIntegrationContext(plugin, integration) {
@@ -294,13 +248,13 @@ function defineIntegration(integration) {
     integrationRoute: routeFactory
   }) : integration.endpoints;
   const endpointRoutes = flattenIntegrationEndpoints(endpoints);
-  const allRoutes = _optionalChain([routes, 'optionalAccess', _8 => _8.length]) || endpointRoutes.length ? [...routes || [], ...endpointRoutes] : void 0;
+  const allRoutes = _optionalChain([routes, 'optionalAccess', _ => _.length]) || endpointRoutes.length ? [...routes || [], ...endpointRoutes] : void 0;
   for (const route of allRoutes || []) {
     _chunkNO3WWW3Ncjs.assertUniqueRouteParameters.call(void 0, route.path, "api");
     _chunkDVM4FKZLcjs.validateConfigRouteSource.call(void 0, route.path, `Integration route "${route.path}"`);
     _chunkNO3WWW3Ncjs.assertTerminalCatchAll.call(void 0, route.path, "api");
   }
-  const derivedApi = integration.api || (_optionalChain([allRoutes, 'optionalAccess', _9 => _9.length]) ? _chunkNZKJGRB3cjs.api.fromRoutes(
+  const derivedApi = integration.api || (_optionalChain([allRoutes, 'optionalAccess', _2 => _2.length]) ? _chunkNZKJGRB3cjs.api.fromRoutes(
     allRoutes
   ) : void 0);
   return {
@@ -402,7 +356,7 @@ function getIntegrationProviders(integrations) {
   }
   const providers = [];
   for (const integration of Object.values(integrations)) {
-    if (!integration || !isFarmIntegration(integration) || !_optionalChain([integration, 'access', _10 => _10.providers, 'optionalAccess', _11 => _11.length])) {
+    if (!integration || !isFarmIntegration(integration) || !_optionalChain([integration, 'access', _3 => _3.providers, 'optionalAccess', _4 => _4.length])) {
       continue;
     }
     for (const provider of integration.providers) {
@@ -430,7 +384,7 @@ function getIntegrationDocumentNavigationMatchers(integrations) {
   }
   const matchers = [];
   for (const integration of Object.values(integrations)) {
-    if (!integration || !isFarmIntegration(integration) || !_optionalChain([integration, 'access', _12 => _12.documentNavigations, 'optionalAccess', _13 => _13.length])) {
+    if (!integration || !isFarmIntegration(integration) || !_optionalChain([integration, 'access', _5 => _5.documentNavigations, 'optionalAccess', _6 => _6.length])) {
       continue;
     }
     for (const navigation of integration.documentNavigations) {
@@ -603,7 +557,7 @@ async function parseIntegrationConfigSchema(integration, schema, value) {
     }
     throw createIntegrationConfigValidationError(integration, result.error);
   }
-  if (_optionalChain([schema, 'access', _14 => _14["~standard"], 'optionalAccess', _15 => _15.validate])) {
+  if (_optionalChain([schema, 'access', _7 => _7["~standard"], 'optionalAccess', _8 => _8.validate])) {
     const result = await schema["~standard"].validate(value);
     if ("value" in result) {
       return result.value;
@@ -654,7 +608,7 @@ async function resolveIntegrationConfig(integration, context) {
     value,
     await resolveIntegrationConfigPart(config.input, context)
   );
-  value = mergeIntegrationConfigValue(value, await _optionalChain([config, 'access', _16 => _16.resolve, 'optionalCall', _17 => _17(context)]));
+  value = mergeIntegrationConfigValue(value, await _optionalChain([config, 'access', _9 => _9.resolve, 'optionalCall', _10 => _10(context)]));
   return config.schema ? parseIntegrationConfigSchema(integration, config.schema, value) : value;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, resolveIntegrationConfig, "resolveIntegrationConfig");
@@ -692,7 +646,7 @@ function createIntegrationLifecycleLogger(integration, phase) {
 _chunkS3JO3N4Hcjs.__name.call(void 0, createIntegrationLifecycleLogger, "createIntegrationLifecycleLogger");
 async function emitIntegrationLog(integration, event) {
   try {
-    await _optionalChain([integration, 'access', _18 => _18.log, 'optionalCall', _19 => _19(event)]);
+    await _optionalChain([integration, 'access', _11 => _11.log, 'optionalCall', _12 => _12(event)]);
   } catch (e) {
   }
 }
@@ -904,7 +858,7 @@ function createIntegrationPlugin(integrationKey, integration) {
         }
       }, "createHandlerRequest");
       for (const entry of middleware) {
-        const params = resolveMatcherParams(entry.matcher, pathname);
+        const params = resolveIntegrationMiddlewareParams(entry, pathname, context.config);
         if (!params) {
           continue;
         }
@@ -1266,7 +1220,7 @@ async function validateIntegrationRouteInput(route, request, url) {
     };
   }
   const schemas = route.input;
-  if (!_optionalChain([schemas, 'optionalAccess', _20 => _20.body]) && !_optionalChain([schemas, 'optionalAccess', _21 => _21.query])) {
+  if (!_optionalChain([schemas, 'optionalAccess', _13 => _13.body]) && !_optionalChain([schemas, 'optionalAccess', _14 => _14.query])) {
     return {
       success: true,
       input: {}
@@ -1329,7 +1283,7 @@ async function parseIntegrationInputSchema(source, schema, value) {
       issues: normalizeIntegrationValidationIssues(source, result.error)
     };
   }
-  if (_optionalChain([schema, 'access', _22 => _22["~standard"], 'optionalAccess', _23 => _23.validate])) {
+  if (_optionalChain([schema, 'access', _15 => _15["~standard"], 'optionalAccess', _16 => _16.validate])) {
     const result = await schema["~standard"].validate(value);
     if ("value" in result) {
       return {
@@ -1455,7 +1409,7 @@ async function readIntegrationValidationBody(request, format) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, readIntegrationValidationBody, "readIntegrationValidationBody");
 function getIntegrationRouteBodyFormat(route) {
-  return route.bodyFormat || _optionalChain([route, 'access', _24 => _24.__operation, 'optionalAccess', _25 => _25.bodyFormat]) || "json";
+  return route.bodyFormat || _optionalChain([route, 'access', _17 => _17.__operation, 'optionalAccess', _18 => _18.bodyFormat]) || "json";
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, getIntegrationRouteBodyFormat, "getIntegrationRouteBodyFormat");
 function createIntegrationRouteArgs(input) {
@@ -1533,7 +1487,7 @@ function createLazyIntegrationOrmModel(resolveOrm, modelName) {
         return async (...args) => {
           const orm = await resolveOrm();
           const model = orm[modelName];
-          const member = _optionalChain([model, 'optionalAccess', _26 => _26[prop]]);
+          const member = _optionalChain([model, 'optionalAccess', _19 => _19[prop]]);
           if (typeof member !== "function") {
             throw new Error(
               `Integration ORM model "${String(modelName)}" does not expose "${String(prop)}".`
@@ -1616,14 +1570,14 @@ async function dispatchIntegrationRequest(runtime, request, options = {}) {
   const integration = runtime.integration;
   const url = new URL(request.url);
   const pathname = url.pathname;
-  const requestId = request.headers.get("x-request-id") || _optionalChain([options, 'access', _27 => _27.currentRequest, 'optionalAccess', _28 => _28.headers, 'access', _29 => _29.get, 'call', _30 => _30("x-request-id")]) || String(Date.now());
+  const requestId = request.headers.get("x-request-id") || _optionalChain([options, 'access', _20 => _20.currentRequest, 'optionalAccess', _21 => _21.headers, 'access', _22 => _22.get, 'call', _23 => _23("x-request-id")]) || String(Date.now());
   const routes = normalizeIntegrationRoutes(integration.routes || []);
   const pathSegments = _chunkUS2QVW3Ecjs.canonicalizeRequestPathSegments.call(void 0, pathname);
   const method = normalizeIntegrationRequestMethod(request.method);
   const middleware = [...integration.middleware || []];
   const forwardedSetCookies = [];
   for (const entry of middleware) {
-    const params = resolveMatcherParams(entry.matcher, pathname);
+    const params = resolveIntegrationMiddlewareParams(entry, pathname, runtime.config);
     if (!params) {
       continue;
     }
@@ -1865,7 +1819,7 @@ async function dispatchIntegrationRequest(runtime, request, options = {}) {
     }
   }
   if (forwardedSetCookies.length > 0) {
-    _optionalChain([options, 'access', _31 => _31.onForwardedCookies, 'optionalCall', _32 => _32(forwardedSetCookies)]);
+    _optionalChain([options, 'access', _24 => _24.onForwardedCookies, 'optionalCall', _25 => _25(forwardedSetCookies)]);
   }
   return null;
 }
@@ -2046,6 +2000,44 @@ function matchesMethod(methods, normalizedMethod) {
   return methods.some((candidate) => candidate === "ALL" || candidate === normalizedMethod);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, matchesMethod, "matchesMethod");
+var compiledIntegrationGuards = /* @__PURE__ */ new WeakMap();
+var noMiddlewareContext = {};
+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);
+    if (routeParams) return routeParams;
+  }
+  let compiled = compiledIntegrationGuards.get(entry);
+  if (!compiled) {
+    compiled = _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, {
+      matcher: typeof entry.matcher === "string" ? entry.matcher : [...entry.matcher]
+    });
+    compiledIntegrationGuards.set(entry, compiled);
+  }
+  for (const candidate of routePathname === pathname ? [pathname] : [pathname, routePathname]) {
+    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");
+function resolveIntegrationRoutePathname(pathname, config) {
+  const basePath = typeof _optionalChain([config, 'optionalAccess', _26 => _26.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]);
+  if (i18n && Array.isArray(i18n.locales) && i18n.locales.length > 0) {
+    routePathname = _chunkBIDYX3SLcjs.resolveFarmLocalePath.call(void 0, routePathname, {
+      locales: i18n.locales,
+      defaultLocale: i18n.defaultLocale,
+      routing: i18n.routing || "prefix-except-default"
+    }).pathname;
+  }
+  return routePathname;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, resolveIntegrationRoutePathname, "resolveIntegrationRoutePathname");
 function resolveMatcherParams(matcher, pathname) {
   if (!matcher) {
     return {};
@@ -2167,7 +2159,4 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, normalizeMatcher, "normalizeMatcher");
 
 
 
-
-
-
-exports.resolveIntegrationAllowedOrigins = resolveIntegrationAllowedOrigins; exports.validateIntegrationRequestOrigin = validateIntegrationRequestOrigin; exports.describeIntegrationOriginRejection = describeIntegrationOriginRejection; 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;

package/dist/{chunk-ND224OE2.cjs → chunk-TKSCR644.cjs}

@@ -6,12 +6,13 @@ var _chunkJ63ZH5OQcjs = require('./chunk-J63ZH5OQ.cjs');
 var _chunkE3UK5IIBcjs = require('./chunk-E3UK5IIB.cjs');
 
 
-var _chunk5ZSWG4UXcjs = require('./chunk-5ZSWG4UX.cjs');
+var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 
 // src/plugins/infra-analytics.ts
+var _async_hooks = require('async_hooks');
 var FARM_PRERENDER_ENV = "FARM_PRERENDER";
 var DEFAULT_URL = "https://app.farmjs.dev";
 var EVENTS_PATH = "/api/telemetry/v1/events";
@@ -265,6 +266,20 @@ function requestEvent(metadata, method, status, durationMs) {
   };
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, requestEvent, "requestEvent");
+function toolEvent(metadata, event) {
+  return {
+    id: uuid(),
+    requestId: metadata.id,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    route: metadata.route,
+    agent: metadata.agent,
+    kind: "mcp.tool",
+    tool: event.tool,
+    outcome: event.outcome,
+    durationMs: duration(event.durationMs)
+  };
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, toolEvent, "toolEvent");
 function farmInfraAnalyticsPlugin(options, send) {
   const contextKey = `${CONTEXT_KEY}.${uuid()}`;
   return {
@@ -284,21 +299,11 @@ function farmInfraAnalyticsPlugin(options, send) {
         context.state.unsubscribe = _chunkE3UK5IIBcjs.onFarmEvent.call(void 0, 
           (event) => {
             if (!isToolEvent(event)) return;
-            const request = _chunk5ZSWG4UXcjs.getCurrentRequestOrNull.call(void 0, );
+            const request = _chunkUXFQ3UDAcjs.getCurrentRequestOrNull.call(void 0, );
             if (!request) return;
             const metadata = context.requestContext.get(request, contextKey);
             if (!metadata) return;
-            exporter.enqueue({
-              id: uuid(),
-              requestId: metadata.id,
-              timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-              route: metadata.route,
-              agent: metadata.agent,
-              kind: "mcp.tool",
-              tool: event.tool,
-              outcome: event.outcome,
-              durationMs: duration(event.durationMs)
-            });
+            exporter.enqueue(toolEvent(metadata, event));
             metadata.waitUntil(exporter.flush());
           },
           { unfiltered: true }
@@ -333,6 +338,17 @@ function farmInfraAnalyticsPlugin(options, send) {
 _chunkS3JO3N4Hcjs.__name.call(void 0, farmInfraAnalyticsPlugin, "farmInfraAnalyticsPlugin");
 function farmInfraAnalyticsRecorder(options, send) {
   const exporter = createFarmInfraAnalyticsExporter(options, send);
+  const requests = new (0, _async_hooks.AsyncLocalStorage)();
+  const unsubscribe = _chunkE3UK5IIBcjs.onFarmEvent.call(void 0, 
+    (event) => {
+      if (!isToolEvent(event)) return;
+      const metadata = requests.getStore();
+      if (!metadata) return;
+      exporter.enqueue(toolEvent(metadata, event));
+      metadata.waitUntil(exporter.flush());
+    },
+    { unfiltered: true }
+  );
   return {
     async record(request, runtime, waitUntil, handler) {
       if (runtime.kind === "asset") return handler();
@@ -342,7 +358,7 @@ function farmInfraAnalyticsRecorder(options, send) {
       const startedAt = performance.now();
       let response;
       try {
-        response = await handler();
+        response = await requests.run(metadata, handler);
       } catch (error) {
         background(exporter.flush());
         throw error;
@@ -355,7 +371,10 @@ function farmInfraAnalyticsRecorder(options, send) {
       background(exporter.flush());
       return response;
     },
-    close: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => exporter.close(), "close")
+    close() {
+      unsubscribe();
+      return exporter.close();
+    }
   };
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, farmInfraAnalyticsRecorder, "farmInfraAnalyticsRecorder");