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

package/dist/server.cjs

@@ -118,7 +118,7 @@ function createFarmMarkdownRouteModule(input) {
         ...props,
         components: {
           ...components,
-          ...props?.components || {}
+          ...props?.components
         }
       })
     );
@@ -635,7 +635,11 @@ async function prepareFarmWorkflowsForNitro(config) {
     };
   }
   const handlerPath = path23.join(generatedDir, "http-handler.mjs");
-  await fs9.writeFile(handlerPath, createNitroWorkflowHTTPHandler(workflowConfig, workflows), "utf8");
+  await fs9.writeFile(
+    handlerPath,
+    createNitroWorkflowHTTPHandler(workflowConfig, workflows),
+    "utf8"
+  );
   const manifestPath = path23.join(generatedDir, "manifest.json");
   await fs9.writeFile(
     manifestPath,
@@ -709,13 +713,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;
@@ -1708,8 +1706,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);
@@ -1770,7 +1768,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;
@@ -1838,20 +1836,41 @@ function applyFarmCacheInvalidations(keys) {
     }
   }
 }
+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(notifyFarmCacheInvalidation, "notifyFarmCacheInvalidation");
     __name(applyFarmCacheInvalidations, "applyFarmCacheInvalidations");
+    __name(encodeFarmCacheInvalidations, "encodeFarmCacheInvalidations");
+    __name(decodeFarmCacheInvalidations, "decodeFarmCacheInvalidations");
     __name(subscribeFarmCacheInvalidation, "subscribeFarmCacheInvalidation");
   }
 });
@@ -5898,7 +5917,9 @@ function readManifest(contentDir) {
   const manifestPath = import_node_path7.default.join(contentDir, FARM_DOCS_LAST_MODIFIED_MANIFEST);
   if (!(0, import_node_fs5.existsSync)(manifestPath)) return null;
   try {
-    const parsed = JSON.parse((0, import_node_fs5.readFileSync)(manifestPath, "utf8"));
+    const parsed = JSON.parse(
+      (0, import_node_fs5.readFileSync)(manifestPath, "utf8")
+    );
     if (parsed.version !== 1 || !parsed.pages || typeof parsed.pages !== "object") return null;
     const pages = Object.fromEntries(
       Object.entries(parsed.pages).filter(
@@ -12417,16 +12438,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;
@@ -12736,6 +12748,7 @@ __export(server_exports, {
   createServerQuery: () => createServerQuery,
   createStorageClient: () => createStorageClient,
   databaseStorage: () => databaseStorage,
+  defineCacheKey: () => defineCacheKey,
   defineConfig: () => defineConfig2,
   defineStorageClient: () => defineStorageClient,
   disposeStorage: () => disposeStorage,
@@ -13472,6 +13485,23 @@ __name(getActiveFarmI18nSnapshot, "getActiveFarmI18nSnapshot");
 
 // src/cache.ts
 init_cache_invalidation();
+function defineCacheKey() {
+  return (factory) => {
+    if (typeof factory !== "function") {
+      throw new TypeError("defineCacheKey expects a key factory function.");
+    }
+    return ((...args) => {
+      const key = factory(...args);
+      if (typeof key !== "string" && !Array.isArray(key)) {
+        throw new TypeError(
+          "A defined cache key factory must return a string or structured array."
+        );
+      }
+      return key;
+    });
+  };
+}
+__name(defineCacheKey, "defineCacheKey");
 var _FarmDataCache = class _FarmDataCache {
   constructor() {
     this.entries = /* @__PURE__ */ new Map();
@@ -15985,7 +16015,7 @@ function mergeMetadata(base, next) {
 __name(mergeMetadata, "mergeMetadata");
 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 = [
         {
@@ -16002,7 +16032,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";
@@ -16608,8 +16638,8 @@ var _FarmI18nRuntime = class _FarmI18nRuntime {
       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]
       }
     };
   }
@@ -18083,11 +18113,7 @@ var _FarmApp = class _FarmApp {
     _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) {
@@ -18536,6 +18562,29 @@ var fs3 = __toESM(require("fs"));
 var path10 = __toESM(require("path"));
 init_route_runtime();
 
+// src/api/runtime.ts
+init_cache_invalidation();
+
+// src/api/endpoint.ts
+var import_better_call = require("better-call");
+var _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");
+var EndpointFailure = _EndpointFailure;
+function isEndpointFailure(value) {
+  return value instanceof EndpointFailure;
+}
+__name(isEndpointFailure, "isEndpointFailure");
+var EMPTY_ENDPOINT_MIDDLEWARE = Object.freeze([]);
+var EMPTY_ENDPOINT_CONTEXT = Object.freeze(/* @__PURE__ */ Object.create(null));
+
 // src/api/runtime.ts
 function matchAPIRoute(routes, pathname) {
   const exactRoute = routes.get(pathname);
@@ -18568,10 +18617,10 @@ __name(invokeAPIRouteEndpoint, "invokeAPIRouteEndpoint");
 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 = {};
@@ -18596,15 +18645,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);
 }
 __name(invokeAPIRouteEndpointInContext, "invokeAPIRouteEndpointInContext");
 function normalizeRouteResponse(result) {
@@ -18624,6 +18688,40 @@ function isWebResponse2(value) {
   return value instanceof Response || typeof value === "object" && value !== null && "headers" in value && "status" in value && typeof value.arrayBuffer === "function";
 }
 __name(isWebResponse2, "isWebResponse");
+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
+  });
+}
+__name(attachEndpointInvalidations, "attachEndpointInvalidations");
+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"
+      }
+    }
+  );
+}
+__name(createEndpointFailureResponse, "createEndpointFailureResponse");
 function isFarmContextHandler(endpoint) {
   if (typeof endpoint !== "function") {
     return false;
@@ -19652,7 +19750,7 @@ var _MiddlewareManager = class _MiddlewareManager {
     if (!nestedMatch.matched) {
       return { matched: false };
     }
-    const params = { ...nestedMatch.params || {} };
+    const params = { ...nestedMatch.params };
     delete params.__farmRest;
     return {
       matched: true,
@@ -20534,6 +20632,12 @@ function transformError(id, message) {
 }
 __name(transformError, "transformError");
 
+// package.json
+var version = "0.1.0-beta.3";
+
+// src/version.ts
+var FARM_VERSION = version;
+
 // src/after.ts
 var import_node_async_hooks4 = require("async_hooks");
 var AFTER_STORAGE = /* @__PURE__ */ Symbol.for("@farm.js/core/after-storage");
@@ -21005,7 +21109,7 @@ function isResolvedEnvScope(value) {
 }
 __name(isResolvedEnvScope, "isResolvedEnvScope");
 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");
 }
 __name(isPotentialProgrammaticRouteSourceFile, "isPotentialProgrammaticRouteSourceFile");
 function fileContainsProgrammaticPageRoute(file) {
@@ -24131,7 +24235,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(
@@ -25295,7 +25399,7 @@ __name(createLoggerPlugin, "createLoggerPlugin");
 // 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");
@@ -25369,7 +25473,7 @@ function createBrandingPlugin() {
           const pc = getColors();
           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(
@@ -25678,6 +25782,7 @@ __name(assertFunction, "assertFunction");
   createServerQuery,
   createStorageClient,
   databaseStorage,
+  defineCacheKey,
   defineConfig,
   defineStorageClient,
   disposeStorage,