@farm.js/core 0.1.16 → 0.1.17

package/dist/docs.cjs

@@ -3468,6 +3468,7 @@ function createFarmDocsHandler(docs, options) {
     if (!isFarmDocsRequest(docs, request)) return null;
     const page = loadPage(contentDir, docs, request);
     if (!page) return null;
+    const negotiatesAccept = !requestUrl.pathname.endsWith(".md");
     if (shouldReturnMarkdown(request)) {
       const origin = new URL(request.url).origin;
       return omitFarmDocsHeadBody(
@@ -3482,7 +3483,8 @@ function createFarmDocsHandler(docs, options) {
             status: 200,
             headers: {
               "Content-Type": "text/markdown; charset=utf-8",
-              "Cache-Control": "public, max-age=60"
+              "Cache-Control": "public, max-age=60",
+              ...negotiatesAccept ? { Vary: "Accept" } : {}
             }
           }
         )
@@ -3512,6 +3514,7 @@ function createFarmDocsHandler(docs, options) {
           headers: {
             "Content-Type": "text/html; charset=utf-8",
             "Cache-Control": "public, s-maxage=60, stale-while-revalidate=300",
+            Vary: "Accept",
             ...fontPreloadHeader ? { Link: fontPreloadHeader } : {}
           }
         }
@@ -4635,6 +4638,19 @@ function normalizeMatcher(matcher) {
 }
 __name(normalizeMatcher, "normalizeMatcher");
 
+// src/utils/runtime-env.ts
+function getFarmRuntimeBindings() {
+  const runtimeBindings = globalThis.__env__;
+  return runtimeBindings && typeof runtimeBindings === "object" ? runtimeBindings : void 0;
+}
+__name(getFarmRuntimeBindings, "getFarmRuntimeBindings");
+function readFarmEnvironmentValue(name) {
+  const runtimeValue = getFarmRuntimeBindings()?.[name];
+  if (typeof runtimeValue === "string") return runtimeValue;
+  return typeof process !== "undefined" ? process.env?.[name] : void 0;
+}
+__name(readFarmEnvironmentValue, "readFarmEnvironmentValue");
+
 // src/workflows.ts
 var import_node_path6 = require("path");
 
@@ -4703,9 +4719,8 @@ __name(readServerEnvKey, "readServerEnvKey");
 function readRuntimeServerEnv(env2) {
   const state = env2[FARM_ENV_RUNTIME_SYMBOL];
   if (!state) return;
-  const source = getProcessEnv();
   for (const [key, type] of Object.entries(state.pending)) {
-    const raw = source[key];
+    const raw = readFarmEnvironmentValue(key);
     if (raw === void 0) continue;
     env2.server[key] = coerceRuntimeEnvValue(raw, type);
     delete state.pending[key];
@@ -4805,13 +4820,6 @@ function isRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 __name(isRecord, "isRecord");
-function getProcessEnv() {
-  if (typeof process !== "undefined" && process.env) {
-    return process.env;
-  }
-  return {};
-}
-__name(getProcessEnv, "getProcessEnv");
 
 // src/app-markdown-config.ts
 var import_node_path7 = __toESM(require("path"));

package/dist/docs.mjs

@@ -4,7 +4,7 @@ import {
   createFarmDocsAdapterHandler,
   hasFarmDocsRuntimeAdapter,
   isFarmDocsAPIRequest
-} from "./chunk-NUD6XBMO.mjs";
+} from "./chunk-UTBVHYS3.mjs";
 import {
   createFarmDocsHandler,
   discoverFarmDocsPages,
@@ -13,10 +13,10 @@ import {
   isFarmDocsRequest,
   loadFarmDocsPage,
   resolveFarmDocsContentDir
-} from "./chunk-MOQNHLTS.mjs";
+} from "./chunk-5QOEPUYE.mjs";
 import "./chunk-UP4CW6WP.mjs";
 import "./chunk-TFQG7TBC.mjs";
-import "./chunk-IXTEENRS.mjs";
+import "./chunk-QGVJVSNX.mjs";
 import "./chunk-XZNTNMHT.mjs";
 import "./chunk-TVGP4BBZ.mjs";
 import "./chunk-FZC7EEPM.mjs";
@@ -24,16 +24,16 @@ import "./chunk-JBSVKMC5.mjs";
 import "./chunk-7WPA7GBZ.mjs";
 import "./chunk-IILNZK5G.mjs";
 import "./chunk-OLYK7EAK.mjs";
-import "./chunk-Q3MDL7TM.mjs";
+import "./chunk-ZCNJKLA2.mjs";
 import "./chunk-G2KY33I6.mjs";
-import "./chunk-4L7SZOHZ.mjs";
+import "./chunk-YHOCRI4H.mjs";
 import "./chunk-QCFFHV5H.mjs";
-import "./chunk-7HDZYYS4.mjs";
+import "./chunk-4OOBRCJX.mjs";
 import "./chunk-FA2W42OV.mjs";
-import "./chunk-6SCB2MXB.mjs";
-import "./chunk-MUUZJLCI.mjs";
-import "./chunk-ONUEYC6N.mjs";
+import "./chunk-SXHV42UQ.mjs";
+import "./chunk-EGJDUF4Q.mjs";
 import "./chunk-2UC36WAC.mjs";
+import "./chunk-ONUEYC6N.mjs";
 import "./chunk-AELACLOB.mjs";
 import "./chunk-JLCQGPXE.mjs";
 import "./chunk-FP2INE7H.mjs";

package/dist/{endpoint-kSAxE52R.d.ts → endpoint-1zA994xL.d.ts}

@@ -364,4 +364,4 @@ declare function OPTIONS<T = any>(handler: EndpointHandler<never, never, never,
 declare function OPTIONS<const TOptions extends MethodlessEndpointOptions, TResponse = any>(options: TOptions, handler: ValidatedEndpointHandlerFromOptions<TOptions, TResponse>): CreatedEndpointFromOptions<TOptions, TResponse>;
 declare function OPTIONS<TBody extends AnySchema = never, TQuery extends AnySchema = never, THeaders extends AnySchema = never, TResponse = any>(options: Omit<EndpointOptions<TBody, TQuery, THeaders, readonly []>, "method">, handler: EndpointHandler<TBody, TQuery, THeaders, TResponse>): CreatedEndpoint<TBody, TQuery, THeaders, TResponse>;
 
-export { type AnyEndpointMiddleware as A, type MultipartValues as B, type TypedFormData as C, DELETE as D, type EndpointMiddlewareResult as E, type MultipartSchema as F, GET as G, HEAD as H, type InferEndpointMiddlewareContext as I, type FarmStreamResponse as J, type FarmAPIStream as K, multipart as L, type MultipartField as M, isMultipartSchema as N, OPTIONS as O, POST as P, QUERY as Q, type RouteSchema as R, toFormData as S, type TypedEndpoint as T, jsonStream as U, isJSONStreamResponse as V, readJSONStream as W, isFarmAPIStream as X, type OpenAPISecurityMode as Y, type RouteSchemaOutput as a, type EndpointMCPOptions as b, type RouteSchemaInput as c, type EndpointMCPMetadata as d, EndpointFailure as e, type EndpointOpenAPIMetadata as f, type EndpointErrorSchema as g, type EndpointErrorDefinition as h, type EndpointErrorDefinitions as i, type EndpointErrorContracts as j, type EndpointErrorHandler as k, type EndpointFail as l, isEndpointFailure as m, type EndpointParamValue as n, type EndpointParams as o, parseRouteSchema as p, type EndpointMiddlewareContext as q, type EndpointMiddleware as r, type EndpointInvalidationTarget as s, type EndpointInvalidationContext as t, type EndpointInvalidations as u, type EndpointOptions as v, type EndpointHandler as w, createEndpoint as x, PUT as y, PATCH as z };
+export { type AnyEndpointMiddleware as A, type MultipartValues as B, type TypedFormData as C, DELETE as D, type EndpointMiddlewareResult as E, type MultipartSchema as F, GET as G, HEAD as H, type InferEndpointMiddlewareContext as I, type FarmStreamResponse as J, type FarmAPIStream as K, multipart as L, type MultipartField as M, isMultipartSchema as N, OPTIONS as O, POST as P, QUERY as Q, type RouteSchema as R, toFormData as S, type TypedEndpoint as T, jsonStream as U, isJSONStreamResponse as V, readJSONStream as W, isFarmAPIStream as X, type OpenAPISecurityMode as Y, type RouteSchemaOutput as a, type EndpointMCPOptions as b, type RouteSchemaInput as c, type EndpointMCPMetadata as d, EndpointFailure as e, type EndpointOpenAPIMetadata as f, type EndpointErrorSchema as g, type EndpointErrorDefinition as h, isEndpointFailure as i, type EndpointErrorDefinitions as j, type EndpointErrorContracts as k, type EndpointErrorHandler as l, type EndpointFail as m, type EndpointParamValue as n, type EndpointParams as o, parseRouteSchema as p, type EndpointMiddlewareContext as q, type EndpointMiddleware as r, type EndpointInvalidationTarget as s, type EndpointInvalidationContext as t, type EndpointInvalidations as u, type EndpointOptions as v, type EndpointHandler as w, createEndpoint as x, PUT as y, PATCH as z };

package/dist/{endpoint-Bu3XgeMK.d.mts → endpoint-DAc96i93.d.mts}

@@ -364,4 +364,4 @@ declare function OPTIONS<T = any>(handler: EndpointHandler<never, never, never,
 declare function OPTIONS<const TOptions extends MethodlessEndpointOptions, TResponse = any>(options: TOptions, handler: ValidatedEndpointHandlerFromOptions<TOptions, TResponse>): CreatedEndpointFromOptions<TOptions, TResponse>;
 declare function OPTIONS<TBody extends AnySchema = never, TQuery extends AnySchema = never, THeaders extends AnySchema = never, TResponse = any>(options: Omit<EndpointOptions<TBody, TQuery, THeaders, readonly []>, "method">, handler: EndpointHandler<TBody, TQuery, THeaders, TResponse>): CreatedEndpoint<TBody, TQuery, THeaders, TResponse>;
 
-export { type AnyEndpointMiddleware as A, type MultipartValues as B, type TypedFormData as C, DELETE as D, type EndpointMiddlewareResult as E, type MultipartSchema as F, GET as G, HEAD as H, type InferEndpointMiddlewareContext as I, type FarmStreamResponse as J, type FarmAPIStream as K, multipart as L, type MultipartField as M, isMultipartSchema as N, OPTIONS as O, POST as P, QUERY as Q, type RouteSchema as R, toFormData as S, type TypedEndpoint as T, jsonStream as U, isJSONStreamResponse as V, readJSONStream as W, isFarmAPIStream as X, type OpenAPISecurityMode as Y, type RouteSchemaOutput as a, type EndpointMCPOptions as b, type RouteSchemaInput as c, type EndpointMCPMetadata as d, EndpointFailure as e, type EndpointOpenAPIMetadata as f, type EndpointErrorSchema as g, type EndpointErrorDefinition as h, type EndpointErrorDefinitions as i, type EndpointErrorContracts as j, type EndpointErrorHandler as k, type EndpointFail as l, isEndpointFailure as m, type EndpointParamValue as n, type EndpointParams as o, parseRouteSchema as p, type EndpointMiddlewareContext as q, type EndpointMiddleware as r, type EndpointInvalidationTarget as s, type EndpointInvalidationContext as t, type EndpointInvalidations as u, type EndpointOptions as v, type EndpointHandler as w, createEndpoint as x, PUT as y, PATCH as z };
+export { type AnyEndpointMiddleware as A, type MultipartValues as B, type TypedFormData as C, DELETE as D, type EndpointMiddlewareResult as E, type MultipartSchema as F, GET as G, HEAD as H, type InferEndpointMiddlewareContext as I, type FarmStreamResponse as J, type FarmAPIStream as K, multipart as L, type MultipartField as M, isMultipartSchema as N, OPTIONS as O, POST as P, QUERY as Q, type RouteSchema as R, toFormData as S, type TypedEndpoint as T, jsonStream as U, isJSONStreamResponse as V, readJSONStream as W, isFarmAPIStream as X, type OpenAPISecurityMode as Y, type RouteSchemaOutput as a, type EndpointMCPOptions as b, type RouteSchemaInput as c, type EndpointMCPMetadata as d, EndpointFailure as e, type EndpointOpenAPIMetadata as f, type EndpointErrorSchema as g, type EndpointErrorDefinition as h, isEndpointFailure as i, type EndpointErrorDefinitions as j, type EndpointErrorContracts as k, type EndpointErrorHandler as l, type EndpointFail as m, type EndpointParamValue as n, type EndpointParams as o, parseRouteSchema as p, type EndpointMiddlewareContext as q, type EndpointMiddleware as r, type EndpointInvalidationTarget as s, type EndpointInvalidationContext as t, type EndpointInvalidations as u, type EndpointOptions as v, type EndpointHandler as w, createEndpoint as x, PUT as y, PATCH as z };

package/dist/env.cjs

@@ -32,6 +32,21 @@ __export(env_exports, {
   setEnv: () => setEnv
 });
 module.exports = __toCommonJS(env_exports);
+
+// src/utils/runtime-env.ts
+function getFarmRuntimeBindings() {
+  const runtimeBindings = globalThis.__env__;
+  return runtimeBindings && typeof runtimeBindings === "object" ? runtimeBindings : void 0;
+}
+__name(getFarmRuntimeBindings, "getFarmRuntimeBindings");
+function readFarmEnvironmentValue(name) {
+  const runtimeValue = getFarmRuntimeBindings()?.[name];
+  if (typeof runtimeValue === "string") return runtimeValue;
+  return typeof process !== "undefined" ? process.env?.[name] : void 0;
+}
+__name(readFarmEnvironmentValue, "readFarmEnvironmentValue");
+
+// src/env.ts
 var FARM_ENV_SYMBOL = /* @__PURE__ */ Symbol.for("farm.env");
 var FARM_ENV_RUNTIME_SYMBOL = /* @__PURE__ */ Symbol.for("farm.env.runtime");
 var farmEnvGlobal = globalThis;
@@ -49,10 +64,12 @@ function createBundledEnv(env2, source = getProcessEnv()) {
   const server = {};
   const runtime = {};
   for (const [key, value] of Object.entries(resolved.server)) {
-    if (source[key] === void 0) {
-      server[key] = value;
+    const raw = source[key];
+    const type = getRuntimeEnvType(value);
+    if (raw !== void 0 && isSameEnvValue(coerceRuntimeEnvValue(raw, type), value)) {
+      runtime[key] = type;
     } else {
-      runtime[key] = getRuntimeEnvType(value);
+      server[key] = value;
     }
   }
   return {
@@ -177,9 +194,8 @@ __name(readServerEnvKey, "readServerEnvKey");
 function readRuntimeServerEnv(env2) {
   const state = env2[FARM_ENV_RUNTIME_SYMBOL];
   if (!state) return;
-  const source = getProcessEnv();
   for (const [key, type] of Object.entries(state.pending)) {
-    const raw = source[key];
+    const raw = readFarmEnvironmentValue(key);
     if (raw === void 0) continue;
     env2.server[key] = coerceRuntimeEnvValue(raw, type);
     delete state.pending[key];
@@ -213,6 +229,24 @@ function coerceRuntimeEnvValue(raw, type) {
   return raw;
 }
 __name(coerceRuntimeEnvValue, "coerceRuntimeEnvValue");
+function isSameEnvValue(left, right) {
+  if (Object.is(left, right)) return true;
+  if (Array.isArray(left) || Array.isArray(right)) {
+    return Array.isArray(left) && Array.isArray(right) && left.length === right.length && left.every((item, index) => isSameEnvValue(item, right[index]));
+  }
+  if (!isPlainObject(left) || !isPlainObject(right)) return false;
+  const keys = Object.keys(left);
+  return keys.length === Object.keys(right).length && keys.every(
+    (key) => Object.prototype.hasOwnProperty.call(right, key) && isSameEnvValue(left[key], right[key])
+  );
+}
+__name(isSameEnvValue, "isSameEnvValue");
+function isPlainObject(value) {
+  if (!value || typeof value !== "object") return false;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+__name(isPlainObject, "isPlainObject");
 function prepareEnv(env2) {
   const normalized = normalizeResolvedEnv(env2);
   const runtime = env2.runtime?.server;

package/dist/env.d.mts

@@ -45,9 +45,11 @@ interface BundledFarmEnv extends ResolvedFarmEnv {
 declare function resolveEnv<TConfig extends FarmEnvConfig<any, any> | undefined>(config: TConfig, source?: Record<string, string | undefined>): InferEnv<NonNullable<TConfig>>;
 /**
  * Prepare resolved env for a server bundle. Server values that came from the
- * build environment are left out and read from `process.env` when the server
- * uses them, so secrets never land in build output and a restart picks up a
- * rotated value. Values a parser produced without an env var (defaults) stay.
+ * build environment are left out and read from the server's environment when
+ * the server uses them, so secrets never land in build output and a restart
+ * picks up a rotated value. Values a parser produced without an env var
+ * (defaults) stay, and so do values the runtime cannot rebuild from the raw
+ * string, because the parser itself does not run in the server bundle.
  */
 declare function createBundledEnv(env: ResolvedFarmEnv | FarmEnvConfig<any, any> | undefined, source?: Record<string, string | undefined>): BundledFarmEnv;
 declare function setEnv(env: ResolvedFarmEnv | BundledFarmEnv): void;

package/dist/env.d.ts

@@ -45,9 +45,11 @@ interface BundledFarmEnv extends ResolvedFarmEnv {
 declare function resolveEnv<TConfig extends FarmEnvConfig<any, any> | undefined>(config: TConfig, source?: Record<string, string | undefined>): InferEnv<NonNullable<TConfig>>;
 /**
  * Prepare resolved env for a server bundle. Server values that came from the
- * build environment are left out and read from `process.env` when the server
- * uses them, so secrets never land in build output and a restart picks up a
- * rotated value. Values a parser produced without an env var (defaults) stay.
+ * build environment are left out and read from the server's environment when
+ * the server uses them, so secrets never land in build output and a restart
+ * picks up a rotated value. Values a parser produced without an env var
+ * (defaults) stay, and so do values the runtime cannot rebuild from the raw
+ * string, because the parser itself does not run in the server bundle.
  */
 declare function createBundledEnv(env: ResolvedFarmEnv | FarmEnvConfig<any, any> | undefined, source?: Record<string, string | undefined>): BundledFarmEnv;
 declare function setEnv(env: ResolvedFarmEnv | BundledFarmEnv): void;

package/dist/env.mjs

@@ -8,7 +8,8 @@ import {
   resolveEnv,
   serverEnv,
   setEnv
-} from "./chunk-7HDZYYS4.mjs";
+} from "./chunk-4OOBRCJX.mjs";
+import "./chunk-ONUEYC6N.mjs";
 import "./chunk-LPEX4YW6.mjs";
 export {
   createBundledEnv,