@bettercms-ai/kit 2.0.0 → 2.0.1

package/dist/adapters/schema.js

@@ -1,9 +1,10 @@
 import { CATALOG, FEATURES, isHostConfigKey } from "./lossy.js";
-import { CONTROL_TYPES, HELP_MORE_MAX, ITEM_NAME_RE, UI_CONTROLS } from "./prod-types.js";
+import { CONTROL_TYPES, FIELDSET_DESCRIPTION_MAX, FIELD_HELP_MAX, HELP_MORE_MAX, ITEM_NAME_RE, MAX_FIELD_DEPTH, OPTION_DESCRIPTION_MAX, PROP_GROUP_DESCRIPTION_MAX, PROP_HELP_MAX, PROP_PLACEHOLDER_MAX, PROP_TAB_MAX, TAB_MAX as TAB_MAX$1, UI_CONTROLS, UI_PLACEHOLDER_MAX } from "./prod-types.js";
 import { dockIconOf, tablerIconOf } from "./icons.js";
 import { slotChildrenFromStored, slotChildrenToStored } from "../controls/slot-services.js";
 import { isDataTableProp, tableConfigFromOptions, tableOptionsFromConfig } from "../controls/table/prod.js";
 import { buttonFromProd, buttonToProd, datetimeFromProd, datetimeToProd, imageFromProd, imageToProd, isCropRect, linkFromProd, linkToProd, listFromProd, listToProd, ratingFromProd, ratingToProd, referenceFromProd, referenceToProd, scaleFromProd, scaleToProd, typedRowsFromProd, typedRowsToProd, videoFromProd, videoToProd, zoneListFromProd, zoneListToProd } from "./values.js";
+import { BLOCK_FIELD_TYPES_RENDERABLE_NOW, KEY_FORMAT, KIT_CATEGORIES, PRIMITIVE_ARRAY_RULE, RICHTEXT_FEATURES, SEGMENTED_MAX, SEGMENTED_MIN, isReservedKey, normaliseRichTextFeatures } from "@bettercms-ai/types";
 //#region src/adapters/schema.ts
 var isObj = (v) => !!v && typeof v === "object" && !Array.isArray(v);
 function deepEqual(a, b) {
@@ -182,8 +183,12 @@ var CATEGORY_TO_PROD = {
 	Content: "content",
 	Layout: "section"
 };
-/** The field types a kind:'block' model may hold (backend block-model-mapping.ts FIELD_PRIMITIVE). */
-var BLOCK_FIELD_TYPES = /* @__PURE__ */ new Set([
+/** The field types a kind:'block' model holds today: the ones a block primitive renders (types, staged to G7). */
+var BLOCK_FIELD_TYPES = new Set(BLOCK_FIELD_TYPES_RENDERABLE_NOW);
+/** What a block row's cell may hold, and a primitive list's items (backend block-model-mapping.ts CELL_FIELD_TYPES, LIST_ITEM_TYPES). */
+/** The block-variant select's key on a model (c2ee279dd: a top-level select, only beside v2.variants). */
+var BLOCK_VARIANT_KEY = "_variant";
+var BLOCK_CELL_TYPES = /* @__PURE__ */ new Set([
 	"text",
 	"longtext",
 	"richtext",
@@ -200,6 +205,24 @@ var BLOCK_FIELD_TYPES = /* @__PURE__ */ new Set([
 	"datetime",
 	"boolean"
 ]);
+var BLOCK_LIST_ITEM_TYPES = /* @__PURE__ */ new Set([
+	"text",
+	"number",
+	"date"
+]);
+/**
+* Whether a block model may hold this stored field (backend findUnmappableFields / containerProblem): its type has a
+* primitive, and an object or array has rows of cells (an array no non-repeating fields), or lists text, numbers or dates.
+*/
+function blockRenders(f) {
+	if (!BLOCK_FIELD_TYPES.has(f.type)) return false;
+	if (f.type !== "object" && f.type !== "array") return true;
+	const zones = f.config?.zones;
+	if (f.type === "array" && zones?.nonRepeatable?.length) return false;
+	const row = f.type === "object" ? f.fields ?? [] : zones ? zones.repeatable?.fields ?? [] : null;
+	if (row === null) return BLOCK_LIST_ITEM_TYPES.has(String(f.config?.itemType));
+	return row.length > 0 && row.every((c) => BLOCK_CELL_TYPES.has(c.type));
+}
 /** A slot prop's config.minItems / maxItems cap (SLOT_ITEMS_CAP, componentPropDefSchema). */
 var SLOT_ITEMS_CAP = 50;
 /** A table prop's rows and an array prop's items: their config.minItems / maxItems cap (LIST_ITEMS_CAP). */
@@ -358,23 +381,26 @@ function shapeOf(f, lv, ctx, top, nest) {
 	};
 	return shape;
 }
-/** backend content.ts keyRuleProblem: keys a resolver would misread (KEY_RESERVED), and a key's format (KEY_FORMAT). */
-var MODEL_RESERVED_KEYS = /* @__PURE__ */ new Set([
-	"derived",
-	"layout",
-	"page"
-]);
-/** The key a model field is stored under: a reserved or malformed V2 name, renamed. */
-function modelKeyOf(name) {
+/**
+* The key a model field is stored under: a V2 name the API refuses (types' isReservedKey, the API lane: `derived`,
+* `layout`, `page`, a forbidden key or a leading `_`; or one off KEY_FORMAT), renamed. V2 authoring follows the API
+* lane, so `id` is a field key like any other (only the derive lane, which mints keys, reserves it).
+*/
+/** The address-prefix keys a model may hold below its top level (019141ffc): they are no address there. */
+var NESTED_OK_KEYS = /* @__PURE__ */ new Set(["layout", "page"]);
+function modelKeyOf(name, nested = false) {
+	if (KEY_FORMAT.test(name) && (!isReservedKey(name) || nested && NESTED_OK_KEYS.has(name))) return name;
 	let k = name.replace(/^_+/, "").replace(/[^A-Za-z0-9_-]/g, "");
 	if (!/^[A-Za-z]/.test(k)) k = `f${k}`;
-	return MODEL_RESERVED_KEYS.has(k) ? `${k}Field` : k;
+	return isReservedKey(k) ? `${k}Field` : k;
 }
+/** The config keys a model's primitive list holds (types' PRIMITIVE_ARRAY_RULE). */
+var MODEL_LIST_KEYS = new Set(PRIMITIVE_ARRAY_RULE.configKeys);
 /** A slot's V2 allow list as the backend keeps it: 1–50 distinct block names of 1–64 characters (slotAllowIssues). */
 var slotAllowOk = (allow) => Array.isArray(allow) && allow.length >= 1 && allow.length <= SLOT_ALLOW_MAX && new Set(allow).size === allow.length && allow.every((n) => typeof n === "string" && n === n.trim() && n.length >= 1 && n.length <= SLOT_ALLOW_NAME_MAX);
 function shapeOfField(f, lv, ctx, top) {
 	const props = ctx.lane === "props";
-	const deep = lv >= 10;
+	const deep = lv >= MAX_FIELD_DEPTH;
 	const of = Array.isArray(f.of) ? f.of : void 0;
 	/** a prop reference names a content model or a page / form / collection target (refTargetNamed): with none it is stored as json */
 	const noEntry = (r) => props && !(r?.to ?? []).some((t) => ENTRY_TARGET(t) || REF_TARGET_KINDS.includes(t));
@@ -498,6 +524,36 @@ var trunc = (ctx, at, s, max, feature) => {
 	lose(ctx, at, feature);
 	return s.slice(0, max);
 };
+/** The prod field types that store a rich text and its features (config.features). */
+var RICH_TYPES = /* @__PURE__ */ new Set(["richtext", "document"]);
+/** Every feature, canonical: RICHTEXT_FEATURES through normaliseRichTextFeatures, so no alias is ever in it. */
+var ALL_RICH_FEATURES = normaliseRichTextFeatures(RICHTEXT_FEATURES).features;
+/**
+* A rich text's features through types normaliseRichTextFeatures (its aliases expand there: `headings` is h1–h6), distinct,
+* in the order given. `named`: something was not carried (a name outside RICHTEXT_FEATURES, a repeat, a non-list).
+*/
+/** A content model's id, as the backend's config.references rule reads one. */
+var MODEL_ID = /^[A-Za-z0-9_-]{1,64}$/;
+/** A rich text's references: posts and authors, each a model id; `named` when anything else was there. */
+function richRefs(v) {
+	if (!v || typeof v !== "object" || Array.isArray(v)) return { named: true };
+	const r = v;
+	const kept = {};
+	for (const k of ["posts", "authors"]) if (typeof r[k] === "string" && MODEL_ID.test(r[k])) kept[k] = r[k];
+	const named = Object.keys(r).some((k) => k !== "posts" && k !== "authors" || r[k] !== void 0 && kept[k] === void 0);
+	return {
+		kept: Object.keys(kept).length ? kept : void 0,
+		named
+	};
+}
+function richFeatures(v) {
+	const names = Array.isArray(v) ? v.filter((x) => typeof x === "string") : [];
+	const { features, unknown } = normaliseRichTextFeatures(names);
+	return {
+		kept: [...new Set(features)],
+		named: !Array.isArray(v) || names.length !== v.length || new Set(names).size !== names.length || unknown.length > 0
+	};
+}
 function convertField(f, at, lv, ctx, siblings, top, inTable = false, inItem = false, inSetting = false) {
 	const props = ctx.lane === "props";
 	const shape = shapeOf(f, lv, ctx, top, inTable ? "rows" : inItem ? "item" : inSetting ? "setting" : void 0);
@@ -512,8 +568,8 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false, inItem = f
 	if (twins) {
 		node.key = `${f.name}_${twins + 1}`;
 		lose(ctx, `${at}/name`, "duplicate name");
-	} else if (!props && modelKeyOf(f.name) !== f.name) {
-		node.key = modelKeyOf(f.name);
+	} else if (!props && modelKeyOf(f.name, lv > 1) !== f.name) {
+		node.key = modelKeyOf(f.name, lv > 1);
 		lose(ctx, `${at}/name`, "reserved name");
 	}
 	const nesting = shape.kind === "object" || shape.kind === "zones" || shape.kind === "types";
@@ -554,15 +610,15 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false, inItem = f
 			case "title":
 			case "type": break;
 			case "description":
-				node.helpText = trunc(ctx, p, f.description, props ? 200 : 500, "help>limit");
+				node.helpText = trunc(ctx, p, f.description, props ? PROP_HELP_MAX : FIELD_HELP_MAX, "help>limit");
 				break;
 			case "helpMore":
 				node.helpMore = trunc(ctx, p, f.helpMore, HELP_MORE_MAX, "help>limit");
 				break;
 			case "placeholder":
-				if (props) node.placeholder = trunc(ctx, p, f.placeholder, 120, "help>limit");
+				if (props) node.placeholder = trunc(ctx, p, f.placeholder, PROP_PLACEHOLDER_MAX, "help>limit");
 				else if (looseConfig) node.placeholder = f.placeholder;
-				else node.ui.placeholder = trunc(ctx, p, f.placeholder, 120, "help>limit");
+				else node.ui.placeholder = trunc(ctx, p, f.placeholder, UI_PLACEHOLDER_MAX, "help>limit");
 				break;
 			case "initialValue":
 				if (props && (shape.type === "reference" || shape.type === "multi-reference" || shape.kind === "slot")) cat(ctx, p, "seeded instance");
@@ -597,7 +653,7 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false, inItem = f
 			case "hidden":
 				if (typeof f.hidden === "boolean") node.ui.hidden = f.hidden;
 				else {
-					const showIf = conditionToShowIf(f.hidden, p, siblings, ctx, props && top);
+					const showIf = conditionToShowIf(f.hidden, p, siblings, ctx, top && (props || !!ctx.variants));
 					if (showIf) node.showIf = showIf;
 				}
 				break;
@@ -630,7 +686,7 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false, inItem = f
 				node.advanced = f.advanced;
 				break;
 			case "ai":
-				cat(ctx, p, "ai");
+				node.ai = f.ai;
 				break;
 			case "reference":
 				if (shape.kind === "leaf" && shape.type === "reference") referenceToConfig(f.reference, node, p, ctx);
@@ -703,10 +759,27 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false, inItem = f
 				if (shape.kind === "leaf" && shape.type === "table") Object.assign(node.config, tableConfigFromOptions(f.table));
 				else lose(ctx, p, "type:table");
 				break;
+			case "references":
+				if (!RICH_TYPES.has(shape.type)) lose(ctx, p, "unsupported key");
+				else {
+					const { kept, named } = richRefs(f.references);
+					if (named) lose(ctx, p, "richtext references");
+					if (kept) node.config.references = kept;
+				}
+				break;
+			case "features":
+				if (!RICH_TYPES.has(shape.type)) lose(ctx, p, "unsupported key");
+				else {
+					const { kept, named } = richFeatures(f.features);
+					if (named) lose(ctx, p, "richtext features");
+					node.config.features = kept;
+				}
+				break;
 			default: lose(ctx, p, "unsupported key");
 		}
 	}
 	if (props && f.description === void 0) node.helpText = null;
+	if (RICH_TYPES.has(shape.type) && shape.kind === "leaf" && f.features === void 0) node.config.features = [...ALL_RICH_FEATURES];
 	if (f.itemNoun === void 0 && shape.kind === "zones" && node.ui.itemLabel !== void 0) cat(ctx, `${at}/itemNoun`, "itemNoun (derived)");
 	placeInSet(f, node, at, ctx, top, siblings);
 	if (f.type === "rating" && node.type === "rating" && f.numeric?.step === void 0) {
@@ -760,10 +833,24 @@ function placeInSet(f, node, at, ctx, top, siblings) {
 		}
 		return;
 	}
+	if (f.fieldset !== void 0 && !ctx.sets.has(f.fieldset) && !ctx.tabs.has(f.fieldset) && !ctx.droppedTabs.has(f.fieldset) && f.fieldset.length <= 60) {
+		const derived = ctx.derivedSets ??= [];
+		if (derived.length + ctx.sets.size + ctx.tabs.size < 30) {
+			derived.push({
+				id: f.fieldset,
+				name: f.fieldset,
+				kind: "group"
+			});
+			ctx.sets.set(f.fieldset, void 0);
+		}
+	}
 	const set = f.fieldset !== void 0 && ctx.sets.has(f.fieldset) ? f.fieldset : void 0;
 	if (f.fieldset !== void 0 && !set) lose(ctx, `${at}/fieldset`, "fieldset collision");
 	if (!top) {
-		if (f.group !== void 0) lose(ctx, `${at}/group`, "group (nested)");
+		if (f.group !== void 0) {
+			if (ctx.tabs.has(f.group)) node.ui.tab = { id: f.group };
+			else lose(ctx, `${at}/group`, "group (nested)");
+		}
 		if (set) node.fieldsetId = set;
 		return;
 	}
@@ -787,7 +874,7 @@ function propGroupOf(s, ctx) {
 	if (ctx.groupOrder) g.order = Math.min(99, ctx.propOrder.get(s.name) ?? 0);
 	return g;
 }
-var groupDescriptionOk = (d) => typeof d === "string" && d === d.trim() && d.length >= 1 && d.length <= 200;
+var groupDescriptionOk = (d) => typeof d === "string" && d === d.trim() && d.length >= 1 && d.length <= PROP_GROUP_DESCRIPTION_MAX;
 /** The zone a datetime field fixes, if any (what lets a stored instant read back with its [Zone]). */
 var fixedZone = (f) => typeof f.timezone === "string" && f.timezone.startsWith("fixed:") ? f.timezone.slice(6) : void 0;
 /**
@@ -1226,7 +1313,7 @@ function optionsToProd(f, shape, node, at, ctx) {
 		}
 		const d = o.description;
 		if (d !== void 0) {
-			if (typeof d === "string" && d.trim() !== "" && !/[\r\n]/.test(d) && d.length <= 140) out.description = d;
+			if (typeof d === "string" && d.trim() !== "" && !/[\r\n]/.test(d) && d.length <= OPTION_DESCRIPTION_MAX) out.description = d;
 			else lose(ctx, `${at}/${i}/description`, "option description");
 		}
 		for (const k of Object.keys(o)) if (![
@@ -1244,8 +1331,8 @@ function layoutToProd(f, shape, node, at, ctx) {
 	const t = shape.type;
 	const n = f.options?.length ?? 0;
 	if (l === "segmented" && t === "select") {
-		if (n >= 2 && n <= 4) node.ui.control = "segmented";
-		else if (n >= 5) cat(ctx, at, "segmented fallback");
+		if (n >= SEGMENTED_MIN && n <= SEGMENTED_MAX) node.ui.control = "segmented";
+		else if (n > SEGMENTED_MAX) cat(ctx, at, "segmented fallback");
 		else lose(ctx, at, "layout");
 	} else if (l === "slider" && t === "number" && f.type === "number") node.ui.control = "slider";
 	else if (UI_CONTROLS.includes(l) && l !== "segmented" && l !== "slider" && CONTROL_TYPES[l]?.includes(t)) node.ui.control = l;
@@ -1435,7 +1522,7 @@ function ofToProd(f, shape, node, at, lv, ctx) {
 	if (shape.kind === "itemType") node.config.itemType = shape.itemType;
 	itemIdentity(item, conventionItem(f.name, f.title), node, ip, ctx);
 	const settings = {};
-	const scalars = shape.kind === "itemType" && !shape.shopify && ctx.lane === "props";
+	const scalars = shape.kind === "itemType" && !shape.shopify && (ctx.lane === "props" || MODEL_LIST_KEYS.has("item"));
 	for (const k of Object.keys(item)) {
 		const v = item[k];
 		if (v === void 0) continue;
@@ -1446,7 +1533,7 @@ function ofToProd(f, shape, node, at, lv, ctx) {
 			if (shape.kind === "itemType" && item.type === "text") lose(ctx, p, "item settings");
 		} else if (k === "reference" && shape.kind === "refs") referenceToConfig(item.reference, node, p, ctx);
 		else if (k === "reference" && shape.kind === "itemType" && shape.shopify) continue;
-		else if (scalars && k === "description" && typeof v === "string" && v.trim() === v && v.length >= 1 && v.length <= 200) settings.helpText = v;
+		else if (scalars && k === "description" && typeof v === "string" && v.trim() === v && v.length >= 1 && v.length <= PROP_HELP_MAX) settings.helpText = v;
 		else if (scalars && k === "localized" && typeof v === "boolean") settings.localized = v;
 		else if (scalars && k === "validation") itemValidationToProd(item, shape.itemType, settings, p, ctx);
 		else lose(ctx, p, "item settings");
@@ -1548,28 +1635,8 @@ function blockModelFor(item, at, ctx, list) {
 		if (item[k] === void 0 || k === "type" || k === "title") continue;
 		if (k === "name") {
 			if (camel(slug) !== item.name) lose(ctx, p, "item identity");
-		} else if (k === "fields") {
-			let dropped = false;
-			let shifted = false;
-			fields.forEach((c, j) => {
-				const fp = `${p}/${j}`;
-				const mark = ctx.lossy.length;
-				const markCat = ctx.catalog.length;
-				const node = convertField(c, fp, 1, sub, fields, false);
-				if (BLOCK_FIELD_TYPES.has(node.type)) {
-					kept.push(emitField(node));
-					if (dropped && !shifted) {
-						shifted = true;
-						lose(ctx, p, "block model field");
-					}
-					return;
-				}
-				ctx.lossy.length = mark;
-				ctx.catalog.length = markCat;
-				dropped = true;
-				lose(ctx, fp, "block model field");
-			});
-		} else if (k === "openMode") cat(ctx, p, "item openMode");
+		} else if (k === "fields") fields.forEach((c, j) => kept.push(emitField(convertField(c, `${p}/${j}`, 1, sub, fields, false))));
+		else if (k === "openMode") chrome.openMode = item.openMode;
 		else if (k === "icon") {
 			const dock = dockIconOf(item.icon);
 			if (dock) chrome.icon = dock;
@@ -1577,11 +1644,17 @@ function blockModelFor(item, at, ctx, list) {
 		} else if (k === "preview") chrome.preview = previewToProd(item.preview, fields, p, ctx);
 		else lose(ctx, p, "item identity");
 	}
-	const model = {
+	const model = kept.every(blockRenders) ? {
 		name: item.title,
 		slug,
 		kind: "block",
 		fields: kept
+	} : {
+		name: item.title,
+		slug,
+		kind: "model",
+		fields: kept,
+		v2: { shape: "block" }
 	};
 	const prev = ctx.blockModels.get(slug);
 	const keep = () => {
@@ -1751,13 +1824,14 @@ function conditionToShowIf(h, at, siblings, ctx, variantOk) {
 /** One V2 rule as a prod rule, or null when prod cannot hold it (a scope, a non-sibling, a value showIf cannot test). */
 function conditionRule(r, head, siblings, variantOk) {
 	const variant = variantOk && r.field === "_variant";
-	if (!r.field || r.scope !== void 0 || !variant && !siblings.some((s) => s.name === r.field)) return null;
+	if (!r.field || r.scope === void 0 && !variant && !siblings.some((s) => s.name === r.field)) return null;
 	const allowed = head ? [
 		"field",
 		"equals",
 		"notEmpty",
 		"op",
 		"value",
+		"scope",
 		"also",
 		"match"
 	] : [
@@ -1765,7 +1839,8 @@ function conditionRule(r, head, siblings, variantOk) {
 		"equals",
 		"notEmpty",
 		"op",
-		"value"
+		"value",
+		"scope"
 	];
 	if (Object.keys(r).some((k) => !allowed.includes(k) && r[k] !== void 0)) return null;
 	if ([
@@ -1773,22 +1848,26 @@ function conditionRule(r, head, siblings, variantOk) {
 		r.equals !== void 0,
 		r.notEmpty !== void 0
 	].filter(Boolean).length !== 1) return null;
+	const scope = r.scope ? { scope: r.scope } : {};
 	if (r.notEmpty !== void 0) return r.notEmpty === true ? {
 		field: r.field,
-		op: "notEmpty"
+		op: "notEmpty",
+		...scope
 	} : null;
 	const target = r.op !== void 0 ? r.value : r.equals;
 	const op = r.op !== void 0 ? SHOW_IF_OP[r.op] : Array.isArray(target) ? "in" : "eq";
 	if (!op) return null;
 	if (VALUELESS.has(op)) return r.value === void 0 ? {
 		field: r.field,
-		op
+		op,
+		...scope
 	} : null;
-	const sibType = variant ? void 0 : siblings.find((s) => s.name === r.field)?.type;
+	const sibType = variant || r.scope ? void 0 : siblings.find((s) => s.name === r.field)?.type;
 	if (op === "gt" || op === "lt") return typeof target === "number" && Number.isFinite(target) ? {
 		field: r.field,
 		op,
-		value: String(target)
+		value: String(target),
+		...scope
 	} : null;
 	const list = Array.isArray(target) ? target : [target];
 	const strs = [];
@@ -1805,16 +1884,19 @@ function conditionRule(r, head, siblings, variantOk) {
 	if (op === "in" || op === "notIn") return {
 		field: r.field,
 		op,
-		value: strs
+		value: strs,
+		...scope
 	};
 	return Array.isArray(target) ? strs.length ? {
 		field: r.field,
 		op: op === "eq" ? "in" : "notIn",
-		value: strs
+		value: strs,
+		...scope
 	} : null : {
 		field: r.field,
 		op,
-		value: strs[0]
+		value: strs[0],
+		...scope
 	};
 }
 var nonEmpty = (o) => Object.keys(o).length ? o : void 0;
@@ -1831,6 +1913,7 @@ function common(n) {
 		"showIf",
 		"helpMore",
 		"advanced",
+		"ai",
 		"recommendedMax",
 		"openMode",
 		"localized",
@@ -1924,9 +2007,12 @@ function fromTypeSchema(v2, target) {
 		blockModels: /* @__PURE__ */ new Map()
 	};
 	const props = target === "props";
+	if (!props && v2.variants?.length) ctx.variants = true;
 	const slug = kebab(v2.name);
-	const category = v2.category !== void 0 ? CATEGORY_TO_PROD[v2.category] : void 0;
+	const kitCategory = KIT_CATEGORIES.includes(v2.category ?? "") ? v2.category : void 0;
+	const category = kitCategory ?? (v2.category !== void 0 ? CATEGORY_TO_PROD[v2.category] : void 0);
 	const fieldsets = [];
+	const block = {};
 	for (const k of Object.keys(v2)) {
 		if (v2[k] === void 0) continue;
 		const p = `/${k}`;
@@ -1940,23 +2026,22 @@ function fromTypeSchema(v2, target) {
 			case "fieldsets":
 			case "groups": break;
 			case "kind":
-				if (props && v2.kind !== "block") cat(ctx, p, v2.kind === "global" ? "kind:global" : "kind:entry (props)");
-				else if (!props && v2.kind !== "entry") cat(ctx, p, v2.kind === "global" ? "kind:global" : v2.kind === "page" ? "kind:page" : v2.kind === "block" ? "kind:block (fields)" : "kind:object");
+				if (props ? v2.kind !== "block" : v2.kind !== "entry") block.shape = v2.kind;
 				break;
 			case "icon":
-				if (!props || !dockIconOf(v2.icon)) cat(ctx, p, "block icon");
-				break;
-			case "preview":
-				if (!props) cat(ctx, p, "document preview");
+				if (!dockIconOf(v2.icon)) cat(ctx, p, "block icon");
 				break;
+			case "preview": break;
 			case "variants":
-				cat(ctx, p, "variants");
+				if (!ctx.variants) cat(ctx, p, "variants");
 				break;
 			case "category":
-				if (!props || !category || capitalize(category) !== v2.category) cat(ctx, p, "category");
+				if (kitCategory) {
+					if (!props) block.category = kitCategory;
+				} else if (!props || !category || capitalize(category) !== v2.category) cat(ctx, p, "category");
 				break;
 			case "placement":
-				cat(ctx, p, "block placement");
+				block.placement = v2.placement;
 				break;
 			case "initialValue":
 				cat(ctx, p, "seeded instance");
@@ -1977,6 +2062,7 @@ function fromTypeSchema(v2, target) {
 		};
 		if (v2.description !== void 0) component.description = v2.description;
 		if (category) component.category = category;
+		if (nonEmpty(block)) component.v2 = { ...block };
 		const icon = v2.icon === void 0 ? void 0 : dockIconOf(v2.icon);
 		if (icon) component.icon = icon;
 		if (v2.preview !== void 0) {
@@ -1997,7 +2083,35 @@ function fromTypeSchema(v2, target) {
 		fields: nodes.map(emitField)
 	};
 	if (v2.description !== void 0) model.description = v2.description;
-	model.kind = "model";
+	const modelIcon = v2.icon === void 0 ? void 0 : dockIconOf(v2.icon);
+	if (modelIcon) model.icon = modelIcon;
+	model.kind = block.shape === "block" && model.fields.every(blockRenders) ? "block" : "model";
+	if (ctx.variants) {
+		const variants = v2.variants;
+		model.fields.unshift({
+			key: BLOCK_VARIANT_KEY,
+			label: "Variant",
+			type: "select",
+			required: false,
+			options: variants.map((v) => ({
+				label: v.name,
+				value: v.id
+			}))
+		});
+		model.v2 = {
+			...block,
+			variants: Object.fromEntries(variants.map((v) => [v.id, v.description !== void 0 ? { description: v.description } : {}]))
+		};
+	} else if (nonEmpty(block)) model.v2 = { ...block };
+	if (v2.preview !== void 0) {
+		const preview = componentPreviewToProd(v2.preview, new Set(model.fields.map((x) => x.key)), v2.fields, "/preview", ctx);
+		if (Object.keys(preview).length) model.listPreview = preview;
+	}
+	if (ctx.derivedSets) {
+		const declared = fieldsets.filter((x) => x.kind !== "tab").length;
+		ctx.derivedSets.forEach((_, i) => cat(ctx, `/fieldsets/${declared + i}`, "fieldset (derived)"));
+		fieldsets.push(...ctx.derivedSets);
+	}
 	if (fieldsets.length) model.fieldsets = fieldsets;
 	return {
 		schema: model,
@@ -2021,7 +2135,7 @@ function fieldsetsFor(v2, ctx, out) {
 			lose(ctx, p, why);
 		};
 		if (ctx.tabs.has(g.name) || names.has(folded)) return drop("group name collision");
-		if (out.length >= 3) return drop("groups>3");
+		if (out.length >= TAB_MAX$1) return drop("groups>3");
 		names.add(folded);
 		const tab = {
 			id: g.name,
@@ -2066,7 +2180,7 @@ function fieldsetsFor(v2, ctx, out) {
 			const v = fs[k];
 			if (v === void 0 || k === "name" || k === "title") continue;
 			if (k === "description") {
-				if (v.length <= 500) set.description = v;
+				if (v.length <= FIELDSET_DESCRIPTION_MAX) set.description = v;
 				else lose(ctx, `${p}/${k}`, "help>limit");
 			} else if (k === "collapsed" || k === "collapsible" || k === "columns" || k === "layout") set[k] = v;
 			else lose(ctx, `${p}/${k}`, "unsupported key");
@@ -2095,7 +2209,7 @@ function propTabsFor(v2, ctx) {
 		const label = g.title.slice(0, 40).trim();
 		const folded = label.toLowerCase();
 		if (kept.some((k) => k.g.name === g.name) || labels.has(folded)) return drop("group name collision");
-		if (kept.length >= 8 || g.name.length < 1 || g.name.length > 40) return drop("prop tab limit");
+		if (kept.length >= PROP_TAB_MAX || g.name.length < 1 || g.name.length > 40) return drop("prop tab limit");
 		if (!label) return drop("group title");
 		labels.add(folded);
 		const tab = {
@@ -2198,7 +2312,7 @@ function propSetsFor(v2, ctx) {
 				firstSeen.push(f.fieldset);
 				if (!named.has(f.fieldset)) undeclared.push(f.fieldset);
 			}
-			if (lv >= 10) continue;
+			if (lv >= MAX_FIELD_DEPTH) continue;
 			const kids = previewKids(f);
 			if (kids) visit(kids, lv + 1);
 		}
@@ -2381,9 +2495,12 @@ function previewFromProd(pv, children) {
 function showIfToCondition(s, siblings, at, ctx) {
 	const conds = [];
 	for (const r of s.rules) {
-		const c = showIfRuleToCondition(r, siblings);
+		const c = showIfRuleToCondition(r, r.scope ? [] : siblings);
 		if (!c) return void ctx.onLoss(at, "condition", `V2 conditions have no "${r.op}" with this value; the field always shows.`);
-		conds.push(c);
+		conds.push(r.scope ? {
+			...c,
+			scope: r.scope
+		} : c);
 	}
 	if (!conds.length) return void 0;
 	const [head, ...also] = conds;
@@ -2497,6 +2614,7 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 	if (n.unique !== void 0) val.unique = n.unique;
 	if (n.recommendedMax !== void 0) val.recommendedMax = n.recommendedMax;
 	if (n.advanced !== void 0) f.advanced = n.advanced;
+	if (n.ai !== void 0) f.ai = n.ai;
 	if (n.openMode !== void 0) f.openMode = n.openMode;
 	if (n.readOnly === true) f.readOnly = true;
 	if (n.archived === true) f.archived = true;
@@ -2536,7 +2654,7 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 		} else loss("fieldsetId", "fieldset", `No fieldset "${n.fieldsetId}" exists on this model; the membership is dropped.`);
 	}
 	if (lane === "props" && n.ui.group) f.fieldset = n.ui.group.id;
-	if (lane === "props" && n.ui.tab) f.group = n.ui.tab.id;
+	if ((lane === "props" || !top) && n.ui.tab) f.group = n.ui.tab.id;
 	for (const k of [
 		"target",
 		"stale",
@@ -2560,8 +2678,21 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 	]);
 	const use = (...k) => k.forEach((x) => used.add(x));
 	const useUi = (...k) => k.forEach((x) => usedUi.add(x));
+	if (!top && lane === "fields") useUi("tab");
 	if (lane === "props") useUi("group");
 	if (lane === "props") useUi("tab");
+	if (RICH_TYPES.has(n.type) && cfg.references !== void 0) {
+		use("references");
+		const { kept, named } = richRefs(cfg.references);
+		if (named) loss("config/references", "richtext references", FEATURES["richtext references"].reason);
+		if (kept) f.references = kept;
+	}
+	if (RICH_TYPES.has(n.type) && cfg.features !== void 0) {
+		use("features");
+		const { kept, named } = richFeatures(cfg.features);
+		if (named) loss("config/features", "richtext features", FEATURES["richtext features"].reason);
+		if (kept.length < ALL_RICH_FEATURES.length) f.features = kept;
+	}
 	if ([
 		"text",
 		"longtext",
@@ -2770,6 +2901,7 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 			};
 			if (chrome?.icon) item.icon = tablerIconOf(chrome.icon);
 			if (chrome?.preview) item.preview = previewFromProd(chrome.preview, kids);
+			if (chrome?.openMode) item.openMode = chrome.openMode;
 			return item;
 		});
 		const missing = slugs.filter((s) => !ctx.blockModels.has(s));
@@ -2927,14 +3059,27 @@ function toTypeSchema(model, opts = {}) {
 		if (s.icon !== void 0) ctx.onLoss(`/fieldsets/${i}/icon`, "fieldset icon", "V2 sections have no icon.");
 		fieldsets.push(fs);
 	});
-	const nodes = model.fields.map(readField);
+	const variantField = model.v2?.variants ? model.fields.find((f) => f.key === BLOCK_VARIANT_KEY && f.type === "select") : void 0;
+	const nodes = model.fields.filter((f) => f !== variantField).map(readField);
 	const out = {
 		name: camel(model.slug),
 		title: model.name,
-		kind: model.kind === "block" ? "block" : "entry",
+		kind: model.kind === "block" ? "block" : model.v2?.shape ?? "entry",
 		fields: nodes.map((n, i) => readToV2(n, `/fields/${i}`, nodes, ctx, true, "fields"))
 	};
+	if (model.v2?.placement) out.placement = model.v2.placement;
+	if (variantField) {
+		const meta = model.v2.variants;
+		out.variants = (variantField.options ?? []).map((o) => ({
+			id: o.value,
+			name: o.label,
+			...meta[o.value]?.description !== void 0 ? { description: meta[o.value].description } : {}
+		}));
+	}
+	if (model.listPreview) out.preview = previewFromProd(model.listPreview, nodes);
+	if (model.v2?.category) out.category = model.v2.category;
 	if (model.description !== void 0) out.description = model.description;
+	if (model.icon) out.icon = tablerIconOf(model.icon);
 	if (fieldsets.length) out.fieldsets = fieldsets;
 	if (groups.length) out.groups = groups;
 	return out;
@@ -3003,18 +3148,72 @@ function propsToTypeSchema(component, opts = {}) {
 	const out = {
 		name: camel(component.slug),
 		title: component.name,
-		kind: "block",
+		kind: component.v2?.shape ?? "block",
 		fields: nodes.map((n, i) => readToV2(n, `/fields/${i}`, nodes, ctx, true, "props"))
 	};
+	if (component.v2?.placement) out.placement = component.v2.placement;
 	if (component.description !== void 0 && component.description !== null) out.description = component.description;
-	if (component.category !== void 0 && component.category !== "custom") out.category = capitalize(component.category);
+	if (component.category !== void 0 && component.category !== "custom") out.category = KIT_CATEGORIES.includes(component.category) ? component.category : capitalize(component.category);
 	if (component.icon) out.icon = tablerIconOf(component.icon);
 	if (component.preview) out.preview = previewFromProd(component.preview, nodes);
 	if (fieldsets.length) out.fieldsets = fieldsets;
 	if (groups.length) out.groups = groups;
 	return out;
 }
+/** A V2 variant id a member slug can carry, so the read takes it back verbatim (the component slug rule). */
+var VARIANT_ID_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+function variantFamilyFromTypeSchema(v2) {
+	const base = fromTypeSchema(v2, "props");
+	const variants = v2.variants ?? [];
+	if (!variants.length || !variants.every((v) => VARIANT_ID_RE.test(v.id))) return {
+		members: [base.schema],
+		group: null,
+		lossy: base.lossy,
+		catalog: base.catalog
+	};
+	const slug = base.schema.slug;
+	return {
+		members: variants.map((v) => ({
+			...base.schema,
+			name: v.name,
+			slug: `${slug}-${v.id}`,
+			sectionType: v2.title
+		})),
+		group: {
+			name: v2.title,
+			slug,
+			variants: variants.map((v) => ({
+				member: `${slug}-${v.id}`,
+				...v.description !== void 0 ? { description: v.description } : {}
+			}))
+		},
+		lossy: base.lossy,
+		catalog: base.catalog.filter((c) => c.feature !== "variants")
+	};
+}
+/** The group's `v2` (component_variant_groups.v2, variantGroupV2Schema) once the members exist: `idOf` maps a member slug to its id. */
+function variantGroupV2(group, idOf) {
+	return { variants: group.variants.map((v) => ({
+		componentId: idOf(v.member),
+		...v.description !== void 0 ? { description: v.description } : {}
+	})) };
+}
+/**
+* A family read back as one V2 block: the first member's props, the family's name and title, and its variants from the
+* group's members in `v2.variants` order (the id after the group slug, the member's name, the meta's description).
+*/
+function variantFamilyToTypeSchema(members, group, opts = {}) {
+	const out = propsToTypeSchema(members[0], opts);
+	out.name = camel(group.slug);
+	if (members[0].sectionType) out.title = members[0].sectionType;
+	out.variants = members.map((m, i) => ({
+		id: m.slug.slice(group.slug.length + 1),
+		name: m.name,
+		...group.variants[i]?.description !== void 0 ? { description: group.variants[i].description } : {}
+	}));
+	return out;
+}
 //#endregion
-export { CATEGORY_TO_PROD, SHOPIFY_REF_LOCK, fromTypeSchema, leafValuePlan, planFromProd, planToProd, propsToTypeSchema, schemaSlugOf, toTypeSchema };
+export { CATEGORY_TO_PROD, SHOPIFY_REF_LOCK, fromTypeSchema, leafValuePlan, planFromProd, planToProd, propsToTypeSchema, schemaSlugOf, toTypeSchema, variantFamilyFromTypeSchema, variantFamilyToTypeSchema, variantGroupV2 };
 
 //# sourceMappingURL=schema.js.map