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

package/dist/middleware.d.mts

@@ -1,9 +1,9 @@
-import { cm as MiddlewareChain, cq as RateLimitStorage, cr as RateLimitStatus, ch as MiddlewareContext, Y as FarmMiddlewareConfig, ci as MiddlewareFunction, cY as MiddlewareConfig, M as MiddlewareProps } from './client-plugins-g4bzuCmo.mjs';
-export { cn as CookieJar, co as CookieOptions, ct as MiddlewareResult, cl as MiddlewareStore, cs as NextFunction, cp as RateLimitConfig, X as ReadonlyMiddlewareStore, cj as RequestMiddleware, ck as RequestMiddlewareContext } from './client-plugins-g4bzuCmo.mjs';
+import { cs as MiddlewareChain, cw as RateLimitStorage, cx as RateLimitStatus, cn as MiddlewareContext, Y as FarmMiddlewareConfig, co as MiddlewareFunction, d2 as MiddlewareConfig, M as MiddlewareProps } from './client-plugins-jsk-ZLzJ.mjs';
+export { ct as CookieJar, cu as CookieOptions, cz as MiddlewareResult, cr as MiddlewareStore, cy as NextFunction, cv as RateLimitConfig, X as ReadonlyMiddlewareStore, cp as RequestMiddleware, cq as RequestMiddlewareContext } from './client-plugins-jsk-ZLzJ.mjs';
 import { IncomingMessage, ServerResponse } from 'http';
 import { ViteDevServer, Plugin } from 'vite';
-import { R as ResolvedFarmI18nConfig } from './types-BH1lhg5G.mjs';
-export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue } from './production-runtime-flrjp_nC.mjs';
+import { R as ResolvedFarmI18nConfig } from './types-BMxWr97v.mjs';
+export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue } from './production-runtime-B-fweKts.mjs';
 import './plugin-BJDf43dc.mjs';
 import 'react';
 import './types-D1A6-XvH.mjs';
@@ -20,6 +20,7 @@ import './cron.mjs';
 import './env.mjs';
 import './server-action-security.mjs';
 import './image-config-Duob7wER.mjs';
+import './cache.mjs';
 import './route-runtime-DoOHzCAD.mjs';
 
 /**

package/dist/middleware.d.ts

@@ -1,9 +1,9 @@
-import { cm as MiddlewareChain, cq as RateLimitStorage, cr as RateLimitStatus, ch as MiddlewareContext, Y as FarmMiddlewareConfig, ci as MiddlewareFunction, cY as MiddlewareConfig, M as MiddlewareProps } from './client-plugins-BZnpeTGA.js';
-export { cn as CookieJar, co as CookieOptions, ct as MiddlewareResult, cl as MiddlewareStore, cs as NextFunction, cp as RateLimitConfig, X as ReadonlyMiddlewareStore, cj as RequestMiddleware, ck as RequestMiddlewareContext } from './client-plugins-BZnpeTGA.js';
+import { cs as MiddlewareChain, cw as RateLimitStorage, cx as RateLimitStatus, cn as MiddlewareContext, Y as FarmMiddlewareConfig, co as MiddlewareFunction, d2 as MiddlewareConfig, M as MiddlewareProps } from './client-plugins-Bc5jHcNr.js';
+export { ct as CookieJar, cu as CookieOptions, cz as MiddlewareResult, cr as MiddlewareStore, cy as NextFunction, cv as RateLimitConfig, X as ReadonlyMiddlewareStore, cp as RequestMiddleware, cq as RequestMiddlewareContext } from './client-plugins-Bc5jHcNr.js';
 import { IncomingMessage, ServerResponse } from 'http';
 import { ViteDevServer, Plugin } from 'vite';
-import { R as ResolvedFarmI18nConfig } from './types-BH1lhg5G.js';
-export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue } from './production-runtime-DRkCHUvJ.js';
+import { R as ResolvedFarmI18nConfig } from './types-BMxWr97v.js';
+export { _ as _runWithMiddlewareContext, b as _runWithMiddlewareData, a as applyProductionMiddlewareHeaders, c as createProductionMiddlewareRunner, g as getMiddlewareContext, d as getMiddlewareData, e as getMiddlewareValue } from './production-runtime-9KG7GuvW.js';
 import './plugin-BJDf43dc.js';
 import 'react';
 import './types-D1A6-XvH.js';
@@ -20,6 +20,7 @@ import './cron.js';
 import './env.js';
 import './server-action-security.js';
 import './image-config-Duob7wER.js';
+import './cache.js';
 import './route-runtime-DoOHzCAD.js';
 
 /**

package/dist/middleware.mjs

@@ -5,15 +5,15 @@ import {
   hasMiddlewareData,
   middleware,
   unwrapMiddleware
-} from "./chunk-SXZTEK3V.mjs";
+} from "./chunk-UXUAWNO5.mjs";
 import {
   applyProductionMiddlewareHeaders,
   createProductionMiddlewareRunner
-} from "./chunk-JN3UU635.mjs";
+} from "./chunk-EJ7T4TPB.mjs";
 import {
   MiddlewareManager,
   createContext
-} from "./chunk-O3HADRW6.mjs";
+} from "./chunk-MIUW47JX.mjs";
 import {
   _runWithMiddlewareContext,
   _runWithMiddlewareData,

package/dist/navigation.cjs

@@ -589,6 +589,7 @@ __name(requireSnapshot, "requireSnapshot");
 
 // src/client/spa-router.ts
 var FARM_PAGE_STATE_KEY = "__farmPageState";
+var FARM_INTERCEPT_FROM_KEY = "__farmInterceptFrom";
 var IDLE_NAVIGATION_STATE = {
   state: "idle",
   pending: false,
@@ -659,7 +660,11 @@ var _SPARouter = class _SPARouter {
       return;
     }
     const from = window.location.pathname + window.location.search;
-    if (await this.shouldBlockNavigation({ from, to: fullPath, action: replace ? "replace" : "push" })) {
+    if (await this.shouldBlockNavigation({
+      from,
+      to: fullPath,
+      action: replace ? "replace" : "push"
+    })) {
       return;
     }
     if (this.options.scrollRestoration) {
@@ -677,11 +682,11 @@ var _SPARouter = class _SPARouter {
         to: url,
         action: replace ? "replace" : "push"
       });
-      const pageData = await this.fetchPageData(fullPath);
+      const pageData = await this.fetchPageData(fullPath, true, from);
       if (clientNavigation) {
         await this.clientPlugins?.markNavigationLoaded(clientNavigation, pageData);
       }
-      if (pageData.isClientComponent === false) {
+      if (pageData.isClientComponent === false && !pageData.interception) {
         this.finishNavigation();
         window.location.assign(pageData.canonicalPath || fullPath);
         return;
@@ -719,11 +724,12 @@ var _SPARouter = class _SPARouter {
     if (isFarmLocaleChangeHref(href)) return;
     const url = new URL(href, window.location.origin);
     const fullPath = url.pathname + url.search;
+    const interceptFrom = window.location.pathname + window.location.search;
     if (this.prefetchingUrls.has(fullPath)) return;
-    if (this.isCached(fullPath)) return;
+    if (this.isCached(fullPath, interceptFrom)) return;
     this.prefetchingUrls.add(fullPath);
     try {
-      await this.fetchPageData(fullPath, false);
+      await this.fetchPageData(fullPath, false, interceptFrom);
     } catch (error) {
       console.warn("[Farm.js] Prefetch failed:", href, error);
     } finally {
@@ -798,7 +804,12 @@ var _SPARouter = class _SPARouter {
   }
   async commitNavigation(options) {
     const historyPath = options.pageData.canonicalPath || options.fullPath;
-    const historyState = createHistoryState(historyPath, options.state);
+    const historyState = createHistoryState(
+      historyPath,
+      options.state,
+      void 0,
+      options.pageData.interception?.from ?? null
+    );
     if (options.replace) {
       window.history.replaceState(historyState, "", historyPath);
     } else {
@@ -853,15 +864,17 @@ var _SPARouter = class _SPARouter {
   /**
    * Fetch page data from cache or server
    */
-  async fetchPageData(path, recover = true) {
-    const cached = this.cache.get(path);
+  async fetchPageData(path, recover = true, interceptFrom) {
+    const cacheKey = getPageDataCacheKey(path, interceptFrom);
+    const cached = this.cache.get(cacheKey);
     if (cached && Date.now() - cached.timestamp < this.options.cacheMaxAge) {
       return cached.data;
     }
     const response = await fetch(`/__farm/page-data?path=${encodeURIComponent(path)}`, {
       headers: createFarmDeploymentRequestHeaders(this.options.deploymentId, {
         Accept: "application/x-farm-deferred+json, application/json",
-        "X-Farm-SPA": "1"
+        "X-Farm-SPA": "1",
+        ...interceptFrom ? { "X-Farm-Intercept-From": interceptFrom } : {}
       })
     });
     if (isFarmDeploymentMismatchResponse(response, this.options.deploymentId)) {
@@ -879,7 +892,7 @@ var _SPARouter = class _SPARouter {
       throw new Error(`Failed to fetch page data: ${response.status}`);
     }
     const data = await readDeferredDataResponse(response);
-    this.cache.set(path, {
+    this.cache.set(cacheKey, {
       data,
       timestamp: Date.now()
     });
@@ -910,7 +923,8 @@ var _SPARouter = class _SPARouter {
         to: window.location.href,
         action: "pop"
       });
-      const pageData = await this.fetchPageData(path);
+      const interceptFrom = typeof event.state?.[FARM_INTERCEPT_FROM_KEY] === "string" ? event.state[FARM_INTERCEPT_FROM_KEY] : void 0;
+      const pageData = await this.fetchPageData(path, true, interceptFrom);
       if (clientNavigation) {
         await this.clientPlugins?.markNavigationLoaded(clientNavigation, pageData);
       }
@@ -941,8 +955,8 @@ var _SPARouter = class _SPARouter {
   /**
    * Check if URL is cached
    */
-  isCached(path) {
-    const cached = this.cache.get(path);
+  isCached(path, interceptFrom) {
+    const cached = this.cache.get(getPageDataCacheKey(path, interceptFrom));
     return cached !== void 0 && Date.now() - cached.timestamp < this.options.cacheMaxAge;
   }
   /**
@@ -1082,15 +1096,26 @@ function readPageState() {
   return state[FARM_PAGE_STATE_KEY] ?? null;
 }
 __name(readPageState, "readPageState");
-function createHistoryState(path, pageState, currentState) {
+function createHistoryState(path, pageState, currentState, interceptFrom) {
   const base = currentState && typeof currentState === "object" ? { ...currentState } : {};
-  return {
+  const nextState = {
     ...base,
     path,
     [FARM_PAGE_STATE_KEY]: pageState
   };
+  if (interceptFrom === null) {
+    delete nextState[FARM_INTERCEPT_FROM_KEY];
+  } else if (interceptFrom) {
+    nextState[FARM_INTERCEPT_FROM_KEY] = interceptFrom;
+  }
+  return nextState;
 }
 __name(createHistoryState, "createHistoryState");
+function getPageDataCacheKey(path, interceptFrom) {
+  return interceptFrom ? `${path}
+intercept:${interceptFrom}` : path;
+}
+__name(getPageDataCacheKey, "getPageDataCacheKey");
 function createNavigationLocation(url) {
   return {
     href: url.href,