camox 0.40.0 → 0.41.1

package/dist/core/createApp.d.ts

@@ -1,5 +1,5 @@
 import { EmbedURL, FileValue, ImageValue, LinkValue } from "./lib/contentType.js";
-import { MarkdownInlineComponents } from "./lib/lexicalReact.js";
+import { InlineTextStyles } from "./lib/textStyles.js";
 import { BlockComponentProps, PeekItem, RepeatableItemSeed } from "./editing/createEditableBlock.js";
 import { Block } from "./createBlock.js";
 import { Layout, LayoutBlockData, OgImageParams } from "./createLayout.js";
@@ -30,11 +30,11 @@ declare function createApp({
     }) => React.JSX.Element;
     Field: <K extends never>({
       name,
-      components,
+      textStyle,
+      linkStyle,
       children
-    }: {
+    }: InlineTextStyles & {
       name: K;
-      components?: MarkdownInlineComponents;
       children: (props: {
         children: React.ReactNode;
       } & {
@@ -136,9 +136,8 @@ declare function createApp({
     }: {
       name: K;
       children: (item: {
-        Field: <F extends keyof { [F_1 in keyof ({}[K] extends (infer U)[] ? U : never) as ({}[K] extends (infer U)[] ? U : never)[F_1] extends string ? F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1] }>(props: {
+        Field: <F extends keyof { [F_1 in keyof ({}[K] extends (infer U)[] ? U : never) as ({}[K] extends (infer U)[] ? U : never)[F_1] extends string ? F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1] }>(props: InlineTextStyles & {
           name: F;
-          components?: MarkdownInlineComponents;
           children: (props: {
             children: React.ReactNode;
           } & {
@@ -261,9 +260,8 @@ declare function createApp({
         Repeater: <F extends keyof { [F_1 in keyof ({}[K] extends (infer U)[] ? U : never) as ({}[K] extends (infer U)[] ? U : never)[F_1] extends (infer U_1)[] ? ImageValue extends U_1 ? never : FileValue extends U_1 ? never : F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1] }>(props: {
           name: F;
           children: (item: {
-            Field: (props: {
+            Field: (props: InlineTextStyles & {
               name: string;
-              components?: MarkdownInlineComponents;
               children: (props: {
                 children: React.ReactNode;
               } & {
@@ -386,6 +384,7 @@ declare function createApp({
         required: string[];
       } | undefined;
       layoutOnly: boolean;
+      synced: boolean;
       getInitialBundle: () => {
         content: Record<string, unknown>;
         settings: {
@@ -432,11 +431,11 @@ declare function createApp({
     }) => React.JSX.Element;
     Field: <K extends never>({
       name,
-      components,
+      textStyle,
+      linkStyle,
       children
-    }: {
+    }: InlineTextStyles & {
       name: K;
-      components?: MarkdownInlineComponents;
       children: (props: {
         children: React.ReactNode;
       } & {
@@ -538,9 +537,8 @@ declare function createApp({
     }: {
       name: K;
       children: (item: {
-        Field: <F extends keyof { [F_1 in keyof ({}[K] extends (infer U)[] ? U : never) as ({}[K] extends (infer U)[] ? U : never)[F_1] extends string ? F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1] }>(props: {
+        Field: <F extends keyof { [F_1 in keyof ({}[K] extends (infer U)[] ? U : never) as ({}[K] extends (infer U)[] ? U : never)[F_1] extends string ? F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1] }>(props: InlineTextStyles & {
           name: F;
-          components?: MarkdownInlineComponents;
           children: (props: {
             children: React.ReactNode;
           } & {
@@ -663,9 +661,8 @@ declare function createApp({
         Repeater: <F extends keyof { [F_1 in keyof ({}[K] extends (infer U)[] ? U : never) as ({}[K] extends (infer U)[] ? U : never)[F_1] extends (infer U_1)[] ? ImageValue extends U_1 ? never : FileValue extends U_1 ? never : F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1] }>(props: {
           name: F;
           children: (item: {
-            Field: (props: {
+            Field: (props: InlineTextStyles & {
               name: string;
-              components?: MarkdownInlineComponents;
               children: (props: {
                 children: React.ReactNode;
               } & {
@@ -788,6 +785,7 @@ declare function createApp({
         required: string[];
       } | undefined;
       layoutOnly: boolean;
+      synced: boolean;
       getInitialBundle: () => {
         content: Record<string, unknown>;
         settings: {
@@ -829,8 +827,13 @@ declare function createApp({
       (): _$react_jsx_runtime0.JSX.Element;
       displayName: string;
     };
+    useData(): unknown;
     _internal: {
       id: string;
+      kind: "curated" | "derived";
+      loader: ((context: {
+        params: Record<string, string>;
+      }) => unknown) | undefined;
       title: string;
       description: string;
       buildMetaTitle: (params: {
@@ -881,10 +884,12 @@ declare function createApp({
       }>;
       Provider: ({
         layoutBlocks,
-        children
+        children,
+        data
       }: {
         layoutBlocks: Record<string, LayoutBlockData>;
         children: React.ReactNode;
+        data?: unknown;
       }) => _$react_jsx_runtime0.JSX.Element;
     };
   }[];
@@ -897,8 +902,13 @@ declare function createApp({
       (): _$react_jsx_runtime0.JSX.Element;
       displayName: string;
     };
+    useData(): unknown;
     _internal: {
       id: string;
+      kind: "curated" | "derived";
+      loader: ((context: {
+        params: Record<string, string>;
+      }) => unknown) | undefined;
       title: string;
       description: string;
       buildMetaTitle: (params: {
@@ -949,10 +959,12 @@ declare function createApp({
       }>;
       Provider: ({
         layoutBlocks,
-        children
+        children,
+        data
       }: {
         layoutBlocks: Record<string, LayoutBlockData>;
         children: React.ReactNode;
+        data?: unknown;
       }) => _$react_jsx_runtime0.JSX.Element;
     };
   } | undefined;
@@ -974,6 +986,7 @@ declare function createApp({
       required: string[];
     } | undefined;
     layoutOnly: true | undefined;
+    synced: boolean;
   }[];
   getSerializableLayoutDefinitions(): {
     layoutId: string;

package/dist/core/createApp.js

@@ -3,7 +3,17 @@ function createApp({ blocks, layouts = [] }) {
 	const blocksMap = /* @__PURE__ */ new Map();
 	const layoutsMap = /* @__PURE__ */ new Map();
 	for (const block of blocks) blocksMap.set(block._internal.id, block);
-	for (const layout of layouts) layoutsMap.set(layout._internal.id, layout);
+	const derivedPatterns = /* @__PURE__ */ new Set();
+	for (const layout of layouts) {
+		const { id, kind } = layout._internal;
+		if (layoutsMap.has(id)) throw new Error(`Duplicate layout: ${id}`);
+		if (kind === "derived") {
+			const pattern = id.split(".").map((segment) => segment.startsWith("$") ? "$" : segment).join(".");
+			if (derivedPatterns.has(pattern)) throw new Error(`Equivalent derived route: ${id}`);
+			derivedPatterns.add(pattern);
+		}
+		layoutsMap.set(id, layout);
+	}
 	const layoutsWithInitialBlocks = layouts.filter((l) => l._internal.initialBlockBundles);
 	if (layoutsWithInitialBlocks.length > 1) {
 		const ids = layoutsWithInitialBlocks.map((l) => `"${l._internal.id}"`).join(", ");
@@ -29,7 +39,8 @@ function createApp({ blocks, layouts = [] }) {
 				description: block._internal.description,
 				contentSchema: block._internal.contentSchema,
 				settingsSchema: block._internal.settingsSchema,
-				layoutOnly: block._internal.layoutOnly || void 0
+				layoutOnly: block._internal.layoutOnly || void 0,
+				synced: block._internal.synced
 			}));
 		},
 		getSerializableLayoutDefinitions() {
@@ -46,7 +57,7 @@ function createApp({ blocks, layouts = [] }) {
 				blocks: layout._internal.initialBlockBundles,
 				hasInitialBlocks: true
 			};
-			const fallback = layouts[0];
+			const fallback = layouts.find((layout) => layout._internal.kind === "curated");
 			if (!fallback) return null;
 			return {
 				layoutId: fallback._internal.id,

package/dist/core/createBlock.d.ts

@@ -1,5 +1,5 @@
 import { Type } from "./lib/contentType.js";
-import { MarkdownInlineComponents, MarkdownLinkRenderData, MarkdownLinkRenderProps } from "./lib/lexicalReact.js";
+import { InlineStyle, InlineTextStyles, TextLinkStyleData, TextStyleData } from "./lib/textStyles.js";
 import { BlockComponentProps, PeekItem, RepeatableItemSeed, createEditableBlock } from "./editing/createEditableBlock.js";
 
 //#region src/core/createBlock.d.ts
@@ -7,4 +7,4 @@ type EditableCreateBlock = typeof createEditableBlock;
 declare const createBlock: EditableCreateBlock;
 type Block = ReturnType<typeof createBlock>;
 //#endregion
-export { Block, type BlockComponentProps, type MarkdownInlineComponents, type MarkdownLinkRenderData, type MarkdownLinkRenderProps, type PeekItem, type RepeatableItemSeed, Type, createBlock };
+export { Block, type BlockComponentProps, type InlineStyle, type InlineTextStyles, type PeekItem, type RepeatableItemSeed, type TextLinkStyleData, type TextStyleData, Type, createBlock };

package/dist/core/createBlock.js

@@ -122,11 +122,12 @@ function createViewBlock(options) {
 		if (!block) throw new Error("Field must be used within a Block Component");
 		return item ? item.itemContent[name] : block.content[name];
 	}
-	const Field = ({ name, components, children }) => {
+	const Field = ({ name, textStyle, linkStyle, children }) => {
 		const editingRuntime = useBlockEditingRuntime();
 		if (editingRuntime) return editingRuntime.renderPrimitive(options, "Field", {
 			name,
-			components,
+			textStyle,
+			linkStyle,
 			children
 		});
 		const value = useValue(name);
@@ -139,7 +140,8 @@ function createViewBlock(options) {
 		return children({ children: markdownToReactNodes(value, {
 			pages,
 			fallbackHref: useLocation({ select: (location) => location.pathname }),
-			components
+			textStyle,
+			linkStyle
 		}) }, { text: value });
 	};
 	const Embed = ({ name, children }) => {
@@ -179,9 +181,9 @@ function createViewBlock(options) {
 	};
 	function useAsset(name) {
 		const $ = c(4);
-		if ($[0] !== "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982") {
+		if ($[0] !== "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267") {
 			for (let $i = 0; $i < 4; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982";
+			$[0] = "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267";
 		}
 		const block = React.use(Context);
 		const item = React.use(RepeaterContext);
@@ -262,9 +264,9 @@ function createViewBlock(options) {
 	};
 	const ImageList = (props) => {
 		const $ = c(3);
-		if ($[0] !== "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982") {
+		if ($[0] !== "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267") {
 			for (let $i = 0; $i < 3; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982";
+			$[0] = "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267";
 		}
 		let t0;
 		if ($[1] !== props) {
@@ -279,9 +281,9 @@ function createViewBlock(options) {
 	};
 	const FileList = (props) => {
 		const $ = c(3);
-		if ($[0] !== "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982") {
+		if ($[0] !== "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267") {
 			for (let $i = 0; $i < 3; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982";
+			$[0] = "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267";
 		}
 		let t0;
 		if ($[1] !== props) {
@@ -342,31 +344,17 @@ function createViewBlock(options) {
 		});
 	};
 	const useSetting = (name) => {
-		const $ = c(4);
-		if ($[0] !== "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982") {
-			for (let $i = 0; $i < 4; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982";
-		}
 		const editingRuntime = useBlockEditingRuntime();
-		if (editingRuntime) {
-			let t0;
-			if ($[1] !== editingRuntime || $[2] !== name) {
-				t0 = editingRuntime.getSetting(options, name);
-				$[1] = editingRuntime;
-				$[2] = name;
-				$[3] = t0;
-			} else t0 = $[3];
-			return t0;
-		}
+		if (editingRuntime) return editingRuntime.useSetting(options, name);
 		const context = React.use(Context);
 		if (!context) throw new Error("useSetting must be used within a Block Component");
 		return context.settings[name];
 	};
 	const Detached = (t0) => {
 		const $ = c(6);
-		if ($[0] !== "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982") {
+		if ($[0] !== "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267") {
 			for (let $i = 0; $i < 6; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982";
+			$[0] = "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267";
 		}
 		const { children } = t0;
 		const editingRuntime = useBlockEditingRuntime();
@@ -396,9 +384,9 @@ function createViewBlock(options) {
 	};
 	const Component = (props) => {
 		const $ = c(23);
-		if ($[0] !== "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982") {
+		if ($[0] !== "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267") {
 			for (let $i = 0; $i < 23; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "04a637ebd823abadf975e738c0e326acccffcffd1f7360db558a19fce0075982";
+			$[0] = "2482501ae16e686c6c2d84727ab607bf02513a6bcdd7de7e2f7f973cc1690267";
 		}
 		const editingRuntime = useBlockEditingRuntime();
 		if (editingRuntime) {
@@ -547,6 +535,7 @@ function createViewBlock(options) {
 			contentSchema,
 			settingsSchema,
 			layoutOnly: options.layoutOnly ?? false,
+			synced: options.synced ?? false,
 			getInitialBundle,
 			getInitialContent: () => {
 				const content = { ...contentDefaults };

package/dist/core/createLayout.d.ts

@@ -51,6 +51,10 @@ type ValidateLayoutOnlyBlocks<T extends readonly LayoutBlock[]> = { [K in keyof
 type ValidatePageContentBlocks<T extends readonly LayoutBlock[]> = { [K in keyof T]: T[K] extends LayoutBlock<true> ? "❌ Camox: blocks in `blocks.initial` must NOT be `layoutOnly: true` — `initial` is for page-content blocks. Remove `layoutOnly: true` from this block's `createBlock` options." : T[K] };
 interface CreateLayoutOptions<TBefore extends readonly LayoutBlock[], TAfter extends readonly LayoutBlock[], TInitial extends readonly LayoutBlock[]> {
   id: string;
+  kind?: "curated" | "derived";
+  loader?: (context: {
+    params: Record<string, string>;
+  }) => unknown;
   title: string;
   description: string;
   blocks: {
@@ -68,7 +72,7 @@ interface CreateLayoutOptions<TBefore extends readonly LayoutBlock[], TAfter ext
   }) => string;
   buildOgImage?: (params: OgImageParams) => React.ReactElement;
 }
-declare function createLayout<const TBefore extends readonly LayoutBlock[], const TAfter extends readonly LayoutBlock[], const TInitial extends readonly LayoutBlock[] = []>(options: CreateLayoutOptions<TBefore, TAfter, TInitial>): {
+declare function createLayoutDefinition<const TBefore extends readonly LayoutBlock[], const TAfter extends readonly LayoutBlock[], const TInitial extends readonly LayoutBlock[] = []>(options: CreateLayoutOptions<TBefore, TAfter, TInitial>): {
   BeforeBlocks: {
     (): _$react_jsx_runtime0.JSX.Element;
     displayName: string;
@@ -77,8 +81,13 @@ declare function createLayout<const TBefore extends readonly LayoutBlock[], cons
     (): _$react_jsx_runtime0.JSX.Element;
     displayName: string;
   };
+  useData(): unknown;
   _internal: {
     id: string;
+    kind: "curated" | "derived";
+    loader: ((context: {
+      params: Record<string, string>;
+    }) => unknown) | undefined;
     title: string;
     description: string;
     buildMetaTitle: (params: {
@@ -129,13 +138,48 @@ declare function createLayout<const TBefore extends readonly LayoutBlock[], cons
     }>;
     Provider: ({
       layoutBlocks,
-      children
+      children,
+      data
     }: {
       layoutBlocks: Record<string, LayoutBlockData>;
       children: React.ReactNode;
+      data?: unknown;
     }) => _$react_jsx_runtime0.JSX.Element;
   };
 };
-type Layout = ReturnType<typeof createLayout>;
+type Layout = ReturnType<typeof createLayoutDefinition>;
+interface LayoutFileRoutes {}
+type Params<Id extends string> = Id extends `${infer Head}.${infer Tail}` ? Params<Head> & Params<Tail> : Id extends `$${infer Name}` ? { [K in Name]: string } : {};
+type FileOptions<Id extends string, Data, B extends readonly LayoutBlock[], A extends readonly LayoutBlock[], I extends readonly LayoutBlock[]> = Omit<CreateLayoutOptions<B, A, I>, "id" | "kind" | "loader" | "component"> & ({
+  kind: "curated";
+  component: React.ComponentType<{
+    children: React.ReactNode;
+  }>;
+  loader?: never;
+} | {
+  kind: "derived";
+  blocks: {
+    before: ValidateLayoutOnlyBlocks<B>;
+    after: ValidateLayoutOnlyBlocks<A>;
+    initial?: never;
+  };
+  loader: (context: {
+    params: Id extends keyof LayoutFileRoutes ? LayoutFileRoutes[Id] extends {
+      params: infer P;
+    } ? P : Params<Id> : Params<Id>;
+  }) => Data;
+  component: React.ComponentType<{
+    children?: never;
+  }>;
+});
+declare function createLayout<const Id extends string>(id: Id): <Data, const B extends readonly LayoutBlock[], const A extends readonly LayoutBlock[], const I extends readonly LayoutBlock[] = []>(options: FileOptions<Id, Data, B, A, I>) => Omit<Layout, "useData"> & {
+  useData: () => Awaited<Data>;
+};
+declare function createLayout<const B extends readonly LayoutBlock[], const A extends readonly LayoutBlock[], const I extends readonly LayoutBlock[] = []>(options: CreateLayoutOptions<B, A, I>): Layout;
+/** Signal a missing derived page; other loader failures remain server errors. */
+declare function notFound(): Error & {
+  status: number;
+  code: string;
+};
 //#endregion
-export { Layout, LayoutBlockData, OgImageParams, createLayout };
+export { Layout, LayoutBlockData, LayoutFileRoutes, OgImageParams, createLayout, notFound };

package/dist/core/createLayout.js

@@ -4,16 +4,16 @@ import * as React from "react";
 import { Fragment, jsx } from "react/jsx-runtime";
 
 //#region src/core/createLayout.tsx
-function createLayout(options) {
+function createLayoutDefinition(options) {
 	const LayoutContext = React.createContext(null);
 	const beforeBlocks = options.blocks.before;
 	const afterBlocks = options.blocks.after;
 	const initialBlocks = options.blocks.initial;
 	const BeforeBlocks = () => {
 		const $ = c(5);
-		if ($[0] !== "7133c1370318efe3d17ae04e10ee61f13b2babe8b7bb9f5f91e396facf4493b3") {
+		if ($[0] !== "2ae925f72331cad3d35d77334ec5712b5849211fd0dcab4e27af95282e583b7a") {
 			for (let $i = 0; $i < 5; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "7133c1370318efe3d17ae04e10ee61f13b2babe8b7bb9f5f91e396facf4493b3";
+			$[0] = "2ae925f72331cad3d35d77334ec5712b5849211fd0dcab4e27af95282e583b7a";
 		}
 		const ctx = React.use(LayoutContext);
 		if (!ctx) throw new Error(`Layout "${options.id}" BeforeBlocks must be rendered inside its Provider`);
@@ -29,7 +29,7 @@ function createLayout(options) {
 					children: /* @__PURE__ */ jsx(block._internal.Component, {
 						blockData,
 						mode: "layout",
-						showAddBlockBottom: isLastBefore || void 0,
+						showAddBlockBottom: options.kind !== "derived" && isLastBefore || void 0,
 						addBlockAfterPosition: isLastBefore ? "" : void 0
 					})
 				}, block._internal.id);
@@ -48,9 +48,9 @@ function createLayout(options) {
 	BeforeBlocks.displayName = `LayoutBeforeBlocks(${options.id})`;
 	const AfterBlocks = () => {
 		const $ = c(5);
-		if ($[0] !== "7133c1370318efe3d17ae04e10ee61f13b2babe8b7bb9f5f91e396facf4493b3") {
+		if ($[0] !== "2ae925f72331cad3d35d77334ec5712b5849211fd0dcab4e27af95282e583b7a") {
 			for (let $i = 0; $i < 5; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "7133c1370318efe3d17ae04e10ee61f13b2babe8b7bb9f5f91e396facf4493b3";
+			$[0] = "2ae925f72331cad3d35d77334ec5712b5849211fd0dcab4e27af95282e583b7a";
 		}
 		const ctx = React.use(LayoutContext);
 		if (!ctx) throw new Error(`Layout "${options.id}" AfterBlocks must be rendered inside its Provider`);
@@ -66,7 +66,7 @@ function createLayout(options) {
 					children: /* @__PURE__ */ jsx(block._internal.Component, {
 						blockData,
 						mode: "layout",
-						showAddBlockTop: isFirstAfter || void 0,
+						showAddBlockTop: options.kind !== "derived" && isFirstAfter || void 0,
 						addBlockAfterPosition: isFirstAfter ? null : void 0
 					})
 				}, block._internal.id);
@@ -84,29 +84,33 @@ function createLayout(options) {
 	};
 	AfterBlocks.displayName = `LayoutAfterBlocks(${options.id})`;
 	const Provider = (t0) => {
-		const $ = c(6);
-		if ($[0] !== "7133c1370318efe3d17ae04e10ee61f13b2babe8b7bb9f5f91e396facf4493b3") {
-			for (let $i = 0; $i < 6; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-			$[0] = "7133c1370318efe3d17ae04e10ee61f13b2babe8b7bb9f5f91e396facf4493b3";
+		const $ = c(7);
+		if ($[0] !== "2ae925f72331cad3d35d77334ec5712b5849211fd0dcab4e27af95282e583b7a") {
+			for (let $i = 0; $i < 7; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
+			$[0] = "2ae925f72331cad3d35d77334ec5712b5849211fd0dcab4e27af95282e583b7a";
 		}
-		const { layoutBlocks, children } = t0;
+		const { layoutBlocks, children, data } = t0;
 		let t1;
-		if ($[1] !== layoutBlocks) {
-			t1 = { layoutBlocks };
-			$[1] = layoutBlocks;
-			$[2] = t1;
-		} else t1 = $[2];
+		if ($[1] !== data || $[2] !== layoutBlocks) {
+			t1 = {
+				layoutBlocks,
+				data
+			};
+			$[1] = data;
+			$[2] = layoutBlocks;
+			$[3] = t1;
+		} else t1 = $[3];
 		const value = t1;
 		let t2;
-		if ($[3] !== children || $[4] !== value) {
+		if ($[4] !== children || $[5] !== value) {
 			t2 = /* @__PURE__ */ jsx(LayoutContext.Provider, {
 				value,
 				children
 			});
-			$[3] = children;
-			$[4] = value;
-			$[5] = t2;
-		} else t2 = $[5];
+			$[4] = children;
+			$[5] = value;
+			$[6] = t2;
+		} else t2 = $[6];
 		return t2;
 	};
 	const blockDefinitions = [...beforeBlocks.map((block) => {
@@ -147,8 +151,15 @@ function createLayout(options) {
 	return {
 		BeforeBlocks,
 		AfterBlocks,
+		useData() {
+			const context = React.use(LayoutContext);
+			if (!context) throw new Error(`Layout "${options.id}" useData must be rendered inside its Provider`);
+			return context.data;
+		},
 		_internal: {
 			id: options.id,
+			kind: options.kind ?? "curated",
+			loader: options.loader,
 			title: options.title,
 			description: options.description,
 			buildMetaTitle: options.buildMetaTitle,
@@ -160,6 +171,23 @@ function createLayout(options) {
 		}
 	};
 }
+function createLayout(idOrOptions) {
+	if (typeof idOrOptions !== "string") return createLayoutDefinition(idOrOptions);
+	return (options) => {
+		if (options.kind === "derived" && options.blocks.initial) throw new Error("Derived layouts cannot define initial page blocks");
+		return createLayoutDefinition({
+			...options,
+			id: idOrOptions
+		});
+	};
+}
+/** Signal a missing derived page; other loader failures remain server errors. */
+function notFound() {
+	return Object.assign(/* @__PURE__ */ new Error("Page not found"), {
+		status: 404,
+		code: "NOT_FOUND"
+	});
+}
 
 //#endregion
-export { createLayout };
+export { createLayout, notFound };

package/dist/core/derivedRoutes.js

@@ -0,0 +1,36 @@
+//#region src/core/derivedRoutes.ts
+function routeSegments(id) {
+	return id.split(".");
+}
+function matchDerivedLayout(layouts, pathname) {
+	const path = pathname.replace(/^\/|\/$/g, "").split("/");
+	const candidates = layouts.filter((layout) => layout._internal.kind === "derived").sort((a, b) => routeSegments(a._internal.id).filter((s) => s.startsWith("$")).length - routeSegments(b._internal.id).filter((s) => s.startsWith("$")).length);
+	for (const layout of candidates) {
+		const segments = routeSegments(layout._internal.id);
+		if (segments.length !== path.length) continue;
+		const params = {};
+		let matches = true;
+		for (const [index, segment] of segments.entries()) {
+			let value;
+			try {
+				value = decodeURIComponent(path[index]);
+			} catch {
+				matches = false;
+				break;
+			}
+			if (segment.startsWith("$") && value && !value.includes("/")) params[segment.slice(1)] = value;
+			else if (segment !== value) {
+				matches = false;
+				break;
+			}
+		}
+		if (matches) return {
+			layout,
+			params
+		};
+	}
+	return null;
+}
+
+//#endregion
+export { matchDerivedLayout, routeSegments };

package/dist/core/editing/BlockEditingRuntime.js

@@ -6,9 +6,9 @@ import { jsx } from "react/jsx-runtime";
 const BlockEditingRuntimeContext = React.createContext(null);
 function BlockEditingRuntimeProvider(t0) {
 	const $ = c(4);
-	if ($[0] !== "018faf594421b0a35898b0151f09f96da583a27bff230a04b3f1849452dbd5f1") {
+	if ($[0] !== "ad4fc9cc5b1b02b16c68794c8ba79d99d7e878328fdbc5bd08fcf7fbaebb83df") {
 		for (let $i = 0; $i < 4; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "018faf594421b0a35898b0151f09f96da583a27bff230a04b3f1849452dbd5f1";
+		$[0] = "ad4fc9cc5b1b02b16c68794c8ba79d99d7e878328fdbc5bd08fcf7fbaebb83df";
 	}
 	const { children, runtime } = t0;
 	let t1;
@@ -25,9 +25,9 @@ function BlockEditingRuntimeProvider(t0) {
 }
 function useBlockEditingRuntime() {
 	const $ = c(1);
-	if ($[0] !== "018faf594421b0a35898b0151f09f96da583a27bff230a04b3f1849452dbd5f1") {
+	if ($[0] !== "ad4fc9cc5b1b02b16c68794c8ba79d99d7e878328fdbc5bd08fcf7fbaebb83df") {
 		for (let $i = 0; $i < 1; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "018faf594421b0a35898b0151f09f96da583a27bff230a04b3f1849452dbd5f1";
+		$[0] = "ad4fc9cc5b1b02b16c68794c8ba79d99d7e878328fdbc5bd08fcf7fbaebb83df";
 	}
 	return React.useContext(BlockEditingRuntimeContext);
 }

package/dist/core/editing/CompleteBlockEditingRuntime.js

@@ -15,9 +15,9 @@ function getEditableDefinition(options) {
 }
 function EditableBlock(t0) {
 	const $ = c(6);
-	if ($[0] !== "1831c7be6bdb574903d92ed788ce4950eb5e960930a89aedad2e2125bc6edd2a") {
+	if ($[0] !== "e1b3ebcb34bc95f5c457074764df3357687300ade86d161e3e1014255268f87d") {
 		for (let $i = 0; $i < 6; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "1831c7be6bdb574903d92ed788ce4950eb5e960930a89aedad2e2125bc6edd2a";
+		$[0] = "e1b3ebcb34bc95f5c457074764df3357687300ade86d161e3e1014255268f87d";
 	}
 	const { options, props } = t0;
 	let t1;
@@ -38,7 +38,7 @@ function EditableBlock(t0) {
 	return t3;
 }
 const completeEditingRuntime = {
-	getSetting(options, name) {
+	useSetting(options, name) {
 		return getEditableDefinition(options).useSetting(name);
 	},
 	renderBlock(options, props) {
@@ -55,9 +55,9 @@ const completeEditingRuntime = {
 };
 function CompleteBlockEditingRuntimeProvider(t0) {
 	const $ = c(3);
-	if ($[0] !== "1831c7be6bdb574903d92ed788ce4950eb5e960930a89aedad2e2125bc6edd2a") {
+	if ($[0] !== "e1b3ebcb34bc95f5c457074764df3357687300ade86d161e3e1014255268f87d") {
 		for (let $i = 0; $i < 3; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "1831c7be6bdb574903d92ed788ce4950eb5e960930a89aedad2e2125bc6edd2a";
+		$[0] = "e1b3ebcb34bc95f5c457074764df3357687300ade86d161e3e1014255268f87d";
 	}
 	const { children } = t0;
 	let t1;