@farm.js/core 0.1.0-beta.1 → 0.1.0-beta.3

package/dist/internal/build-runtime.cjs

@@ -2946,7 +2946,11 @@ async function prepareFarmWorkflowsForNitro(config) {
     };
   }
   const handlerPath = path27.join(generatedDir, "http-handler.mjs");
-  await fs8.writeFile(handlerPath, createNitroWorkflowHTTPHandler(workflowConfig, workflows), "utf8");
+  await fs8.writeFile(
+    handlerPath,
+    createNitroWorkflowHTTPHandler(workflowConfig, workflows),
+    "utf8"
+  );
   const manifestPath = path27.join(generatedDir, "manifest.json");
   await fs8.writeFile(
     manifestPath,
@@ -3020,13 +3024,7 @@ function normalizeSchedule(schedule) {
   return (Array.isArray(schedule) ? schedule : [schedule]).map((value) => value.trim()).filter(Boolean);
 }
 function resolveWorkflowDefinition(module2) {
-  const candidates = [
-    module2.default,
-    module2.workflow,
-    module2.cron,
-    module2.task,
-    module2.job
-  ];
+  const candidates = [module2.default, module2.workflow, module2.cron, module2.task, module2.job];
   for (const candidate of candidates) {
     if (candidate && typeof candidate === "object" && typeof candidate.run === "function") {
       return candidate;
@@ -3892,7 +3890,7 @@ function createFarmMarkdownRouteModule(input) {
         ...props,
         components: {
           ...components,
-          ...props?.components || {}
+          ...props?.components
         }
       })
     );
@@ -4082,8 +4080,8 @@ function compareFarmRouteRuleSpecificity(left, right) {
 }
 function getFarmRouteRuleSpecificity(pattern) {
   return normalizeRoutePattern(pattern).split("/").filter(Boolean).reduce((score, segment) => {
-    if (segment === "**" || /^\[\[\.\.\./.test(segment)) return score + 1;
-    if (segment === "*" || /^\[\.\.\./.test(segment)) return score + 10;
+    if (segment === "**" || segment.startsWith("[[...")) return score + 1;
+    if (segment === "*" || segment.startsWith("[...")) return score + 10;
     if (/^\[.+\]$/.test(segment) || /^:.+$/.test(segment)) return score + 50;
     return score + 100;
   }, 0);
@@ -4145,7 +4143,7 @@ function routeRulesToHeaders(routeRules) {
   for (const [source, rule] of Object.entries(routeRules)) {
     const headers = {
       ...normalizeCorsHeaders(rule.cors),
-      ...rule.headers || {}
+      ...rule.headers
     };
     const entries = Object.entries(headers);
     if (entries.length === 0) continue;
@@ -4175,7 +4173,7 @@ function routeRulesToNitroRouteRules(routeRules) {
       nitroRule.cors = true;
       nitroRule.headers = {
         ...normalizeCorsHeaders(rule.cors),
-        ...rule.headers || {}
+        ...rule.headers
       };
     }
     delete nitroRule.render;
@@ -4230,18 +4228,39 @@ function getFarmCacheInvalidationState() {
     listeners: /* @__PURE__ */ new Set()
   });
 }
+function encodeFarmCacheInvalidations(keys) {
+  const normalized = Array.from(
+    new Set(keys.filter((key) => typeof key === "string" && key.length > 0))
+  );
+  if (normalized.length === 0) return null;
+  return encodeURIComponent(JSON.stringify(normalized));
+}
+function decodeFarmCacheInvalidations(value) {
+  if (!value) return [];
+  try {
+    const parsed = JSON.parse(decodeURIComponent(value));
+    return Array.isArray(parsed) ? Array.from(
+      new Set(parsed.filter((key) => typeof key === "string" && key.length > 0))
+    ) : [];
+  } catch {
+    return [];
+  }
+}
 function subscribeFarmCacheInvalidation(listener) {
   const state = getFarmCacheInvalidationState();
   state.listeners.add(listener);
   return () => state.listeners.delete(listener);
 }
-var FARM_CACHE_INVALIDATION_STATE, globalState;
+var FARM_CACHE_INVALIDATION_HEADER, FARM_CACHE_INVALIDATION_STATE, globalState;
 var init_cache_invalidation = __esm({
   "src/cache-invalidation.ts"() {
     "use strict";
+    FARM_CACHE_INVALIDATION_HEADER = "x-farm-cache-invalidations";
     FARM_CACHE_INVALIDATION_STATE = /* @__PURE__ */ Symbol.for("farm.cacheInvalidationState");
     globalState = globalThis;
     __name(getFarmCacheInvalidationState, "getFarmCacheInvalidationState");
+    __name(encodeFarmCacheInvalidations, "encodeFarmCacheInvalidations");
+    __name(decodeFarmCacheInvalidations, "decodeFarmCacheInvalidations");
     __name(subscribeFarmCacheInvalidation, "subscribeFarmCacheInvalidation");
   }
 });
@@ -8869,7 +8888,7 @@ function mergeMetadata(base, next) {
 }
 function addMetadataImageReference(metadata, reference) {
   if (reference.kind === "opengraph") {
-    const openGraph = { ...metadata.openGraph || {} };
+    const openGraph = { ...metadata.openGraph };
     if (!hasMetadataImages(openGraph.images) && !hasMetadataImages(openGraph.image)) {
       openGraph.images = [
         {
@@ -8886,7 +8905,7 @@ function addMetadataImageReference(metadata, reference) {
       openGraph
     };
   }
-  const twitter = { ...metadata.twitter || {} };
+  const twitter = { ...metadata.twitter };
   if (!hasMetadataImages(twitter.images)) {
     twitter.images = [reference.href];
     twitter.card = twitter.card || "summary_large_image";
@@ -9512,8 +9531,8 @@ var init_runtime = __esm({
           cookie: this.config.cookie,
           direction: getFarmLocaleDirection(resolution.locale, this.config.direction),
           messages: {
-            ...this.catalogs[this.config.fallbackLocale] || {},
-            ...this.catalogs[resolution.locale] || {}
+            ...this.catalogs[this.config.fallbackLocale],
+            ...this.catalogs[resolution.locale]
           }
         };
       }
@@ -11048,11 +11067,7 @@ var init_app = __esm({
         _setDefaultFarmI18nRuntime(this.i18nRuntime);
         this.viteServer = viteServer;
         this.routeManager = new RouteManager(this.config, viteServer);
-        this.serverRenderer = new ServerRenderer(
-          this.config,
-          this.routeManager,
-          this.i18nRuntime
-        );
+        this.serverRenderer = new ServerRenderer(this.config, this.routeManager, this.i18nRuntime);
       }
       async initialize() {
         if (process.env.FARM_VERBOSE) {
@@ -11163,6 +11178,33 @@ var init_app = __esm({
   }
 });
 
+// src/api/endpoint.ts
+function isEndpointFailure(value) {
+  return value instanceof EndpointFailure;
+}
+var import_better_call, _EndpointFailure, EndpointFailure, EMPTY_ENDPOINT_MIDDLEWARE, EMPTY_ENDPOINT_CONTEXT;
+var init_endpoint = __esm({
+  "src/api/endpoint.ts"() {
+    "use strict";
+    import_better_call = require("better-call");
+    init_cache();
+    _EndpointFailure = class _EndpointFailure extends Error {
+      constructor(code, data, options) {
+        super(options.message);
+        this.name = "EndpointFailure";
+        this.code = code;
+        this.data = data;
+        this.status = options.status;
+      }
+    };
+    __name(_EndpointFailure, "EndpointFailure");
+    EndpointFailure = _EndpointFailure;
+    __name(isEndpointFailure, "isEndpointFailure");
+    EMPTY_ENDPOINT_MIDDLEWARE = Object.freeze([]);
+    EMPTY_ENDPOINT_CONTEXT = Object.freeze(/* @__PURE__ */ Object.create(null));
+  }
+});
+
 // src/api/runtime.ts
 function matchAPIRoute(routes, pathname) {
   const exactRoute = routes.get(pathname);
@@ -11193,10 +11235,10 @@ async function invokeAPIRouteEndpoint(endpoint, request, params = {}) {
 async function invokeAPIRouteEndpointInContext(endpoint, request, params) {
   const farmHandler = endpoint.__handler || (isFarmContextHandler(endpoint) ? endpoint : null);
   if (!farmHandler) {
-    const result2 = await endpoint(request, {
+    const result = await endpoint(request, {
       params: Promise.resolve(params)
     });
-    return normalizeRouteResponse(result2);
+    return normalizeRouteResponse(result);
   }
   const url = new URL(request.url);
   const query = {};
@@ -11221,15 +11263,30 @@ async function invokeAPIRouteEndpointInContext(endpoint, request, params) {
   if (headersValidation instanceof Response) {
     return headersValidation;
   }
-  const result = await farmHandler({
+  const handlerContext = {
     query: queryValidation,
     body: bodyValidation,
     headers: headersValidation,
     request,
     context: {},
     params
-  });
-  return normalizeRouteResponse(result);
+  };
+  let execution;
+  try {
+    execution = typeof endpoint.__farmInvoke === "function" ? await endpoint.__farmInvoke(handlerContext) : {
+      result: await farmHandler(handlerContext),
+      context: handlerContext.context,
+      handlerExecuted: true,
+      invalidations: []
+    };
+  } catch (error) {
+    if (isEndpointFailure(error)) {
+      return createEndpointFailureResponse(error);
+    }
+    throw error;
+  }
+  const response = normalizeRouteResponse(execution.result);
+  return attachEndpointInvalidations(response, execution.invalidations);
 }
 function normalizeRouteResponse(result) {
   if (isWebResponse2(result)) {
@@ -11246,6 +11303,38 @@ function normalizeRouteResponse(result) {
 function isWebResponse2(value) {
   return value instanceof Response || typeof value === "object" && value !== null && "headers" in value && "status" in value && typeof value.arrayBuffer === "function";
 }
+function attachEndpointInvalidations(response, keys) {
+  const existing = decodeFarmCacheInvalidations(
+    response.headers.get(FARM_CACHE_INVALIDATION_HEADER)
+  );
+  const encoded = encodeFarmCacheInvalidations([...existing, ...keys]);
+  if (!encoded) return response;
+  const headers = new Headers(response.headers);
+  headers.set(FARM_CACHE_INVALIDATION_HEADER, encoded);
+  return new Response(response.body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers
+  });
+}
+function createEndpointFailureResponse(failure) {
+  return new Response(
+    JSON.stringify({
+      error: {
+        code: failure.code,
+        message: failure.message,
+        data: failure.data
+      }
+    }),
+    {
+      status: failure.status,
+      headers: {
+        "cache-control": "no-store",
+        "content-type": "application/json"
+      }
+    }
+  );
+}
 function isFarmContextHandler(endpoint) {
   if (typeof endpoint !== "function") {
     return false;
@@ -11354,11 +11443,15 @@ var init_runtime2 = __esm({
   "src/api/runtime.ts"() {
     "use strict";
     init_request();
+    init_cache_invalidation();
+    init_endpoint();
     __name(matchAPIRoute, "matchAPIRoute");
     __name(invokeAPIRouteEndpoint, "invokeAPIRouteEndpoint");
     __name(invokeAPIRouteEndpointInContext, "invokeAPIRouteEndpointInContext");
     __name(normalizeRouteResponse, "normalizeRouteResponse");
     __name(isWebResponse2, "isWebResponse");
+    __name(attachEndpointInvalidations, "attachEndpointInvalidations");
+    __name(createEndpointFailureResponse, "createEndpointFailureResponse");
     __name(isFarmContextHandler, "isFarmContextHandler");
     __name(readJSONBody, "readJSONBody");
     __name(validateInput, "validateInput");
@@ -12329,7 +12422,9 @@ function readManifest(contentDir) {
   const manifestPath = import_node_path4.default.join(contentDir, FARM_DOCS_LAST_MODIFIED_MANIFEST);
   if (!(0, import_node_fs2.existsSync)(manifestPath)) return null;
   try {
-    const parsed = JSON.parse((0, import_node_fs2.readFileSync)(manifestPath, "utf8"));
+    const parsed = JSON.parse(
+      (0, import_node_fs2.readFileSync)(manifestPath, "utf8")
+    );
     if (parsed.version !== 1 || !parsed.pages || typeof parsed.pages !== "object") return null;
     const pages = Object.fromEntries(
       Object.entries(parsed.pages).filter(
@@ -13341,7 +13436,7 @@ var init_manager = __esm({
         if (!nestedMatch.matched) {
           return { matched: false };
         }
-        const params = { ...nestedMatch.params || {} };
+        const params = { ...nestedMatch.params };
         delete params.__farmRest;
         return {
           matched: true,
@@ -14144,6 +14239,24 @@ var init_type_artifacts = __esm({
   }
 });
 
+// package.json
+var version;
+var init_package = __esm({
+  "package.json"() {
+    version = "0.1.0-beta.3";
+  }
+});
+
+// src/version.ts
+var FARM_VERSION;
+var init_version = __esm({
+  "src/version.ts"() {
+    "use strict";
+    init_package();
+    FARM_VERSION = version;
+  }
+});
+
 // src/after.ts
 function getAfterStorage() {
   const runtime = globalThis;
@@ -20432,16 +20545,7 @@ __export(devtools_client_exports, {
 function parseShortcut(shortcut) {
   const tokens = shortcut.toLowerCase().split("+").map((token) => token.trim()).filter(Boolean);
   const key = tokens.find(
-    (token) => ![
-      "alt",
-      "ctrl",
-      "control",
-      "meta",
-      "cmd",
-      "command",
-      "mod",
-      "shift"
-    ].includes(token)
+    (token) => !["alt", "ctrl", "control", "meta", "cmd", "command", "mod", "shift"].includes(token)
   );
   if (!key) {
     return null;
@@ -20872,7 +20976,7 @@ function isResolvedEnvScope(value) {
   );
 }
 function isPotentialProgrammaticRouteSourceFile(normalizedFile, srcDirSlug) {
-  return normalizedFile.startsWith(`${srcDirSlug}/`) && /\.(ts|tsx|js|jsx)$/.test(normalizedFile) && !/\.d\.ts$/.test(normalizedFile) && !normalizedFile.endsWith("/farm-routes.d.ts") && !normalizedFile.endsWith("/farm-env.d.ts") && !normalizedFile.endsWith("/lib/api.generated.ts");
+  return normalizedFile.startsWith(`${srcDirSlug}/`) && /\.(ts|tsx|js|jsx)$/.test(normalizedFile) && !normalizedFile.endsWith(".d.ts") && !normalizedFile.endsWith("/farm-routes.d.ts") && !normalizedFile.endsWith("/farm-env.d.ts") && !normalizedFile.endsWith("/lib/api.generated.ts");
 }
 function fileContainsProgrammaticPageRoute(file) {
   if (!fs7.existsSync(file)) {
@@ -23983,7 +24087,7 @@ async function defineConfig2(config = {}) {
           const isExposed = hostConfig === true || hostConfig === "0.0.0.0";
           console.log("");
           console.log(
-            `  ${pc.bold(pc.green("Farm.js"))} ${pc.dim("v1.0.0")} ${pc.dim(`ready in ${elapsed}ms`)}`
+            `  ${pc.bold(pc.green("Farm.js"))} ${pc.dim(`v${FARM_VERSION}`)} ${pc.dim(`ready in ${elapsed}ms`)}`
           );
           console.log("");
           console.log(
@@ -24107,6 +24211,7 @@ var init_vite = __esm({
     path23 = __toESM(require("path"));
     init_layers();
     init_environment_vite();
+    init_version();
     init_deferred();
     init_after();
     init_deployment();
@@ -25322,14 +25427,12 @@ export default defineEventHandler(async (event: H3Event) => {
     ...preset === "cloudflare-module" && cloudflareCronConfig ? {
       cloudflare: cloudflareCronConfig
     } : {},
-    handlers: [
-      ...farmWorkflows.handlerPath ? [
-        {
-          route: `${config.workflows.route}/**`,
-          handler: farmWorkflows.handlerPath
-        }
-      ] : []
-    ],
+    handlers: farmWorkflows.handlerPath ? [
+      {
+        route: `${config.workflows.route}/**`,
+        handler: farmWorkflows.handlerPath
+      }
+    ] : [],
     // Route rules for Vercel
     routeRules: {
       "/api/**": {
@@ -25723,8 +25826,8 @@ function compareRuntimeRoutes(left, right) {
 __name(compareRuntimeRoutes, "compareRuntimeRoutes");
 function getPatternSpecificity(pattern) {
   return normalizePattern(pattern).split("/").filter(Boolean).reduce((score, segment) => {
-    if (segment === "**" || /^\[\[\.\.\./.test(segment)) return score + 1;
-    if (segment === "*" || /^\[\.\.\./.test(segment)) return score + 10;
+    if (segment === "**" || segment.startsWith("[[...")) return score + 1;
+    if (segment === "*" || segment.startsWith("[...")) return score + 10;
     if (/^\[.+\]$/.test(segment)) return score + 50;
     return score + 100;
   }, 0);
@@ -30362,9 +30465,8 @@ async function buildNitroUniversal(config, routeManager, apiRouteManager, server
   const nitroEntryPath = import_path12.default.join(ssrOutputDir, "nitro-entry.mjs");
   const nitroEntryCode = `
 // Farm.js Nitro Entry
-// This file imports h3 and the SSR handler, wrapping it for Nitro
+// This file adapts Farm's Web fetch handler to Nitro's event handler contract.
 
-import { defineEventHandler } from 'h3'
 import handler from './${ssrEntryFile}'
 
 function mergeVaryHeaders(target, source) {
@@ -30402,8 +30504,8 @@ function createResponseFinishedHook(event) {
   }
 }
 
-// Export the wrapped handler for Nitro
-export default defineEventHandler(async (event) => {
+// Export the event handler for Nitro
+export default async function farmNitroEventHandler(event) {
   const response = await handler.fetch(event.req, {
     waitUntil: (promise) => event.waitUntil(promise),
     onResponseFinished: createResponseFinishedHook(event),
@@ -30414,7 +30516,7 @@ export default defineEventHandler(async (event) => {
   const farmVary = response.headers.get('Vary')
   if (farmVary) mergeVaryHeaders(event.res.headers, farmVary)
   return response
-})
+}
   `.trim();
   await fs8.writeFile(nitroEntryPath, nitroEntryCode);
   const prebuiltSSRPlugin = createExternalSSRBundlePlugin(
@@ -30832,8 +30934,8 @@ async function copySharpRuntime(config, root, nitroFuncDir, fs8) {
     await fs8.mkdir(import_path12.default.dirname(targetDir), { recursive: true });
     const packageRequire = (0, import_module2.createRequire)(packageJsonPath);
     const dependencies = {
-      ...packageJson.dependencies || {},
-      ...packageJson.optionalDependencies || {}
+      ...packageJson.dependencies,
+      ...packageJson.optionalDependencies
     };
     await Promise.all([
       fs8.cp(packageDir, targetDir, {
@@ -30926,7 +31028,7 @@ init_environment_vite();
 // src/server/vite-config.ts
 function mergeNoExternal(farmValue, userValue) {
   if (farmValue === true || userValue === true) return true;
-  const normalize = /* @__PURE__ */ __name((value) => value == null ? [] : Array.isArray(value) ? value : [value], "normalize");
+  const normalize = /* @__PURE__ */ __name((value) => value == null || value === true ? [] : Array.isArray(value) ? value : [value], "normalize");
   return Array.from(/* @__PURE__ */ new Set([...normalize(farmValue), ...normalize(userValue)]));
 }
 __name(mergeNoExternal, "mergeNoExternal");