@farm.js/core 0.1.31 → 0.1.35

package/dist/{chunk-ZCU4NZ3M.cjs → chunk-IE7XCHH3.cjs}

@@ -2,7 +2,7 @@
 
 
 
-var _chunkKH7BN726cjs = require('./chunk-KH7BN726.cjs');
+var _chunkN4UOK6ZIcjs = require('./chunk-N4UOK6ZI.cjs');
 
 
 var _chunk63H6BKXGcjs = require('./chunk-63H6BKXG.cjs');
@@ -14,7 +14,7 @@ var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 var _react = require('react');
 function useServerQuery(query, input, options = {}) {
   const cache = _chunk63H6BKXGcjs.getFarmClientDataCache.call(void 0, );
-  const key = _chunkKH7BN726cjs.createServerQueryCallKey.call(void 0, query, input);
+  const key = _chunkN4UOK6ZIcjs.createServerQueryCallKey.call(void 0, query, input);
   const inputRef = _react.useRef.call(void 0, input);
   const optionsRef = _react.useRef.call(void 0, options);
   const mountedKeyRef = _react.useRef.call(void 0, void 0);
@@ -36,7 +36,7 @@ function useServerQuery(query, input, options = {}) {
   const run = _react.useCallback.call(void 0, 
     (force = false) => {
       pendingInvalidationRef.current = false;
-      return _chunkKH7BN726cjs.fetchServerQuery.call(void 0, query, inputRef.current, {
+      return _chunkN4UOK6ZIcjs.fetchServerQuery.call(void 0, query, inputRef.current, {
         ...optionsRef.current,
         force
       });
@@ -56,7 +56,7 @@ function useServerQuery(query, input, options = {}) {
   }, [cache, entry, key, options.enabled, run]);
   _react.useEffect.call(void 0, () => {
     if (options.enabled === false) return;
-    return _chunkKH7BN726cjs.attachRevalidationListeners.call(void 0, 
+    return _chunkN4UOK6ZIcjs.attachRevalidationListeners.call(void 0, 
       () => {
         if (cache.isStale(key)) void run().catch(() => void 0);
       },

package/dist/{chunk-I26CZYPV.cjs → chunk-IHNIDL6H.cjs}

@@ -11,7 +11,7 @@ var _chunkSOR334EBcjs = require('./chunk-SOR334EB.cjs');
 
 
 
-var _chunk2SDO73HKcjs = require('./chunk-2SDO73HK.cjs');
+var _chunkYWN746UScjs = require('./chunk-YWN746US.cjs');
 
 
 var _chunkNYJMY3JAcjs = require('./chunk-NYJMY3JA.cjs');
@@ -282,7 +282,7 @@ function createRouteModuleFromProgrammaticPage(route, rendererRuntime) {
     default: createProgrammaticPageComponent(route, rendererRuntime),
     ..._chunkSOR334EBcjs.normalizeFarmRouteRuntimeConfig.call(void 0, route, `Route "${route.path}"`)
   };
-  if (route.params || route.search || route.guard || route.data) {
+  if (route.params || route.search || hasProgrammaticServerProps(route)) {
     mod.__farmRouteSchemas = {
       params: route.params,
       search: getProgrammaticRouteSearchSchema(route.search)
@@ -346,7 +346,7 @@ function scanProgrammaticPagePaths(source) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, scanProgrammaticPagePaths, "scanProgrammaticPagePaths");
 function createProgrammaticPageComponent(route, rendererRuntime) {
-  if (!route.params && !route.search && !route.guard && !route.data && !route.pending && !route.error && !route.notFound) {
+  if (!route.params && !route.search && !hasProgrammaticServerProps(route) && !route.pending && !route.error && !route.notFound) {
     return route.component;
   }
   const createElement = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (...args) => {
@@ -391,7 +391,22 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
         createElement(PageContent, props)
       );
     }, "FarmProgrammaticPage");
-    return markFunctionComponent(FarmProgrammaticPage);
+    return markClientStrippedPage(
+      route,
+      markFunctionComponent(FarmProgrammaticPage)
+    );
+  }
+  if (getClientStrippedServerHooks(route)) {
+    const FarmProgrammaticClientPage = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, function FarmProgrammaticClientPage2(props) {
+      if (!isProgrammaticRoutePropsResolved(props)) {
+        throw createClientStrippedRouteError(route);
+      }
+      return createElement(Component, stripProgrammaticRoutePropsMarker(props));
+    }, "FarmProgrammaticClientPage");
+    return markClientStrippedPage(
+      route,
+      markFunctionComponent(FarmProgrammaticClientPage)
+    );
   }
   const FarmProgrammaticPageContent = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, async function FarmProgrammaticPageContent2(props) {
     try {
@@ -410,9 +425,34 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
       throw error;
     }
   }, "FarmProgrammaticPageContent");
-  return markFunctionComponent(FarmProgrammaticPageContent);
+  return markClientStrippedPage(
+    route,
+    markFunctionComponent(FarmProgrammaticPageContent)
+  );
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createProgrammaticPageComponent, "createProgrammaticPageComponent");
+function getClientStrippedServerHooks(route) {
+  const hooks = route.__farmServerHooks;
+  return Array.isArray(hooks) && hooks.length > 0 ? hooks : void 0;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getClientStrippedServerHooks, "getClientStrippedServerHooks");
+function createClientStrippedRouteError(route) {
+  return new Error(
+    `Route "${route.path}" resolves its ${getClientStrippedServerHooks(route).join(" and ")} on the server; the browser can only render it with server-resolved props.`
+  );
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, createClientStrippedRouteError, "createClientStrippedRouteError");
+function hasProgrammaticServerProps(route) {
+  return Boolean(route.guard || route.data || getClientStrippedServerHooks(route));
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, hasProgrammaticServerProps, "hasProgrammaticServerProps");
+function markClientStrippedPage(route, component) {
+  if (getClientStrippedServerHooks(route) && typeof component === "function") {
+    Object.defineProperty(component, "__farmServerProps", { value: true });
+  }
+  return component;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, markClientStrippedPage, "markClientStrippedPage");
 function readProgrammaticRouteProps(route, props, resources) {
   if (isProgrammaticRoutePropsResolved(props)) {
     return props;
@@ -479,6 +519,9 @@ async function resolveProgrammaticRouteProps(route, props) {
     props.path,
     route.path
   );
+  if (getClientStrippedServerHooks(route)) {
+    throw createClientStrippedRouteError(route);
+  }
   const routeContextValue = _chunk6QQDAAAZcjs.getFarmRouteContext.call(void 0, props);
   const pluginContext = props.context;
   const baseProps = {
@@ -529,7 +572,7 @@ async function resolveProgrammaticRouteData(route, dataHooks, context) {
   const cacheKey = _chunkNYJMY3JAcjs.createFarmCacheKey.call(void 0, ["route-data", routeDataKey]);
   const cacheOptions = {
     tags: [
-      _chunk2SDO73HKcjs.createRouteDataCacheTag.call(void 0, routeDataKey),
+      _chunkYWN746UScjs.createRouteDataCacheTag.call(void 0, routeDataKey),
       ...await resolveProgrammaticRouteDataKeys(dataHooks.tags, context)
     ],
     paths: [
@@ -538,7 +581,7 @@ async function resolveProgrammaticRouteData(route, dataHooks, context) {
     ],
     revalidate: normalizeProgrammaticRouteStaleTime(dataHooks.staleTime)
   };
-  return _chunk2SDO73HKcjs.getFarmDataCache.call(void 0, ).getOrSet(cacheKey, () => dataHooks.main(context), cacheOptions);
+  return _chunkYWN746UScjs.getFarmDataCache.call(void 0, ).getOrSet(cacheKey, () => dataHooks.main(context), cacheOptions);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, resolveProgrammaticRouteData, "resolveProgrammaticRouteData");
 async function resolveProgrammaticRouteDataKeys(input, context) {

package/dist/{chunk-2FQHH5SC.mjs → chunk-IHNMMXHV.mjs}

@@ -1,13 +1,19 @@
 import {
-  compileMiddlewareConfig,
-  compileMiddlewareRoute,
-  matchesMiddlewareConfig,
-  matchesMiddlewareRoute,
   normalizeMiddlewareModule,
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion
-} from "./chunk-NRVGEI5I.mjs";
+} from "./chunk-2NNMOPDN.mjs";
+import {
+  compileMiddlewareConfig,
+  compileMiddlewareRoute,
+  matchesMiddlewareConfig,
+  matchesMiddlewareConfigAt,
+  matchesMiddlewareRouteAt
+} from "./chunk-JG6DJF5A.mjs";
+import {
+  createFarmAPIMiddlewarePathnames
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   emitFarmEvent
 } from "./chunk-FUZEBRP3.mjs";
@@ -469,6 +475,7 @@ function createProductionMiddlewareRunner(options = {}) {
   const entries = [...configMiddleware.entries, ...fileMiddleware];
   const globalConfig = configMiddleware.globalConfig;
   if (globalConfig) compileMiddlewareConfig(globalConfig);
+  const toMiddlewarePathnames = createFarmAPIMiddlewarePathnames(options.apiBasePath);
   return /* @__PURE__ */ __name(async function runProductionMiddleware(request, requestOptions = {}) {
     if (!globalConfig && entries.length === 0) {
       return emptyResult(request);
@@ -481,10 +488,22 @@ function createProductionMiddlewareRunner(options = {}) {
     );
     let ctx = contextState.ctx;
     let currentRequest = contextState.getRequest();
-    const initialPathname = options.i18n?.enabled ? stripFarmLocaleFromPathname(ctx.pathname, options.i18n) : stripFarmBasePath(ctx.pathname, options.i18n?.basePath ?? "/");
+    const toRoutePathname = /* @__PURE__ */ __name((pathname) => options.i18n?.enabled ? stripFarmLocaleFromPathname(pathname, options.i18n) : stripFarmBasePath(pathname, options.i18n?.basePath ?? "/"), "toRoutePathname");
+    const initialRequestPathname = ctx.pathname;
+    const initialPathname = toRoutePathname(initialRequestPathname);
+    const matchPathnames = /* @__PURE__ */ __name((pathname, requestPathname) => options.rawPathRouting && requestPathname !== pathname ? [
+      .../* @__PURE__ */ new Set([
+        ...toMiddlewarePathnames(pathname),
+        ...toMiddlewarePathnames(requestPathname)
+      ])
+    ] : toMiddlewarePathnames(pathname), "matchPathnames");
     let parentData;
     if (globalConfig) {
-      const globalMatch = matchesMiddlewareConfig(initialPathname, globalConfig, ctx);
+      const globalMatch = matchesMiddlewareConfigAt(
+        matchPathnames(initialPathname, initialRequestPathname),
+        globalConfig,
+        ctx
+      );
       if (!globalMatch.matched) {
         return emptyResult(request);
       }
@@ -492,26 +511,32 @@ function createProductionMiddlewareRunner(options = {}) {
         ctx.params = { ...ctx.params, ...globalMatch.params };
       }
     }
-    const applicable = entries.map((entry) => ({
-      entry,
-      routeMatch: entry.source === "config" ? { matched: true } : matchesMiddlewareRoute(initialPathname, entry)
-    })).filter((candidate) => candidate.routeMatch.matched);
-    if (applicable.length === 0) {
-      return {
-        request: currentRequest,
-        response: null,
-        data: new Map(ctx.data),
-        context: new Map(ctx.locals),
-        headers: mapToHeaders(contextState.headers),
-        handled: false
-      };
+    const ran = /* @__PURE__ */ new Set();
+    function* applicableMiddleware() {
+      for (let pathname = initialPathname, requestPathname = initialRequestPathname, pass = 0; ; pass++) {
+        const pathnames = matchPathnames(pathname, requestPathname);
+        if (pass > 0 && globalConfig) {
+          if (!matchesMiddlewareConfigAt(pathnames, globalConfig, ctx).matched) return;
+        }
+        for (const entry of entries) {
+          if (ran.has(entry)) continue;
+          const routeMatch = entry.source === "config" ? { matched: true } : matchesMiddlewareRouteAt(pathnames, entry);
+          if (routeMatch.matched) yield { entry, routeMatch, pathname, pathnames };
+        }
+        const rewrittenRequestPathname = new URL(currentRequest.url).pathname;
+        const rewrittenPathname = toRoutePathname(rewrittenRequestPathname);
+        if (rewrittenPathname === pathname && rewrittenRequestPathname === requestPathname) return;
+        pathname = rewrittenPathname;
+        requestPathname = rewrittenRequestPathname;
+      }
     }
-    for (const candidate of applicable) {
-      const { entry, routeMatch } = candidate;
-      const configMatch = entry.config ? matchesMiddlewareConfig(initialPathname, entry.config, ctx) : { matched: true };
+    __name(applicableMiddleware, "applicableMiddleware");
+    for (const { entry, routeMatch, pathname, pathnames } of applicableMiddleware()) {
+      const configMatch = entry.config ? matchesMiddlewareConfigAt(pathnames, entry.config, ctx) : { matched: true };
       if (!configMatch.matched) {
         continue;
       }
+      ran.add(entry);
       if (parentData) {
         contextState = createWebMiddlewareContext(
           currentRequest,
@@ -530,7 +555,7 @@ function createProductionMiddlewareRunner(options = {}) {
       const middlewareStartTime = Date.now();
       const middlewareEvent = {
         route: entry.path,
-        pathname: initialPathname,
+        pathname,
         name: entry.filePath
       };
       emitFarmEvent({ type: "middleware.start", ...middlewareEvent });