camox 0.71.0 → 0.74.1

package/dist/core/hooks/useIsEditable.js

@@ -10,11 +10,11 @@ import { useSelector } from "@xstate/store-react";
 * the Page. Frames keep the editing runtime either way, so toggling never remounts the page.
 */
 const EditableSurfaceContext = React.createContext(true);
-function useIsEditable(mode) {
+function useIsEditable() {
 	const isAuthenticated = useIsAuthenticated();
 	const isCanvasShown = useSelector(previewStore, selectIsCanvasShown);
 	const surface = React.use(EditableSurfaceContext);
-	return isAuthenticated && (mode === "site" || mode === "layout") && isCanvasShown && surface;
+	return isAuthenticated && isCanvasShown && surface;
 }
 
 //#endregion

package/dist/core/lib/artifactData.js

@@ -1,3 +1,5 @@
+import { emptyFieldValue } from "@camox/api-contract";
+
 //#region src/core/lib/artifactData.ts
 const DATA_SOURCES = Symbol("camox.artifactDataSources");
 /** Content fields that can't be Artifact Data. */
@@ -38,7 +40,10 @@ function valueSchema(schema) {
 			newTab: { type: "boolean" }
 		}, title);
 		case "Image":
-		case "File": return objectSchema(assetProperties[schema.fieldType], title);
+		case "File": return {
+			...titled,
+			anyOf: [objectSchema(assetProperties[schema.fieldType]), { type: "null" }]
+		};
 		case "ImageList":
 		case "FileList": {
 			const single = schema.fieldType === "ImageList" ? "Image" : "File";
@@ -111,10 +116,10 @@ function normalizeValue(schema, value, resolve) {
 			};
 		}
 		case "Image":
-		case "File": return normalizeAsset(schema.fieldType, resolve.asset(value) ?? schema.default);
+		case "File": return normalizeAsset(schema.fieldType, resolve.asset(value));
 		case "ImageList":
 		case "FileList": return (Array.isArray(value) ? value : []).map((item) => normalizeAsset(schema.fieldType, resolve.asset(item))).filter(Boolean);
-		default: return value ?? schema.default;
+		default: return value ?? emptyFieldValue(schema);
 	}
 }
 /**

package/dist/core/lib/contentType.d.ts

@@ -1,6 +1,6 @@
 import { BlockStructuredData, KnownNodesOnly, RepeatedNodes } from "../structuredData.js";
 import { Collection } from "../createCollection.js";
-import { IconId, IconValue } from "./iconTypes.js";
+import { IconValue } from "./iconTypes.js";
 import { SystemOrderKey } from "@camox/api-contract";
 import { Static, TArray, TBoolean, TObject, TSchema, TUnsafe } from "@sinclair/typebox";
 //#region src/core/lib/contentType.d.ts
@@ -208,29 +208,23 @@ type StringOptions = {
 /**
  * Builds the fields of a block or repeatable item's content.
  * `enum` and `boolean` are not content: declare them in `settings` instead.
+ * Fields have no default: an unset field holds the empty value of its kind.
  */
 export interface ContentFieldBuilder {
   /**
    * An inline-editable text field.
    *
    * @example
-   * field.string({ default: "Hello", maxLength: 100, title: "Title" })
+   * field.string({ maxLength: 100, title: "Title" })
    */
-  string: (options: StringOptions & {
-    default: string;
-  }) => StringField;
+  string: (options?: StringOptions) => StringField;
   /**
    * A link with text, a target (external URL or internal page) and a new-tab flag.
    *
    * @example
-   * field.link({ default: { text: "Learn more", href: "/", newTab: false }, title: "CTA" })
+   * field.link({ title: "CTA" })
    */
-  link: (options: {
-    default: {
-      text: string;
-      href: string;
-      newTab: boolean;
-    };
+  link: (options?: {
     title?: string;
   }) => LinkField;
   /**
@@ -247,11 +241,10 @@ export interface ContentFieldBuilder {
    * A list of image assets.
    *
    * @example
-   * field.imageList({ title: "Gallery", defaultItems: 3 })
+   * field.imageList({ title: "Gallery" })
    */
   imageList: (options?: {
     title?: string;
-    defaultItems?: number;
   }) => ImageListField;
   /**
    * A file asset.
@@ -273,7 +266,6 @@ export interface ContentFieldBuilder {
   fileList: (options: {
     accept: string[];
     title?: string;
-    defaultItems?: number;
   }) => FileListField;
   /**
    * A URL that must match `pattern`, rendered as an embed.
@@ -281,13 +273,11 @@ export interface ContentFieldBuilder {
    * @example
    * field.embed({
    *   pattern: "https:\\/\\/(www\\.)?youtube\\.com\\/watch\\?v=.+",
-   *   default: "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
    *   title: "YouTube URL",
    * })
    */
   embed: (options: {
     pattern: string;
-    default: string;
     title?: string;
   }) => EmbedField;
   /**
@@ -305,17 +295,15 @@ export interface ContentFieldBuilder {
      * repeater, the siblings are the item's own fields and settings.
      */
     data?: readonly D[];
-    default?: string;
     title?: string;
   }) => ArtifactField<NoInfer<D>>;
   /**
    * An icon from the set configured in `camox()`.
    *
    * @example
-   * field.icon({ default: "lucide:star", title: "Icon" })
+   * field.icon({ title: "Icon" })
    */
-  icon: (options: {
-    default: IconId;
+  icon: (options?: {
     title?: string;
   }) => IconField;
   /**
@@ -355,11 +343,11 @@ export interface ContentFieldBuilder {
    * @example
    * field.repeater({
    *   content: (field) => ({
-   *     title: field.string({ default: "Item" }),
-   *     description: field.string({ default: "Description" }),
+   *     title: field.string(),
+   *     description: field.string(),
    *   }),
    *   settings: (setting) => ({
-   *     highlighted: setting.boolean({ default: false, title: "Highlighted" }),
+   *     highlighted: setting.boolean({ title: "Highlighted" }),
    *   }),
    *   minItems: 1,
    *   maxItems: 10,
@@ -416,30 +404,29 @@ type ArtifactKey<T extends Record<string, TSchema>> = { [K in keyof T & string]-
  */
 export interface SettingBuilder {
   /**
-   * One of a fixed set of options; keys are stored, values are editor labels.
+   * One of a fixed set of options; keys are stored, values are editor labels. Unset, it holds
+   * the first option.
    *
    * @example
-   * setting.enum({ default: "left", options: { left: "Left", right: "Right" }, title: "Alignment" })
+   * setting.enum({ options: { left: "Left", right: "Right" }, title: "Alignment" })
    */
   enum: <const O extends Record<string, string>>(options: {
-    default: keyof O & string;
     options: O;
     title?: string;
   }) => EnumSetting<O>;
   /**
-   * A toggle.
+   * A toggle. Unset, it's off.
    *
    * @example
-   * setting.boolean({ default: false, title: "Show background" })
+   * setting.boolean({ title: "Show background" })
    */
-  boolean: (options: {
-    default: boolean;
+  boolean: (options?: {
     title?: string;
   }) => BooleanSetting;
 }
 /**
- * Builds the fields of a collection record. Records are created through an authoring form, so
- * `string` needs no default. Collections have no settings: `enum` and `boolean` are content here.
+ * Builds the fields of a collection record. Collections have no settings: `enum` and `boolean`
+ * are content here.
  */
 export interface CollectionFieldBuilder extends Pick<ContentFieldBuilder, "imageList" | "fileList" | "embed"> {
   /**
@@ -490,21 +477,19 @@ export interface CollectionFieldBuilder extends Pick<ContentFieldBuilder, "image
    * @example
    * field.string({ minLength: 1, title: "Name" })
    */
-  string: (options?: StringOptions & {
-    default?: string;
-  }) => StringField;
+  string: (options?: StringOptions) => StringField;
   /**
    * One of a fixed set of options; keys are stored, values are editor labels.
    *
    * @example
-   * field.enum({ default: "draft", options: { draft: "Draft", final: "Final" } })
+   * field.enum({ options: { draft: "Draft", final: "Final" } })
    */
   enum: SettingBuilder["enum"];
   /**
    * A toggle.
    *
    * @example
-   * field.boolean({ default: false, title: "Featured" })
+   * field.boolean({ title: "Featured" })
    */
   boolean: SettingBuilder["boolean"];
 }

package/dist/core/lib/contentType.js

@@ -156,6 +156,20 @@ function resolveRecordStructuredData(builder, contentShape) {
 /** The longest artifact source content writes accept (256 KB). */
 const ARTIFACT_MAX_LENGTH = 262144;
 const IMAGE_PLACEHOLDER = Symbol("camox.imagePlaceholder");
+/**
+* What an empty image field renders in a block: an illustrated placeholder labeled with the
+* field's title. Its URL is the fallback for callbacks that don't render a plain `<img>`.
+*/
+function placeholderImage(title) {
+	const label = title || "image";
+	return {
+		url: `https://placehold.co/1200x800/f4f4f5/a1a1aa.png?text=${encodeURIComponent(label)}`,
+		alt: "",
+		filename: "placeholder.png",
+		mimeType: "image/png",
+		[IMAGE_PLACEHOLDER]: label
+	};
+}
 function isImagePlaceholder(value) {
 	return typeof value[IMAGE_PLACEHOLDER] === "string" && !value._fileId;
 }
@@ -173,13 +187,6 @@ function _imageSingle(options) {
 		},
 		accept: ["image/*"],
 		required: options.required ?? false,
-		default: {
-			url: `https://placehold.co/1200x800/f4f4f5/a1a1aa.png?text=${options?.title || "image"}`,
-			alt: "",
-			filename: "placeholder.png",
-			mimeType: "image/png",
-			[IMAGE_PLACEHOLDER]: options.title || "image"
-		},
 		title: options.title,
 		fieldType: "Image"
 	});
@@ -188,8 +195,6 @@ function _imageList(options) {
 	return Type.Array(_imageSingle({ title: options.title }), {
 		minItems: 0,
 		maxItems: 100,
-		default: [],
-		defaultItems: options.defaultItems ?? 0,
 		title: options.title,
 		fieldType: "ImageList"
 	});
@@ -205,12 +210,6 @@ function _fileSingle(options) {
 		},
 		accept: options.accept,
 		required: options.required ?? false,
-		default: {
-			url: "https://placehold.co/file-placeholder",
-			alt: "",
-			filename: "placeholder",
-			mimeType: "application/octet-stream"
-		},
 		title: options.title,
 		fieldType: "File"
 	});
@@ -222,8 +221,6 @@ function _fileList(options) {
 	}), {
 		minItems: 0,
 		maxItems: 100,
-		default: [],
-		defaultItems: options.defaultItems ?? 0,
 		title: options.title,
 		fieldType: "FileList"
 	});
@@ -246,21 +243,14 @@ function assertFieldKinds(shape, context, owner) {
 		if (context === "content" && isSetting) throw new Error(`${owner} field "${key}": ${field.fieldType} is a setting, not content`);
 	}
 }
-function collectSchemaDefaults(properties) {
-	const defaults = {};
-	for (const [key, prop] of Object.entries(properties)) if ("default" in prop) defaults[key] = prop.default;
-	return defaults;
-}
 const enumSetting = (options) => Type.Unsafe({
 	type: "string",
 	enum: Object.keys(options.options),
-	default: options.default,
 	title: options.title,
 	enumLabels: options.options,
 	fieldType: "Enum"
 });
-const booleanSetting = (options) => Type.Boolean({
-	default: options.default,
+const booleanSetting = (options = {}) => Type.Boolean({
 	title: options.title,
 	fieldType: "Boolean"
 });
@@ -268,13 +258,14 @@ const settingBuilder = {
 	enum: enumSetting,
 	boolean: booleanSetting
 };
+const stringField = (options = {}) => Type.Unsafe({
+	type: "string",
+	...options,
+	fieldType: "String"
+});
 const contentFieldBuilder = {
-	string: (options) => Type.Unsafe({
-		type: "string",
-		...options,
-		fieldType: "String"
-	}),
-	link: (options) => Type.Unsafe({
+	string: stringField,
+	link: (options = {}) => Type.Unsafe({
 		type: "object",
 		properties: {
 			type: {
@@ -286,10 +277,6 @@ const contentFieldBuilder = {
 			pageId: { anyOf: [{ const: "" }, uuidv7JsonSchema] },
 			newTab: { type: "boolean" }
 		},
-		default: {
-			...options.default,
-			type: "external"
-		},
 		title: options.title,
 		fieldType: "Link"
 	}),
@@ -297,33 +284,27 @@ const contentFieldBuilder = {
 	imageList: (options = {}) => _imageList(options),
 	file: (options) => _fileSingle(options),
 	fileList: (options) => _fileList(options),
-	embed: (options) => {
-		if (!new RegExp(options.pattern).test(options.default)) throw new Error(`Embed default value "${options.default}" does not match pattern "${options.pattern}"`);
-		return Type.Unsafe({
-			type: "string",
-			pattern: options.pattern,
-			default: options.default,
-			title: options.title,
-			fieldType: "Embed"
-		});
-	},
+	embed: (options) => Type.Unsafe({
+		type: "string",
+		pattern: options.pattern,
+		title: options.title,
+		fieldType: "Embed"
+	}),
 	artifact: (options) => Type.Unsafe({
 		type: "string",
 		maxLength: ARTIFACT_MAX_LENGTH,
 		size: options.size,
 		...options.data?.length ? { data: [...options.data] } : {},
-		default: options.default ?? "",
 		title: options.title,
 		fieldType: "Artifact"
 	}),
-	icon: (options) => {
+	icon: (options = {}) => {
 		const ids = typeof __CAMOX_ICON_IDS__ === "undefined" ? [] : __CAMOX_ICON_IDS__;
-		if (!ids.includes(options.default)) throw new Error(`Invalid icon default "${String(options.default)}". Configure icons in camox() first.`);
+		if (ids.length === 0) throw new Error("Icon fields need icons: configure them in camox() first.");
 		return Type.Unsafe({
 			type: "string",
 			fieldType: "Icon",
 			enum: [...ids],
-			default: options.default,
 			title: options.title
 		});
 	},
@@ -336,7 +317,6 @@ const contentFieldBuilder = {
 		collectionId: collection._internal.id,
 		required: options.required ?? false,
 		title: options.title ?? collection._internal.title,
-		default: null,
 		referenceSchema: collection._internal.contentSchema
 	}),
 	referenceList: (collection, options = {}) => Type.Unsafe({
@@ -350,7 +330,7 @@ const contentFieldBuilder = {
 		title: options.title ?? collection._internal.title,
 		...options.description === void 0 ? {} : { description: options.description },
 		...options.maxItems === void 0 ? {} : { maxItems: options.maxItems },
-		...options.query === void 0 ? { default: [] } : { query: validateQuery(options.query, collection) },
+		...options.query === void 0 ? {} : { query: validateQuery(options.query, collection) },
 		...options.toMarkdown === void 0 ? {} : { toMarkdown: resolveToMarkdown(options.toMarkdown, void 0, "item", collection._internal.contentSchema.properties) },
 		referenceSchema: collection._internal.contentSchema
 	}),
@@ -363,8 +343,6 @@ const contentFieldBuilder = {
 		if (settings) assertFieldKinds(settings, "settings", owner);
 		attachArtifactData(content, settings, owner);
 		const objectSchema = Type.Object(content);
-		const defaultItem = collectSchemaDefaults(objectSchema.properties);
-		const defaultArray = Array(options.minItems).fill(null).map(() => ({ ...defaultItem }));
 		const settingsObjectSchema = settings ? Type.Object(settings) : null;
 		const itemSettingsSchema = settingsObjectSchema ? {
 			type: "object",
@@ -374,23 +352,17 @@ const contentFieldBuilder = {
 		return Type.Array(objectSchema, {
 			minItems: options.minItems,
 			...Number.isFinite(options.maxItems) ? { maxItems: options.maxItems } : {},
-			default: defaultArray,
 			title: options.title,
 			fieldType: "Repeater",
 			toTitle: resolveToTitle(options.toTitle, settings, "item", content),
 			toMarkdown: resolveToMarkdown(options.toMarkdown, settings, "item", content),
 			...options.toStructuredData && { toStructuredData: resolveToStructuredData(options.toStructuredData, settings, "item", content) },
-			itemSettingsSchema,
-			defaultItemSettings: settingsObjectSchema ? collectSchemaDefaults(settingsObjectSchema.properties) : void 0
+			itemSettingsSchema
 		});
 	}
 };
 const collectionFieldBuilder = {
-	string: (options = {}) => Type.Unsafe({
-		type: "string",
-		...options,
-		fieldType: "String"
-	}),
+	string: stringField,
 	enum: enumSetting,
 	boolean: booleanSetting,
 	image: (options = {}) => contentFieldBuilder.image({ title: options.title }),
@@ -422,4 +394,4 @@ function resolveBlockFields(options) {
 }
 
 //#endregion
-export { ARTIFACT_MAX_LENGTH, Conditional, FieldToken, assertFieldKinds, collectionField, collectionFieldBuilder, contentFieldBuilder, getImagePlaceholderTitle, isImagePlaceholder, resolveBlockFields, resolveRecordStructuredData, resolveRecordTemplate, resolveToMarkdown, resolveToStructuredData, resolveToTitle, settingBuilder };
+export { ARTIFACT_MAX_LENGTH, Conditional, FieldToken, assertFieldKinds, collectionField, collectionFieldBuilder, contentFieldBuilder, getImagePlaceholderTitle, isImagePlaceholder, placeholderImage, resolveBlockFields, resolveRecordStructuredData, resolveRecordTemplate, resolveToMarkdown, resolveToStructuredData, resolveToTitle, settingBuilder };

package/dist/core/lib/iconTypes.d.ts

@@ -2,9 +2,6 @@
 declare global {
   interface CamoxIconRegistry {}
 }
-export type IconId = CamoxIconRegistry extends {
-  ids: infer IDs extends string;
-} ? IDs : never;
 declare const iconBrand: unique symbol;
 export type IconValue = string & {
   readonly [iconBrand]: true;

package/dist/core/lib/icons.js

@@ -19,8 +19,9 @@ const iconQuery = (id) => ({
 		return response.json();
 	}
 });
+/** An icon by ID; an unset icon field (`""`) renders an empty SVG without fetching. */
 function IconSvg(t0) {
-	const $ = c(21);
+	const $ = c(24);
 	let iconId;
 	let props;
 	if ($[0] !== t0) {
@@ -38,64 +39,75 @@ function IconSvg(t0) {
 		$[3] = iconId;
 		$[4] = t1;
 	} else t1 = $[4];
-	const { data } = useQuery(t1);
-	const t2 = useId();
+	const t2 = iconId !== "";
 	let t3;
-	if ($[5] !== t2) {
-		let t4;
-		if ($[7] === Symbol.for("react.memo_cache_sentinel")) {
-			t4 = /[^a-zA-Z0-9_-]/g;
-			$[7] = t4;
-		} else t4 = $[7];
-		t3 = t2.replace(t4, "");
-		$[5] = t2;
-		$[6] = t3;
-	} else t3 = $[6];
-	const instance = t3;
-	const t4 = data?.body ?? "";
-	const t5 = `camox-${instance}-`;
-	let t6;
-	if ($[8] !== t4 || $[9] !== t5) {
-		t6 = scopeIconSvgIds(t4, t5);
+	if ($[5] !== t1 || $[6] !== t2) {
+		t3 = {
+			...t1,
+			enabled: t2
+		};
+		$[5] = t1;
+		$[6] = t2;
+		$[7] = t3;
+	} else t3 = $[7];
+	const { data } = useQuery(t3);
+	const t4 = useId();
+	let t5;
+	if ($[8] !== t4) {
+		let t6;
+		if ($[10] === Symbol.for("react.memo_cache_sentinel")) {
+			t6 = /[^a-zA-Z0-9_-]/g;
+			$[10] = t6;
+		} else t6 = $[10];
+		t5 = t4.replace(t6, "");
 		$[8] = t4;
 		$[9] = t5;
-		$[10] = t6;
-	} else t6 = $[10];
-	const body = t6;
+	} else t5 = $[9];
+	const instance = t5;
+	const t6 = data?.body ?? "";
+	const t7 = `camox-${instance}-`;
+	let t8;
+	if ($[11] !== t6 || $[12] !== t7) {
+		t8 = scopeIconSvgIds(t6, t7);
+		$[11] = t6;
+		$[12] = t7;
+		$[13] = t8;
+	} else t8 = $[13];
+	const body = t8;
 	const labeled = !!(props["aria-label"] || props["aria-labelledby"]);
-	const t7 = data?.attributes;
-	const t8 = labeled ? void 0 : true;
-	const t9 = labeled ? "img" : void 0;
-	const t10 = data?.attribution?.url ?? data?.attribution?.license;
-	const t11 = data?.attribution?.author;
-	let t12;
-	if ($[11] !== body) {
-		t12 = { __html: body };
-		$[11] = body;
-		$[12] = t12;
-	} else t12 = $[12];
-	let t13;
-	if ($[13] !== props || $[14] !== t10 || $[15] !== t11 || $[16] !== t12 || $[17] !== t7 || $[18] !== t8 || $[19] !== t9) {
-		t13 = /* @__PURE__ */ jsx("svg", {
-			...t7,
-			"aria-hidden": t8,
-			role: t9,
+	const t9 = data?.attributes;
+	const t10 = labeled ? void 0 : true;
+	const t11 = labeled ? "img" : void 0;
+	const t12 = data?.attribution?.url ?? data?.attribution?.license;
+	const t13 = data?.attribution?.author;
+	let t14;
+	if ($[14] !== body) {
+		t14 = { __html: body };
+		$[14] = body;
+		$[15] = t14;
+	} else t14 = $[15];
+	let t15;
+	if ($[16] !== props || $[17] !== t10 || $[18] !== t11 || $[19] !== t12 || $[20] !== t13 || $[21] !== t14 || $[22] !== t9) {
+		t15 = /* @__PURE__ */ jsx("svg", {
+			...t9,
+			"aria-hidden": t10,
+			role: t11,
 			focusable: "false",
-			"data-icon-license": t10,
-			"data-icon-author": t11,
+			"data-icon-license": t12,
+			"data-icon-author": t13,
 			...props,
-			dangerouslySetInnerHTML: t12
+			dangerouslySetInnerHTML: t14
 		});
-		$[13] = props;
-		$[14] = t10;
-		$[15] = t11;
-		$[16] = t12;
-		$[17] = t7;
-		$[18] = t8;
-		$[19] = t9;
+		$[16] = props;
+		$[17] = t10;
+		$[18] = t11;
+		$[19] = t12;
 		$[20] = t13;
-	} else t13 = $[20];
-	return t13;
+		$[21] = t14;
+		$[22] = t9;
+		$[23] = t15;
+	} else t15 = $[23];
+	return t15;
 }
 async function prefetchIcons(client, ...sources) {
 	const ids = /* @__PURE__ */ new Set();

package/dist/core/lib/recordScope.js

@@ -64,7 +64,7 @@ function renderFile(value, children) {
 		download: value.filename
 	}, value);
 }
-/** An asset field's value; unset assets render nothing rather than a fabricated default. */
+/** An asset field's value, or null: an unset asset renders nothing in a record. */
 function useAsset(name) {
 	const $ = c(3);
 	const { filesMap } = useNormalizedData();