@farm.js/core 0.1.0-beta.51 → 0.1.0-beta.53

package/dist/client.mjs

@@ -9,7 +9,7 @@ import {
 } from "./chunk-SALMKQXH.mjs";
 import {
   useServerQuery
-} from "./chunk-ZAW3D2TI.mjs";
+} from "./chunk-M2DI67UZ.mjs";
 import {
   useBlocker,
   useNavigation,
@@ -38,7 +38,7 @@ import {
 import {
   fetchServerQuery,
   prefetchServerQuery
-} from "./chunk-HSHA3H3U.mjs";
+} from "./chunk-3E2WRUR2.mjs";
 import {
   SPARouter,
   getRouter,
@@ -62,7 +62,7 @@ import {
   createClientPluginManager,
   installChunkErrorRecovery,
   isChunkLoadError
-} from "./chunk-FRN7PNL4.mjs";
+} from "./chunk-LN2BAU5H.mjs";
 import "./chunk-GQVQESLY.mjs";
 import {
   api,
@@ -80,7 +80,7 @@ import "./chunk-RBRLLZL5.mjs";
 import "./chunk-WZ5QFROO.mjs";
 import "./chunk-7ZMKVETU.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-7XJV5RZO.mjs";
+import "./chunk-RPEYD7TD.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {
   APIClientError,

package/dist/index.cjs

@@ -15255,7 +15255,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.0-beta.51";
+    version = "0.1.0-beta.53";
   }
 });
 
@@ -21792,6 +21792,13 @@ var init_after = __esm({
 });
 
 // src/dev-static.ts
+function shouldBypassFarmRouterForDottedPath(pathname, routeManager, baseDirs) {
+  if (!pathname.includes(".") || pathname.endsWith(".html")) return false;
+  const matchesAppRoute = Boolean(
+    routeManager?.matchRoute(pathname)?.route || routeManager?.matchMetadataRoute(pathname) || routeManager?.matchMetadataImage(pathname)
+  );
+  return !matchesAppRoute || devServableFileExists(pathname, baseDirs);
+}
 function devServableFileExists(pathname, baseDirs) {
   let decodedPathname;
   try {
@@ -21821,10 +21828,45 @@ var init_dev_static = __esm({
     "use strict";
     fs9 = __toESM(require("fs"));
     path20 = __toESM(require("path"));
+    __name(shouldBypassFarmRouterForDottedPath, "shouldBypassFarmRouterForDottedPath");
     __name(devServableFileExists, "devServableFileExists");
   }
 });
 
+// src/server-query-boundary.ts
+function findClientServerFnViolation(code, id) {
+  if (id.startsWith("\0") || id.startsWith("virtual:") || id.includes("node_modules")) return null;
+  if (!code.includes("@farm.js/core")) return null;
+  for (const match of code.matchAll(FARM_CORE_IMPORT_RE)) {
+    const specifiers = match[1];
+    for (const factory of SERVER_FN_FACTORIES) {
+      if (!new RegExp(`(?:^|[\\s{,])${factory}(?:[\\s},]|$)`).test(specifiers)) continue;
+      if (new RegExp(`(?<![\\w$.])${factory}\\s*(?:<[^>]*>)?\\s*\\(`).test(code)) {
+        return { factory };
+      }
+    }
+  }
+  return null;
+}
+function formatServerFnBoundaryError(violation, id) {
+  return [
+    `${violation.factory} handlers run only on the server, but ${id} is being bundled into the client.`,
+    `Importing a ${violation.factory} module from client code executes the server handler (and its Node-only imports) in the browser.`,
+    `Either enable the server-function transform (add @farm.js/plugin/rsc and set experimental.serverActions: true in farm.config.ts) so client imports become server references,`,
+    `or keep the query on the server: call it from server components, or expose an API route and use createAPIClient from the client.`
+  ].join("\n");
+}
+var SERVER_FN_FACTORIES, FARM_CORE_IMPORT_RE;
+var init_server_query_boundary = __esm({
+  "src/server-query-boundary.ts"() {
+    "use strict";
+    SERVER_FN_FACTORIES = ["createServerQuery", "createServerFn"];
+    FARM_CORE_IMPORT_RE = /import\s*(?!type\b)(?:[\w$]+\s*,\s*)?\{([^}]*)\}\s*from\s*(["'])@farm\.js\/core(?:\/[\w./-]+)?\2/g;
+    __name(findClientServerFnViolation, "findClientServerFnViolation");
+    __name(formatServerFnBoundaryError, "formatServerFnBoundaryError");
+  }
+});
+
 // src/image-vite.ts
 function farmImageImportsPlugin() {
   return {
@@ -29617,13 +29659,11 @@ window.__FARM_MANIFEST__ = ${inlineValue({
           if (req.url?.startsWith("/@") || req.url?.startsWith("/node_modules")) {
             return next();
           }
-          if (requestPathname.includes(".") && !requestPathname.endsWith(".html")) {
-            const matchesAppRoute = Boolean(
-              farmApp?.getRouteManager()?.matchRoute(requestPathname)?.route
-            );
-            if (!matchesAppRoute || devServableFileExists(requestPathname, [server.config.publicDir, server.config.root])) {
-              return next();
-            }
+          if (shouldBypassFarmRouterForDottedPath(requestPathname, farmApp?.getRouteManager(), [
+            server.config.publicDir,
+            server.config.root
+          ])) {
+            return next();
           }
           if (req.url?.startsWith("/__farm/page-data")) {
             const urlObj = new URL(req.url, `http://${req.headers.host || "localhost:3000"}`);
@@ -30277,6 +30317,15 @@ export const manifest = getManifest();
       }
     },
     async transform(code, id, transformOptions) {
+      if (!transformOptions?.ssr) {
+        const currentConfig = farmApp?.getConfig() ?? options;
+        if (currentConfig.experimental?.serverActions !== true) {
+          const violation = findClientServerFnViolation(code, id);
+          if (violation) {
+            this.error(formatServerFnBoundaryError(violation, id));
+          }
+        }
+      }
       if (typeof imageImports.transform === "function") {
         const imageModule = await imageImports.transform.call(this, code, id, transformOptions);
         if (imageModule) return imageModule;
@@ -32500,6 +32549,7 @@ var init_vite2 = __esm({
     init_deferred();
     init_after();
     init_dev_static();
+    init_server_query_boundary();
     init_deployment();
     init_image_config();
     init_image_vite();
@@ -38883,6 +38933,19 @@ var serverQueryClientState = serverQueryClientGlobal[FARM_SERVER_QUERY_CLIENT_ST
   nextFunctionId: 0,
   active: []
 });
+var RAW_SERVER_QUERY_SYMBOL = /* @__PURE__ */ Symbol.for("farm.server-query");
+function assertNotRawServerQueryInBrowser(query) {
+  if (typeof window === "undefined" || typeof document === "undefined") return;
+  if (!query?.[RAW_SERVER_QUERY_SYMBOL]) return;
+  throw new Error(
+    [
+      "useServerQuery received a raw server query implementation in the browser.",
+      "Server query handlers run only on the server. Enable the server-function transform (add @farm.js/plugin/rsc and set experimental.serverActions: true in farm.config.ts) so client imports become server references,",
+      "or call the query from server code / an API route (createAPIClient) instead."
+    ].join("\n")
+  );
+}
+__name(assertNotRawServerQueryInBrowser, "assertNotRawServerQueryInBrowser");
 function beginFarmServerQueryAction(actionId, args) {
   const active = serverQueryClientState.active.at(-1);
   return {
@@ -38939,6 +39002,7 @@ function prefetchServerQuery(query, input, options = {}) {
 }
 __name(prefetchServerQuery, "prefetchServerQuery");
 async function executeServerQuery(query, input, provisionalKey, options) {
+  assertNotRawServerQueryInBrowser(query);
   const cache = getFarmClientDataCache();
   const inflight = cache.getInflight(provisionalKey);
   if (inflight) return inflight;