@farm.js/core 0.1.15 → 0.1.17

package/dist/internal/production-runtime.mjs

@@ -1,7 +1,7 @@
 import {
   applyProductionMiddlewareHeaders,
   createProductionMiddlewareRunner
-} from "../chunk-KTGFMHET.mjs";
+} from "../chunk-N6UROPT7.mjs";
 import {
   createFarmInstrumentationLifecycle,
   resolveFarmInstrumentationRuntime
@@ -22,7 +22,7 @@ import {
   getDefaultErrorStatusText,
   renderFarmLocaleAlternateLinks,
   resolveDefaultErrorStatus
-} from "../chunk-7ZWL7XOU.mjs";
+} from "../chunk-76DG3LF3.mjs";
 import {
   mergeRouteRenderingDirectiveConfig
 } from "../chunk-DAO7JGTS.mjs";
@@ -47,8 +47,8 @@ import {
   renderFarmLlmsFullTxt,
   reportFarmPreloadWarnings,
   resolveFarmSecurityConfig
-} from "../chunk-Q3MDL7TM.mjs";
-import "../chunk-6SCB2MXB.mjs";
+} from "../chunk-ZCNJKLA2.mjs";
+import "../chunk-SXHV42UQ.mjs";
 import {
   farmSecretsMatch
 } from "../chunk-2UC36WAC.mjs";
@@ -60,7 +60,7 @@ import {
 import {
   _runWithMiddlewareContext,
   _runWithMiddlewareData
-} from "../chunk-NDD2YVGU.mjs";
+} from "../chunk-NRVGEI5I.mjs";
 import "../chunk-5TISYEQF.mjs";
 import {
   _runWithAPIRequestRuntime
@@ -112,7 +112,7 @@ import {
   createFarmCacheKey,
   getFarmDataCache,
   normalizeRevalidatePath
-} from "../chunk-IGO2HEV7.mjs";
+} from "../chunk-F6SJAKFJ.mjs";
 import "../chunk-4SIYUGRY.mjs";
 import "../chunk-C4NCTZLM.mjs";
 import {

package/dist/markdown.cjs

@@ -139,8 +139,16 @@ async function createMarkdownMirrorResponse(options) {
   if (!hasMarkdownExtension) {
     headersOut.set("Vary", "Accept");
   }
+  for (const token of pageResponse.headers.get("vary")?.split(",") ?? []) {
+    const name = token.trim();
+    if (name && name.toLowerCase() !== "accept") appendHeaderToken(headersOut, "Vary", name);
+  }
+  const pageCacheControl = pageResponse.headers.get("cache-control");
   const cache = target.route?.cache ?? options.config?.cache ?? false;
-  headersOut.set("Cache-Control", createMarkdownCacheHeader(cache));
+  headersOut.set(
+    "Cache-Control",
+    pageCacheControl && isPrivateCacheControl(pageCacheControl) ? pageCacheControl : createMarkdownCacheHeader(cache)
+  );
   return new Response(options.request.method === "HEAD" ? null : markdown, {
     status: pageResponse.status,
     headers: headersOut
@@ -370,6 +378,13 @@ function isHtmlResponse(response) {
   return contentType.includes("text/html");
 }
 __name(isHtmlResponse, "isHtmlResponse");
+function isPrivateCacheControl(value) {
+  return value.split(",").some((directive) => {
+    const name = directive.split("=", 1)[0].trim().toLowerCase();
+    return name === "private" || name === "no-store";
+  });
+}
+__name(isPrivateCacheControl, "isPrivateCacheControl");
 function createMarkdownCacheHeader(cache) {
   if (cache === false || cache <= 0) {
     return "no-store";

package/dist/markdown.mjs

@@ -13,7 +13,7 @@ import {
   requestAcceptsMarkdown,
   resolveMarkdownConfig,
   resolveMarkdownMirrorTarget
-} from "./chunk-6SCB2MXB.mjs";
+} from "./chunk-SXHV42UQ.mjs";
 import "./chunk-LPEX4YW6.mjs";
 export {
   FARM_MARKDOWN_CONTENT_TYPE,

package/dist/{metadata-BsUcOEXg.d.ts → metadata-BcNJP4fq.d.ts}

@@ -1,4 +1,4 @@
-import { M as Metadata, s as FarmAgentJsonLd } from './client-plugins-CslwYp3E.js';
+import { M as Metadata, s as FarmAgentJsonLd } from './client-plugins-C089bQhN.js';
 
 type MetadataImageKind = "opengraph" | "twitter";
 interface FarmMetadataImageReference {

package/dist/{metadata-B1bxCPUY.d.mts → metadata-C1Z9vLbb.d.mts}

@@ -1,4 +1,4 @@
-import { M as Metadata, s as FarmAgentJsonLd } from './client-plugins-C1EgdoJM.mjs';
+import { M as Metadata, s as FarmAgentJsonLd } from './client-plugins-JXXmZliS.mjs';
 
 type MetadataImageKind = "opengraph" | "twitter";
 interface FarmMetadataImageReference {

package/dist/middleware.cjs

@@ -1611,7 +1611,7 @@ function parseColonParam(segment) {
   };
 }
 __name(parseColonParam, "parseColonParam");
-function compilePathPattern(pattern) {
+function compilePathPattern(pattern, trailingSlash = false) {
   const params = [];
   const segments = pattern.split("/").filter(Boolean);
   if (segments.length === 0) {
@@ -1647,11 +1647,18 @@ function compilePathPattern(pattern) {
   });
   return {
     kind: "path",
-    regex: new RegExp(`^${parts.join("")}$`),
+    regex: new RegExp(`^${parts.join("")}${trailingSlash ? "/?" : ""}$`),
     params
   };
 }
 __name(compilePathPattern, "compilePathPattern");
+function compileMatcherPattern(pattern) {
+  if (typeof pattern === "string" && pattern !== "*" && !pattern.endsWith("(.*)")) {
+    return compilePathPattern(pattern, true);
+  }
+  return compilePattern(pattern);
+}
+__name(compileMatcherPattern, "compileMatcherPattern");
 function compilePattern(pattern) {
   if (pattern instanceof RegExp) {
     return { kind: "regexp", regex: pattern };
@@ -1671,7 +1678,7 @@ __name(compilePattern, "compilePattern");
 function compileMiddlewareConfig(config) {
   const compiled = {
     matcher: config.matcher ? toMatcherList(config.matcher).map(
-      (matcher) => typeof matcher === "function" ? matcher : compilePattern(matcher)
+      (matcher) => typeof matcher === "function" ? matcher : compileMatcherPattern(matcher)
     ) : void 0,
     exclude: config.exclude?.map(compilePattern)
   };

package/dist/middleware.d.mts

@@ -1,12 +1,13 @@
-import { eo as MiddlewareChain, et as RateLimitStorage, eu as RateLimitStatus, ev as MemoryRateLimitStorageOptions, an as MiddlewareContext, ak as FarmMiddlewareConfig, ek as MiddlewareFunction, am as MiddlewareConfig, u as MiddlewareProps } from './client-plugins-C1EgdoJM.mjs';
-export { ep as CookieJar, eq as CookieOptions, ex as MiddlewareResult, en as MiddlewareStore, ew as NextFunction, er as RateLimitConfig, es as RateLimitIncrementResult, aj as ReadonlyMiddlewareStore, el as RequestMiddleware, em as RequestMiddlewareContext } from './client-plugins-C1EgdoJM.mjs';
+import { ep as MiddlewareChain, eu as RateLimitStorage, ev as RateLimitStatus, ew as MemoryRateLimitStorageOptions, an as MiddlewareContext, ak as FarmMiddlewareConfig, el as MiddlewareFunction, am as MiddlewareConfig, u as MiddlewareProps } from './client-plugins-JXXmZliS.mjs';
+export { eq as CookieJar, er as CookieOptions, ey as MiddlewareResult, eo as MiddlewareStore, ex as NextFunction, es as RateLimitConfig, et as RateLimitIncrementResult, aj as ReadonlyMiddlewareStore, em as RequestMiddleware, en as RequestMiddlewareContext } from './client-plugins-JXXmZliS.mjs';
 import { IncomingMessage, ServerResponse } from 'http';
 import { ViteDevServer, Plugin } from 'vite';
 import { a as FarmServerConfig, R as ResolvedFarmServerConfig } from './workflows-CR9ex-gz.mjs';
 import { R as ResolvedFarmI18nConfig } from './types-Z0aotQ8w.mjs';
-export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue, m as matchesMiddlewareConfig } from './production-runtime-BDllolVh.mjs';
+export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue, m as matchesMiddlewareConfig } from './production-runtime-jcrTlRTb.mjs';
 import './lifecycle-DK06VuKP.mjs';
-import './route-C6UClI1z.mjs';
+import './route-B0XrsrFk.mjs';
+import './endpoint-DAc96i93.mjs';
 import './cache.mjs';
 import './renderer.mjs';
 import './deployment.mjs';
@@ -29,6 +30,8 @@ import './server-action-security.mjs';
 import './server-fn-error-DDh14a0V.mjs';
 import 'esbuild';
 import './image-config-Duob7wER.mjs';
+import './server-fn.mjs';
+import './server-query.mjs';
 import './types-DQnyD3VD.mjs';
 import './font.mjs';
 import './after.mjs';

package/dist/middleware.d.ts

@@ -1,12 +1,13 @@
-import { eo as MiddlewareChain, et as RateLimitStorage, eu as RateLimitStatus, ev as MemoryRateLimitStorageOptions, an as MiddlewareContext, ak as FarmMiddlewareConfig, ek as MiddlewareFunction, am as MiddlewareConfig, u as MiddlewareProps } from './client-plugins-CslwYp3E.js';
-export { ep as CookieJar, eq as CookieOptions, ex as MiddlewareResult, en as MiddlewareStore, ew as NextFunction, er as RateLimitConfig, es as RateLimitIncrementResult, aj as ReadonlyMiddlewareStore, el as RequestMiddleware, em as RequestMiddlewareContext } from './client-plugins-CslwYp3E.js';
+import { ep as MiddlewareChain, eu as RateLimitStorage, ev as RateLimitStatus, ew as MemoryRateLimitStorageOptions, an as MiddlewareContext, ak as FarmMiddlewareConfig, el as MiddlewareFunction, am as MiddlewareConfig, u as MiddlewareProps } from './client-plugins-C089bQhN.js';
+export { eq as CookieJar, er as CookieOptions, ey as MiddlewareResult, eo as MiddlewareStore, ex as NextFunction, es as RateLimitConfig, et as RateLimitIncrementResult, aj as ReadonlyMiddlewareStore, em as RequestMiddleware, en as RequestMiddlewareContext } from './client-plugins-C089bQhN.js';
 import { IncomingMessage, ServerResponse } from 'http';
 import { ViteDevServer, Plugin } from 'vite';
 import { a as FarmServerConfig, R as ResolvedFarmServerConfig } from './workflows-CR9ex-gz.js';
 import { R as ResolvedFarmI18nConfig } from './types-Z0aotQ8w.js';
-export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue, m as matchesMiddlewareConfig } from './production-runtime-CsNn2-zx.js';
+export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue, m as matchesMiddlewareConfig } from './production-runtime-oKmC0WU-.js';
 import './lifecycle-DK06VuKP.js';
-import './route-CHBaW55F.js';
+import './route-DOEpbyWZ.js';
+import './endpoint-1zA994xL.js';
 import './cache.js';
 import './renderer.js';
 import './deployment.js';
@@ -29,6 +30,8 @@ import './server-action-security.js';
 import './server-fn-error-DDh14a0V.js';
 import 'esbuild';
 import './image-config-Duob7wER.js';
+import './server-fn.js';
+import './server-query.js';
 import './types-DQnyD3VD.js';
 import './font.js';
 import './after.js';

package/dist/middleware.mjs

@@ -7,23 +7,23 @@ import {
   memoryRateLimitStorage,
   middleware,
   unwrapMiddleware
-} from "./chunk-EWDK36MM.mjs";
+} from "./chunk-A72YEUZ3.mjs";
 import {
   applyProductionMiddlewareHeaders,
   createProductionMiddlewareRunner,
   matchesMiddlewareConfig
-} from "./chunk-KTGFMHET.mjs";
+} from "./chunk-N6UROPT7.mjs";
 import {
   MiddlewareManager,
   createContext
-} from "./chunk-B76DT5Y6.mjs";
+} from "./chunk-57J3Y7Y3.mjs";
 import {
   _runWithMiddlewareContext,
   _runWithMiddlewareData,
   getMiddlewareContext,
   getMiddlewareData,
   getMiddlewareValue
-} from "./chunk-NDD2YVGU.mjs";
+} from "./chunk-NRVGEI5I.mjs";
 import "./chunk-5TISYEQF.mjs";
 import "./chunk-I2BHUNBU.mjs";
 import "./chunk-7GNWGLWB.mjs";

package/dist/{nitro-ICBP5APY.mjs → nitro-CVZ36JM5.mjs}

@@ -5,12 +5,15 @@ import {
   createFarmCronCloudflareConfig,
   mergeScheduledTasks,
   prepareFarmCronForNitro
-} from "./chunk-4L7SZOHZ.mjs";
+} from "./chunk-YHOCRI4H.mjs";
+import {
+  createBundledEnv
+} from "./chunk-4OOBRCJX.mjs";
 import {
   prepareFarmWorkflowsForNitro
-} from "./chunk-MUUZJLCI.mjs";
-import "./chunk-ONUEYC6N.mjs";
+} from "./chunk-EGJDUF4Q.mjs";
 import "./chunk-2UC36WAC.mjs";
+import "./chunk-ONUEYC6N.mjs";
 import {
   resolveFarmAPIServerBasePath
 } from "./chunk-I6XDAKWQ.mjs";
@@ -76,7 +79,7 @@ export const farmRegistry: {
   clientManifest?: any;
   routePaths?: Record<string, string>;
 } = {
-  env: ${JSON.stringify(config.env || { server: {}, public: {} }, null, 2)},
+  env: ${JSON.stringify(createBundledEnv(config.env), null, 2)},
   deploymentId: ${JSON.stringify(config.deploymentId)},
   basePath: ${JSON.stringify(config.basePath)},
   apiBasePath: ${JSON.stringify(apiBasePath)},
@@ -580,7 +583,7 @@ export default defineEventHandler(async (event: H3Event) => {
           farmRegistry.apiRouteManager = apiRouteManager;
           farmRegistry.routeManager = routeManager;
           farmRegistry.serverRenderer = serverRenderer;
-          farmRegistry.env = config.env || { server: {}, public: {} };
+          farmRegistry.env = createBundledEnv(config.env);
           farmRegistry.deploymentId = config.deploymentId;
           farmRegistry.basePath = config.basePath;
         };