@farm.js/core 0.1.15 → 0.1.16

package/dist/internal/build-runtime.cjs

@@ -31,6 +31,259 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// src/env.ts
+function resolveEnv(config, source = getProcessEnv()) {
+  const resolved = {
+    server: resolveEnvScope(config?.server, source, "server"),
+    public: resolveEnvScope(config?.public, source, "public")
+  };
+  return resolved;
+}
+function createBundledEnv(env2, source = getProcessEnv()) {
+  const resolved = normalizeResolvedEnv(env2 ?? {});
+  const server = {};
+  const runtime3 = {};
+  for (const [key, value] of Object.entries(resolved.server)) {
+    if (source[key] === void 0) {
+      server[key] = value;
+    } else {
+      runtime3[key] = getRuntimeEnvType(value);
+    }
+  }
+  return {
+    server,
+    public: resolved.public,
+    ...Object.keys(runtime3).length > 0 ? { runtime: { server: runtime3 } } : {}
+  };
+}
+function setEnv(env2) {
+  currentEnv = prepareEnv(env2);
+  if (typeof window === "undefined") {
+    farmEnvGlobal[FARM_ENV_SYMBOL] = currentEnv;
+  }
+}
+function getResolvedEnv() {
+  const env2 = getCurrentEnv();
+  if (typeof window === "undefined") readRuntimeServerEnv(env2);
+  return env2;
+}
+function resolveEnvScope(shape, source, scope) {
+  if (!shape) {
+    return {};
+  }
+  const resolved = {};
+  for (const [key, parser] of Object.entries(shape)) {
+    try {
+      resolved[key] = parseEnvValue(parser, source[key], key, scope);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Invalid ${scope} env "${key}": ${message}`);
+    }
+  }
+  return resolved;
+}
+function parseEnvValue(parser, value, key, scope) {
+  if (typeof parser === "function") {
+    return parser(value, { key, scope });
+  }
+  if (parser && typeof parser.parse === "function") {
+    return parser.parse(value);
+  }
+  throw new Error("expected a parser function or schema with parse()");
+}
+function createEnvProxy(scope) {
+  return new Proxy(
+    {},
+    {
+      get(_target, property) {
+        if (typeof property === "symbol") {
+          return void 0;
+        }
+        const env2 = getEnvScope(scope);
+        return scope === "server" ? readServerEnvKey(env2, property) : env2[property];
+      },
+      ownKeys() {
+        return Reflect.ownKeys(getEnvScope(scope));
+      },
+      getOwnPropertyDescriptor(_target, property) {
+        const env2 = getEnvScope(scope);
+        if (!(property in env2)) {
+          return void 0;
+        }
+        return {
+          enumerable: true,
+          configurable: true,
+          value: env2[property]
+        };
+      },
+      has(_target, property) {
+        return property in getEnvScope(scope);
+      }
+    }
+  );
+}
+function getEnvScope(scope) {
+  const env2 = getCurrentEnv();
+  if (scope === "server") {
+    assertServerEnvAccess();
+    readRuntimeServerEnv(env2);
+  }
+  return env2[scope] || {};
+}
+function readServerEnvKey(server, key) {
+  const value = server[key];
+  if (value === void 0) {
+    const state = getCurrentEnv()[FARM_ENV_RUNTIME_SYMBOL];
+    if (state && key in state.pending && !state.warned.has(key)) {
+      state.warned.add(key);
+      console.warn(
+        `[Farm] Server env "${key}" was set when this app was built but is not set where the server runs, so it reads as undefined. Farm reads server env at runtime and does not store it in the build output; set "${key}" in the server's environment.`
+      );
+    }
+  }
+  return value;
+}
+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];
+    if (raw === void 0) continue;
+    env2.server[key] = coerceRuntimeEnvValue(raw, type);
+    delete state.pending[key];
+  }
+}
+function getRuntimeEnvType(value) {
+  if (typeof value === "number") return "number";
+  if (typeof value === "boolean") return "boolean";
+  if (value !== null && typeof value === "object" && !(value instanceof Date)) return "json";
+  return "string";
+}
+function coerceRuntimeEnvValue(raw, type) {
+  if (type === "number") {
+    const value = Number(raw);
+    return raw.trim() !== "" && Number.isFinite(value) ? value : raw;
+  }
+  if (type === "boolean") {
+    if (/^(true|1)$/i.test(raw.trim())) return true;
+    if (/^(false|0|)$/i.test(raw.trim())) return false;
+    return raw;
+  }
+  if (type === "json") {
+    try {
+      return JSON.parse(raw);
+    } catch {
+      return raw;
+    }
+  }
+  return raw;
+}
+function prepareEnv(env2) {
+  const normalized = normalizeResolvedEnv(env2);
+  const runtime3 = env2.runtime?.server;
+  if (!isRecord(runtime3) || Object.keys(runtime3).length === 0) return normalized;
+  const prepared = { server: { ...normalized.server }, public: normalized.public };
+  Object.defineProperty(prepared, FARM_ENV_RUNTIME_SYMBOL, {
+    value: {
+      pending: { ...runtime3 },
+      warned: /* @__PURE__ */ new Set()
+    },
+    enumerable: false
+  });
+  return prepared;
+}
+function assertServerEnvAccess() {
+  if (typeof window !== "undefined") {
+    throw new Error("Farm server env is not available in the browser. Use publicEnv.");
+  }
+}
+function getInitialEnv() {
+  const injectedEnv = getInjectedEnv();
+  if (injectedEnv) {
+    return injectedEnv;
+  }
+  if (typeof window === "undefined" && farmEnvGlobal[FARM_ENV_SYMBOL]) {
+    return normalizeResolvedEnv(farmEnvGlobal[FARM_ENV_SYMBOL]);
+  }
+  return {
+    server: {},
+    public: getInjectedPublicEnv()
+  };
+}
+function getCurrentEnv() {
+  if (typeof window === "undefined" && farmEnvGlobal[FARM_ENV_SYMBOL]) {
+    return farmEnvGlobal[FARM_ENV_SYMBOL];
+  }
+  return currentEnv;
+}
+function getInjectedEnv() {
+  try {
+    if (typeof __FARM_ENV__ !== "undefined" && __FARM_ENV__) {
+      return prepareEnv(__FARM_ENV__);
+    }
+  } catch {
+  }
+  return null;
+}
+function getInjectedPublicEnv() {
+  try {
+    if (typeof __FARM_PUBLIC_ENV__ !== "undefined" && __FARM_PUBLIC_ENV__) {
+      return __FARM_PUBLIC_ENV__;
+    }
+  } catch {
+  }
+  return {};
+}
+function normalizeResolvedEnv(env2) {
+  return {
+    server: isRecord(env2.server) ? env2.server : {},
+    public: isRecord(env2.public) ? env2.public : {}
+  };
+}
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function getProcessEnv() {
+  if (typeof process !== "undefined" && process.env) {
+    return process.env;
+  }
+  return {};
+}
+var FARM_ENV_SYMBOL, FARM_ENV_RUNTIME_SYMBOL, farmEnvGlobal, currentEnv, env, publicEnv;
+var init_env = __esm({
+  "src/env.ts"() {
+    "use strict";
+    FARM_ENV_SYMBOL = /* @__PURE__ */ Symbol.for("farm.env");
+    FARM_ENV_RUNTIME_SYMBOL = /* @__PURE__ */ Symbol.for("farm.env.runtime");
+    farmEnvGlobal = globalThis;
+    currentEnv = getInitialEnv();
+    __name(resolveEnv, "resolveEnv");
+    __name(createBundledEnv, "createBundledEnv");
+    __name(setEnv, "setEnv");
+    __name(getResolvedEnv, "getResolvedEnv");
+    env = createEnvProxy("server");
+    publicEnv = createEnvProxy("public");
+    __name(resolveEnvScope, "resolveEnvScope");
+    __name(parseEnvValue, "parseEnvValue");
+    __name(createEnvProxy, "createEnvProxy");
+    __name(getEnvScope, "getEnvScope");
+    __name(readServerEnvKey, "readServerEnvKey");
+    __name(readRuntimeServerEnv, "readRuntimeServerEnv");
+    __name(getRuntimeEnvType, "getRuntimeEnvType");
+    __name(coerceRuntimeEnvValue, "coerceRuntimeEnvValue");
+    __name(prepareEnv, "prepareEnv");
+    __name(assertServerEnvAccess, "assertServerEnvAccess");
+    __name(getInitialEnv, "getInitialEnv");
+    __name(getCurrentEnv, "getCurrentEnv");
+    __name(getInjectedEnv, "getInjectedEnv");
+    __name(getInjectedPublicEnv, "getInjectedPublicEnv");
+    __name(normalizeResolvedEnv, "normalizeResolvedEnv");
+    __name(isRecord, "isRecord");
+    __name(getProcessEnv, "getProcessEnv");
+  }
+});
+
 // src/plugin-dependencies.ts
 function pluginShortName(name2) {
   return name2.slice(Math.max(name2.lastIndexOf(":"), name2.lastIndexOf("/")) + 1);
@@ -5786,168 +6039,6 @@ var init_cron = __esm({
   }
 });
 
-// src/env.ts
-function resolveEnv(config, source = getProcessEnv()) {
-  const resolved = {
-    server: resolveEnvScope(config?.server, source, "server"),
-    public: resolveEnvScope(config?.public, source, "public")
-  };
-  return resolved;
-}
-function setEnv(env2) {
-  currentEnv = normalizeResolvedEnv(env2);
-  if (typeof window === "undefined") {
-    farmEnvGlobal[FARM_ENV_SYMBOL] = currentEnv;
-  }
-}
-function getResolvedEnv() {
-  return getCurrentEnv();
-}
-function resolveEnvScope(shape, source, scope) {
-  if (!shape) {
-    return {};
-  }
-  const resolved = {};
-  for (const [key, parser] of Object.entries(shape)) {
-    try {
-      resolved[key] = parseEnvValue(parser, source[key], key, scope);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Invalid ${scope} env "${key}": ${message}`);
-    }
-  }
-  return resolved;
-}
-function parseEnvValue(parser, value, key, scope) {
-  if (typeof parser === "function") {
-    return parser(value, { key, scope });
-  }
-  if (parser && typeof parser.parse === "function") {
-    return parser.parse(value);
-  }
-  throw new Error("expected a parser function or schema with parse()");
-}
-function createEnvProxy(scope) {
-  return new Proxy(
-    {},
-    {
-      get(_target, property) {
-        if (typeof property === "symbol") {
-          return void 0;
-        }
-        const env2 = getEnvScope(scope);
-        return env2[property];
-      },
-      ownKeys() {
-        return Reflect.ownKeys(getEnvScope(scope));
-      },
-      getOwnPropertyDescriptor(_target, property) {
-        const env2 = getEnvScope(scope);
-        if (!(property in env2)) {
-          return void 0;
-        }
-        return {
-          enumerable: true,
-          configurable: true,
-          value: env2[property]
-        };
-      },
-      has(_target, property) {
-        return property in getEnvScope(scope);
-      }
-    }
-  );
-}
-function getEnvScope(scope) {
-  if (scope === "server") {
-    assertServerEnvAccess();
-  }
-  return getCurrentEnv()[scope] || {};
-}
-function assertServerEnvAccess() {
-  if (typeof window !== "undefined") {
-    throw new Error("Farm server env is not available in the browser. Use publicEnv.");
-  }
-}
-function getInitialEnv() {
-  const injectedEnv = getInjectedEnv();
-  if (injectedEnv) {
-    return injectedEnv;
-  }
-  if (typeof window === "undefined" && farmEnvGlobal[FARM_ENV_SYMBOL]) {
-    return normalizeResolvedEnv(farmEnvGlobal[FARM_ENV_SYMBOL]);
-  }
-  return {
-    server: {},
-    public: getInjectedPublicEnv()
-  };
-}
-function getCurrentEnv() {
-  if (typeof window === "undefined" && farmEnvGlobal[FARM_ENV_SYMBOL]) {
-    return farmEnvGlobal[FARM_ENV_SYMBOL];
-  }
-  return currentEnv;
-}
-function getInjectedEnv() {
-  try {
-    if (typeof __FARM_ENV__ !== "undefined" && __FARM_ENV__) {
-      return normalizeResolvedEnv(__FARM_ENV__);
-    }
-  } catch {
-  }
-  return null;
-}
-function getInjectedPublicEnv() {
-  try {
-    if (typeof __FARM_PUBLIC_ENV__ !== "undefined" && __FARM_PUBLIC_ENV__) {
-      return __FARM_PUBLIC_ENV__;
-    }
-  } catch {
-  }
-  return {};
-}
-function normalizeResolvedEnv(env2) {
-  return {
-    server: isRecord(env2.server) ? env2.server : {},
-    public: isRecord(env2.public) ? env2.public : {}
-  };
-}
-function isRecord(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function getProcessEnv() {
-  if (typeof process !== "undefined" && process.env) {
-    return process.env;
-  }
-  return {};
-}
-var FARM_ENV_SYMBOL, farmEnvGlobal, currentEnv, env, publicEnv;
-var init_env = __esm({
-  "src/env.ts"() {
-    "use strict";
-    FARM_ENV_SYMBOL = /* @__PURE__ */ Symbol.for("farm.env");
-    farmEnvGlobal = globalThis;
-    currentEnv = getInitialEnv();
-    __name(resolveEnv, "resolveEnv");
-    __name(setEnv, "setEnv");
-    __name(getResolvedEnv, "getResolvedEnv");
-    env = createEnvProxy("server");
-    publicEnv = createEnvProxy("public");
-    __name(resolveEnvScope, "resolveEnvScope");
-    __name(parseEnvValue, "parseEnvValue");
-    __name(createEnvProxy, "createEnvProxy");
-    __name(getEnvScope, "getEnvScope");
-    __name(assertServerEnvAccess, "assertServerEnvAccess");
-    __name(getInitialEnv, "getInitialEnv");
-    __name(getCurrentEnv, "getCurrentEnv");
-    __name(getInjectedEnv, "getInjectedEnv");
-    __name(getInjectedPublicEnv, "getInjectedPublicEnv");
-    __name(normalizeResolvedEnv, "normalizeResolvedEnv");
-    __name(isRecord, "isRecord");
-    __name(getProcessEnv, "getProcessEnv");
-  }
-});
-
 // src/app-markdown-config.ts
 function resolveMdxConfig(config) {
   return {
@@ -20387,7 +20478,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.15";
+    version = "0.1.16";
   }
 });
 
@@ -36471,7 +36562,7 @@ function getEnvDefines(config, configEnv) {
     )
   };
   if (configEnv?.isSsrBuild) {
-    defines.__FARM_ENV__ = JSON.stringify(getFullEnvDefine(config));
+    defines.__FARM_ENV__ = JSON.stringify(createBundledEnv(getFullEnvDefine(config)));
   }
   return defines;
 }
@@ -40866,6 +40957,7 @@ var fs15, path43, import_node_url12, ALL_TYPE_ARTIFACTS, createEmptyTypeArtifact
 var init_vite2 = __esm({
   "src/vite.ts"() {
     "use strict";
+    init_env();
     init_app();
     init_utils();
     init_plugin();
@@ -41081,7 +41173,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)},
@@ -41585,7 +41677,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;
         };
@@ -41650,6 +41742,7 @@ var import_path16;
 var init_nitro = __esm({
   "src/nitro/index.ts"() {
     "use strict";
+    init_env();
     import_path16 = __toESM(require("path"));
     init_workflows();
     init_cron();
@@ -41672,6 +41765,7 @@ __export(build_runtime_exports, {
 module.exports = __toCommonJS(build_runtime_exports);
 
 // src/build/index.ts
+init_env();
 init_config4();
 var import_path17 = __toESM(require("path"));
 var import_node_fs14 = require("fs");
@@ -41682,6 +41776,7 @@ init_server_path();
 init_layers();
 
 // src/nitro/universal-build.ts
+init_env();
 init_config4();
 
 // src/nitro/client-css-href.ts
@@ -46366,7 +46461,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
       },
       define: {
         __FARM_API_BASE_URL__: JSON.stringify(config.api.baseURL),
-        __FARM_ENV__: JSON.stringify(config.env || { server: {}, public: {} }),
+        __FARM_ENV__: JSON.stringify(createBundledEnv(config.env)),
         __FARM_PUBLIC_ENV__: JSON.stringify(config.env?.public || {})
       },
       plugins: [
@@ -51817,7 +51912,7 @@ async function buildSSR(viteBuild, config, root, srcDir, outputDir) {
     },
     define: {
       __FARM_API_BASE_URL__: JSON.stringify(config.api.baseURL),
-      __FARM_ENV__: JSON.stringify(config.env || { server: {}, public: {} }),
+      __FARM_ENV__: JSON.stringify(createBundledEnv(config.env)),
       __FARM_PUBLIC_ENV__: JSON.stringify(config.env?.public || {})
     },
     plugins: [
@@ -51900,7 +51995,7 @@ async function buildNitro(config, routeManager, apiRouteManager, serverRenderer,
     farmRegistry.apiRouteManager = apiRouteManager;
     farmRegistry.routeManager = routeManager;
     farmRegistry.serverRenderer = serverRenderer;
-    farmRegistry.env = config.env || { server: {}, public: {} };
+    farmRegistry.env = createBundledEnv(config.env);
     const routePaths = {};
     for (const [pattern, entry] of routeManager.getRoutes()) {
       const bundledPath = entry.modulePath.replace(/.*\/src\/app\//, "").replace(/\.(tsx?|jsx?)$/, ".js");

package/dist/internal/build-runtime.d.mts

@@ -1,9 +1,10 @@
-import { cf as ResolvedFarmConfig } from '../client-plugins-C1EgdoJM.mjs';
-export { b2 as loadConfig, b1 as resolveConfig, b3 as resolveDeployConfig } from '../client-plugins-C1EgdoJM.mjs';
+import { cg as ResolvedFarmConfig } from '../client-plugins-CIPRtSsW.mjs';
+export { b2 as loadConfig, b1 as resolveConfig, b3 as resolveDeployConfig } from '../client-plugins-CIPRtSsW.mjs';
 import { FarmProductionViteRuntime } from './config-runtime.mjs';
-export { l as logger } from '../utils-DR2wfZAn.mjs';
+export { l as logger } from '../utils-5kQP1mFR.mjs';
 import '../lifecycle-DK06VuKP.mjs';
-import '../route-C6UClI1z.mjs';
+import '../route-C_eLaFTZ.mjs';
+import '../endpoint-Bu3XgeMK.mjs';
 import '../cache.mjs';
 import '../renderer.mjs';
 import '../deployment.mjs';
@@ -30,6 +31,8 @@ import '../server-fn-error-DDh14a0V.mjs';
 import 'esbuild';
 import '../image-config-Duob7wER.mjs';
 import '../types-Z0aotQ8w.mjs';
+import '../server-fn.mjs';
+import '../server-query.mjs';
 import '../types-DQnyD3VD.mjs';
 import '../font.mjs';
 import '../after.mjs';

package/dist/internal/build-runtime.d.ts

@@ -1,9 +1,10 @@
-import { cf as ResolvedFarmConfig } from '../client-plugins-CslwYp3E.js';
-export { b2 as loadConfig, b1 as resolveConfig, b3 as resolveDeployConfig } from '../client-plugins-CslwYp3E.js';
+import { cg as ResolvedFarmConfig } from '../client-plugins-CqVtZi5X.js';
+export { b2 as loadConfig, b1 as resolveConfig, b3 as resolveDeployConfig } from '../client-plugins-CqVtZi5X.js';
 import { FarmProductionViteRuntime } from './config-runtime.js';
-export { l as logger } from '../utils-jISOE9SD.js';
+export { l as logger } from '../utils-C4yrAhNc.js';
 import '../lifecycle-DK06VuKP.js';
-import '../route-CHBaW55F.js';
+import '../route-BxNJT447.js';
+import '../endpoint-kSAxE52R.js';
 import '../cache.js';
 import '../renderer.js';
 import '../deployment.js';
@@ -30,6 +31,8 @@ import '../server-fn-error-DDh14a0V.js';
 import 'esbuild';
 import '../image-config-Duob7wER.js';
 import '../types-Z0aotQ8w.js';
+import '../server-fn.js';
+import '../server-query.js';
 import '../types-DQnyD3VD.js';
 import '../font.js';
 import '../after.js';

package/dist/internal/build-runtime.mjs

@@ -1,9 +1,9 @@
 import {
   build
-} from "../chunk-FBHGHMOA.mjs";
+} from "../chunk-TYVVIQ5M.mjs";
 import "../chunk-S3FNNQHR.mjs";
 import "../chunk-655RLQQL.mjs";
-import "../chunk-NJ47VORC.mjs";
+import "../chunk-NUD6XBMO.mjs";
 import "../chunk-MOQNHLTS.mjs";
 import "../chunk-UP4CW6WP.mjs";
 import "../chunk-TFQG7TBC.mjs";
@@ -12,11 +12,11 @@ import {
   loadConfig,
   resolveConfig,
   resolveDeployConfig
-} from "../chunk-GNTPTTLA.mjs";
+} from "../chunk-IXTEENRS.mjs";
 import "../chunk-XZNTNMHT.mjs";
 import "../chunk-F5D4XEAS.mjs";
 import "../chunk-H77NVNJ2.mjs";
-import "../chunk-JRF3C33L.mjs";
+import "../chunk-NHHKW2T6.mjs";
 import "../chunk-27JNCYEK.mjs";
 import "../chunk-DHDVMXYK.mjs";
 import "../chunk-ZMSZZXOR.mjs";
@@ -43,7 +43,7 @@ import "../chunk-Q3MDL7TM.mjs";
 import "../chunk-G2KY33I6.mjs";
 import "../chunk-4L7SZOHZ.mjs";
 import "../chunk-QCFFHV5H.mjs";
-import "../chunk-FOGLGRDS.mjs";
+import "../chunk-7HDZYYS4.mjs";
 import "../chunk-KATQ6I56.mjs";
 import "../chunk-LUC2FAGW.mjs";
 import "../chunk-FA2W42OV.mjs";
@@ -83,7 +83,7 @@ import {
 } from "../chunk-KI3MESHB.mjs";
 import "../chunk-QVKYGNVM.mjs";
 import "../chunk-Z2RZJZIZ.mjs";
-import "../chunk-UE75PB52.mjs";
+import "../chunk-IL5RWYK7.mjs";
 import "../chunk-54UPOYFS.mjs";
 import "../chunk-WNSDDRNU.mjs";
 import "../chunk-JPLUGGRV.mjs";