@farm.js/core 0.1.31 → 0.1.35

package/dist/{chunk-SORB3MAR.cjs → chunk-GQ3Z3IZI.cjs}

@@ -7,10 +7,10 @@ var _chunkSU7MH53Pcjs = require('./chunk-SU7MH53P.cjs');
 
 
 
-var _chunkWNLBF77Xcjs = require('./chunk-WNLBF77X.cjs');
+var _chunkD227TIENcjs = require('./chunk-D227TIEN.cjs');
 
 
-var _chunk5OVTOKGHcjs = require('./chunk-5OVTOKGH.cjs');
+var _chunkFFFW3OQ7cjs = require('./chunk-FFFW3OQ7.cjs');
 
 
 var _chunkU4KT7QP3cjs = require('./chunk-U4KT7QP3.cjs');
@@ -52,7 +52,7 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, shouldBlockUnload, "shouldBlockUnload");
 function navigateViaRouter(href, basePath, replace, options = {}) {
   if (typeof window === "undefined") return;
   const url = _chunkI57LW5VZcjs.applyFarmBasePath.call(void 0, href, basePath);
-  const spaRouter = _chunkWNLBF77Xcjs.getInstalledFarmSPARouter.call(void 0, );
+  const spaRouter = _chunkD227TIENcjs.getInstalledFarmSPARouter.call(void 0, );
   if (spaRouter) {
     void spaRouter.navigate(url, {
       replace,
@@ -65,7 +65,7 @@ function navigateViaRouter(href, basePath, replace, options = {}) {
   } else {
     window.history.pushState(null, "", url);
   }
-  _chunkWNLBF77Xcjs.notifyHistoryChange.call(void 0, "url-search");
+  _chunkD227TIENcjs.notifyHistoryChange.call(void 0, "url-search");
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, navigateViaRouter, "navigateViaRouter");
 function useRouter(options = {}) {
@@ -85,7 +85,7 @@ function useRouter(options = {}) {
       setState(readRouterState(basePath, routeMatcher));
     }, "handlePopState");
     handlePopState();
-    const unsubscribe = _chunkWNLBF77Xcjs.subscribeHistoryChange.call(void 0, handlePopState);
+    const unsubscribe = _chunkD227TIENcjs.subscribeHistoryChange.call(void 0, handlePopState);
     return unsubscribe;
   }, [basePath, routeMatcher]);
   const push = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (href, navigateOptions) => {
@@ -96,11 +96,11 @@ function useRouter(options = {}) {
   }, "replace");
   const pushState = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (pageState, href) => {
     if (typeof window === "undefined") return;
-    _chunkWNLBF77Xcjs.getRouter.call(void 0, ).pushState(pageState, resolveClientHref(href, basePath));
+    _chunkD227TIENcjs.getRouter.call(void 0, ).pushState(pageState, resolveClientHref(href, basePath));
   }, "pushState");
   const replaceState = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (pageState, href) => {
     if (typeof window === "undefined") return;
-    _chunkWNLBF77Xcjs.getRouter.call(void 0, ).replaceState(pageState, resolveClientHref(href, basePath));
+    _chunkD227TIENcjs.getRouter.call(void 0, ).replaceState(pageState, resolveClientHref(href, basePath));
   }, "replaceState");
   const back = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => {
     if (typeof window !== "undefined") {
@@ -124,25 +124,25 @@ function useRouter(options = {}) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, useRouter, "useRouter");
 function usePageState() {
-  const [state, setState] = _react.useState.call(void 0, () => _chunkWNLBF77Xcjs.readPageState.call(void 0, ));
+  const [state, setState] = _react.useState.call(void 0, () => _chunkD227TIENcjs.readPageState.call(void 0, ));
   _react.useEffect.call(void 0, () => {
     if (typeof window === "undefined") return;
     const handlePopState = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => {
-      setState(_chunkWNLBF77Xcjs.readPageState.call(void 0, ));
+      setState(_chunkD227TIENcjs.readPageState.call(void 0, ));
     }, "handlePopState");
     handlePopState();
-    return _chunkWNLBF77Xcjs.subscribeHistoryChange.call(void 0, handlePopState);
+    return _chunkD227TIENcjs.subscribeHistoryChange.call(void 0, handlePopState);
   }, []);
   return state;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, usePageState, "usePageState");
 function useNavigation() {
   const [state, setState] = _react.useState.call(void 0, 
-    () => _chunkWNLBF77Xcjs.getRouter.call(void 0, ).getNavigationState()
+    () => _chunkD227TIENcjs.getRouter.call(void 0, ).getNavigationState()
   );
   _react.useEffect.call(void 0, () => {
     if (typeof window === "undefined") return;
-    return _chunkWNLBF77Xcjs.getRouter.call(void 0, ).subscribeNavigation(setState);
+    return _chunkD227TIENcjs.getRouter.call(void 0, ).subscribeNavigation(setState);
   }, []);
   return state;
 }
@@ -155,7 +155,7 @@ function useBlocker(options) {
     if (typeof window === "undefined" || !active) {
       return;
     }
-    return _chunkWNLBF77Xcjs.getRouter.call(void 0, ).addBlocker(
+    return _chunkD227TIENcjs.getRouter.call(void 0, ).addBlocker(
       async (context) => {
         const current = optionsRef.current;
         const when = typeof current.when === "function" ? current.when(context) : current.when;
@@ -179,7 +179,7 @@ function useScrollRestoration(key) {
   _react.useEffect.call(void 0, () => {
     const element = ref.current;
     if (!element) return;
-    return _chunkWNLBF77Xcjs.getRouter.call(void 0, ).registerScrollElement(key, element);
+    return _chunkD227TIENcjs.getRouter.call(void 0, ).registerScrollElement(key, element);
   }, [key]);
   return ref;
 }
@@ -195,13 +195,13 @@ function readRouterState(basePath, routeMatcher) {
     };
   }
   const pathname = normalizeClientPathname(url.pathname, basePath);
-  const i18n = _chunk5OVTOKGHcjs.getFarmI18nClientState.call(void 0, );
-  const routePathname = i18n ? _chunkBIDYX3SLcjs.stripFarmLocaleFromPathname.call(void 0, pathname, i18n) : pathname;
+  const i18n = _chunkFFFW3OQ7cjs.getFarmI18nClientState.call(void 0, );
+  const routePathname = i18n ? _chunkBIDYX3SLcjs.stripFarmLocaleFromPathname.call(void 0, pathname, { ...i18n, basePath: "/" }) : pathname;
   return {
     pathname,
     searchParams: url.searchParams,
     params: _optionalChain([routeMatcher, 'optionalAccess', _5 => _5.match, 'call', _6 => _6(routePathname), 'optionalAccess', _7 => _7.params]) || {},
-    pageState: typeof window === "undefined" ? null : _chunkWNLBF77Xcjs.readPageState.call(void 0, )
+    pageState: typeof window === "undefined" ? null : _chunkD227TIENcjs.readPageState.call(void 0, )
   };
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, readRouterState, "readRouterState");

package/dist/{chunk-75WGQVQA.cjs → chunk-HITLGIAO.cjs}

@@ -40,7 +40,16 @@ async function hydrateFarmDocsAdapterRuntime() {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, generateFarmDocsAdapterClientRuntime, "generateFarmDocsAdapterClientRuntime");
 
+// src/docs/config-secrets.ts
+function isSecretDocsConfigKey(key) {
+  const normalized = key.replace(/[-_]/g, "").toLowerCase();
+  if (!normalized || normalized.endsWith("env")) return false;
+  return /apikey|token|secret|password|authorization|credential/.test(normalized);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isSecretDocsConfigKey, "isSecretDocsConfigKey");
+
+
 
 
 
-exports.getFarmDocsAdapterConfigModule = getFarmDocsAdapterConfigModule; exports.generateFarmDocsAdapterClientRuntime = generateFarmDocsAdapterClientRuntime;
+exports.getFarmDocsAdapterConfigModule = getFarmDocsAdapterConfigModule; exports.generateFarmDocsAdapterClientRuntime = generateFarmDocsAdapterClientRuntime; exports.isSecretDocsConfigKey = isSecretDocsConfigKey;

package/dist/{chunk-HBTUGXHS.cjs → chunk-HLJ6MBUZ.cjs}

@@ -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" && _optionalChain([input, 'access', _3 => _3.cookie, 'optionalAccess', _4 => _4.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);
@@ -74,15 +77,15 @@ function resolveFarmI18nConfig(input, options = {}) {
     fallbackLocale,
     strict: _nullishCoalesce(input.strict, () => ( strictByDefault)),
     cookie: {
-      name: _optionalChain([input, 'access', _3 => _3.cookie, 'optionalAccess', _4 => _4.name, 'optionalAccess', _5 => _5.trim, 'call', _6 => _6()]) || DEFAULT_FARM_I18N_COOKIE,
+      name: _optionalChain([input, 'access', _5 => _5.cookie, 'optionalAccess', _6 => _6.name, 'optionalAccess', _7 => _7.trim, 'call', _8 => _8()]) || DEFAULT_FARM_I18N_COOKIE,
       maxAge: normalizePositiveInteger(
-        _optionalChain([input, 'access', _7 => _7.cookie, 'optionalAccess', _8 => _8.maxAge]),
+        _optionalChain([input, 'access', _9 => _9.cookie, 'optionalAccess', _10 => _10.maxAge]),
         DEFAULT_FARM_I18N_COOKIE_MAX_AGE,
         "i18n.cookie.maxAge"
       ),
-      path: normalizeCookiePath(_optionalChain([input, 'access', _9 => _9.cookie, 'optionalAccess', _10 => _10.path])),
+      path: normalizeCookiePath(_optionalChain([input, 'access', _11 => _11.cookie, 'optionalAccess', _12 => _12.path])),
       sameSite,
-      secure: _nullishCoalesce(_optionalChain([input, 'access', _11 => _11.cookie, 'optionalAccess', _12 => _12.secure]), () => ( options.mode === "production"))
+      secure: _nullishCoalesce(_optionalChain([input, 'access', _13 => _13.cookie, 'optionalAccess', _14 => _14.secure]), () => ( (sameSite === "none" || options.mode === "production")))
     },
     direction
   };

package/dist/{chunk-JLCQGPXE.mjs → chunk-HMIJDL7S.mjs}

@@ -1,12 +1,10 @@
-import {
-  getRequestSourceOrigin,
-  matchesAllowedOrigin,
-  matchesHostHeader,
-  normalizeAllowedOriginPattern
-} from "./chunk-FP2INE7H.mjs";
 import {
   defineSchema
 } from "./chunk-44SYJEG3.mjs";
+import {
+  compileMiddlewareConfig,
+  matchesCompiledMiddlewareConfig
+} from "./chunk-JG6DJF5A.mjs";
 import {
   bufferFarmRequestBody,
   clearRequestContext,
@@ -18,7 +16,7 @@ import {
   readNodeRequestBody,
   resolveFarmServerConfig,
   setRequestContext
-} from "./chunk-XF7Q24PF.mjs";
+} from "./chunk-Y7RKTKYI.mjs";
 import {
   applyWebResponseHeaders,
   sendWebResponse
@@ -34,6 +32,12 @@ import {
   canonicalizeRequestPathSegments,
   canonicalizeRequestPathname
 } from "./chunk-CQ6OSQ3K.mjs";
+import {
+  resolveFarmLocalePath
+} from "./chunk-L3KT7IXV.mjs";
+import {
+  stripFarmBasePath
+} from "./chunk-4RB44K6Z.mjs";
 import {
   assertTerminalCatchAll,
   assertUniqueRouteParameters,
@@ -44,56 +48,6 @@ import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
 
-// src/integration-request-security.ts
-function resolveIntegrationAllowedOrigins(values, label) {
-  return Object.freeze((values ?? []).map((value) => normalizeAllowedOriginPattern(value, label)));
-}
-__name(resolveIntegrationAllowedOrigins, "resolveIntegrationAllowedOrigins");
-function validateIntegrationRequestOrigin(request, policy = {}) {
-  const allowedOrigins = policy.allowedOrigins ?? [];
-  const requireOriginMetadata = policy.requireOriginMetadata ?? true;
-  const fetchSite = request.headers.get("sec-fetch-site")?.trim().toLowerCase();
-  const source = getRequestSourceOrigin(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) => matchesAllowedOrigin(source.origin, pattern)
-  );
-  const matchesRequest = source.origin === requestUrl.origin || matchesHostHeader(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 };
-}
-__name(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.";
-  }
-}
-__name(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) {
@@ -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;
         }
@@ -1623,7 +1577,7 @@ async function dispatchIntegrationRequest(runtime, request, options = {}) {
   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;
     }
@@ -2046,6 +2000,44 @@ function matchesMethod(methods, normalizedMethod) {
   return methods.some((candidate) => candidate === "ALL" || candidate === normalizedMethod);
 }
 __name(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 = compileMiddlewareConfig({
+      matcher: typeof entry.matcher === "string" ? entry.matcher : [...entry.matcher]
+    });
+    compiledIntegrationGuards.set(entry, compiled);
+  }
+  for (const candidate of routePathname === pathname ? [pathname] : [pathname, routePathname]) {
+    const result = matchesCompiledMiddlewareConfig(candidate, compiled, noMiddlewareContext);
+    if (result.matched) return result.params ?? {};
+  }
+  return null;
+}
+__name(resolveIntegrationMiddlewareParams, "resolveIntegrationMiddlewareParams");
+function resolveIntegrationRoutePathname(pathname, config) {
+  const basePath = typeof config?.basePath === "string" ? config.basePath : void 0;
+  let routePathname = basePath ? stripFarmBasePath(pathname, basePath) : pathname;
+  const i18n = config?.i18n;
+  if (i18n && Array.isArray(i18n.locales) && i18n.locales.length > 0) {
+    routePathname = resolveFarmLocalePath(routePathname, {
+      locales: i18n.locales,
+      defaultLocale: i18n.defaultLocale,
+      routing: i18n.routing || "prefix-except-default"
+    }).pathname;
+  }
+  return routePathname;
+}
+__name(resolveIntegrationRoutePathname, "resolveIntegrationRoutePathname");
 function resolveMatcherParams(matcher, pathname) {
   if (!matcher) {
     return {};
@@ -2143,9 +2135,6 @@ function normalizeMatcher(matcher) {
 __name(normalizeMatcher, "normalizeMatcher");
 
 export {
-  resolveIntegrationAllowedOrigins,
-  validateIntegrationRequestOrigin,
-  describeIntegrationOriginRejection,
   getFarmPluginIntegrationContext,
   FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY,
   FARM_INTEGRATION_SET_COOKIES_KEY,

package/dist/{chunk-F6XEGFHO.mjs → chunk-HUMR6LSU.mjs}

@@ -1,6 +1,6 @@
 import {
   matchesFarmIfNoneMatch
-} from "./chunk-XF7Q24PF.mjs";
+} from "./chunk-Y7RKTKYI.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
@@ -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;