@bettercms-ai/kit 1.0.0 → 2.0.0

package/{adapters → 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 { dockIconOf, tablerIconOf } from "./icons.js";
-import { CATALOG, FEATURES } from "./lossy.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, linkFromProd, linkToProd, listFromProd, listToProd, ratingFromProd, ratingToProd, referenceFromProd, referenceToProd, scaleFromProd, scaleToProd, videoFromProd, videoToProd, zoneListFromProd, zoneListToProd } from "./values.js";
-//#region src/kit/adapters/schema.ts
+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";
+//#region src/adapters/schema.ts
 var isObj = (v) => !!v && typeof v === "object" && !Array.isArray(v);
 function deepEqual(a, b) {
 	if (a === b) return true;
@@ -14,6 +15,8 @@ function deepEqual(a, b) {
 var singular = (t) => t.endsWith("ies") ? `${t.slice(0, -3)}y` : t.endsWith("s") && !t.endsWith("ss") ? t.slice(0, -1) : t;
 var kebab = (s) => s.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "") || "schema";
 var camel = (s) => s.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
+/** The slug a V2 schema name is stored under (a component's, when the host seeds a /kit block): `textBlock` → `text-block`. */
+var schemaSlugOf = kebab;
 var capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
 var ZONE_NAMES = new Set(typeof Intl.supportedValuesOf === "function" ? [...Intl.supportedValuesOf("timeZone"), "UTC"] : ["UTC"]);
 /** An IANA zone name (isTimeZoneName): ICU's canonical list, or a current name Intl itself accepts (Asia/Kolkata). */
@@ -94,7 +97,7 @@ var PROP_TYPE = {
 	code: "code"
 };
 /** Field types whose `config` the backend parses strictly (unknown keys stripped or refused). */
-var STRICT_CONFIG = new Set([
+var STRICT_CONFIG = /* @__PURE__ */ new Set([
 	"array",
 	"reference",
 	"multi-reference",
@@ -107,7 +110,9 @@ var STRICT_CONFIG = new Set([
 	"tags",
 	"rating",
 	"code",
-	"video"
+	"video",
+	"table",
+	"slot"
 ]);
 /** V2 list item types → prod `config.itemType` (ARRAY_ITEM_TYPES); a V2 `text` item reads back as `string`. */
 var PRIM_ITEM = {
@@ -125,6 +130,23 @@ var ENTRY_TARGET = (t) => ![
 	"shopify",
 	"collection"
 ].includes(t);
+/** The non-entry targets a prop reference stores in config.targets (backend reference-target-config.ts REF_TARGET_KINDS). */
+var REF_TARGET_KINDS = [
+	"page",
+	"form",
+	"collection"
+];
+/**
+* A prop reference whose only target is Shopify (backend reference-target-config.ts UNSUPPORTED_TARGETS refuses it by
+* name) is stored as locked text holding the id (a list of them: a list of text), so the value stays the plain gid
+* string V2 holds. This lock reason is the marker the read side turns back into V2's reference (allowed deviation
+* "shopify reference").
+*/
+var SHOPIFY_REF_LOCK = "A Shopify product id. No Shopify integration backs a reference in BetterCMS yet, so the id is kept as it is.";
+var shopifyOnly = (r) => !!r?.to?.length && r.to.every((t) => t === "shopify");
+/** backend REFERENCE_FILTER_MAX; parameters ($x) and the parent document (^) are refused there (reference_filter_invalid). */
+var REFERENCE_FILTER_MAX = 500;
+var filterKept = (f) => typeof f === "string" && f.trim() !== "" && f.length <= REFERENCE_FILTER_MAX && !/[$^]/.test(f);
 /** The old rating: a number with ui.control "rating" and these bounds read back as no `numeric` (read side only). */
 var RATING_CONFIG = {
 	min: 0,
@@ -132,6 +154,12 @@ var RATING_CONFIG = {
 	step: .5
 };
 /**
+* A V2 rating sets no step and holds any number on its scale (a 4.8 average). Prod's unset step is 1, which refuses
+* 4.8 (rating_value_invalid), so a rating with no step is written with step 0.1 (≤ RATING_MAX_STOPS stops on a 1–10
+* scale) and that step reads back as none; a prod rating with no step reads back as its real step, 1.
+*/
+var V2_RATING_STEP = .1;
+/**
 * V2 block-picker category (KitCategory, and the core examples' own) → the nearest prod ComponentCategory. A category
 * with no row has no prod twin; the server defaults the component to "custom".
 */
@@ -155,7 +183,7 @@ var CATEGORY_TO_PROD = {
 	Layout: "section"
 };
 /** The field types a kind:'block' model may hold (backend block-model-mapping.ts FIELD_PRIMITIVE). */
-var BLOCK_FIELD_TYPES = new Set([
+var BLOCK_FIELD_TYPES = /* @__PURE__ */ new Set([
 	"text",
 	"longtext",
 	"richtext",
@@ -172,15 +200,20 @@ var BLOCK_FIELD_TYPES = new Set([
 	"datetime",
 	"boolean"
 ]);
-/** A prop's config.minItems / maxItems cap (SLOT_ITEMS_CAP, componentPropDefSchema). */
+/** 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). */
+var LIST_ITEMS_CAP = 500;
+/** backend slotAllowIssues: a slot's config.allow holds 1–50 block names of 1–64 characters, no repeats. */
+var SLOT_ALLOW_MAX = 50;
+var SLOT_ALLOW_NAME_MAX = 64;
 /** Backend dock-vocabulary.ts SLIDER_MAX_STOPS: a slider's (max − min) / step. */
 var SLIDER_MAX_STOPS = 1e3;
 /**
 * The field types prod's unique flag accepts (uniqueFlagRules): a comparable scalar (UNIQUE_FIELD_TYPES, no two entries
 * share it; a reference only to one model) or a list (UNIQUE_ITEMS_FIELD_TYPES, no item repeats).
 */
-var UNIQUE_TYPES = new Set([
+var UNIQUE_TYPES = /* @__PURE__ */ new Set([
 	"text",
 	"longtext",
 	"slug",
@@ -197,14 +230,14 @@ var UNIQUE_TYPES = new Set([
 	"multi-reference"
 ]);
 /** Prop types whose value is a list (UNIQUE_LIST_PROP_TYPES), and the sub-field types a table row compares (UNIQUE_ROW_PROP_TYPES). */
-var UNIQUE_LIST_PROPS = new Set([
+var UNIQUE_LIST_PROPS = /* @__PURE__ */ new Set([
 	"multiselect",
 	"tags",
 	"multi-reference",
 	"table",
 	"array"
 ]);
-var UNIQUE_ROW_PROPS = new Set([
+var UNIQUE_ROW_PROPS = /* @__PURE__ */ new Set([
 	"text",
 	"url",
 	"slug",
@@ -215,19 +248,19 @@ var UNIQUE_ROW_PROPS = new Set([
 	"date"
 ]);
 /** Types measured by minLength / maxLength (fields: LENGTH_FIELD_TYPES; props: LENGTH_TWIN), and those that take a pattern. */
-var LENGTH_FIELDS = new Set([
+var LENGTH_FIELDS = /* @__PURE__ */ new Set([
 	"text",
 	"longtext",
 	"richtext",
 	"document"
 ]);
-var LENGTH_PROPS = new Set([
+var LENGTH_PROPS = /* @__PURE__ */ new Set([
 	"text",
 	"url",
 	"longtext",
 	"richtext"
 ]);
-var PATTERN_TYPES = new Set([
+var PATTERN_TYPES = /* @__PURE__ */ new Set([
 	"text",
 	"longtext",
 	"url"
@@ -236,7 +269,7 @@ var PATTERN_TYPES = new Set([
 * Leaf types whose value is an object a dotted preview path may read into (previewPathProblem OBJECT_VALUE_TYPES), and the
 * keys an image or video value holds (LEAF_VALUE_KEYS). V2 reads `image.alt`; prod stores the key as `altText`.
 */
-var OBJECT_VALUE_TYPES = new Set([
+var OBJECT_VALUE_TYPES = /* @__PURE__ */ new Set([
 	"image",
 	"link",
 	"button",
@@ -268,6 +301,8 @@ var LEAF_VALUE_KEYS = {
 	]
 };
 var IMAGE_PATH_KEY = { alt: "altText" };
+/** The keys of a data table's value a preview path may end on (previewPathProblem `<table>.caption` / `.notes`). */
+var TABLE_PATH_KEYS = ["caption", "notes"];
 var lose = (ctx, path, feature) => ctx.lossy.push({
 	path,
 	feature,
@@ -279,7 +314,7 @@ var cat = (ctx, path, feature) => ctx.catalog.push({
 	reason: CATALOG[feature]
 });
 /** Keys every type keeps, including a field degraded to json. */
-var COMMON_KEYS = new Set([
+var COMMON_KEYS = /* @__PURE__ */ new Set([
 	"name",
 	"title",
 	"type",
@@ -296,14 +331,53 @@ var COMMON_KEYS = new Set([
 	"advanced",
 	"localized",
 	"ai",
-	"placeholder"
+	"placeholder",
+	"archived"
+]);
+/** Types a slot setting may not be (backend slotSettingsHardening, and a model slot's SLOT_SETTINGS_NESTING: leaf fields only). */
+var SETTING_NESTING_TYPES = /* @__PURE__ */ new Set([
+	"object",
+	"group",
+	"array",
+	"table",
+	"slot",
+	"form",
+	"modular"
 ]);
-function shapeOf(f, lv, ctx, top) {
+/** backend slotSettingsHardening: at most this many per-child settings. */
+var SLOT_SETTINGS_MAX = 20;
+/** backend ITEM_TYPE_NAME (what a row's `_type` holds), and an item type label's cap. */
+var ITEM_TYPE_NAME = /^[a-zA-Z][a-zA-Z0-9_-]{0,63}$/;
+var ITEM_TYPE_LABEL_MAX = 120;
+function shapeOf(f, lv, ctx, top, nest) {
+	const shape = shapeOfField(f, lv, ctx, top);
+	if (nest === "setting" && SETTING_NESTING_TYPES.has(shape.type)) return {
+		kind: "json",
+		type: "json",
+		feature: "slotSettings"
+	};
+	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) {
+	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;
+}
+/** 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 of = Array.isArray(f.of) ? f.of : void 0;
-	/** a prop reference needs a content model to point at (refTargetNamed): with none it is stored as json */
-	const noEntry = (r) => props && !(r?.to ?? []).some(ENTRY_TARGET);
+	/** 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));
 	switch (f.type) {
 		case "object": return deep ? {
 			kind: "json",
@@ -314,11 +388,22 @@ function shapeOf(f, lv, ctx, top) {
 			type: "object"
 		};
 		case "array": {
-			if (of && of.length > 1 && !props && of.every((i) => i.type === "object")) return {
-				kind: "modular",
-				type: "modular",
-				items: of
-			};
+			if (of && of.length > 1 && of.every((i) => i.type === "object")) {
+				if (!props) return {
+					kind: "modular",
+					type: "modular",
+					items: of
+				};
+				return deep ? {
+					kind: "json",
+					type: "json",
+					feature: "depth>10"
+				} : {
+					kind: "types",
+					type: "table",
+					items: of
+				};
+			}
 			if (!of || of.length !== 1) return {
 				kind: "json",
 				type: "json",
@@ -334,6 +419,13 @@ function shapeOf(f, lv, ctx, top) {
 				type: props ? "table" : "array",
 				item
 			};
+			if (item.type === "reference" && shopifyOnly(item.reference)) return {
+				kind: "itemType",
+				type: "array",
+				item,
+				itemType: "text",
+				shopify: true
+			};
 			if (item.type === "reference") return noEntry(item.reference) ? {
 				kind: "json",
 				type: "json",
@@ -356,24 +448,30 @@ function shapeOf(f, lv, ctx, top) {
 				feature: "type:primitive-array"
 			};
 		}
-		case "slot": return {
-			kind: "json",
-			type: "json",
-			feature: "type:slot"
-		};
-		case "table": return props ? {
+		case "slot":
+			if (!props && !slotAllowOk(f.of?.allow)) return {
+				kind: "json",
+				type: "json",
+				feature: "type:slot"
+			};
+			return {
+				kind: "slot",
+				type: "slot"
+			};
+		case "table": return {
 			kind: "leaf",
 			type: "table"
-		} : {
-			kind: "json",
-			type: "json",
-			feature: "type:table"
 		};
 		case "reference":
 			if (props && top && f.reference?.to?.length === 1 && f.reference.to[0] === "form" && !f.reference.filter) return {
 				kind: "leaf",
 				type: "form"
 			};
+			if (shopifyOnly(f.reference)) return {
+				kind: "leaf",
+				type: "text",
+				shopify: true
+			};
 			return noEntry(f.reference) ? {
 				kind: "json",
 				type: "json",
@@ -400,9 +498,9 @@ var trunc = (ctx, at, s, max, feature) => {
 	lose(ctx, at, feature);
 	return s.slice(0, max);
 };
-function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
+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);
+	const shape = shapeOf(f, lv, ctx, top, inTable ? "rows" : inItem ? "item" : inSetting ? "setting" : void 0);
 	const node = {
 		key: f.name,
 		label: f.title,
@@ -414,17 +512,28 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 	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);
+		lose(ctx, `${at}/name`, "reserved name");
 	}
-	const nesting = shape.kind === "object" || shape.kind === "zones";
-	/** a list of items (objects, block models, scalars or entries): ui.itemLabel names one item */
-	const listy = shape.kind === "zones" || shape.kind === "modular" || shape.kind === "itemType" || shape.kind === "refs";
+	const nesting = shape.kind === "object" || shape.kind === "zones" || shape.kind === "types";
+	/** a list of items (objects, block models, item types, scalars or entries): ui.itemLabel names one item */
+	const listy = shape.kind === "zones" || shape.kind === "modular" || shape.kind === "types" || shape.kind === "itemType" || shape.kind === "refs";
 	const looseConfig = props || !STRICT_CONFIG.has(shape.type);
 	if (shape.kind === "json") lose(ctx, `${at}/type`, shape.feature);
+	const shopify = (shape.kind === "leaf" || shape.kind === "itemType") && shape.shopify === true;
+	if (shopify) {
+		if (f.readOnly !== true) lose(ctx, `${at}/readOnly`, "shopify reference");
+		node.readOnly = true;
+		node.lockReason = SHOPIFY_REF_LOCK;
+	}
 	if (!props && f.type === "url") node.config.inputType = "url";
 	if (shape.type === "datetime" && !props) node.config.includeTime = true;
 	if (shape.kind === "leaf" && shape.type === "table") node.config.mode = "data";
+	if (shape.kind === "types") node.config.mode = "types";
+	if (shape.kind === "slot" && props) node.config.multiple = true;
 	if (listy) {
-		const label = f.itemNoun !== void 0 ? capitalize(f.itemNoun) : shape.kind === "zones" && shape.item.title !== conventionItem(f.name, f.title).title ? shape.item.title : void 0;
+		const label = f.itemNoun !== void 0 ? capitalize(f.itemNoun) : props && shape.kind === "zones" && shape.item.title !== conventionItem(f.name, f.title).title ? shape.item.title : void 0;
 		if (label !== void 0 && label.length <= 24) node.ui.itemLabel = label;
 	}
 	const devLock = f.access?.edit === "schema.manage" && !!f.lockReason;
@@ -435,6 +544,11 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 			lose(ctx, p, shape.feature);
 			continue;
 		}
+		if (shopify && (k === "reference" || k === "readOnly")) continue;
+		if (shopify && (k === "access" || k === "lockReason")) {
+			lose(ctx, p, "shopify reference");
+			continue;
+		}
 		switch (k) {
 			case "name":
 			case "title":
@@ -451,7 +565,7 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 				else node.ui.placeholder = trunc(ctx, p, f.placeholder, 120, "help>limit");
 				break;
 			case "initialValue":
-				if (props && (shape.type === "reference" || shape.type === "multi-reference")) cat(ctx, p, "seeded instance");
+				if (props && (shape.type === "reference" || shape.type === "multi-reference" || shape.kind === "slot")) cat(ctx, p, "seeded instance");
 				else node.defaultValue = defaultToProd(f, shape, f.initialValue, p, ctx, lv, top);
 				break;
 			case "validation":
@@ -471,7 +585,7 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 				ofToProd(f, shape, node, p, lv, ctx);
 				break;
 			case "openMode":
-				if (nesting) node.openMode = f.openMode;
+				if (nesting || props && shape.type === "code") node.openMode = f.openMode;
 				else lose(ctx, p, "openMode");
 				break;
 			case "preview":
@@ -509,6 +623,9 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 			case "localized":
 				node.localized = f.localized;
 				break;
+			case "archived":
+				if (f.archived) node.archived = true;
+				break;
 			case "advanced":
 				node.advanced = f.advanced;
 				break;
@@ -527,7 +644,7 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 				else lose(ctx, p, "unsupported key");
 				break;
 			case "icon": {
-				const dock = shape.kind === "object" || shape.kind === "modular" ? dockIconOf(f.icon) : void 0;
+				const dock = shape.kind === "object" || shape.kind === "modular" || shape.kind === "types" ? dockIconOf(f.icon) : void 0;
 				if (dock) node.ui.icon = dock;
 				else lose(ctx, p, "icon");
 				break;
@@ -543,13 +660,14 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 				break;
 			}
 			case "slotSettings":
-				lose(ctx, p, "slotSettings");
+				if (shape.kind === "slot") slotSettingsToProd(f.slotSettings, node, p, lv, ctx);
+				else lose(ctx, p, "slotSettings");
 				break;
 			case "itemNoun":
 				if (!listy || node.ui.itemLabel?.toLowerCase() !== f.itemNoun) lose(ctx, p, "itemNoun");
 				break;
 			case "arrayLayout":
-				if (shape.kind === "zones" || shape.kind === "modular") node.ui.layout = f.arrayLayout;
+				if (shape.kind === "zones" || shape.kind === "modular" || shape.kind === "types") node.ui.layout = f.arrayLayout;
 				else if ((shape.kind === "itemType" || shape.kind === "refs") && f.arrayLayout === "grid") node.ui.layout = "gallery";
 				else lose(ctx, p, "layout");
 				break;
@@ -557,6 +675,14 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 				if (shape.type === "link" || shape.type === "image" || shape.type === "button") node.ui.valueShape = f.valueShape;
 				else lose(ctx, p, "valueShape");
 				break;
+			case "linkHref":
+				if (typeof f.linkHref === "string" && f.linkHref) node.config.linkHref = f.linkHref;
+				else lose(ctx, p, "unsupported key");
+				break;
+			case "svgOnly":
+				if (shape.type === "image" && f.svgOnly === true) node.config.media = "icon";
+				else if (f.svgOnly !== false) lose(ctx, p, "unsupported key");
+				break;
 			case "timezone":
 				if (shape.type === "date" || shape.type === "datetime") {
 					const tz = f.timezone;
@@ -580,8 +706,14 @@ function convertField(f, at, lv, ctx, siblings, top, inTable = false) {
 			default: lose(ctx, p, "unsupported key");
 		}
 	}
+	if (props && f.description === void 0) node.helpText = null;
 	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) {
+		const lo = typeof node.config.min === "number" ? node.config.min : 0;
+		const stops = ((typeof node.config.max === "number" ? node.config.max : 5) - lo) / V2_RATING_STEP;
+		if (Math.abs(stops - Math.round(stops)) < 1e-9 && Math.round(stops) <= 100) node.config.step = V2_RATING_STEP;
+	}
 	if (node.ui.control === "slider" && !sliderOk(node.config)) {
 		delete node.ui.control;
 		lose(ctx, `${at}/layout`, "layout");
@@ -606,7 +738,16 @@ function sliderOk({ min, max, step }) {
 /** Where a field sits: its tab (fields lane) or prop group (props lane). */
 function placeInSet(f, node, at, ctx, top, siblings) {
 	if (ctx.lane === "props") {
-		if (f.group !== void 0) lose(ctx, `${at}/group`, "group (props)");
+		if (!top) {
+			if (f.group !== void 0) {
+				if (ctx.keptTabs.has(f.group)) node.ui.tab = { id: f.group };
+				else lose(ctx, `${at}/group`, "group (nested)");
+			}
+		} else {
+			const t = ctx.propTabs.get(f);
+			if (t?.loss) lose(ctx, `${at}/group`, t.loss);
+			if (t?.tab) node.ui.tab = ctx.definedTabs.has(t.tab.id) ? { id: t.tab.id } : (ctx.definedTabs.add(t.tab.id), t.tab);
+		}
 		if (f.fieldset === void 0) return;
 		const set = ctx.propSets.get(f.fieldset);
 		if (!set) return lose(ctx, `${at}/fieldset`, "fieldset collision");
@@ -663,7 +804,7 @@ function defaultToProd(f, shape, v, at, ctx, lv, top) {
 var AS_IS = { k: "as-is" };
 /** The write side's plan, from the V2 field and the shape it is stored as. */
 function writePlan(f, shape, lv, ctx, top) {
-	const kids = (fields) => new Map(fields.map((c) => [c.name, writePlan(c, shapeOf(c, lv + 1, ctx, false), lv + 1, ctx, false)]));
+	const kids = (fields, nest) => new Map(fields.map((c) => [c.name, writePlan(c, shapeOf(c, lv + 1, ctx, false, nest), lv + 1, ctx, false)]));
 	switch (shape.kind) {
 		case "json": return AS_IS;
 		case "itemType": return shape.itemType === "image" || shape.itemType === "link" ? {
@@ -677,8 +818,13 @@ function writePlan(f, shape, lv, ctx, top) {
 		case "zones": return {
 			k: "rows",
 			zoned: ctx.lane === "fields",
-			fields: kids(shape.item.fields ?? [])
+			fields: kids(shape.item.fields ?? [], ctx.lane === "props" ? "rows" : void 0)
 		};
+		case "types": return {
+			k: "types",
+			types: new Map(shape.items.map((i) => [i.name, kids(i.fields ?? [], "item")]))
+		};
+		case "slot": return ctx.lane === "fields" ? { k: "blocks" } : AS_IS;
 		case "modular": {
 			const top1 = (fields) => new Map(fields.map((c) => [c.name, writePlan(c, shapeOf(c, 1, ctx, false), 1, ctx, false)]));
 			return {
@@ -688,6 +834,7 @@ function writePlan(f, shape, lv, ctx, top) {
 		}
 		case "refs": return { k: "refs" };
 		case "leaf":
+			if (shape.shopify) return AS_IS;
 			if (f.type === "link" || f.type === "url") return { k: "link" };
 			if (f.type === "button" || f.type === "image") return { k: f.type };
 			if (f.type === "datetime") return {
@@ -706,7 +853,7 @@ function leafPlan(f, prodType) {
 		scale: {
 			min: f.numeric?.min,
 			max: f.numeric?.max,
-			step: f.numeric?.step
+			step: f.numeric?.step ?? V2_RATING_STEP
 		}
 	};
 	if (f.type === "number" && f.scale) return {
@@ -716,11 +863,12 @@ function leafPlan(f, prodType) {
 	return prodType === "number" ? { k: "number" } : AS_IS;
 }
 /**
-* The read side's plan, from the V2 field read back (`zoned`: lists read from an array's repeatable zone; `modular`:
-* lists read from a modular field, whose item fields live in their block models and pass as stored).
+* The read side's plan, from the V2 field read back (`zoned`: lists read from an array's repeatable zone and groups
+* read from its non-repeatable zone; `modular`: lists read from a modular field, whose item fields live in their block
+* models and pass as stored).
 */
-function readPlan(f, prodType, zoned, modular) {
-	const kids = (fields) => new Map(fields.map((c) => [c.name, readPlan(c, "", zoned, modular)]));
+function readPlan(f, prodType, zoned, modular, types, slots, blocks) {
+	const kids = (fields) => new Map(fields.map((c) => [c.name, readPlan(c, "", zoned, modular, types, slots, blocks)]));
 	switch (f.type) {
 		case "link":
 		case "url": return { k: "link" };
@@ -731,16 +879,29 @@ function readPlan(f, prodType, zoned, modular) {
 			zone: fixedZone(f)
 		};
 		case "date": return { k: "date" };
-		case "reference": return { k: prodType === "form" ? "form" : "ref" };
+		case "reference":
+			if (shopifyOnly(f.reference)) return AS_IS;
+			return { k: prodType === "form" ? "form" : "ref" };
 		case "object": return {
 			k: "object",
+			...zoned.has(f) ? { zoned: true } : {},
 			fields: kids(f.fields ?? [])
 		};
+		case "slot":
+			if (blocks?.has(f)) return { k: "blocks" };
+			return slots?.has(f) ? {
+				k: "slot",
+				multiple: slots.get(f)
+			} : AS_IS;
 		case "array": {
 			if (modular.has(f)) return {
 				k: "modular",
 				types: new Map((Array.isArray(f.of) ? f.of : []).map((i) => [i.name, kids(i.fields ?? [])]))
 			};
+			if (types?.has(f)) return {
+				k: "types",
+				types: new Map((Array.isArray(f.of) ? f.of : []).map((i) => [i.name, kids(i.fields ?? [])]))
+			};
 			const item = Array.isArray(f.of) && f.of.length === 1 ? f.of[0] : void 0;
 			if (item?.type === "object") return {
 				k: "rows",
@@ -751,7 +912,7 @@ function readPlan(f, prodType, zoned, modular) {
 				k: "list",
 				item: item.type
 			};
-			return item?.type === "reference" ? { k: "refs" } : AS_IS;
+			return item?.type === "reference" && !shopifyOnly(item.reference) ? { k: "refs" } : AS_IS;
 		}
 		default: return leafPlan(f, prodType);
 	}
@@ -791,7 +952,10 @@ function planToProd(plan, v, lost, at = "") {
 		case "list": return take(listToProd(v, plan.item));
 		case "scale": return take(scaleToProd(v, plan.scale));
 		case "rating": return take(ratingToProd(v, plan.scale));
-		case "object": return mapKeys(v, plan.fields, (p, x, k) => planToProd(p, x, lost, under(k)));
+		case "object": {
+			const out = mapKeys(v, plan.fields, (p, x, k) => planToProd(p, x, lost, under(k)));
+			return plan.zoned && isObj(out) ? { nonRepeatable: out } : out;
+		}
 		case "rows": {
 			if (!Array.isArray(v)) return v;
 			const rows = v.map((row, i) => mapKeys(row, plan.fields, (p, x, k) => planToProd(p, x, lost, `${under(i)}/${k}`)));
@@ -809,24 +973,46 @@ function planToProd(plan, v, lost, at = "") {
 					data: fields ? mapKeys(rest, fields, (p, x, k) => planToProd(p, x, lost, `${under(i)}/${k}`)) : rest
 				};
 			});
+		case "blocks": return Array.isArray(v) ? v.map((c) => isObj(c) && typeof c._type === "string" ? {
+			...c,
+			_type: kebab(c._type)
+		} : c) : v;
+		case "slot": {
+			const kids = (type) => plan.child?.(type);
+			return slotChildrenToStored(plan.family ? childVariantsToTypes(v, plan.family) : v, plan.multiple !== false, (type, values, i) => {
+				const fields = kids(type);
+				return fields ? mapKeys(values, fields, (p, x, k) => planToProd(p, x, lost, `${under(i)}/${k}`)) : values;
+			}, (rel) => lost?.push(under(rel)));
+		}
+		case "types": return take(typedRowsToProd(v, (row, i) => {
+			const fields = plan.types.get(row._type);
+			return fields ? mapKeys(row, fields, (p, x, k) => planToProd(p, x, lost, `${under(i)}/${k}`)) : row;
+		}));
 		default: return v;
 	}
 }
 /** The keys the kit reads back from a stored image object (imageFromProd) and writes again (imageToProd). */
-var IMAGE_KIT_KEYS = new Set([
+var IMAGE_KIT_KEYS = /* @__PURE__ */ new Set([
 	"url",
 	"id",
 	"name",
 	"altText",
 	"focal"
 ]);
-/** Every key of a stored image the kit cannot hand back: a crop (read back only with the asset's pixel size) or a key it does not model. */
+/**
+* Every key of a stored image the kit cannot hand back. A crop rect is read back as it is (imageFromProd), and an older
+* `{ src, alt }` value reads as its url and alt text, so neither is a loss (QA item 3); a malformed crop, or a key the
+* kit does not model, is.
+*/
 function imageStoredLoss(v, rel, loss) {
 	if (!isObj(v)) return;
+	const legacy = typeof v.url !== "string" && typeof v.src === "string";
 	for (const [k, x] of Object.entries(v)) {
 		if (IMAGE_KIT_KEYS.has(k) || x === void 0) continue;
+		if (legacy && k === "src") continue;
+		if (k === "alt" && typeof x === "string" && v.altText === void 0) continue;
 		if (k === "crop") {
-			if (x != null) loss(`${rel}/crop`, "A saved crop is not read back by the kit; editing the image would drop it.");
+			if (x != null && !isCropRect(x)) loss(`${rel}/crop`, "A saved crop the kit can't read; editing the image would drop it.");
 		} else loss(`${rel}/${k}`, `The image's saved "${k}" is not kept by the kit; editing the image would drop it.`);
 	}
 }
@@ -859,7 +1045,14 @@ function planFromProd(plan, v, loss, rel = "") {
 				else if (isObj(x) && referenceFromProd(x) === null) loss(`${rel}${Array.isArray(v) ? `/${i}` : ""}` || "(value)", "A stored reference the kit can't read; editing it would drop it.");
 			}
 			return referenceFromProd(v);
-		case "object": return mapKeys(v, plan.fields, (p, x, k) => planFromProd(p, x, loss, `${rel}/${k}`));
+		case "object": {
+			const env = plan.zoned && isObj(v) && "nonRepeatable" in v ? v : void 0;
+			if (env && loss) {
+				for (const k of Object.keys(env)) if (k !== "nonRepeatable" && env[k] !== void 0) loss(`${rel}/${k}`, `The group's saved "${k}" is not one of its fields; editing the group would drop it.`);
+			}
+			const at = env ? `${rel}/nonRepeatable` : rel;
+			return mapKeys(env ? isObj(env.nonRepeatable) ? env.nonRepeatable : {} : v, plan.fields, (p, x, k) => planFromProd(p, x, loss, `${at}/${k}`));
+		}
 		case "rows": {
 			const rows = plan.zoned ? zoneListFromProd(v) : v;
 			return Array.isArray(rows) ? rows.map((row, i) => mapKeys(row, plan.fields, (p, x, k) => planFromProd(p, x, loss, `${rel}/${i}/${k}`))) : rows;
@@ -875,6 +1068,27 @@ function planFromProd(plan, v, loss, rel = "") {
 				...back
 			};
 		}) : v;
+		case "blocks": return Array.isArray(v) ? v.map((c) => isObj(c) && typeof c._type === "string" ? {
+			...c,
+			_type: camel(c._type)
+		} : c) : v;
+		case "slot": return slotChildrenFromStored(v, (type, values, i) => {
+			const fields = plan.child?.(type);
+			const read = fields ? mapKeys(values, fields, (p, x, k) => planFromProd(p, x, loss, `${rel}/${i}/${k}`)) : values;
+			const variant = plan.family?.(type)?.current;
+			return variant === void 0 ? read : {
+				...read,
+				_variant: variant
+			};
+		}, (i, reason) => loss?.(`${rel}/${i}`, reason));
+		case "types": return typedRowsFromProd(v, (row, i) => {
+			const fields = plan.types.get(row._type);
+			if (!fields) {
+				loss?.(`${rel}/${i}/_type`, `A stored row of item type "${row._type}", which this list no longer declares; editing the list would drop it.`);
+				return row;
+			}
+			return mapKeys(row, fields, (p, x, k) => planFromProd(p, x, loss, `${rel}/${i}/${k}`));
+		});
 		default: return v;
 	}
 }
@@ -895,7 +1109,7 @@ function diffPaths(a, b, path = "", out = []) {
 	if ((isObj(a) || a === void 0) && (isObj(b) || b === void 0) && (a !== void 0 || b !== void 0)) {
 		const A = a ?? {};
 		const B = b ?? {};
-		for (const k of new Set([...Object.keys(A), ...Object.keys(B)])) diffPaths(A[k], B[k], `${path}/${k}`, out);
+		for (const k of /* @__PURE__ */ new Set([...Object.keys(A), ...Object.keys(B)])) diffPaths(A[k], B[k], `${path}/${k}`, out);
 	} else if (Array.isArray(a) && Array.isArray(b)) for (let i = 0; i < Math.max(a.length, b.length); i++) diffPaths(a[i], b[i], `${path}/${i}`, out);
 	else out.push(path);
 	return out;
@@ -935,17 +1149,21 @@ function validationToProd(f, shape, node, at, ctx, inTable, top) {
 			case "max": {
 				const n = v;
 				const lo = k === "min";
-				if (lengthy) if (isWhole(n)) set(lo ? "minLength" : "maxLength", n, "validation.length", "minLength", "maxLength");
-				else lose(ctx, p, "validation.length");
-				else if (t === "number") {
+				if (lengthy) {
+					if (isWhole(n)) set(lo ? "minLength" : "maxLength", n, "validation.length", "minLength", "maxLength");
+					else lose(ctx, p, "validation.length");
+				} else if (t === "number") {
 					const b = node.config.validation ??= {};
 					b[k] = n;
 				} else if (t === "rating") lose(ctx, p, "rating bounds");
-				else if (shape.kind === "zones" || shape.kind === "modular" || shape.kind === "itemType") if (props && top ? isWhole(n, lo ? 0 : 1, SLOT_ITEMS_CAP) : isWhole(n)) set(lo ? "minItems" : "maxItems", n, "validation.items", "minItems", "maxItems");
-				else lose(ctx, p, "validation.items");
-				else if (shape.kind === "refs" || t === "multiselect" || t === "tags") if (t === "tags" ? isWhole(n, lo ? 0 : 1, 500) : isWhole(n)) set(k, n, "validation.items", "min", "max");
-				else lose(ctx, p, "validation.items");
-				else lose(ctx, p, "validation.length");
+				else if (shape.kind === "zones" || shape.kind === "modular" || shape.kind === "types" || shape.kind === "slot" || shape.kind === "itemType") {
+					const cap = shape.kind === "slot" ? SLOT_ITEMS_CAP : LIST_ITEMS_CAP;
+					if (props && top || shape.kind === "slot" ? isWhole(n, lo ? 0 : 1, cap) : isWhole(n)) set(lo ? "minItems" : "maxItems", n, "validation.items", "minItems", "maxItems");
+					else lose(ctx, p, "validation.items");
+				} else if (shape.kind === "refs" || t === "multiselect" || t === "tags") {
+					if (t === "tags" ? isWhole(n, lo ? 0 : 1, 500) : isWhole(n)) set(k, n, "validation.items", "min", "max");
+					else lose(ctx, p, "validation.items");
+				} else lose(ctx, p, "validation.length");
 				break;
 			}
 			case "recommendedMax":
@@ -962,9 +1180,11 @@ function validationToProd(f, shape, node, at, ctx, inTable, top) {
 				break;
 			case "unique":
 				if (val.unique === false) node.unique = false;
-				else if (props) if (UNIQUE_LIST_PROPS.has(t) || inTable && UNIQUE_ROW_PROPS.has(t)) node.unique = true;
-				else cat(ctx, p, "not applicable (props)");
-				else {
+				else if (shape.kind === "types") lose(ctx, p, "validation.unique");
+				else if (props) {
+					if (UNIQUE_LIST_PROPS.has(t) || inTable && UNIQUE_ROW_PROPS.has(t)) node.unique = true;
+					else cat(ctx, p, "not applicable (props)");
+				} else {
 					const polymorphic = t === "reference" && (f.reference?.to ?? []).filter(ENTRY_TARGET).length > 1;
 					if (UNIQUE_TYPES.has(t) && !polymorphic) node.unique = true;
 					else lose(ctx, p, "validation.unique");
@@ -1000,11 +1220,15 @@ function optionsToProd(f, shape, node, at, ctx) {
 			label: o.label,
 			value: o.value
 		};
-		if (o.icon !== void 0) if (allIcons) out.icon = icons[i];
-		else lose(ctx, `${at}/${i}/icon`, "option icon");
+		if (o.icon !== void 0) {
+			if (allIcons) out.icon = icons[i];
+			else lose(ctx, `${at}/${i}/icon`, "option icon");
+		}
 		const d = o.description;
-		if (d !== void 0) if (typeof d === "string" && d.trim() !== "" && !/[\r\n]/.test(d) && d.length <= 140) out.description = d;
-		else lose(ctx, `${at}/${i}/description`, "option description");
+		if (d !== void 0) {
+			if (typeof d === "string" && d.trim() !== "" && !/[\r\n]/.test(d) && d.length <= 140) out.description = d;
+			else lose(ctx, `${at}/${i}/description`, "option description");
+		}
 		for (const k of Object.keys(o)) if (![
 			"value",
 			"label",
@@ -1019,14 +1243,13 @@ function layoutToProd(f, shape, node, at, ctx) {
 	const l = f.layout;
 	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) {
-		node.ui.control = n <= 6 ? "radio" : "dropdown";
-		lose(ctx, at, "segmented>4");
-	} else lose(ctx, at, "layout");
-	else if (l === "slider" && t === "number" && f.type === "number") node.ui.control = "slider";
+	if (l === "segmented" && t === "select") {
+		if (n >= 2 && n <= 4) node.ui.control = "segmented";
+		else if (n >= 5) 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;
-	else if (l === "list" && (shape.kind === "zones" || shape.kind === "itemType" || shape.kind === "modular" || shape.kind === "refs") && f.arrayLayout === void 0) node.ui.layout = "rows";
+	else if (l === "list" && (shape.kind === "zones" || shape.kind === "itemType" || shape.kind === "modular" || shape.kind === "types" || shape.kind === "refs") && f.arrayLayout === void 0) node.ui.layout = "rows";
 	else lose(ctx, at, "layout");
 }
 /** The prod type a V2 field is stored as, for a preview path reading into it (no loss is reported). */
@@ -1061,6 +1284,7 @@ function previewPathToProd(path, children, ctx) {
 			node = next;
 			continue;
 		}
+		if (node.type === "table") return TABLE_PATH_KEYS.includes(segs[i]) && i === segs.length - 1 ? [...out, segs[i]].join(".") : void 0;
 		const type = storedType(node, ctx);
 		if (!OBJECT_VALUE_TYPES.has(type)) return void 0;
 		const key = type === "image" ? IMAGE_PATH_KEY[segs[i]] ?? segs[i] : segs[i];
@@ -1094,10 +1318,71 @@ function previewToProd(pv, children, at, ctx) {
 	}
 	return out;
 }
+/**
+* A V2 dotted document preview path (`slides.0.heading`, `default.heading`) the backend keeps (componentPreviewRefusals
+* previewPathOfProps): its head a top-level prop, an index segment stepping into an item of a list, the rest a path
+* previewPathToProd stores unchanged (a renamed key, `image.alt` → `altText`, has no stored form here).
+*/
+function documentPreviewPathOk(path, keys, fields, ctx) {
+	const segs = path.split(".");
+	if (segs.length < 2 || !keys.has(segs[0])) return false;
+	const head = fields.find((f) => f.name === segs[0]);
+	if (!head) return false;
+	const polyOf = (f) => f.type === "array" && Array.isArray(f.of) && f.of.length > 1 && f.of.every((o) => o.type === "object") ? f.of : void 0;
+	let node = head;
+	const kept = [segs[0]];
+	let poly = false;
+	for (let i = 1; i < segs.length; i++) {
+		const seg = segs[i];
+		if (/^\d+$/.test(seg) && (node.type === "array" || node.type === "multiselect" || node.type === "tags")) continue;
+		const types = polyOf(node);
+		const kids = types ? types.flatMap((o) => o.fields ?? []) : previewKids(node);
+		if (!kids) {
+			kept.push(...segs.slice(i));
+			break;
+		}
+		const next = kids.find((c) => c.name === seg);
+		if (!next) return false;
+		if (types) poly = true;
+		kept.push(seg);
+		node = next;
+	}
+	if (poly) return true;
+	const clean = kept.join(".");
+	return previewPathToProd(clean, fields, ctx) === clean;
+}
+/**
+* A V2 schema's document-level preview → component.preview (BE componentPreviewSchema): `title` / `subtitle` / `media`
+* kept when they name a top-level prop key or a dotted path into one (else preview_key_unknown; a catalog note: the row
+* reads the first text),
+* `fallback` trimmed and at most COMPONENT_PREVIEW_FALLBACK_MAX, `icon` a dock icon.
+*/
+function componentPreviewToProd(pv, keys, fields, at, ctx) {
+	const out = {};
+	for (const k of Object.keys(pv)) {
+		const v = pv[k];
+		if (v === void 0) continue;
+		if (k === "title" || k === "subtitle" || k === "media") {
+			if ((keys.has(v) || documentPreviewPathOk(v, keys, fields, ctx)) && v.length <= 64) out[k] = v;
+			else cat(ctx, `${at}/${k}`, "document preview path");
+		} else if (k === "fallback") {
+			const t = v.trim();
+			if (t && t === v && t.length <= 120) out.fallback = v;
+			else lose(ctx, `${at}/${k}`, "help>limit");
+		} else if (k === "icon") {
+			const dock = dockIconOf(v);
+			if (dock) out.icon = dock;
+			else lose(ctx, `${at}/${k}`, "preview icon");
+		} else lose(ctx, `${at}/${k}`, "unsupported key");
+	}
+	return out;
+}
 /** A list item's name and title: the convention, else ui.itemName / ui.itemTitle (chromeUiProblems). */
 function itemIdentity(item, conv, node, ip, ctx) {
-	if (item.name !== conv.name) if (ITEM_NAME_RE.test(item.name)) node.ui.itemName = item.name;
-	else lose(ctx, `${ip}/name`, "item identity");
+	if (item.name !== conv.name) {
+		if (ITEM_NAME_RE.test(item.name)) node.ui.itemName = item.name;
+		else lose(ctx, `${ip}/name`, "item identity");
+	}
 	if (item.title !== conv.title) {
 		const t = item.title;
 		if (t === t.trim() && t.length >= 1 && t.length <= 60) node.ui.itemTitle = t;
@@ -1111,6 +1396,21 @@ function ofToProd(f, shape, node, at, lv, ctx) {
 		shape.items.forEach((item, i) => blockModelFor(item, `${at}/${i}`, ctx, node));
 		return;
 	}
+	if (shape.kind === "types") return itemTypesToProd(shape.items, node, at, lv, ctx);
+	if (shape.kind === "slot") {
+		const of = f.of;
+		for (const k of Object.keys(of)) {
+			if (of[k] === void 0) continue;
+			if (k === "allow" && ctx.lane === "fields") {
+				node.config.blockSlugs = of.allow.map(kebab);
+				of.allow.forEach((n, i) => camel(kebab(n)) !== n && lose(ctx, `${at}/allow/${i}`, "type name"));
+			} else if (k === "allow") {
+				if (slotAllowOk(of.allow)) node.config.allow = [...of.allow];
+				else cat(ctx, `${at}/allow`, "slot allow");
+			} else if (k !== "type" || of.type !== "block") lose(ctx, `${at}/${k}`, "unsupported key");
+		}
+		return;
+	}
 	const item = shape.item;
 	const ip = `${at}/0`;
 	if (shape.kind === "zones") {
@@ -1134,15 +1434,96 @@ 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";
 	for (const k of Object.keys(item)) {
-		if (item[k] === void 0) continue;
+		const v = item[k];
+		if (v === void 0) continue;
 		const p = `${ip}/${k}`;
 		if (k === "name" || k === "title") continue;
 		if (k === "type") {
+			if (shape.kind === "itemType" && shape.shopify) continue;
 			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 === "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");
 	}
+	if (nonEmpty(settings)) node.config.item = settings;
+}
+/** A scalar list item's V2 validation → config.item: required, a text / rich text item's length, a text item's pattern. */
+function itemValidationToProd(item, itemType, out, at, ctx) {
+	const val = item.validation;
+	const lengthy = itemType === "text" || itemType === "richtext";
+	for (const k of Object.keys(val)) {
+		const v = val[k];
+		if (v === void 0) continue;
+		if (k === "required" && typeof v === "boolean") out.required = v;
+		else if ((k === "min" || k === "max") && lengthy && isWhole(v)) out[k === "min" ? "minLength" : "maxLength"] = v;
+		else if (k === "pattern" && itemType === "text" && typeof v === "string" && v.length <= 200 && compiles(v)) out.pattern = v;
+		else if (k === "patternMessage" && typeof v === "string" && v.trim() !== "" && v.length <= 200) out.patternMessage = v;
+		else lose(ctx, `${at}/${k}`, "item settings");
+	}
+	if (out.minLength !== void 0 && out.maxLength !== void 0 && out.minLength > out.maxLength) {
+		delete out.minLength;
+		delete out.maxLength;
+		lose(ctx, `${at}/min`, "item settings");
+	}
+	if (out.patternMessage !== void 0 && out.pattern === void 0) {
+		delete out.patternMessage;
+		lose(ctx, `${at}/patternMessage`, "item settings");
+	}
+}
+/** A slot's per-child settings → config.slotSettings: leaf sub-fields, at most SLOT_SETTINGS_MAX (slotSettingsHardening). */
+function slotSettingsToProd(settings, node, at, lv, ctx) {
+	const kept = settings.slice(0, SLOT_SETTINGS_MAX);
+	if (settings.length > SLOT_SETTINGS_MAX) settings.slice(SLOT_SETTINGS_MAX).forEach((_, i) => lose(ctx, `${at}/${SLOT_SETTINGS_MAX + i}`, "slotSettings"));
+	node.slotSettings = kept.map((c, i) => convertField(c, `${at}/${i}`, lv + 1, ctx, kept, false, false, false, true));
+}
+/**
+* A polymorphic list's item types → config.itemTypes `{ name, label, fields }`: the name is what a row's `_type` holds,
+* the title its label, its icon and row preview `icon` / `preview` (paths over its own fields). One prod cannot name is
+* not stored, which moves the ones after it up a place, so the whole list is named.
+*/
+function itemTypesToProd(items, node, at, lv, ctx) {
+	const names = /* @__PURE__ */ new Set();
+	node.itemTypes = [];
+	let dropped = false;
+	items.forEach((item, i) => {
+		const ip = `${at}/${i}`;
+		const fields = item.fields ?? [];
+		const why = !ITEM_TYPE_NAME.test(item.name) || !fields.length ? "item identity" : names.has(item.name) ? "duplicate name" : void 0;
+		if (why) {
+			lose(ctx, ip, why);
+			dropped = true;
+			return;
+		}
+		names.add(item.name);
+		const label = trunc(ctx, `${ip}/title`, item.title, ITEM_TYPE_LABEL_MAX, "item identity");
+		const children = fields.map((c, j) => convertField(c, `${ip}/fields/${j}`, lv + 1, ctx, fields, false, false, true));
+		const type = {
+			name: item.name,
+			label,
+			children
+		};
+		for (const k of Object.keys(item)) {
+			if (item[k] === void 0 || k === "name" || k === "title" || k === "type" || k === "fields") continue;
+			const p = `${ip}/${k}`;
+			if (k === "preview") {
+				const preview = previewToProd(item.preview, fields, p, ctx);
+				if (nonEmpty(preview)) type.preview = preview;
+			} else if (k === "icon") {
+				const dock = dockIconOf(item.icon);
+				if (dock) type.icon = dock;
+				else lose(ctx, p, "item icon");
+			} else if (k === "openMode") cat(ctx, p, "item openMode");
+			else lose(ctx, p, "item identity");
+		}
+		node.itemTypes.push(type);
+	});
+	if (dropped && node.itemTypes.length < items.length && node.itemTypes.length) lose(ctx, at, "item identity");
 }
 /**
 * A modular item type → the kind:'block' model its rows are stored against: the item title is the model name, its fields
@@ -1219,16 +1600,28 @@ function blockModelFor(item, at, ctx, list) {
 	ctx.catalog.length = startCat;
 	lose(ctx, at, "duplicate name");
 }
+/**
+* A reference's targets: entry models → contentModelId / polymorphic + allowedModelSlugs; page, form and collection →
+* config.targets and the filter → config.filter (backend refTargetKeys, both lanes). Read back, entry models come first,
+* then the targets.
+*/
 function referenceToConfig(ref, node, at, ctx) {
 	const to = ref.to ?? [];
 	const entries = to.filter(ENTRY_TARGET);
-	if (entries.length < to.length) lose(ctx, entries.length || !to.length ? `${at}/to` : at, "reference target");
+	const targets = to.filter((t) => REF_TARGET_KINDS.includes(t));
+	const kept = entries.length + targets.length;
+	if (kept < to.length) lose(ctx, kept || !to.length ? `${at}/to` : at, "shopify reference");
+	else if (to.join() !== [...entries, ...targets].join()) lose(ctx, `${at}/to`, "reference order");
 	if (entries.length === 1) node.config.contentModelId = entries[0];
 	else if (entries.length > 1) Object.assign(node.config, {
 		polymorphic: true,
 		allowedModelSlugs: entries
 	});
-	if (ref.filter !== void 0) lose(ctx, `${at}/filter`, "reference filter");
+	if (targets.length) node.config.targets = targets;
+	if (ref.filter !== void 0) {
+		if (filterKept(ref.filter)) node.config.filter = ref.filter;
+		else lose(ctx, `${at}/filter`, "reference filter");
+	}
 	for (const k of Object.keys(ref)) if (k !== "to" && k !== "filter") lose(ctx, `${at}/${k}`, "unsupported key");
 }
 function numericToProd(f, node, at, ctx) {
@@ -1236,7 +1629,7 @@ function numericToProd(f, node, at, ctx) {
 	const n = f.numeric;
 	const lo = n.min ?? 0;
 	const hi = n.max ?? 5;
-	const st = n.step ?? 1;
+	const st = n.step ?? (f.type === "rating" ? V2_RATING_STEP : 1);
 	const stops = (hi - lo) / st;
 	const ratingOk = (n.min === void 0 || Number.isFinite(n.min) && n.min >= 0) && (n.max === void 0 || isWhole(n.max, 1, 10)) && (n.step === void 0 || Number.isFinite(n.step) && n.step > 0) && lo < hi && Math.abs(stops - Math.round(stops)) < 1e-9 && Math.round(stops) <= 100;
 	for (const k of Object.keys(n)) {
@@ -1247,13 +1640,14 @@ function numericToProd(f, node, at, ctx) {
 			const u = v;
 			if (f.type === "number" && typeof u === "string" && u.trim() !== "" && u.length <= 24) node.config.unit = u;
 			else lose(ctx, p, "numeric unit");
-		} else if (k === "min" || k === "max" || k === "step") if (f.type === "number") node.config[k] = v;
-		else if (ratingOk) node.config[k] = v;
-		else lose(ctx, p, "rating bounds");
-		else lose(ctx, p, "unsupported key");
+		} else if (k === "min" || k === "max" || k === "step") {
+			if (f.type === "number") node.config[k] = v;
+			else if (ratingOk) node.config[k] = v;
+			else lose(ctx, p, "rating bounds");
+		} else lose(ctx, p, "unsupported key");
 	}
 }
-var SCALE_UNIT_SET = new Set([
+var SCALE_UNIT_SET = /* @__PURE__ */ new Set([
 	"px",
 	"%",
 	"rem",
@@ -1298,13 +1692,16 @@ function scaleToConfig(s, node, at, ctx) {
 		const v = s[k];
 		if (v === void 0 || k === "steps") continue;
 		const p = `${at}/${k}`;
-		if (k === "units") if (unitsOk(v)) out.units = [...v];
-		else lose(ctx, p, "scale rules");
-		else if (k === "defaultUnit") if (SCALE_UNIT_SET.has(v)) out.defaultUnit = s.defaultUnit;
-		else lose(ctx, p, "scale rules");
-		else if (k === "allowCustom") if (customOk) out.allowCustom = typeof c === "boolean" ? c : JSON.parse(JSON.stringify(c));
-		else lose(ctx, p, "scale rules");
-		else if (k === "presets") {
+		if (k === "units") {
+			if (unitsOk(v)) out.units = [...v];
+			else lose(ctx, p, "scale rules");
+		} else if (k === "defaultUnit") {
+			if (SCALE_UNIT_SET.has(v)) out.defaultUnit = s.defaultUnit;
+			else lose(ctx, p, "scale rules");
+		} else if (k === "allowCustom") {
+			if (customOk) out.allowCustom = typeof c === "boolean" ? c : JSON.parse(JSON.stringify(c));
+			else lose(ctx, p, "scale rules");
+		} else if (k === "presets") {
 			const presets = s.presets;
 			if (presets.length <= 20 && presets.every((x) => {
 				if (x.label !== void 0 && !textOk(x.label, 24)) return false;
@@ -1322,45 +1719,102 @@ function scaleToConfig(s, node, at, ctx) {
 	}
 	node.config.scale = out;
 }
+/** V2 operator → prod showIf op (the legacy `equals` / `notEmpty` forms read as is / is one of / has a value). */
+var SHOW_IF_OP = {
+	is: "eq",
+	isNot: "neq",
+	in: "in",
+	notIn: "notIn",
+	empty: "empty",
+	notEmpty: "notEmpty",
+	gt: "gt",
+	lt: "lt"
+};
+var VALUELESS = /* @__PURE__ */ new Set([
+	"empty",
+	"notEmpty",
+	"isSet"
+]);
 function conditionToShowIf(h, at, siblings, ctx, variantOk) {
-	const variant = variantOk && h.field === "_variant";
-	if (!h.field || !variant && !siblings.some((s) => s.name === h.field)) return void lose(ctx, at, "condition");
-	if (Object.keys(h).filter((k) => ![
+	const rules = [];
+	for (const [i, r] of [h, ...h.also ?? []].entries()) {
+		const rule = conditionRule(r, i === 0, siblings, variantOk);
+		if (!rule) return void lose(ctx, at, "condition");
+		rules.push(rule);
+	}
+	if (h.match !== void 0 && h.match !== "all" && h.match !== "any") return void lose(ctx, at, "condition");
+	return {
+		match: h.match ?? "all",
+		rules
+	};
+}
+/** 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;
+	const allowed = head ? [
+		"field",
+		"equals",
+		"notEmpty",
+		"op",
+		"value",
+		"also",
+		"match"
+	] : [
 		"field",
 		"equals",
-		"notEmpty"
-	].includes(k) && h[k] !== void 0).length || h.equals !== void 0 === (h.notEmpty !== void 0)) return void lose(ctx, at, "condition");
-	if (h.notEmpty !== void 0) return h.notEmpty === true ? {
-		match: "all",
-		rules: [{
-			field: h.field,
-			op: "notEmpty"
-		}]
-	} : void lose(ctx, at, "condition");
-	const sibType = variant ? void 0 : siblings.find((s) => s.name === h.field)?.type;
-	const list = Array.isArray(h.equals) ? h.equals : [h.equals];
+		"notEmpty",
+		"op",
+		"value"
+	];
+	if (Object.keys(r).some((k) => !allowed.includes(k) && r[k] !== void 0)) return null;
+	if ([
+		r.op !== void 0,
+		r.equals !== void 0,
+		r.notEmpty !== void 0
+	].filter(Boolean).length !== 1) return null;
+	if (r.notEmpty !== void 0) return r.notEmpty === true ? {
+		field: r.field,
+		op: "notEmpty"
+	} : 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
+	} : null;
+	const sibType = variant ? 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)
+	} : null;
+	const list = Array.isArray(target) ? target : [target];
 	const strs = [];
 	for (const v of list) {
 		if (![
 			"string",
 			"number",
 			"boolean"
-		].includes(typeof v)) return void lose(ctx, at, "condition");
+		].includes(typeof v)) return null;
 		const s = String(v);
-		if (coerceRuleValue(sibType, s) !== v) return void lose(ctx, at, "condition");
+		if (coerceRuleValue(sibType, s) !== v) return null;
 		strs.push(s);
 	}
-	return {
-		match: "all",
-		rules: [Array.isArray(h.equals) ? {
-			field: h.field,
-			op: "in",
-			value: strs
-		} : {
-			field: h.field,
-			op: "eq",
-			value: strs[0]
-		}]
+	if (op === "in" || op === "notIn") return {
+		field: r.field,
+		op,
+		value: strs
+	};
+	return Array.isArray(target) ? strs.length ? {
+		field: r.field,
+		op: op === "eq" ? "in" : "notIn",
+		value: strs
+	} : null : {
+		field: r.field,
+		op,
+		value: strs[0]
 	};
 }
 var nonEmpty = (o) => Object.keys(o).length ? o : void 0;
@@ -1379,7 +1833,8 @@ function common(n) {
 		"advanced",
 		"recommendedMax",
 		"openMode",
-		"localized"
+		"localized",
+		"archived"
 	]) if (n[k] !== void 0) out[k] = n[k];
 	return out;
 }
@@ -1394,6 +1849,7 @@ function emitField(n) {
 	if (n.type === "select" && n.options) out.options = n.options;
 	if ((n.type === "multiselect" || n.type === "tags") && n.options) config.options = n.options;
 	if (n.type === "object") out.fields = (n.children ?? []).map(emitField);
+	if (n.slotSettings) config.slotSettings = n.slotSettings.map(emitField);
 	if (n.zoned) {
 		const { minItems, maxItems, ...rest } = config;
 		out.config = {
@@ -1418,6 +1874,8 @@ function emitProp(n) {
 	const config = { ...n.config };
 	if (n.options) config.options = n.options;
 	if (n.children) config.fields = n.children.map(emitSubField);
+	if (n.itemTypes) config.itemTypes = emitItemTypes(n.itemTypes);
+	if (n.slotSettings) config.slotSettings = n.slotSettings.map(emitSubField);
 	if (nonEmpty(config)) out.config = config;
 	const ui = nonEmpty(n.ui);
 	if (ui) out.ui = ui;
@@ -1431,11 +1889,22 @@ function emitSubField(n) {
 	if (n.placeholder !== void 0) out.placeholder = n.placeholder;
 	if (n.options) out.options = n.options;
 	if (n.children) out.fields = n.children.map(emitSubField);
-	if (nonEmpty(n.config)) out.config = { ...n.config };
+	const config = { ...n.config };
+	if (n.itemTypes) config.itemTypes = emitItemTypes(n.itemTypes);
+	if (n.slotSettings) config.slotSettings = n.slotSettings.map(emitSubField);
+	if (nonEmpty(config)) out.config = config;
 	const ui = nonEmpty(n.ui);
 	if (ui) out.ui = ui;
 	return out;
 }
+/** A polymorphic list's item types as the backend stores them: `{ name, label, fields }` (typesTableHardening). */
+var emitItemTypes = (types) => types.map((t) => ({
+	name: t.name,
+	label: t.label,
+	fields: t.children.map(emitSubField),
+	...t.icon ? { icon: t.icon } : {},
+	...t.preview ? { preview: t.preview } : {}
+}));
 function fromTypeSchema(v2, target) {
 	const ctx = {
 		lane: target,
@@ -1448,6 +1917,10 @@ function fromTypeSchema(v2, target) {
 		definedGroups: /* @__PURE__ */ new WeakMap(),
 		propOrder: /* @__PURE__ */ new Map(),
 		groupOrder: false,
+		propTabs: /* @__PURE__ */ new Map(),
+		definedTabs: /* @__PURE__ */ new Set(),
+		keptTabs: /* @__PURE__ */ new Set(),
+		declaredTabs: [],
 		blockModels: /* @__PURE__ */ new Map()
 	};
 	const props = target === "props";
@@ -1471,10 +1944,10 @@ function fromTypeSchema(v2, target) {
 				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");
 				break;
 			case "icon":
-				cat(ctx, p, "block icon");
+				if (!props || !dockIconOf(v2.icon)) cat(ctx, p, "block icon");
 				break;
 			case "preview":
-				cat(ctx, p, "document preview");
+				if (!props) cat(ctx, p, "document preview");
 				break;
 			case "variants":
 				cat(ctx, p, "variants");
@@ -1492,7 +1965,7 @@ function fromTypeSchema(v2, target) {
 		}
 	}
 	if (props) {
-		if (v2.groups?.length) lose(ctx, "/groups", "group (props)");
+		propTabsFor(v2, ctx);
 		propSetsFor(v2, ctx);
 	} else fieldsetsFor(v2, ctx, fieldsets);
 	const nodes = v2.fields.map((f, i) => convertField(f, `/fields/${i}`, 1, ctx, v2.fields, true));
@@ -1504,6 +1977,13 @@ function fromTypeSchema(v2, target) {
 		};
 		if (v2.description !== void 0) component.description = v2.description;
 		if (category) component.category = category;
+		const icon = v2.icon === void 0 ? void 0 : dockIconOf(v2.icon);
+		if (icon) component.icon = icon;
+		if (v2.preview !== void 0) {
+			const preview = componentPreviewToProd(v2.preview, new Set(component.props.map((x) => x.key)), v2.fields, "/preview", ctx);
+			if (Object.keys(preview).length) component.preview = preview;
+		}
+		if (ctx.declaredTabs.length) component.tabs = ctx.declaredTabs.map((t) => ({ ...t }));
 		return {
 			schema: component,
 			blockModels: [],
@@ -1533,7 +2013,7 @@ function fieldsetsFor(v2, ctx, out) {
 	let shifted = false;
 	(v2.groups ?? []).forEach((g, i) => {
 		const p = `/groups/${i}`;
-		const stored = g.title.slice(0, 20);
+		const stored = g.title.slice(0, 40);
 		const folded = stored.trim().toLowerCase();
 		const drop = (why) => {
 			if (!ctx.tabs.has(g.name) && !ctx.droppedTabs.has(g.name)) ctx.droppedTabs.set(g.name, why);
@@ -1548,7 +2028,7 @@ function fieldsetsFor(v2, ctx, out) {
 			name: stored,
 			kind: "tab"
 		};
-		if (g.title.length > 20) lose(ctx, `${p}/title`, "group name>20");
+		if (g.title.length > 40) lose(ctx, `${p}/title`, "group name>40");
 		if (g.icon !== void 0) {
 			const dock = dockIconOf(g.icon);
 			if (dock) tab.icon = dock;
@@ -1585,9 +2065,10 @@ function fieldsetsFor(v2, ctx, out) {
 		for (const k of Object.keys(fs)) {
 			const v = fs[k];
 			if (v === void 0 || k === "name" || k === "title") continue;
-			if (k === "description") if (v.length <= 500) set.description = v;
-			else lose(ctx, `${p}/${k}`, "help>limit");
-			else if (k === "collapsed" || k === "collapsible" || k === "columns" || k === "layout") set[k] = v;
+			if (k === "description") {
+				if (v.length <= 500) 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");
 		}
 		ctx.sets.set(fs.name, tab);
@@ -1595,25 +2076,146 @@ function fieldsetsFor(v2, ctx, out) {
 	});
 }
 /**
+* Props lane: V2 groups → each top-level prop's `ui.tab`, defined on the first prop in it (label, icon, and `order` when
+* the V2 order differs from where each tab is first used). A field with no group sits in the V2 default group; a group
+* not stored puts its fields in the default tab; a fieldset's top-level members share the tab most of them sit in
+* (prop_group_split_tabs). No groups → no tab anywhere, so a component without tabs stores as before.
+*/
+function propTabsFor(v2, ctx) {
+	const groups = v2.groups ?? [];
+	const kept = [];
+	const dropped = /* @__PURE__ */ new Map();
+	const labels = /* @__PURE__ */ new Set();
+	groups.forEach((g, i) => {
+		const p = `/groups/${i}`;
+		const drop = (why) => {
+			if (!kept.some((k) => k.g.name === g.name) && !dropped.has(g.name)) dropped.set(g.name, why);
+			lose(ctx, p, why);
+		};
+		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 (!label) return drop("group title");
+		labels.add(folded);
+		const tab = {
+			id: g.name,
+			label
+		};
+		if (label !== g.title.trim()) lose(ctx, `${p}/title`, "group name>40");
+		else if (label !== g.title) lose(ctx, `${p}/title`, "group title");
+		if (g.icon !== void 0) {
+			const dock = dockIconOf(g.icon);
+			if (dock) tab.icon = dock;
+			else lose(ctx, `${p}/icon`, "group icon");
+		}
+		if (i === 0 ? g.default !== true : g.default !== void 0) lose(ctx, `${p}/default`, "group default");
+		for (const k of Object.keys(g)) if (![
+			"name",
+			"title",
+			"icon",
+			"default"
+		].includes(k) && g[k] !== void 0) lose(ctx, `${p}/${k}`, "unsupported key");
+		kept.push({
+			g,
+			i,
+			tab
+		});
+	});
+	const isKept = (name) => name !== void 0 && kept.some((k) => k.g.name === name);
+	const v2Default = (groups.find((g) => g.default) ?? groups[0])?.name;
+	const fallback = isKept(v2Default) ? v2Default : kept[0]?.g.name;
+	const place = /* @__PURE__ */ new Map();
+	for (const f of v2.fields) {
+		const want = f.group ?? v2Default;
+		if (isKept(want)) place.set(f, { tab: want });
+		else if (f.group !== void 0 || want !== void 0) place.set(f, {
+			tab: fallback,
+			loss: dropped.get(want) ?? "unsupported key"
+		});
+	}
+	if (!kept.length) {
+		for (const [f, t] of place) if (f.group !== void 0) ctx.propTabs.set(f, { loss: t.loss });
+		return;
+	}
+	const tally = /* @__PURE__ */ new Map();
+	for (const f of v2.fields) {
+		if (f.fieldset === void 0) continue;
+		const t = tally.get(f.fieldset) ?? /* @__PURE__ */ new Map();
+		t.set(place.get(f)?.tab, (t.get(place.get(f)?.tab) ?? 0) + 1);
+		tally.set(f.fieldset, t);
+	}
+	for (const f of v2.fields) {
+		const counts = f.fieldset !== void 0 ? tally.get(f.fieldset) : void 0;
+		if (!counts) continue;
+		const best = [...counts.entries()].sort((a, b) => b[1] - a[1])[0][0];
+		const cur = place.get(f);
+		if (cur?.tab !== best) place.set(f, {
+			tab: best,
+			loss: cur?.loss ?? "fieldset spans groups"
+		});
+	}
+	const firstUse = [];
+	for (const f of v2.fields) {
+		const t = place.get(f)?.tab;
+		if (t !== void 0 && !firstUse.includes(t)) firstUse.push(t);
+	}
+	const used = kept.filter((k) => firstUse.includes(k.g.name));
+	const unused = kept.filter((k) => !firstUse.includes(k.g.name));
+	for (const k of kept) ctx.keptTabs.add(k.g.name);
+	const firstGap = groups.findIndex((g) => !kept.some((k) => k.g === g));
+	if (firstGap >= 0 && kept.some((k) => k.i > firstGap)) {
+		const g = groups[firstGap];
+		lose(ctx, "/groups", dropped.get(g.name) ?? "unsupported key");
+	}
+	const ordered = unused.length > 0 || used.some((k, i) => k.g.name !== firstUse[i]);
+	kept.forEach((k, i) => {
+		if (ordered) k.tab.order = Math.min(99, i);
+	});
+	ctx.declaredTabs = unused.map((k) => k.tab);
+	for (const [f, t] of place) {
+		const k = used.find((u) => u.g.name === t.tab);
+		if (k) ctx.propTabs.set(f, {
+			tab: k.tab,
+			loss: t.loss
+		});
+		else if (t.loss) ctx.propTabs.set(f, { loss: t.loss });
+	}
+}
+/**
 * Props lane: a V2 fieldset is an inline ui.group, defined on the first prop (at each level, sub-fields too) that uses
 * it. A fieldset no prop uses has nothing to be defined on; when the V2 order differs from where each group is first
 * met (depth first, a prop before its sub-fields: how propsToTypeSchema meets them), every group carries its `order`.
 */
 function propSetsFor(v2, ctx) {
 	const sets = v2.fieldsets ?? [];
-	if (!sets.length) return;
 	const named = new Set(sets.map((s) => s.name));
 	const firstSeen = [];
+	const undeclared = [];
 	const visit = (fields, lv) => {
 		for (const f of fields) {
-			if (f.fieldset !== void 0 && named.has(f.fieldset) && !firstSeen.includes(f.fieldset)) firstSeen.push(f.fieldset);
+			if (f.fieldset !== void 0 && !firstSeen.includes(f.fieldset)) {
+				firstSeen.push(f.fieldset);
+				if (!named.has(f.fieldset)) undeclared.push(f.fieldset);
+			}
 			if (lv >= 10) continue;
 			const kids = previewKids(f);
 			if (kids) visit(kids, lv + 1);
 		}
 	};
 	visit(v2.fields, 1);
-	ctx.groupOrder = sets.filter((s) => firstSeen.includes(s.name)).some((s, i) => s.name !== firstSeen[i]);
+	const derived = undeclared.map((name) => ({
+		name,
+		title: name
+	}));
+	const declaredUsed = sets.filter((s) => firstSeen.includes(s.name)).length;
+	derived.forEach((s, j) => {
+		ctx.propSets.set(s.name, s);
+		ctx.propOrder.set(s.name, sets.length + j);
+		cat(ctx, `/fieldsets/${declaredUsed + j}`, "fieldset (derived)");
+	});
+	if (!sets.length && !derived.length) return;
+	ctx.groupOrder = [...sets, ...derived].filter((s) => firstSeen.includes(s.name)).some((s, i) => s.name !== firstSeen[i]);
 	let gap = false;
 	sets.forEach((s, i) => {
 		ctx.propSets.set(s.name, s);
@@ -1654,6 +2256,10 @@ function readField(f) {
 		delete cfg.options;
 	}
 	n.fields = f.fields?.map(readField);
+	if (f.type === "array" && !cfg.zones && Array.isArray(cfg.fields)) {
+		n.fields = [...n.fields ?? [], ...cfg.fields.map(readField)];
+		delete cfg.fields;
+	}
 	if (cfg.zones) {
 		const z = cfg.zones;
 		n.zones = {
@@ -1717,12 +2323,32 @@ function scaleFromConfig(s, at, ctx) {
 	}));
 	return out;
 }
+/**
+* Slot children with each `_variant` written as the family member that places it (`_type`): the variant the child's
+* component already is drops, another member swaps in. A variant no member places stays, and the write names it lost.
+*/
+function childVariantsToTypes(v, family) {
+	if (!Array.isArray(v)) return v;
+	return v.map((c) => {
+		if (!isObj(c) || typeof c._variant !== "string") return c;
+		const own = family(typeof c._type === "string" ? c._type : "");
+		const { _variant: _gone, ...rest } = c;
+		if (own?.current === c._variant) return rest;
+		const member = own?.member(c._variant);
+		if (!member) return c;
+		return {
+			...rest,
+			_type: member
+		};
+	});
+}
 /** The prod children a preview path segment may name below a node (an object's, a list's rows'), or null for a leaf. */
 var readKids = (n) => n.zones ? [...n.zones.nonRepeatable ?? [], ...n.zones.repeatable?.fields ?? []] : n.fields && [
 	"object",
 	"group",
 	"repeater",
-	"table"
+	"table",
+	"array"
 ].includes(n.type) ? n.fields : null;
 /** A stored preview path → the V2 path: `image.altText` reads as `image.alt`, the rest as it is. */
 function previewPathFromProd(path, children) {
@@ -1753,12 +2379,26 @@ function previewFromProd(pv, children) {
 	return out;
 }
 function showIfToCondition(s, siblings, at, ctx) {
-	const drop = (why) => void ctx.onLoss(at, "condition", why);
-	if (s.rules.length !== 1) return drop("V2 conditions test one sibling; a multi-rule showIf is dropped (the field always shows).");
-	const r = s.rules[0];
+	const conds = [];
+	for (const r of s.rules) {
+		const c = showIfRuleToCondition(r, 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);
+	}
+	if (!conds.length) return void 0;
+	const [head, ...also] = conds;
+	return {
+		...head,
+		...also.length ? { also } : {},
+		...s.match === "any" && conds.length > 1 ? { match: "any" } : {}
+	};
+}
+/** One prod rule as a V2 rule: eq / in / isSet keep V2's legacy forms, the rest name their `op`. */
+function showIfRuleToCondition(r, siblings) {
 	const sib = siblings.find((x) => x.key === r.field);
 	const t = sib?.type === "number" ? "number" : sib?.type;
 	const read = (v) => coerceRuleValue(t, v);
+	const list = (Array.isArray(r.value) ? r.value : [r.value ?? ""]).map(read);
 	switch (r.op) {
 		case "eq": return Array.isArray(r.value) ? {
 			field: r.field,
@@ -1769,14 +2409,37 @@ function showIfToCondition(s, siblings, at, ctx) {
 		};
 		case "in": return {
 			field: r.field,
-			equals: (Array.isArray(r.value) ? r.value : [r.value ?? ""]).map(read)
+			equals: list
 		};
 		case "isSet":
 		case "notEmpty": return {
 			field: r.field,
 			notEmpty: true
 		};
-		default: return drop(`V2 conditions have no "${r.op}"; the field always shows.`);
+		case "empty": return {
+			field: r.field,
+			op: "empty"
+		};
+		case "neq": return {
+			field: r.field,
+			op: "isNot",
+			value: Array.isArray(r.value) ? list : read(r.value ?? "")
+		};
+		case "notIn": return {
+			field: r.field,
+			op: "notIn",
+			value: list
+		};
+		case "gt":
+		case "lt": {
+			const n = Number(r.value);
+			return typeof r.value === "string" && r.value.trim() !== "" && Number.isFinite(n) ? {
+				field: r.field,
+				op: r.op,
+				value: n
+			} : void 0;
+		}
+		default: return;
 	}
 }
 function v2Type(n, at, ctx) {
@@ -1811,9 +2474,14 @@ function v2Type(n, at, ctx) {
 	}
 }
 function readToV2(n, at, siblings, ctx, top, lane) {
-	/** a data-table prop (config.mode "data") holds one TableValue: the V2 `table` field, not a list of rows */
-	const dataTable = lane === "props" && isDataTableProp(n);
-	const type = dataTable ? "table" : v2Type(n, at, ctx);
+	/** a data table holds one TableValue: the V2 `table` field, not a list of rows. A prop says so (config.mode "data");
+	*  a field's table is always one (BE tableFieldSchema: `mode` is optional there and can only be "data") */
+	const dataTable = isDataTableProp(n) || lane === "fields" && n.type === "table";
+	/** a slot prop: component instances, read as the V2 slot (its children `{ _key, _type, _settings?, ...props }`) */
+	const slotProp = lane === "props" && n.type === "slot";
+	/** a model slot field: inline children of the kind:'block' models config.blockSlugs names */
+	const blockSlot = lane === "fields" && n.type === "slot";
+	const type = dataTable ? "table" : slotProp || blockSlot ? "slot" : v2Type(n, at, ctx);
 	const f = {
 		name: n.key,
 		title: n.label,
@@ -1822,7 +2490,7 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 	const cfg = n.config;
 	const val = {};
 	const loss = (k, feature, reason) => ctx.onLoss(`${at}/${k}`, feature, reason);
-	if (n.helpText !== void 0) f.description = n.helpText;
+	if (typeof n.helpText === "string") f.description = n.helpText;
 	if (n.helpMore !== void 0) f.helpMore = n.helpMore;
 	if (n.placeholder !== void 0) f.placeholder = n.placeholder;
 	if (n.required !== void 0) val.required = n.required;
@@ -1831,9 +2499,18 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 	if (n.advanced !== void 0) f.advanced = n.advanced;
 	if (n.openMode !== void 0) f.openMode = n.openMode;
 	if (n.readOnly === true) f.readOnly = true;
+	if (n.archived === true) f.archived = true;
 	if (n.ui.access) f.access = { ...n.ui.access };
 	else if (n.readOnly === "developer") f.access = { edit: "schema.manage" };
 	if (n.lockReason !== void 0) f.lockReason = n.lockReason;
+	const shopify = n.readOnly === true && n.lockReason === "A Shopify product id. No Shopify integration backs a reference in BetterCMS yet, so the id is kept as it is." && (n.type === "text" || n.type === "array" && n.config.itemType === "text");
+	if (shopify) {
+		delete f.lockReason;
+		if (n.type === "text") {
+			f.type = "reference";
+			f.reference = { to: ["shopify"] };
+		}
+	}
 	if (n.localized !== void 0) f.localized = n.localized;
 	if (n.ui.hidden !== void 0) f.hidden = n.ui.hidden;
 	if (n.ui.rows !== void 0) f.rows = n.ui.rows;
@@ -1850,26 +2527,28 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 	if (n.ui.input !== void 0) loss("ui/input", "ui.input", "Custom dock inputs are a dock feature V2 has no key for.");
 	if (n.fieldsetId !== void 0) {
 		const set = ctx.sets.get(n.fieldsetId);
-		if (set?.kind === "tab") if (top) f.group = set.id;
-		else loss("fieldsetId", "fieldset", "Only top-level V2 fields sit in a tab; this nested field's tab is dropped.");
-		else if (set) {
+		if (set?.kind === "tab") {
+			if (top) f.group = set.id;
+			else loss("fieldsetId", "fieldset", "Only top-level V2 fields sit in a tab; this nested field's tab is dropped.");
+		} else if (set) {
 			f.fieldset = set.id;
 			if (top && set.tab !== void 0) f.group = set.tab;
 		} 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;
 	for (const k of [
 		"target",
 		"stale",
 		"origin"
 	]) if (n[k] !== void 0) loss(k, k, k === "target" ? "A prop's target (where it writes in the component) is binding, not schema: V2 has no key for it, so the host keeps it." : `V2 has no "${k}" key.`);
-	const used = new Set([
+	const used = /* @__PURE__ */ new Set([
 		"placeholder",
 		"zones",
 		"options",
 		"fields"
 	]);
-	const usedUi = new Set([
+	const usedUi = /* @__PURE__ */ new Set([
 		"collapsed",
 		"reorderable",
 		"input",
@@ -1882,6 +2561,7 @@ 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 (lane === "props") useUi("group");
+	if (lane === "props") useUi("tab");
 	if ([
 		"text",
 		"longtext",
@@ -1902,6 +2582,10 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 			"max",
 			"step"
 		]) if (typeof cfg[k] === "number") numeric[k] = cfg[k];
+		if (n.type === "rating") {
+			if (numeric.step === V2_RATING_STEP) delete numeric.step;
+			else if (numeric.step === void 0) numeric.step = 1;
+		}
 		const ratingDefault = type === "rating" && n.type === "number" && ratingIsDefault(numeric);
 		if (typeof cfg.unit === "string") numeric.unit = cfg.unit;
 		if (Object.keys(numeric).length && !ratingDefault) f.numeric = numeric;
@@ -1920,6 +2604,12 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 		useUi("control");
 	}
 	if (n.type === "select") use("multiSelect");
+	if (n.type === "image") {
+		use("media");
+		if (cfg.media === "icon") f.svgOnly = true;
+	}
+	if (typeof cfg.linkHref === "string" && cfg.linkHref) f.linkHref = cfg.linkHref;
+	use("linkHref");
 	if ((type === "select" || type === "multiselect" || type === "tags") && n.options) f.options = optionsFromProd(n.options);
 	if (type === "multiselect" || type === "tags") {
 		if (typeof cfg.min === "number") val.min = cfg.min;
@@ -1937,10 +2627,10 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 	if (type === "date" || type === "datetime") use("timezone", "includeTime");
 	if ((type === "date" || type === "datetime") && typeof cfg.timezone === "string") f.timezone = cfg.timezone === "site" ? "site" : `fixed:${cfg.timezone}`;
 	if ((type === "date" || type === "datetime") && typeof cfg.timezone === "boolean") f.timezone = cfg.timezone;
-	if (n.type === "reference" || n.type === "multi-reference" || n.type === "multiReference") use("contentModelId", "polymorphic", "allowedModelSlugs");
+	if (n.type === "reference" || n.type === "multi-reference" || n.type === "multiReference") use("contentModelId", "polymorphic", "allowedModelSlugs", "targets", "filter");
 	if (n.type === "reference") {
-		const to = cfg.polymorphic ? cfg.allowedModelSlugs ?? [] : cfg.contentModelId ? [cfg.contentModelId] : [];
-		if (to.length) f.reference = { to };
+		const ref = referenceFromConfig(cfg);
+		if (ref) f.reference = ref;
 	}
 	if (n.type === "form") f.reference = { to: ["form"] };
 	if (n.type === "object" || n.type === "group") {
@@ -1951,22 +2641,87 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 	}
 	if (n.type === "array" && n.zones?.nonRepeatable) {
 		const nr = n.zones.nonRepeatable;
-		const kids = [{
-			name: "nonRepeatable",
-			title: n.label,
-			type: "object",
-			fields: nr.map((c, i) => readToV2(c, `${at}/config/zones/nonRepeatable/${i}`, nr, ctx, false, lane))
-		}];
-		if (n.zones.repeatable) kids.push(listOf(n, n.zones.repeatable.fields, "repeatable", `${at}/config/zones/repeatable`, ctx, lane));
-		ctx.onLoss(`${at}/config/zones`, "zone envelope", "A non-repeatable zone reads as an object with nonRepeatable (and repeatable) children, matching its stored {nonRepeatable, repeatable} value.");
-		Object.assign(f, {
-			type: "object",
-			fields: kids
+		const fields = nr.map((c, i) => readToV2(c, `${at}/config/zones/nonRepeatable/${i}`, nr, ctx, false, lane));
+		if (n.zones.repeatable) {
+			const kids = [{
+				name: "nonRepeatable",
+				title: n.label,
+				type: "object",
+				fields
+			}, listOf(n, n.zones.repeatable.fields, "repeatable", `${at}/config/zones/repeatable`, ctx, lane)];
+			ctx.onLoss(`${at}/config/zones`, "zone envelope", "A zone pair reads as an object with nonRepeatable and repeatable children, matching its stored {nonRepeatable, repeatable} value.");
+			Object.assign(f, {
+				type: "object",
+				fields: kids
+			});
+		} else {
+			Object.assign(f, {
+				type: "object",
+				fields
+			});
+			ctx.zoned.add(f);
+		}
+	} else if (slotProp) {
+		const ids = Array.isArray(cfg.componentIds) ? cfg.componentIds.filter((x) => typeof x === "string") : [];
+		const names = Array.isArray(cfg.allow) ? cfg.allow.filter((x) => typeof x === "string") : [];
+		f.of = ids.length ? {
+			type: "block",
+			allow: ids
+		} : names.length ? {
+			type: "block",
+			allow: names
+		} : { type: "block" };
+		ctx.slots.set(f, cfg.multiple === true);
+		const settings = Array.isArray(cfg.slotSettings) ? cfg.slotSettings.map(readProp) : [];
+		if (settings.length) f.slotSettings = settings.map((c, k) => readToV2(c, `${at}/config/slotSettings/${k}`, settings, ctx, false, lane));
+		if (cfg.multiple !== true) {
+			val.max = 1;
+			loss("config/multiple", "slot single", "A single slot holds one component instance; V2 reads it as a slot of at most one block.");
+		} else {
+			if (typeof cfg.minItems === "number") val.min = cfg.minItems;
+			if (typeof cfg.maxItems === "number") val.max = cfg.maxItems;
+		}
+		use("multiple", "componentIds", "allow", "minItems", "maxItems", "slotSettings");
+	} else if (blockSlot) {
+		const slugs = Array.isArray(cfg.blockSlugs) ? cfg.blockSlugs.filter((x) => typeof x === "string") : [];
+		f.of = slugs.length ? {
+			type: "block",
+			allow: slugs.map(camel)
+		} : { type: "block" };
+		ctx.blocks.add(f);
+		const settings = Array.isArray(cfg.slotSettings) ? cfg.slotSettings.map(readField) : [];
+		if (settings.length) f.slotSettings = settings.map((c, k) => readToV2(c, `${at}/config/slotSettings/${k}`, settings, ctx, false, lane));
+		if (typeof cfg.minItems === "number") val.min = cfg.minItems;
+		if (typeof cfg.maxItems === "number") val.max = cfg.maxItems;
+		use("blockSlugs", "minItems", "maxItems", "slotSettings");
+	} else if (lane === "props" && n.type === "table" && cfg.mode === "types") {
+		f.of = (Array.isArray(cfg.itemTypes) ? cfg.itemTypes : []).map((t, j) => {
+			const kids = (t.fields ?? []).map(readProp);
+			const item = {
+				name: t.name,
+				title: t.label ?? t.name,
+				type: "object",
+				fields: kids.map((c, k) => readToV2(c, `${at}/config/itemTypes/${j}/fields/${k}`, kids, ctx, false, lane))
+			};
+			if (t.icon) item.icon = tablerIconOf(t.icon);
+			if (t.preview) item.preview = previewFromProd(t.preview, kids);
+			return item;
 		});
+		ctx.types.add(f);
+		if (n.ui.itemLabel !== void 0) f.itemNoun = n.ui.itemLabel.toLowerCase();
+		if (n.ui.icon) f.icon = tablerIconOf(n.ui.icon);
+		const l = n.ui.layout;
+		if (l === "grid" || l === "list") f.arrayLayout = l;
+		else if (l === "rows") f.layout = "list";
+		else if (l) loss("ui/layout", "ui.layout", `V2 has no "${l}" layout for a list of item types.`);
+		if (typeof cfg.minItems === "number") val.min = cfg.minItems;
+		if (typeof cfg.maxItems === "number") val.max = cfg.maxItems;
+		use("mode", "itemTypes", "minItems", "maxItems");
+		useUi("itemLabel", "icon", "layout");
 	} else if (dataTable) {
 		f.table = tableOptionsFromConfig(cfg);
 		use("mode", "columnTypes", "lockColumns", "requireCaption", "allowGroups", "allowFootnotes", "allowNote", "minRows", "maxRows", "maxColumns", "settings", "jsonLd");
-	} else if (n.type === "array" && n.zones?.repeatable || n.type === "repeater" || n.type === "table") {
+	} else if (n.type === "array" && (n.zones?.repeatable || !n.zones && !cfg.itemType && n.fields?.length) || n.type === "repeater" || n.type === "table") {
 		const list = listOf(n, n.zones?.repeatable?.fields ?? n.fields ?? [], n.key, at, ctx, lane);
 		useUi("preview", "icon", "itemLabel", "layout", "itemName", "itemTitle");
 		if (n.zones?.repeatable) ctx.zoned.add(f);
@@ -1982,14 +2737,19 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 		if (typeof r?.maxItems === "number") val.max = r.maxItems;
 		if (n.type === "table") use("minItems", "maxItems");
 	} else if (n.type === "array" && cfg.itemType) {
-		f.of = [{
+		f.of = [shopify ? {
+			...itemOf(n),
+			type: "reference",
+			reference: { to: ["shopify"] }
+		} : {
 			...itemOf(n),
-			type: cfg.itemType === "text" ? "string" : cfg.itemType
+			type: cfg.itemType === "text" ? "string" : cfg.itemType,
+			...itemSettingsFromProd(cfg.item)
 		}];
 		leafListChrome(n, f, loss, "a list of scalars");
 		if (typeof cfg.minItems === "number") val.min = cfg.minItems;
 		if (typeof cfg.maxItems === "number") val.max = cfg.maxItems;
-		use("itemType", "minItems", "maxItems");
+		use("itemType", "minItems", "maxItems", "item");
 		useUi("layout", "itemLabel", "itemName", "itemTitle");
 	} else if (n.type === "modular") {
 		const slugs = cfg.blockSlugs ?? [];
@@ -2026,11 +2786,11 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 		use("blockSlugs", "minItems", "maxItems");
 		useUi("itemLabel", "icon", "layout", "blocks");
 	} else if (n.type === "multi-reference" || n.type === "multiReference") {
-		const to = cfg.polymorphic ? cfg.allowedModelSlugs ?? [] : cfg.contentModelId ? [cfg.contentModelId] : [];
+		const ref = referenceFromConfig(cfg);
 		f.of = [{
 			...itemOf(n),
 			type: "reference",
-			...to.length ? { reference: { to } } : {}
+			...ref ? { reference: ref } : {}
 		}];
 		leafListChrome(n, f, loss, "a list of entries");
 		if (typeof cfg.min === "number") val.min = cfg.min;
@@ -2039,16 +2799,47 @@ function readToV2(n, at, siblings, ctx, top, lane) {
 		useUi("layout", "itemLabel", "itemName", "itemTitle");
 	}
 	if (n.type === "array" && n.zones?.nonRepeatable && n.zones.repeatable) useUi("preview", "icon", "itemLabel", "layout");
-	for (const [k, x] of Object.entries(cfg)) if (x !== void 0 && !used.has(k)) loss(`config/${k}`, "config", `V2 has no "${k}" setting on a ${type} field.`);
+	for (const [k, x] of Object.entries(cfg)) {
+		if (x === void 0 || used.has(k)) continue;
+		if (isHostConfigKey(n.type, k) || isHostConfigKey(type, k)) loss(`config/${k}`, "host config", CATALOG["host config"]);
+		else loss(`config/${k}`, "config", `V2 has no "${k}" setting on a ${type} field.`);
+	}
 	for (const [k, x] of Object.entries(n.ui)) if (x !== void 0 && !usedUi.has(k)) loss(`ui/${k}`, `ui.${k}`, `V2 has no ui.${k} on a ${type} field.`);
 	if (n.defaultValue !== void 0 || top && ctx.plans) {
-		const plan = readPlan(f, n.type, ctx.zoned, ctx.modular);
+		const plan = readPlan(f, n.type, ctx.zoned, ctx.modular, ctx.types, ctx.slots, ctx.blocks);
 		if (top) ctx.plans?.set(f.name, plan);
 		if (n.defaultValue !== void 0) f.initialValue = planFromProd(plan, n.defaultValue, (rel, reason) => loss(`defaultValue${rel}`, "stored value", reason));
 	}
 	if (Object.keys(val).length) f.validation = val;
 	return f;
 }
+/** config.item → the V2 item field's description, localized flag and validation (in V2's key order). */
+function itemSettingsFromProd(item) {
+	if (!isObj(item)) return {};
+	const s = item;
+	const out = {};
+	const val = {};
+	if (s.required !== void 0) val.required = s.required;
+	if (s.minLength !== void 0) val.min = s.minLength;
+	if (s.maxLength !== void 0) val.max = s.maxLength;
+	if (s.pattern !== void 0) val.pattern = s.pattern;
+	if (s.patternMessage !== void 0) val.patternMessage = s.patternMessage;
+	if (Object.keys(val).length) out.validation = val;
+	if (s.localized !== void 0) out.localized = s.localized;
+	if (s.helpText !== void 0) out.description = s.helpText;
+	return out;
+}
+/** A reference config → the V2 `reference`: entry models first, then config.targets; config.filter as written. */
+function referenceFromConfig(cfg) {
+	const entries = cfg.polymorphic ? cfg.allowedModelSlugs ?? [] : cfg.contentModelId ? [cfg.contentModelId] : [];
+	const targets = Array.isArray(cfg.targets) ? cfg.targets.filter((t) => typeof t === "string") : [];
+	const to = [...entries, ...targets];
+	if (!to.length && typeof cfg.filter !== "string") return void 0;
+	return {
+		to,
+		...typeof cfg.filter === "string" ? { filter: cfg.filter } : {}
+	};
+}
 /** A list of scalars or entries: its item's name and title (ui.itemName / ui.itemTitle, else the convention). */
 var itemOf = (n) => {
 	const conv = conventionItem(n.key, n.label);
@@ -2100,6 +2891,9 @@ function toTypeSchema(model, opts = {}) {
 		sets: /* @__PURE__ */ new Map(),
 		zoned: /* @__PURE__ */ new WeakSet(),
 		modular: /* @__PURE__ */ new WeakSet(),
+		types: /* @__PURE__ */ new WeakSet(),
+		slots: /* @__PURE__ */ new WeakMap(),
+		blocks: /* @__PURE__ */ new WeakSet(),
 		blockModels: new Map((opts.blockModels ?? []).map((m) => [m.slug, m])),
 		plans: opts.plans
 	};
@@ -2156,6 +2950,9 @@ function propsToTypeSchema(component, opts = {}) {
 		sets: /* @__PURE__ */ new Map(),
 		zoned: /* @__PURE__ */ new WeakSet(),
 		modular: /* @__PURE__ */ new WeakSet(),
+		types: /* @__PURE__ */ new WeakSet(),
+		slots: /* @__PURE__ */ new WeakMap(),
+		blocks: /* @__PURE__ */ new WeakSet(),
 		blockModels: new Map((opts.blockModels ?? []).map((m) => [m.slug, m])),
 		plans: opts.plans
 	};
@@ -2186,6 +2983,23 @@ function propsToTypeSchema(component, opts = {}) {
 		const at = new Map(fieldsets.map((s, i) => [s.name, i]));
 		fieldsets.sort((a, b) => (order.get(a.name) ?? at.get(a.name)) - (order.get(b.name) ?? at.get(b.name)));
 	}
+	const groups = [];
+	const tabOrder = /* @__PURE__ */ new Map();
+	for (const t of [...nodes.map((n) => n.ui.tab), ...component.tabs ?? []]) {
+		if (!t || groups.some((g) => g.name === t.id)) continue;
+		const g = {
+			name: t.id,
+			title: t.label ?? t.id
+		};
+		if (t.icon) g.icon = tablerIconOf(t.icon);
+		if (typeof t.order === "number") tabOrder.set(t.id, t.order);
+		groups.push(g);
+	}
+	if (tabOrder.size) {
+		const at = new Map(groups.map((g, i) => [g.name, i]));
+		groups.sort((a, b) => (tabOrder.get(a.name) ?? at.get(a.name)) - (tabOrder.get(b.name) ?? at.get(b.name)));
+	}
+	if (groups.length) groups[0].default = true;
 	const out = {
 		name: camel(component.slug),
 		title: component.name,
@@ -2194,10 +3008,13 @@ function propsToTypeSchema(component, opts = {}) {
 	};
 	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.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;
 }
 //#endregion
-export { CATEGORY_TO_PROD, fromTypeSchema, leafValuePlan, planFromProd, planToProd, propsToTypeSchema, toTypeSchema };
+export { CATEGORY_TO_PROD, SHOPIFY_REF_LOCK, fromTypeSchema, leafValuePlan, planFromProd, planToProd, propsToTypeSchema, schemaSlugOf, toTypeSchema };
 
 //# sourceMappingURL=schema.js.map