camox 0.62.0 → 0.65.1

package/dist/core/createApp.d.ts

@@ -2,7 +2,7 @@ import { IconProps } from "./lib/icons.js";
 import { CamoxDocument } from "./defineDocument.js";
 import { ArtifactRenderProps } from "./lib/artifact.js";
 import { InlineTextStyles } from "./lib/textStyles.js";
-import { ReferenceContent, ReferenceScope } from "./lib/reference.js";
+import { ReferenceContent, ReferenceKeys, ReferenceListKeys, ReferenceScope } from "./lib/reference.js";
 import { Layout } from "./createLayout.js";
 import { Collection } from "./createCollection.js";
 import { IconValue } from "./lib/iconTypes.js";
@@ -142,7 +142,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
     Repeater: <K extends never>(props: {
       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 IconValue | ArtifactSource ? never : ({}[K] extends (infer U)[] ? U : never)[F_1] extends string ? F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1]; }>(props: InlineTextStyles & {
+        Field: <F extends keyof { [F_1 in keyof ({}[K] extends (infer U)[] ? U : never) as ({}[K] extends (infer U)[] ? U : never)[F_1] extends ArtifactSource | IconValue ? never : ({}[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;
           children: (props: {
             children: React.ReactNode;
@@ -240,7 +240,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
             [attribute: `data-camox-${string}`]: string | boolean | undefined;
           }, data: FileValue) => React.ReactNode;
         }) => React.ReactNode;
-        ImageList: <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 ? U_1 extends U_1 & {
+        ImageList: <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)[] ? ImageValue extends U ? U extends U & {
           url: string;
           alt: string;
           filename: string;
@@ -258,7 +258,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
             sizes?: string;
           }, data: ImageValue) => React.ReactNode;
         }) => React.ReactNode;
-        FileList: <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)[] ? FileValue extends U_1 ? U_1 extends U_1 & {
+        FileList: <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)[] ? FileValue extends U ? U extends U & {
           url: string;
           alt: string;
           filename: string;
@@ -276,15 +276,15 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
             [attribute: `data-camox-${string}`]: string | boolean | undefined;
           }, data: FileValue) => React.ReactNode;
         }) => React.ReactNode;
-        Reference: <F extends string>(props: {
+        Reference: <F extends ReferenceKeys<never>>(props: {
           name: F;
           children: (scope: ReferenceScope<ReferenceContent<never[F]>>) => React.ReactNode;
         }) => React.ReactNode;
-        ReferenceList: <F extends string>(props: {
+        ReferenceList: <F extends ReferenceListKeys<never>>(props: {
           name: F;
           children: (scope: ReferenceScope<ReferenceContent<never[F]>>) => React.ReactNode;
         }) => React.ReactNode;
-        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 : U_1 extends string ? never : F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1]; }>(props: {
+        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)[] ? ImageValue extends U ? never : FileValue extends U ? never : U extends string ? never : F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1]; }>(props: {
           name: F;
           children: (item: {
             Field: (props: InlineTextStyles & {
@@ -403,11 +403,11 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
         useSetting: <F extends string>(name: F) => never;
       }, index: number) => React.ReactNode;
     }) => React.ReactNode;
-    Reference: <K extends never>(props: {
+    Reference: <K extends ReferenceKeys<Record<string, import("@sinclair/typebox").TSchema>>>(props: {
       name: K;
       children: (scope: ReferenceScope<never>) => React.ReactNode;
     }) => React.ReactNode;
-    ReferenceList: <K extends never>(props: {
+    ReferenceList: <K extends ReferenceListKeys<Record<string, import("@sinclair/typebox").TSchema>>>(props: {
       name: K;
       children: (scope: ReferenceScope<never>) => React.ReactNode;
     }) => React.ReactNode;
@@ -416,12 +416,11 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
       Component: ({ blockData, mode, isFirstBlock, showAddBlockTop, showAddBlockBottom, addBlockAfterPosition }: BlockComponentProps<{
         [x: string]: unknown;
       }>) => import("react").JSX.Element;
-      LayoutItem: ({ collectionId, collection, properties, record, children, fallback }: LayoutItemProps) => string | number | bigint | boolean | Iterable<import("react").ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<import("react").ReactNode> | null | undefined> | import("react").JSX.Element | null | undefined;
+      LayoutItem: ({ collectionId, collection, properties, record, children, fallback }: LayoutItemProps) => string | number | bigint | boolean | import("react").JSX.Element | Iterable<import("react").ReactNode> | Promise<string | number | bigint | boolean | Iterable<import("react").ReactNode> | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | import("react").ReactPortal | null | undefined> | null | undefined;
       id: string;
       title: string;
       description: string;
       contentSchema: {
-        toStructuredData?: unknown;
         type: "object";
         title: string;
         description: string;
@@ -429,6 +428,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
         required: string[];
         toMarkdown: string[];
         toTitle: string;
+        toStructuredData?: unknown;
       };
       settingsSchema: {
         type: "object";
@@ -584,7 +584,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
     Repeater: <K extends never>(props: {
       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 IconValue | ArtifactSource ? never : ({}[K] extends (infer U)[] ? U : never)[F_1] extends string ? F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1]; }>(props: InlineTextStyles & {
+        Field: <F extends keyof { [F_1 in keyof ({}[K] extends (infer U)[] ? U : never) as ({}[K] extends (infer U)[] ? U : never)[F_1] extends ArtifactSource | IconValue ? never : ({}[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;
           children: (props: {
             children: React.ReactNode;
@@ -682,7 +682,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
             [attribute: `data-camox-${string}`]: string | boolean | undefined;
           }, data: FileValue) => React.ReactNode;
         }) => React.ReactNode;
-        ImageList: <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 ? U_1 extends U_1 & {
+        ImageList: <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)[] ? ImageValue extends U ? U extends U & {
           url: string;
           alt: string;
           filename: string;
@@ -700,7 +700,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
             sizes?: string;
           }, data: ImageValue) => React.ReactNode;
         }) => React.ReactNode;
-        FileList: <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)[] ? FileValue extends U_1 ? U_1 extends U_1 & {
+        FileList: <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)[] ? FileValue extends U ? U extends U & {
           url: string;
           alt: string;
           filename: string;
@@ -718,15 +718,15 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
             [attribute: `data-camox-${string}`]: string | boolean | undefined;
           }, data: FileValue) => React.ReactNode;
         }) => React.ReactNode;
-        Reference: <F extends string>(props: {
+        Reference: <F extends ReferenceKeys<never>>(props: {
           name: F;
           children: (scope: ReferenceScope<ReferenceContent<never[F]>>) => React.ReactNode;
         }) => React.ReactNode;
-        ReferenceList: <F extends string>(props: {
+        ReferenceList: <F extends ReferenceListKeys<never>>(props: {
           name: F;
           children: (scope: ReferenceScope<ReferenceContent<never[F]>>) => React.ReactNode;
         }) => React.ReactNode;
-        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 : U_1 extends string ? never : F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1]; }>(props: {
+        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)[] ? ImageValue extends U ? never : FileValue extends U ? never : U extends string ? never : F_1 : never]: ({}[K] extends (infer U)[] ? U : never)[F_1]; }>(props: {
           name: F;
           children: (item: {
             Field: (props: InlineTextStyles & {
@@ -845,11 +845,11 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
         useSetting: <F extends string>(name: F) => never;
       }, index: number) => React.ReactNode;
     }) => React.ReactNode;
-    Reference: <K extends never>(props: {
+    Reference: <K extends ReferenceKeys<Record<string, import("@sinclair/typebox").TSchema>>>(props: {
       name: K;
       children: (scope: ReferenceScope<never>) => React.ReactNode;
     }) => React.ReactNode;
-    ReferenceList: <K extends never>(props: {
+    ReferenceList: <K extends ReferenceListKeys<Record<string, import("@sinclair/typebox").TSchema>>>(props: {
       name: K;
       children: (scope: ReferenceScope<never>) => React.ReactNode;
     }) => React.ReactNode;
@@ -858,12 +858,11 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
       Component: ({ blockData, mode, isFirstBlock, showAddBlockTop, showAddBlockBottom, addBlockAfterPosition }: BlockComponentProps<{
         [x: string]: unknown;
       }>) => import("react").JSX.Element;
-      LayoutItem: ({ collectionId, collection, properties, record, children, fallback }: LayoutItemProps) => string | number | bigint | boolean | Iterable<import("react").ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<import("react").ReactNode> | null | undefined> | import("react").JSX.Element | null | undefined;
+      LayoutItem: ({ collectionId, collection, properties, record, children, fallback }: LayoutItemProps) => string | number | bigint | boolean | import("react").JSX.Element | Iterable<import("react").ReactNode> | Promise<string | number | bigint | boolean | Iterable<import("react").ReactNode> | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | import("react").ReactPortal | null | undefined> | null | undefined;
       id: string;
       title: string;
       description: string;
       contentSchema: {
-        toStructuredData?: unknown;
         type: "object";
         title: string;
         description: string;
@@ -871,6 +870,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
         required: string[];
         toMarkdown: string[];
         toTitle: string;
+        toStructuredData?: unknown;
       };
       settingsSchema: {
         type: "object";
@@ -931,7 +931,6 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
       title: string;
       description: string;
       contentSchema: {
-        toStructuredData?: unknown;
         type: "object";
         title: string;
         description: string;
@@ -939,6 +938,7 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
         required: string[];
         toMarkdown: string[];
         toTitle: string;
+        toStructuredData?: unknown;
       };
       settingsSchema: {
         type: "object";
@@ -955,10 +955,6 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
       synced: boolean;
     }[];
     layouts: {
-      recordPages?: {
-        collectionId: string;
-        field: string;
-      } | undefined;
       layoutId: string;
       kind: "curated" | "derived" | "singleton";
       title: string;
@@ -988,15 +984,19 @@ export declare function createApp({ blocks, lazyBlocks, layouts, collections, do
         }[];
         slot: "after";
       })[];
+      recordPages?: {
+        collectionId: string;
+        field: string;
+      } | undefined;
     }[];
     collections: {
-      contentSchema: any;
-      toStructuredData?: Record<string, unknown> | undefined;
       collectionId: string;
       title: string;
       description: string;
       toTitle: string;
       toDescription: string | null;
+      toStructuredData?: Record<string, unknown> | undefined;
+      contentSchema: any;
     }[];
     homepage: {
       layoutId: string;

package/dist/core/createLayout.d.ts

@@ -244,7 +244,7 @@ declare function createLayoutDefinition(options: AnyLayoutOptions): {
   Item: {
     ({ children }: {
       children: (item: any) => React.ReactNode;
-    }): string | number | bigint | boolean | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | React.ReactPortal | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined> | React.JSX.Element | null | undefined;
+    }): string | number | bigint | boolean | React.JSX.Element | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | Iterable<React.ReactNode> | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | React.ReactPortal | null | undefined> | null | undefined;
     displayName: string;
   };
   useData(): unknown;

package/dist/core/derivedRoutes.js

@@ -1,37 +1,10 @@
 import { asCollectionItem } from "./recordItem.js";
+import { matchLayoutRoute, routeSegments } from "@camox/api-contract/layout-routes";
 
 //#region src/core/derivedRoutes.ts
-function routeSegments(id) {
-	return id.split(".");
-}
+/** The singleton or derived layout whose route matches `pathname`, with its params, or null. */
 function matchDerivedLayout(layouts, pathname) {
-	const path = pathname.replace(/^\/|\/$/g, "").split("/");
-	const candidates = layouts.filter((layout) => layout._internal.kind !== "curated").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;
+	return matchLayoutRoute(layouts, pathname, (layout) => layout._internal);
 }
 /** Builds the path of one discovered page, rejecting params the route could not match. */
 function derivedLayoutPath(layoutId, params) {