@farm.js/core 0.1.47 → 0.1.48

package/dist/internal/form-actions-client.mjs

@@ -1,17 +1,13 @@
-import {
-  __name
-} from "../chunk-LPEX4YW6.mjs";
+import "../chunk-Y6FXYEAI.mjs";
 
 // src/form-actions-client.ts
 import { createServerReference } from "@farm.js/islx/client";
 function getFarmFormActionStub(id) {
   return createServerReference(id);
 }
-__name(getFarmFormActionStub, "getFarmFormActionStub");
 function createFarmFormActionStub(id) {
   return createServerReference(id);
 }
-__name(createFarmFormActionStub, "createFarmFormActionStub");
 export {
   createFarmFormActionStub,
   getFarmFormActionStub

package/dist/internal/form-actions.cjs

@@ -2,17 +2,17 @@
 
 
 
-var _chunk3BROEWFYcjs = require('../chunk-3BROEWFY.cjs');
-require('../chunk-P4TYB4SF.cjs');
-require('../chunk-SVRTJOUF.cjs');
-require('../chunk-5NAVKJCZ.cjs');
-require('../chunk-4TLUFAIP.cjs');
-require('../chunk-ZEG3OPIB.cjs');
-require('../chunk-OX6O6WVA.cjs');
-require('../chunk-NO3WWW3N.cjs');
-require('../chunk-S3JO3N4H.cjs');
+var _chunk6LH33DLLcjs = require('../chunk-6LH33DLL.cjs');
+require('../chunk-FGJQS4EC.cjs');
+require('../chunk-FEFCISOX.cjs');
+require('../chunk-5566GNEG.cjs');
+require('../chunk-JYT7AN37.cjs');
+require('../chunk-UZCMMJJT.cjs');
+require('../chunk-7JUIK547.cjs');
+require('../chunk-YTVSWXEZ.cjs');
+require('../chunk-BTZ5O6VM.cjs');
 
 
 
 
-exports.FARM_FORM_ACTION_HEADER = _chunk3BROEWFYcjs.FARM_FORM_ACTION_HEADER; exports.handleFarmFormActionRequest = _chunk3BROEWFYcjs.handleFarmFormActionRequest; exports.registerFarmFormAction = _chunk3BROEWFYcjs.registerFarmFormAction;
+exports.FARM_FORM_ACTION_HEADER = _chunk6LH33DLLcjs.FARM_FORM_ACTION_HEADER; exports.handleFarmFormActionRequest = _chunk6LH33DLLcjs.handleFarmFormActionRequest; exports.registerFarmFormAction = _chunk6LH33DLLcjs.registerFarmFormAction;

package/dist/internal/form-actions.mjs

@@ -2,15 +2,15 @@ import {
   FARM_FORM_ACTION_HEADER,
   handleFarmFormActionRequest,
   registerFarmFormAction
-} from "../chunk-XUGFRFD2.mjs";
-import "../chunk-WMHG64DA.mjs";
-import "../chunk-FP2INE7H.mjs";
-import "../chunk-ZZGQD7A4.mjs";
-import "../chunk-P7XDC7UJ.mjs";
-import "../chunk-4SIYUGRY.mjs";
-import "../chunk-CBBLJMR5.mjs";
-import "../chunk-55YI3RRB.mjs";
-import "../chunk-LPEX4YW6.mjs";
+} from "../chunk-MJ6IC4K2.mjs";
+import "../chunk-JOHXK4BB.mjs";
+import "../chunk-QSTRBKHZ.mjs";
+import "../chunk-C6U66WWF.mjs";
+import "../chunk-D2LCAV6L.mjs";
+import "../chunk-AZQXXXDX.mjs";
+import "../chunk-JNYFXL7X.mjs";
+import "../chunk-AYP2YFVN.mjs";
+import "../chunk-Y6FXYEAI.mjs";
 export {
   FARM_FORM_ACTION_HEADER,
   handleFarmFormActionRequest,

package/dist/internal/infra-analytics-runtime.cjs

@@ -1,16 +1,30 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkIFWSR7YZcjs = require('../chunk-IFWSR7YZ.cjs');
-require('../chunk-X3GMHKO3.cjs');
-require('../chunk-GS3WR5HX.cjs');
-require('../chunk-ZTP3BJG6.cjs');
-require('../chunk-6IZWX6ES.cjs');
-require('../chunk-S3JO3N4H.cjs');
+var _chunkHUL4LTC6cjs = require('../chunk-HUL4LTC6.cjs');
+require('../chunk-ZGS3ZDF7.cjs');
+require('../chunk-SBABQKPT.cjs');
+require('../chunk-SG57PX7K.cjs');
+require('../chunk-HIFIG6HL.cjs');
+require('../chunk-WJFFPXCV.cjs');
+require('../chunk-6ONBZGVH.cjs');
+require('../chunk-EVIWKPJV.cjs');
+require('../chunk-5566GNEG.cjs');
+require('../chunk-JYT7AN37.cjs');
+require('../chunk-B5BBTPJQ.cjs');
+require('../chunk-JLS6ZLFM.cjs');
+require('../chunk-CA7DNRHO.cjs');
+require('../chunk-IWFV5ZED.cjs');
+require('../chunk-A25FXJ7D.cjs');
+require('../chunk-HNAISJFD.cjs');
+require('../chunk-3BIASUGR.cjs');
+require('../chunk-D22BUQKW.cjs');
+require('../chunk-YTVSWXEZ.cjs');
+require('../chunk-BTZ5O6VM.cjs');
 
 // src/infra-analytics-runtime.ts
-var createFarmInfraAnalyticsPlugin2 = _chunkIFWSR7YZcjs.createFarmInfraAnalyticsPlugin;
-var createFarmInfraAnalyticsRecorder2 = _chunkIFWSR7YZcjs.createFarmInfraAnalyticsRecorder;
+var createFarmInfraAnalyticsPlugin2 = _chunkHUL4LTC6cjs.createFarmInfraAnalyticsPlugin;
+var createFarmInfraAnalyticsRecorder2 = _chunkHUL4LTC6cjs.createFarmInfraAnalyticsRecorder;
 
 
 

package/dist/internal/infra-analytics-runtime.mjs

@@ -1,12 +1,26 @@
 import {
   createFarmInfraAnalyticsPlugin,
   createFarmInfraAnalyticsRecorder
-} from "../chunk-WMBRZI5V.mjs";
-import "../chunk-KYN5ODF6.mjs";
-import "../chunk-4GP3XZ4Z.mjs";
-import "../chunk-X3NGFVRF.mjs";
-import "../chunk-6LVRDOAW.mjs";
-import "../chunk-LPEX4YW6.mjs";
+} from "../chunk-N6SIQJEJ.mjs";
+import "../chunk-NRFUVDTH.mjs";
+import "../chunk-KRRZJ77U.mjs";
+import "../chunk-2WZTGPK6.mjs";
+import "../chunk-LAZK6UV7.mjs";
+import "../chunk-N77JBPLC.mjs";
+import "../chunk-KJMWAUKE.mjs";
+import "../chunk-2DA7CLY7.mjs";
+import "../chunk-C6U66WWF.mjs";
+import "../chunk-D2LCAV6L.mjs";
+import "../chunk-LM2YOGDK.mjs";
+import "../chunk-HRLYO2XJ.mjs";
+import "../chunk-GUZC226X.mjs";
+import "../chunk-BLD5GVCG.mjs";
+import "../chunk-LM55GS4R.mjs";
+import "../chunk-6HRAK7I5.mjs";
+import "../chunk-VIXTAVEA.mjs";
+import "../chunk-SF3JB56B.mjs";
+import "../chunk-AYP2YFVN.mjs";
+import "../chunk-Y6FXYEAI.mjs";
 
 // src/infra-analytics-runtime.ts
 var createFarmInfraAnalyticsPlugin2 = createFarmInfraAnalyticsPlugin;

package/dist/internal/island-codec.cjs

@@ -7,9 +7,9 @@
 
 
 
-var _chunkYKUEJ3MGcjs = require('../chunk-YKUEJ3MG.cjs');
-require('../chunk-H7BLEEAE.cjs');
-require('../chunk-S3JO3N4H.cjs');
+var _chunkTVCFY3KKcjs = require('../chunk-TVCFY3KK.cjs');
+require('../chunk-CQL5ZGFU.cjs');
+require('../chunk-BTZ5O6VM.cjs');
 
 
 
@@ -19,4 +19,4 @@ require('../chunk-S3JO3N4H.cjs');
 
 
 
-exports.NOT_A_FARM_MARKER = _chunkYKUEJ3MGcjs.NOT_A_FARM_MARKER; exports.decodeFarmJson = _chunkYKUEJ3MGcjs.decodeFarmJson; exports.decodeFarmTagged = _chunkYKUEJ3MGcjs.decodeFarmTagged; exports.encodeFarmJson = _chunkYKUEJ3MGcjs.encodeFarmJson; exports.encodeFarmLeaf = _chunkYKUEJ3MGcjs.encodeFarmLeaf; exports.farmPlainObject = _chunkYKUEJ3MGcjs.farmPlainObject; exports.farmTagged = _chunkYKUEJ3MGcjs.farmTagged; exports.needsFarmObjectTag = _chunkYKUEJ3MGcjs.needsFarmObjectTag;
+exports.NOT_A_FARM_MARKER = _chunkTVCFY3KKcjs.NOT_A_FARM_MARKER; exports.decodeFarmJson = _chunkTVCFY3KKcjs.decodeFarmJson; exports.decodeFarmTagged = _chunkTVCFY3KKcjs.decodeFarmTagged; exports.encodeFarmJson = _chunkTVCFY3KKcjs.encodeFarmJson; exports.encodeFarmLeaf = _chunkTVCFY3KKcjs.encodeFarmLeaf; exports.farmPlainObject = _chunkTVCFY3KKcjs.farmPlainObject; exports.farmTagged = _chunkTVCFY3KKcjs.farmTagged; exports.needsFarmObjectTag = _chunkTVCFY3KKcjs.needsFarmObjectTag;

package/dist/internal/island-codec.mjs

@@ -7,9 +7,9 @@ import {
   farmPlainObject,
   farmTagged,
   needsFarmObjectTag
-} from "../chunk-PJEHUSHA.mjs";
-import "../chunk-2NXO5SBY.mjs";
-import "../chunk-LPEX4YW6.mjs";
+} from "../chunk-MNIR7I7B.mjs";
+import "../chunk-NBIVGHAT.mjs";
+import "../chunk-Y6FXYEAI.mjs";
 export {
   NOT_A_FARM_MARKER,
   decodeFarmJson,

package/dist/internal/island-value-store.cjs

@@ -1,13 +1,10 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-var _chunkS3JO3N4Hcjs = require('../chunk-S3JO3N4H.cjs');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});require('../chunk-BTZ5O6VM.cjs');
 
 // src/client/island-value-store.ts
 var _client = require('@farm.js/islx/client');
 function getFarmIslandValueStore() {
   return _client.getValueStore.call(void 0, );
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, getFarmIslandValueStore, "getFarmIslandValueStore");
 
 
 exports.getFarmIslandValueStore = getFarmIslandValueStore;

package/dist/internal/island-value-store.mjs

@@ -1,13 +1,10 @@
-import {
-  __name
-} from "../chunk-LPEX4YW6.mjs";
+import "../chunk-Y6FXYEAI.mjs";
 
 // src/client/island-value-store.ts
 import { getValueStore } from "@farm.js/islx/client";
 function getFarmIslandValueStore() {
   return getValueStore();
 }
-__name(getFarmIslandValueStore, "getFarmIslandValueStore");
 export {
   getFarmIslandValueStore
 };

package/dist/internal/islands-runtime.cjs

@@ -1,13 +1,19 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkH7BLEEAEcjs = require('../chunk-H7BLEEAE.cjs');
-
-
-var _chunkS3JO3N4Hcjs = require('../chunk-S3JO3N4H.cjs');
+var _chunkCQL5ZGFUcjs = require('../chunk-CQL5ZGFU.cjs');
+require('../chunk-BTZ5O6VM.cjs');
 
 // src/client/islands-runtime.ts
 var _client = require('@farm.js/islx/client');
-var _react = require('@farm.js/islx/react');
+var _react = require('react'); var React = _interopRequireWildcard(_react);
+
+
+
+
+
+
+var _react2 = require('@farm.js/islx/react');
+
 
 
 
@@ -20,13 +26,13 @@ function createFarmIsolatedHydrationRuntime(options) {
     wrap: options.wrap,
     report: options.report
   });
-  const router = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => window.__FARM_SPA_ROUTER__, "router");
+  const router = () => window.__FARM_SPA_ROUTER__;
   _client.setActionNavigator.call(void 0, {
-    refresh: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => _optionalChain([router, 'call', _ => _(), 'optionalAccess', _2 => _2.refresh, 'optionalCall', _3 => _3({ scroll: false })]), "refresh"),
-    navigate: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (href) => {
+    refresh: () => _optionalChain([router, 'call', _ => _(), 'optionalAccess', _2 => _2.refresh, 'optionalCall', _3 => _3({ scroll: false })]),
+    navigate: (href) => {
       const current = router();
       return _optionalChain([current, 'optionalAccess', _4 => _4.navigate]) ? current.navigate(href) : location.assign(href);
-    }, "navigate")
+    }
   });
   _client.enhanceForms.call(void 0, );
   return {
@@ -37,28 +43,23 @@ function createFarmIsolatedHydrationRuntime(options) {
     rootCount: runtime.rootCount
   };
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, createFarmIsolatedHydrationRuntime, "createFarmIsolatedHydrationRuntime");
 function createFarmServerPageBoundary(_React, runtime) {
   return _client3.createServerHtml.call(void 0, runtime);
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, createFarmServerPageBoundary, "createFarmServerPageBoundary");
 function wrapFarmIsolatedClientGraph(_React, element) {
-  return _react.withinClientRoot.call(void 0, element);
+  return _react2.withinClientRoot.call(void 0, element);
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, wrapFarmIsolatedClientGraph, "wrapFarmIsolatedClientGraph");
 function isolateFarmServerPageGraph(_React, element) {
-  return _react.isolateIslands.call(void 0, element);
+  return _react2.isolateIslands.call(void 0, element);
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, isolateFarmServerPageGraph, "isolateFarmServerPageGraph");
 function renderFarmServerTreePage(_React, element, options) {
-  return _react.renderServerTree.call(void 0, element, {
+  return _react2.renderServerTree.call(void 0, element, {
     isolate: options.isolate,
     payloadOnly: options.payloadOnly,
     // The values this request's browser holds (Farm's request store).
-    held: _nullishCoalesce(_optionalChain([_chunkH7BLEEAEcjs.getFarmIslandValuesServer.call(void 0, ), 'optionalAccess', _5 => _5.held, 'call', _6 => _6()]), () => ( null))
+    held: _nullishCoalesce(_optionalChain([_chunkCQL5ZGFUcjs.getFarmIslandValuesServer.call(void 0, ), 'optionalAccess', _5 => _5.held, 'call', _6 => _6()]), () => ( null))
   });
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, renderFarmServerTreePage, "renderFarmServerTreePage");
 function createFarmServerTreeElement(_React, source, options) {
   return _client3.createServerTreeElement.call(void 0, source, {
     load: options.load,
@@ -66,7 +67,31 @@ function createFarmServerTreeElement(_React, source, options) {
     key: options.key
   });
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, createFarmServerTreeElement, "createFarmServerTreeElement");
+function renderFarmServerTreeLayout(Layout, props, outlets, scope) {
+  const outletProps = {};
+  for (const name of Object.keys(outlets)) {
+    outletProps[name] = React.createElement(_react2.Outlet, name === "children" ? {} : { name });
+  }
+  return _react2.renderServerTree.call(void 0, React.createElement(Layout, { ...props, ...outletProps }), {
+    isolate: _react2.isolateIslands,
+    outlets,
+    scope,
+    held: _nullishCoalesce(_optionalChain([_chunkCQL5ZGFUcjs.getFarmIslandValuesServer.call(void 0, ), 'optionalAccess', _7 => _7.held, 'call', _8 => _8()]), () => ( null))
+  });
+}
+function createFarmServerTreeLayout(_React, source, scope, options) {
+  return _client3.createServerTreeLayout.call(void 0, source, scope, options);
+}
+function withFarmIslandsRender(element) {
+  return React.createElement(
+    _react2.IslandsProvider,
+    { held: _nullishCoalesce(_optionalChain([_chunkCQL5ZGFUcjs.getFarmIslandValuesServer.call(void 0, ), 'optionalAccess', _9 => _9.held, 'call', _10 => _10()]), () => ( null)) },
+    element
+  );
+}
+
+
+
 
 
 
@@ -74,4 +99,4 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmServerTreeElement, "createFarmSe
 
 
 
-exports.createFarmIsolatedHydrationRuntime = createFarmIsolatedHydrationRuntime; exports.createFarmServerPageBoundary = createFarmServerPageBoundary; exports.createFarmServerTreeElement = createFarmServerTreeElement; exports.isolateFarmServerPageGraph = isolateFarmServerPageGraph; exports.renderFarmServerTreePage = renderFarmServerTreePage; exports.wrapFarmIsolatedClientGraph = wrapFarmIsolatedClientGraph;
+exports.createFarmIsolatedHydrationRuntime = createFarmIsolatedHydrationRuntime; exports.createFarmServerPageBoundary = createFarmServerPageBoundary; exports.createFarmServerTreeElement = createFarmServerTreeElement; exports.createFarmServerTreeLayout = createFarmServerTreeLayout; exports.isolateFarmServerPageGraph = isolateFarmServerPageGraph; exports.renderFarmServerTreeLayout = renderFarmServerTreeLayout; exports.renderFarmServerTreePage = renderFarmServerTreePage; exports.withFarmIslandsRender = withFarmIslandsRender; exports.wrapFarmIsolatedClientGraph = wrapFarmIsolatedClientGraph;

package/dist/internal/islands-runtime.d.mts

@@ -1,14 +1,8 @@
-import React__default from 'react';
+import * as _farm_js_islx_react_client from '@farm.js/islx/react/client';
 import { createServerHtml } from '@farm.js/islx/react/client';
+import * as React from 'react';
 import { F as FarmIslandStrategy } from '../island-CfGru1MO.mjs';
 
-/**
- * @internal Islands mode's runtime (`experimental.serverComponents: { mode: "islands" }`), run by
- * islx. Generated code imports these in islands mode under the names the isolated-hydration
- * runtime uses, so the rest of Farm's runtime stays the same; apps on isolated hydration without
- * islands mode never load islx.
- */
-
 interface FarmIslandsRuntimeOptions {
     load(reference: string): Promise<Record<string, unknown>>;
     schedule(options: {
@@ -17,7 +11,7 @@ interface FarmIslandsRuntimeOptions {
         signal?: AbortSignal;
         hydrate(): Promise<void>;
     }): Promise<unknown>;
-    wrap?(element: React__default.ReactElement): React__default.ReactNode;
+    wrap?(element: React.ReactElement): React.ReactNode;
     report?(message: string, error?: unknown): void;
 }
 /**
@@ -32,26 +26,44 @@ declare function createFarmIsolatedHydrationRuntime(options: FarmIslandsRuntimeO
     rootCount: () => number;
 };
 /** A page a hydrating layout keeps as server HTML; its islands start inside it. */
-declare function createFarmServerPageBoundary(_React: typeof React__default, runtime: Parameters<typeof createServerHtml>[0]): React__default.ComponentType<Record<string, unknown> & {
+declare function createFarmServerPageBoundary(_React: typeof React, runtime: Parameters<typeof createServerHtml>[0]): React.ComponentType<Record<string, unknown> & {
     as?: string;
     dangerouslySetInnerHTML: {
         __html: string;
     };
 }>;
 /** A layout that hydrates as one React root: its client components join that root. */
-declare function wrapFarmIsolatedClientGraph(_React: typeof React__default, element: React__default.ReactNode): React__default.ReactElement<any, string | React__default.JSXElementConstructor<any>>;
+declare function wrapFarmIsolatedClientGraph(_React: typeof React, element: React.ReactNode): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 /** The page such a layout keeps as server HTML: its client components are islands again. */
-declare function isolateFarmServerPageGraph(_React: typeof React__default, element: React__default.ReactNode): React__default.ReactElement<any, string | React__default.JSXElementConstructor<any>>;
+declare function isolateFarmServerPageGraph(_React: typeof React, element: React.ReactNode): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 /** An async page under a hydrating layout, as a server tree the browser rebuilds in its root. */
-declare function renderFarmServerTreePage(_React: typeof React__default, element: React__default.ReactNode, options: {
-    isolate?(element: React__default.ReactNode): React__default.ReactNode;
+declare function renderFarmServerTreePage(_React: typeof React, element: React.ReactNode, options: {
+    isolate?(element: React.ReactNode): React.ReactNode;
     payloadOnly?: boolean;
-}): Promise<React__default.ReactElement<any, string | React__default.JSXElementConstructor<any>>>;
+}): Promise<React.ReactElement<any, string | React.JSXElementConstructor<any>>>;
 /** Rebuilds a server-tree page in the browser, inside the layout's React root. */
-declare function createFarmServerTreeElement(_React: typeof React__default, source: ParentNode | string, options: {
+declare function createFarmServerTreeElement(_React: typeof React, source: ParentNode | string, options: {
     load(reference: string): Promise<Record<string, unknown>>;
-    ServerHtml: React__default.ComponentType<any>;
+    ServerHtml: React.ComponentType<any>;
     key?: string;
-}): Promise<React__default.ReactElement<any, string | React__default.JSXElementConstructor<any>> | null>;
+}): Promise<React.ReactElement<any, string | React.JSXElementConstructor<any>> | null>;
+/**
+ * A layout around a client provider, as a server tree (islands mode): its module stays on the
+ * server, and the browser rebuilds it with the page at its outlet, so the page reads its context.
+ * `outlets` are what the layout receives as elements: `children`, and its route slots.
+ */
+declare function renderFarmServerTreeLayout(Layout: React.ComponentType<any>, props: Record<string, unknown>, outlets: Record<string, React.ReactNode>, scope: string): Promise<React.ReactElement<any, string | React.JSXElementConstructor<any>>>;
+/** Rebuilds a server-tree layout in the browser; null when `source` has no tree for it. */
+declare function createFarmServerTreeLayout(_React: typeof React, source: ParentNode | string, scope: string, options: {
+    load(reference: string): Promise<Record<string, unknown>>;
+    ServerHtml: React.ComponentType<any>;
+    onUpdate?(): void;
+}): Promise<_farm_js_islx_react_client.ServerTreeLayout | null>;
+/**
+ * One server render of a page. Its islands write each large value once per render: a request that
+ * renders twice (a page that calls notFound(), or a synchronous attempt that suspended and
+ * streams instead) sends the values again in the render that reaches the browser.
+ */
+declare function withFarmIslandsRender(element: React.ReactNode): React.ReactElement;
 
-export { type FarmIslandsRuntimeOptions, createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, createFarmServerTreeElement, isolateFarmServerPageGraph, renderFarmServerTreePage, wrapFarmIsolatedClientGraph };
+export { type FarmIslandsRuntimeOptions, createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, createFarmServerTreeElement, createFarmServerTreeLayout, isolateFarmServerPageGraph, renderFarmServerTreeLayout, renderFarmServerTreePage, withFarmIslandsRender, wrapFarmIsolatedClientGraph };

package/dist/internal/islands-runtime.d.ts

@@ -1,14 +1,8 @@
-import React__default from 'react';
+import * as _farm_js_islx_react_client from '@farm.js/islx/react/client';
 import { createServerHtml } from '@farm.js/islx/react/client';
+import * as React from 'react';
 import { F as FarmIslandStrategy } from '../island-CfGru1MO.js';
 
-/**
- * @internal Islands mode's runtime (`experimental.serverComponents: { mode: "islands" }`), run by
- * islx. Generated code imports these in islands mode under the names the isolated-hydration
- * runtime uses, so the rest of Farm's runtime stays the same; apps on isolated hydration without
- * islands mode never load islx.
- */
-
 interface FarmIslandsRuntimeOptions {
     load(reference: string): Promise<Record<string, unknown>>;
     schedule(options: {
@@ -17,7 +11,7 @@ interface FarmIslandsRuntimeOptions {
         signal?: AbortSignal;
         hydrate(): Promise<void>;
     }): Promise<unknown>;
-    wrap?(element: React__default.ReactElement): React__default.ReactNode;
+    wrap?(element: React.ReactElement): React.ReactNode;
     report?(message: string, error?: unknown): void;
 }
 /**
@@ -32,26 +26,44 @@ declare function createFarmIsolatedHydrationRuntime(options: FarmIslandsRuntimeO
     rootCount: () => number;
 };
 /** A page a hydrating layout keeps as server HTML; its islands start inside it. */
-declare function createFarmServerPageBoundary(_React: typeof React__default, runtime: Parameters<typeof createServerHtml>[0]): React__default.ComponentType<Record<string, unknown> & {
+declare function createFarmServerPageBoundary(_React: typeof React, runtime: Parameters<typeof createServerHtml>[0]): React.ComponentType<Record<string, unknown> & {
     as?: string;
     dangerouslySetInnerHTML: {
         __html: string;
     };
 }>;
 /** A layout that hydrates as one React root: its client components join that root. */
-declare function wrapFarmIsolatedClientGraph(_React: typeof React__default, element: React__default.ReactNode): React__default.ReactElement<any, string | React__default.JSXElementConstructor<any>>;
+declare function wrapFarmIsolatedClientGraph(_React: typeof React, element: React.ReactNode): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 /** The page such a layout keeps as server HTML: its client components are islands again. */
-declare function isolateFarmServerPageGraph(_React: typeof React__default, element: React__default.ReactNode): React__default.ReactElement<any, string | React__default.JSXElementConstructor<any>>;
+declare function isolateFarmServerPageGraph(_React: typeof React, element: React.ReactNode): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 /** An async page under a hydrating layout, as a server tree the browser rebuilds in its root. */
-declare function renderFarmServerTreePage(_React: typeof React__default, element: React__default.ReactNode, options: {
-    isolate?(element: React__default.ReactNode): React__default.ReactNode;
+declare function renderFarmServerTreePage(_React: typeof React, element: React.ReactNode, options: {
+    isolate?(element: React.ReactNode): React.ReactNode;
     payloadOnly?: boolean;
-}): Promise<React__default.ReactElement<any, string | React__default.JSXElementConstructor<any>>>;
+}): Promise<React.ReactElement<any, string | React.JSXElementConstructor<any>>>;
 /** Rebuilds a server-tree page in the browser, inside the layout's React root. */
-declare function createFarmServerTreeElement(_React: typeof React__default, source: ParentNode | string, options: {
+declare function createFarmServerTreeElement(_React: typeof React, source: ParentNode | string, options: {
     load(reference: string): Promise<Record<string, unknown>>;
-    ServerHtml: React__default.ComponentType<any>;
+    ServerHtml: React.ComponentType<any>;
     key?: string;
-}): Promise<React__default.ReactElement<any, string | React__default.JSXElementConstructor<any>> | null>;
+}): Promise<React.ReactElement<any, string | React.JSXElementConstructor<any>> | null>;
+/**
+ * A layout around a client provider, as a server tree (islands mode): its module stays on the
+ * server, and the browser rebuilds it with the page at its outlet, so the page reads its context.
+ * `outlets` are what the layout receives as elements: `children`, and its route slots.
+ */
+declare function renderFarmServerTreeLayout(Layout: React.ComponentType<any>, props: Record<string, unknown>, outlets: Record<string, React.ReactNode>, scope: string): Promise<React.ReactElement<any, string | React.JSXElementConstructor<any>>>;
+/** Rebuilds a server-tree layout in the browser; null when `source` has no tree for it. */
+declare function createFarmServerTreeLayout(_React: typeof React, source: ParentNode | string, scope: string, options: {
+    load(reference: string): Promise<Record<string, unknown>>;
+    ServerHtml: React.ComponentType<any>;
+    onUpdate?(): void;
+}): Promise<_farm_js_islx_react_client.ServerTreeLayout | null>;
+/**
+ * One server render of a page. Its islands write each large value once per render: a request that
+ * renders twice (a page that calls notFound(), or a synchronous attempt that suspended and
+ * streams instead) sends the values again in the render that reaches the browser.
+ */
+declare function withFarmIslandsRender(element: React.ReactNode): React.ReactElement;
 
-export { type FarmIslandsRuntimeOptions, createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, createFarmServerTreeElement, isolateFarmServerPageGraph, renderFarmServerTreePage, wrapFarmIsolatedClientGraph };
+export { type FarmIslandsRuntimeOptions, createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, createFarmServerTreeElement, createFarmServerTreeLayout, isolateFarmServerPageGraph, renderFarmServerTreeLayout, renderFarmServerTreePage, withFarmIslandsRender, wrapFarmIsolatedClientGraph };

package/dist/internal/islands-runtime.mjs

@@ -1,17 +1,23 @@
 import {
   getFarmIslandValuesServer
-} from "../chunk-2NXO5SBY.mjs";
-import {
-  __name
-} from "../chunk-LPEX4YW6.mjs";
+} from "../chunk-NBIVGHAT.mjs";
+import "../chunk-Y6FXYEAI.mjs";
 
 // src/client/islands-runtime.ts
 import { enhanceForms, setActionNavigator } from "@farm.js/islx/client";
-import { isolateIslands, renderServerTree, withinClientRoot } from "@farm.js/islx/react";
+import * as React from "react";
+import {
+  IslandsProvider,
+  Outlet,
+  isolateIslands,
+  renderServerTree,
+  withinClientRoot
+} from "@farm.js/islx/react";
 import {
   createHydrationRuntime,
   createServerHtml,
-  createServerTreeElement
+  createServerTreeElement,
+  createServerTreeLayout
 } from "@farm.js/islx/react/client";
 function createFarmIsolatedHydrationRuntime(options) {
   const runtime = createHydrationRuntime({
@@ -20,13 +26,13 @@ function createFarmIsolatedHydrationRuntime(options) {
     wrap: options.wrap,
     report: options.report
   });
-  const router = /* @__PURE__ */ __name(() => window.__FARM_SPA_ROUTER__, "router");
+  const router = () => window.__FARM_SPA_ROUTER__;
   setActionNavigator({
-    refresh: /* @__PURE__ */ __name(() => router()?.refresh?.({ scroll: false }), "refresh"),
-    navigate: /* @__PURE__ */ __name((href) => {
+    refresh: () => router()?.refresh?.({ scroll: false }),
+    navigate: (href) => {
       const current = router();
       return current?.navigate ? current.navigate(href) : location.assign(href);
-    }, "navigate")
+    }
   });
   enhanceForms();
   return {
@@ -37,19 +43,15 @@ function createFarmIsolatedHydrationRuntime(options) {
     rootCount: runtime.rootCount
   };
 }
-__name(createFarmIsolatedHydrationRuntime, "createFarmIsolatedHydrationRuntime");
 function createFarmServerPageBoundary(_React, runtime) {
   return createServerHtml(runtime);
 }
-__name(createFarmServerPageBoundary, "createFarmServerPageBoundary");
 function wrapFarmIsolatedClientGraph(_React, element) {
   return withinClientRoot(element);
 }
-__name(wrapFarmIsolatedClientGraph, "wrapFarmIsolatedClientGraph");
 function isolateFarmServerPageGraph(_React, element) {
   return isolateIslands(element);
 }
-__name(isolateFarmServerPageGraph, "isolateFarmServerPageGraph");
 function renderFarmServerTreePage(_React, element, options) {
   return renderServerTree(element, {
     isolate: options.isolate,
@@ -58,7 +60,6 @@ function renderFarmServerTreePage(_React, element, options) {
     held: getFarmIslandValuesServer()?.held() ?? null
   });
 }
-__name(renderFarmServerTreePage, "renderFarmServerTreePage");
 function createFarmServerTreeElement(_React, source, options) {
   return createServerTreeElement(source, {
     load: options.load,
@@ -66,12 +67,36 @@ function createFarmServerTreeElement(_React, source, options) {
     key: options.key
   });
 }
-__name(createFarmServerTreeElement, "createFarmServerTreeElement");
+function renderFarmServerTreeLayout(Layout, props, outlets, scope) {
+  const outletProps = {};
+  for (const name of Object.keys(outlets)) {
+    outletProps[name] = React.createElement(Outlet, name === "children" ? {} : { name });
+  }
+  return renderServerTree(React.createElement(Layout, { ...props, ...outletProps }), {
+    isolate: isolateIslands,
+    outlets,
+    scope,
+    held: getFarmIslandValuesServer()?.held() ?? null
+  });
+}
+function createFarmServerTreeLayout(_React, source, scope, options) {
+  return createServerTreeLayout(source, scope, options);
+}
+function withFarmIslandsRender(element) {
+  return React.createElement(
+    IslandsProvider,
+    { held: getFarmIslandValuesServer()?.held() ?? null },
+    element
+  );
+}
 export {
   createFarmIsolatedHydrationRuntime,
   createFarmServerPageBoundary,
   createFarmServerTreeElement,
+  createFarmServerTreeLayout,
   isolateFarmServerPageGraph,
+  renderFarmServerTreeLayout,
   renderFarmServerTreePage,
+  withFarmIslandsRender,
   wrapFarmIsolatedClientGraph
 };

package/dist/internal/islands-server.cjs

@@ -1,19 +1,16 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkAPDGOKKEcjs = require('../chunk-APDGOKKE.cjs');
-require('../chunk-YKUEJ3MG.cjs');
-require('../chunk-H7BLEEAE.cjs');
-require('../chunk-6IZWX6ES.cjs');
-
-
-var _chunkS3JO3N4Hcjs = require('../chunk-S3JO3N4H.cjs');
+var _chunkXGJVRPYLcjs = require('../chunk-XGJVRPYL.cjs');
+require('../chunk-TVCFY3KK.cjs');
+require('../chunk-CQL5ZGFU.cjs');
+require('../chunk-3BIASUGR.cjs');
+require('../chunk-BTZ5O6VM.cjs');
 
 // src/client/islands-server.ts
 var _server = require('@farm.js/islx/react/server');
 function installFarmIslandsServer() {
-  _server.setRenderStateResolver.call(void 0, _chunkAPDGOKKEcjs.resolveFarmIslandRenderState);
+  _server.setRenderStateResolver.call(void 0, _chunkXGJVRPYLcjs.resolveFarmIslandRenderState);
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, installFarmIslandsServer, "installFarmIslandsServer");
 
 
 exports.installFarmIslandsServer = installFarmIslandsServer;