@nivaro/react 0.3.36 → 0.3.38

package/dist/shared/components/layout-editor/revert-element.js

@@ -0,0 +1,140 @@
+var I = Object.defineProperty;
+var N = (i, r, o) => r in i ? I(i, r, { enumerable: !0, configurable: !0, writable: !0, value: o }) : i[r] = o;
+var c = (i, r, o) => N(i, typeof r != "symbol" ? r + "" : r, o);
+import { UNGROUPED_KEY as $, applyLayoutOps as P, isCanvasSlot as v, HEADER_GROUP_KEY as _ } from "../../lib/layout-ops.js";
+import { titleCase as y } from "../../lib/utils.js";
+import { sectionLabel as T } from "./canvas-diff.js";
+import { normalizedBundle as w } from "./field-zones.js";
+import { restorePieceOps as a } from "./restore-piece.js";
+import { slotName as U } from "./slot-names.js";
+import { refuse as k, checked as z } from "./structure-ops.js";
+import { humanizeOpError as G } from "./useLayoutDraft.js";
+const L = (i, r) => i.sort - r.sort, u = (i, r) => i.placements.filter((o) => o.group_key === r && !v(o)).sort(L), M = (i) => i.kind === "header" ? _ : i.group_key;
+class E {
+  constructor(r) {
+    c(this, "list", []);
+    /** The baseline does not have it: the revert takes it off. */
+    c(this, "isNew", !1);
+    /** Where it ends up, to select afterwards. */
+    c(this, "select");
+    this.w = r;
+  }
+  push(...r) {
+    for (const o of r)
+      this.w = P(this.w, [o]), this.list.push(o);
+  }
+}
+const x = (i, r) => r === null || r === _ || i.groups.some((o) => o.key === r);
+function h(i, r, o, e) {
+  if (i.select = e.group_key === _ ? { kind: "header", field: e.field } : {
+    kind: e.field.startsWith("__") ? "slot" : "field",
+    field: e.field,
+    group_key: e.group_key
+  }, e.group_key !== o.group_key) {
+    if (!x(i.w, e.group_key))
+      throw new Error(
+        `Its saved section “${T(r.groups, e.group_key)}” is not on the form — put that back first`
+      );
+    i.push({
+      op: "move",
+      from: { field: o.field, group_key: o.group_key },
+      to_group_key: e.group_key,
+      index: Math.max(
+        0,
+        u(r, e.group_key).findIndex((t) => t.field === e.field)
+      )
+    });
+  }
+  i.push(
+    ...a(i.w, r, {
+      kind: "field",
+      field: e.field,
+      group_key: e.group_key
+    })
+  );
+  const f = u(r, e.group_key).findIndex((t) => t.field === e.field), s = u(i.w, e.group_key).findIndex((t) => t.field === e.field);
+  if (!v(e) && f >= 0 && s >= 0 && f !== s) {
+    const t = u(i.w, e.group_key).length;
+    i.push({
+      op: "move",
+      from: { field: e.field, group_key: e.group_key },
+      to_group_key: e.group_key,
+      index: Math.min(f, t - 1)
+    });
+  }
+}
+function R(i, r, o) {
+  const e = M(o), f = i.placements.find((n) => n.field === o.field && n.group_key === e);
+  if (!f) throw new Error("That is no longer on this form");
+  const s = new E(i), t = r.placements.find((n) => n.field === o.field && n.group_key === e);
+  if (t)
+    return h(s, r, f, t), s;
+  const d = r.placements.filter((n) => n.field === o.field).find(
+    (n) => !i.placements.some((p) => p.field === n.field && p.group_key === n.group_key)
+  );
+  return d ? (h(s, r, f, d), s) : (s.isNew = !0, s.push({ op: "remove", at: { field: f.field, group_key: f.group_key } }), s);
+}
+function B(i, r, o) {
+  if (o === $) throw new Error("Ungrouped is not a section");
+  if (!i.groups.some((t) => t.key === o)) throw new Error("That section is no longer here");
+  const e = new E(i);
+  if (r.groups.some((t) => t.key === o))
+    return e.push(...a(i, r, { kind: "group", key: o })), e.select = { kind: "group", key: o }, e;
+  e.isNew = !0;
+  const f = [], s = (t) => {
+    for (const l of i.groups) l.parent_key === t && s(l.key);
+    f.push(t);
+  };
+  s(o);
+  for (const t of f) {
+    if (r.groups.some((l) => l.key === t)) {
+      e.push(...a(e.w, r, { kind: "group", key: t }));
+      continue;
+    }
+    for (const l of u(e.w, t)) {
+      const d = r.placements.find(
+        (n) => n.field === l.field && !e.w.placements.some((p) => p.field === n.field && p.group_key === n.group_key) && x(e.w, n.group_key) && !f.includes(n.group_key ?? "")
+      );
+      d ? e.push({
+        op: "move",
+        from: { field: l.field, group_key: t },
+        to_group_key: d.group_key,
+        index: Math.max(
+          0,
+          u(r, d.group_key).findIndex((n) => n.field === d.field)
+        )
+      }) : e.push({ op: "remove", at: { field: l.field, group_key: t } });
+    }
+    e.push({ op: "group_remove", key: t, placements: "delete" });
+  }
+  return e;
+}
+function j(i, r, o, e = {}) {
+  var m;
+  if (!o) return k("Select a field or section first");
+  if (!r) return k("The saved form is still loading");
+  const f = e.baseline === "opened" ? "as it was when you opened the form" : "as saved", s = w(i), t = w(r), l = o.kind === "group" ? (() => {
+    const g = s.groups.find((O) => O.key === o.key);
+    return g ? g.label || y(g.key) : y(o.key);
+  })() : o.field.startsWith("__") ? U(o.field) : ((m = e.fieldLabel) == null ? void 0 : m.call(e, o.field)) ?? y(o.field);
+  let d;
+  try {
+    d = o.kind === "group" ? B(s, t, o.key) : R(s, t, o);
+  } catch (g) {
+    return k(G(g.message));
+  }
+  if (d.list.length === 0) return k(`${l} is already ${f}`);
+  const n = d.isNew, p = n ? [
+    e.baseline === "opened" ? "It was not on the form when you opened it: it comes off" : "It is not on the saved form: it comes off"
+  ] : [];
+  return z(s, {
+    ok: !0,
+    ops: d.list,
+    label: n ? `Take ${l} off (not ${f})` : `Put ${l} back ${f}`,
+    notes: p,
+    select: n ? void 0 : d.select
+  });
+}
+export {
+  j as revertPlan
+};

package/dist/shared/components/layout-editor/section-structure.js

@@ -1,241 +1,264 @@
-import { readGroupStructure as m, withGroupStructure as _, isFolded as E, FOLD_KEY as G, rowOf as L } from "../../lib/form-structure.js";
-import { GROUP_PATCH_KEYS as A, applyLayoutOps as M } from "../../lib/layout-ops.js";
+import { readGroupStructure as g, withGroupStructure as w, isFolded as E, FOLD_KEY as G, rowOf as L } from "../../lib/form-structure.js";
+import { GROUP_PATCH_KEYS as M, applyLayoutOps as W } from "../../lib/layout-ops.js";
 import { titleCase as N } from "../../lib/utils.js";
-import { newGroupKey as W } from "./add-target.js";
-import { normalizedBundle as x, zoneItems as P, keyOf as v, plural as b, inPageOrder as Y, selectedPlacements as z } from "./field-zones.js";
-import { withKey as C, readOverrides as J } from "./inspector/model.js";
-import { isPinned as U } from "./pin.js";
-import { humanizeOpError as D } from "./useLayoutDraft.js";
-const y = (t) => ({ ok: !1, reason: t });
-function O(t, r) {
-  if (r.ops.length === 0) return y("Nothing would change");
+import { newGroupKey as Y } from "./add-target.js";
+import { normalizedBundle as T, zoneItems as x, keyOf as O, plural as _, inPageOrder as D, selectedPlacements as z } from "./field-zones.js";
+import { withKey as A, readOverrides as J } from "./inspector/model.js";
+import { isPinned as P } from "./pin.js";
+import { humanizeOpError as H } from "./useLayoutDraft.js";
+const d = (t) => ({ ok: !1, reason: t });
+function $(t, n) {
+  if (n.ops.length === 0) return d("Nothing would change");
   try {
-    return M(t, r.ops), r;
+    return W(t, n.ops), n;
   } catch (e) {
-    return y(D(e.message));
+    return d(H(e.message));
   }
 }
-const a = (t, r) => r ? t.groups.find((e) => e.key === r) ?? null : null, g = (t) => t.label || N(t.key), I = /* @__PURE__ */ new Set(["section", "tab"]), B = (t) => !t.field.startsWith("__");
-function K(t, r) {
-  const e = new Map(t.map((s, n) => [s.field, n]));
-  return t.map((s, n) => {
-    const o = L(r, s.field);
-    if (!o) return n;
-    const i = o.fields.map((l) => e.get(l)).filter((l) => l != null);
-    return i.length >= 2 ? Math.min(...i) : n;
+const a = (t, n) => n ? t.groups.find((e) => e.key === n) ?? null : null, u = (t) => t.label || N(t.key), j = /* @__PURE__ */ new Set(["section", "tab"]), B = (t) => !t.field.startsWith("__");
+function C(t, n) {
+  const e = new Map(t.map((o, s) => [o.field, s]));
+  return t.map((o, s) => {
+    const r = L(n, o.field);
+    if (!r) return s;
+    const i = r.fields.map((p) => e.get(p)).filter((p) => p != null);
+    return i.length >= 2 ? Math.min(...i) : s;
   });
 }
-const F = (t, r) => t.map((e) => ({ ...e, fields: e.fields.filter((s) => r.has(s)) })).filter((e) => e.fields.length > 0);
-function H(t, r) {
-  const e = {}, s = /* @__PURE__ */ new Set(["label", "content", "content_tone", "summary_fields", "editor_note", "i18n"]);
-  for (const n of A) !s.has(n) && n !== "swap_config" && (e[n] = t[n]);
-  return e.swap_config = _(null, { rows: r }), e;
+const I = (t, n) => t.map((e) => ({ ...e, fields: e.fields.filter((o) => n.has(o)) })).filter((e) => e.fields.length > 0);
+function q(t, n) {
+  const e = {}, o = /* @__PURE__ */ new Set(["label", "content", "content_tone", "summary_fields", "editor_note", "i18n"]);
+  for (const s of M) !o.has(s) && s !== "swap_config" && (e[s] = t[s]);
+  return e.swap_config = w(null, { rows: n }), e;
 }
-function q(t, r) {
-  if (!r || r.kind !== "field" && r.kind !== "slot") return "Select the field to split at";
-  if (r.group_key === null) return "Ungrouped fields are not in a section";
-  const e = a(t, r.group_key);
+function Q(t, n) {
+  if (!n || n.kind !== "field" && n.kind !== "slot") return "Select the field to split at";
+  if (n.group_key === null) return "Ungrouped fields are not in a section";
+  const e = a(t, n.group_key);
   if (!e) return "This comes from the parent form: override it here first";
-  if (!I.has(e.type)) return "Only sections, tabs and steps split";
-  if (U(e) || U(a(t, e.parent_key))) return "Unpin it first";
-  const s = x(t), n = P(s, e.key), o = n.findIndex((l) => l.field === r.field);
-  return o < 0 ? "That field is no longer where it was" : K(n, m(e.swap_config).rows)[o] !== o ? "Split before or after the row it sits in" : o === 0 ? "It is already the first field: nothing above it would stay" : null;
-}
-function ie(t, r) {
-  const e = q(t, r);
-  if (e) return y(e);
-  const s = r, n = x(t), o = a(n, s.group_key), i = m(o.swap_config), l = P(n, o.key), p = K(l, i.rows), k = l.findIndex((h) => h.field === s.field), w = l.filter((h, j) => p[j] >= k), u = new Set(w.map((h) => h.field)), S = new Set(l.filter((h) => !u.has(h.field)).map((h) => h.field)), d = W(n, `${o.key}_2`), $ = `${g(o)} (continued)`, f = [
+  if (!j.has(e.type)) return "Only sections, tabs and steps split";
+  if (P(e) || P(a(t, e.parent_key))) return "Unpin it first";
+  const o = T(t), s = x(o, e.key), r = s.findIndex((p) => p.field === n.field);
+  return r < 0 ? "That field is no longer where it was" : C(s, g(e.swap_config).rows)[r] !== r ? "Split before or after the row it sits in" : r === 0 ? "It is already the first field: nothing above it would stay" : null;
+}
+function pe(t, n) {
+  const e = Q(t, n);
+  if (e) return d(e);
+  const o = n, s = T(t), r = a(s, o.group_key), i = g(r.swap_config), p = x(s, r.key), f = C(p, i.rows), b = p.findIndex((h) => h.field === o.field), y = p.filter((h, U) => f[U] >= b), k = new Set(y.map((h) => h.field)), m = new Set(p.filter((h) => !k.has(h.field)).map((h) => h.field)), c = Y(s, `${r.key}_2`), S = `${u(r)} (continued)`, l = [
     {
       op: "group_create",
-      key: d,
-      label: $,
-      group_type: o.type,
-      parent_key: o.parent_key,
-      index: o.sort + 1,
-      patch: H(o, F(i.rows, u))
+      key: c,
+      label: S,
+      group_type: r.type,
+      parent_key: r.parent_key,
+      index: r.sort + 1,
+      patch: q(r, I(i.rows, k))
     },
-    ...w.map((h, j) => ({ op: "move", from: v(h), to_group_key: d, index: j }))
-  ], c = F(i.rows, S);
-  JSON.stringify(c) !== JSON.stringify(i.rows) && f.push({
+    ...y.map((h, U) => ({ op: "move", from: O(h), to_group_key: c, index: U }))
+  ], v = I(i.rows, m);
+  JSON.stringify(v) !== JSON.stringify(i.rows) && l.push({
     op: "group_update",
-    key: o.key,
-    patch: { swap_config: _(o.swap_config, { rows: c }) }
+    key: r.key,
+    patch: { swap_config: w(r.swap_config, { rows: v }) }
   });
-  const T = [`${b(w.length, "field")} move to ${$}`];
-  return i.sticky && T.push("Only the first part stays pinned to the top"), O(t, {
+  const F = [`${_(y.length, "field")} move to ${S}`];
+  return i.sticky && F.push("Only the first part stays pinned to the top"), $(t, {
     ok: !0,
-    ops: f,
-    label: `Split ${g(o)}`,
-    notes: T,
-    select: { kind: "group", key: d }
+    ops: l,
+    label: `Split ${u(r)}`,
+    notes: F,
+    select: { kind: "group", key: c }
   });
 }
-function R(t, r) {
-  const e = x(t), s = a(e, r);
-  if (!s) return null;
-  const o = e.groups.filter((i) => i.parent_key === s.parent_key).sort((i, l) => i.sort - l.sort).find((i) => i.sort > s.sort);
-  return o && o.sort === s.sort + 1 && o.type === s.type ? o : null;
+function K(t, n) {
+  const e = T(t), o = a(e, n);
+  if (!o) return null;
+  const r = e.groups.filter((i) => i.parent_key === o.parent_key).sort((i, p) => i.sort - p.sort).find((i) => i.sort > o.sort);
+  return r && r.sort === o.sort + 1 && r.type === o.type ? r : null;
 }
-function Q(t, r) {
-  const e = a(t, r);
+function V(t, n) {
+  const e = a(t, n);
   if (!e) return "This comes from the parent form: override it here first";
-  if (!I.has(e.type)) return "Only sections, tabs and steps join";
-  const s = R(t, r);
-  return s ? [e, s].some((n) => U(n)) || U(a(t, e.parent_key)) ? "Unpin it first" : null : e.type === "tab" ? "No tab or step right after it" : "No section right below it";
-}
-function fe(t, r) {
-  const e = Q(t, r);
-  if (e) return y(e);
-  const s = x(t), n = a(s, r), o = R(s, r), i = P(s, n.key), l = new Set(i.map((c) => c.field)), p = P(s, o.key), k = [];
-  let w = i.length, u = 0;
-  for (const c of p) {
-    if (l.has(c.field)) {
-      u++, k.push({ op: "remove", at: v(c) });
+  if (!j.has(e.type)) return "Only sections, tabs and steps join";
+  const o = K(t, n);
+  return o ? [e, o].some((s) => P(s)) || P(a(t, e.parent_key)) ? "Unpin it first" : null : e.type === "tab" ? "No tab or step right after it" : "No section right below it";
+}
+function ce(t, n) {
+  const e = V(t, n);
+  if (e) return d(e);
+  const o = T(t), s = a(o, n), r = K(o, n), { ops: i, notes: p } = R(o, s, r);
+  return $(t, {
+    ok: !0,
+    ops: i,
+    label: `Join ${u(s)} and ${u(r)}`,
+    notes: p,
+    select: { kind: "group", key: s.key }
+  });
+}
+function R(t, n, e) {
+  const o = x(t, n.key), s = new Set(o.map((c) => c.field)), r = x(t, e.key), i = [];
+  let p = o.length, f = 0;
+  for (const c of r) {
+    if (s.has(c.field)) {
+      f++, i.push({ op: "remove", at: O(c) });
       continue;
     }
-    k.push({ op: "move", from: v(c), to_group_key: n.key, index: w++ });
+    i.push({ op: "move", from: O(c), to_group_key: n.key, index: p++ });
   }
-  const S = m(n.swap_config), d = new Set(p.filter((c) => !l.has(c.field)).map((c) => c.field)), $ = F(m(o.swap_config).rows, d).map((c) => ({
+  const b = g(n.swap_config), y = new Set(r.filter((c) => !s.has(c.field)).map((c) => c.field)), k = I(g(e.swap_config).rows, y).map((c) => ({
     ...c,
-    key: S.rows.some((T) => T.key === c.key) ? `${c.key}_${o.key}` : c.key
+    key: b.rows.some((S) => S.key === c.key) ? `${c.key}_${e.key}` : c.key
   }));
-  $.length && k.push({
+  k.length && i.push({
     op: "group_update",
     key: n.key,
-    patch: { swap_config: _(n.swap_config, { rows: [...S.rows, ...$] }) }
-  }), k.push({ op: "group_remove", key: o.key, placements: "delete" });
-  const f = [`${b(p.length, "field")} from ${g(o)} join ${g(n)}`];
-  return f.push(`${g(n)} keeps its settings`), u && f.push(`${b(u, "field")} in both ${u === 1 ? "shows" : "show"} once`), O(t, {
+    patch: { swap_config: w(n.swap_config, { rows: [...b.rows, ...k] }) }
+  }), i.push({ op: "group_remove", key: e.key, placements: "delete" });
+  const m = [`${_(r.length, "field")} from ${u(e)} join ${u(n)}`];
+  return m.push(`${u(n)} keeps its settings`), f && m.push(`${_(f, "field")} in both ${f === 1 ? "shows" : "show"} once`), { ops: i, notes: m };
+}
+function X(t, n, e) {
+  if (n === e) return "It is the same section";
+  const o = a(t, n), s = a(t, e);
+  return !o || !s ? "This comes from the parent form: override it here first" : !j.has(o.type) || !j.has(s.type) ? "Only sections, tabs and steps join" : o.type !== s.type ? o.type === "tab" ? "A tab joins another tab" : "A section joins another section" : (o.parent_key ?? null) !== (s.parent_key ?? null) ? "They sit in different holders" : [o, s].some((r) => P(r)) || P(a(t, o.parent_key)) ? "Unpin it first" : null;
+}
+function le(t, n, e) {
+  const o = X(t, n, e);
+  if (o) return d(o);
+  const s = T(t), r = a(s, n), i = a(s, e), { ops: p, notes: f } = R(s, i, r);
+  return $(t, {
     ok: !0,
-    ops: k,
-    label: `Join ${g(n)} and ${g(o)}`,
+    ops: p,
+    label: `Join ${u(r)} into ${u(i)}`,
     notes: f,
-    select: { kind: "group", key: n.key }
+    select: { kind: "group", key: i.key }
   });
 }
-function V(t, r) {
-  const e = z(t, r).filter(B);
+function Z(t, n) {
+  const e = z(t, n).filter(B);
   if (e.length < 2) return "Select two or more fields in one section";
-  const s = e[0].group_key;
-  if (e.some((o) => o.group_key !== s)) return "Pick fields from one section";
-  if (s === null) return "Ungrouped fields are not in a section: wrap them first";
-  const n = a(t, s);
-  return n ? I.has(n.type) ? e.length > 6 ? "Six fields at most share one row" : null : "Only fields in sections, tabs and steps share a row" : "This comes from the parent form: override it here first";
-}
-function pe(t, r, e = N) {
-  const s = V(t, r);
-  if (s) return y(s);
-  const n = x(t), o = Y(n, z(n, r).filter(B)), i = a(n, o[0].group_key), l = m(i.swap_config), p = o.map((f) => f.field), k = new Set(l.rows.map((f) => f.key));
-  let w = "row";
-  for (let f = 2; k.has(w); f++) w = `row_${f}`;
-  const u = { key: w, label: p.map(e).join(" / "), fields: p }, S = [
-    ...l.rows.map((f) => ({ ...f, fields: f.fields.filter((c) => !p.includes(c)) })).filter((f) => f.fields.length >= 2),
-    u
-  ], d = [], $ = P(n, i.key).findIndex((f) => f.field === p[0]);
-  o.slice(1).forEach((f, c) => {
-    d.push({ op: "move", from: v(f), to_group_key: i.key, index: $ + 1 + c });
+  const o = e[0].group_key;
+  if (e.some((r) => r.group_key !== o)) return "Pick fields from one section";
+  if (o === null) return "Ungrouped fields are not in a section: wrap them first";
+  const s = a(t, o);
+  return s ? j.has(s.type) ? e.length > 6 ? "Six fields at most share one row" : null : "Only fields in sections, tabs and steps share a row" : "This comes from the parent form: override it here first";
+}
+function ae(t, n, e = N) {
+  const o = Z(t, n);
+  if (o) return d(o);
+  const s = T(t), r = D(s, z(s, n).filter(B)), i = a(s, r[0].group_key), p = g(i.swap_config), f = r.map((l) => l.field), b = new Set(p.rows.map((l) => l.key));
+  let y = "row";
+  for (let l = 2; b.has(y); l++) y = `row_${l}`;
+  const k = { key: y, label: f.map(e).join(" / "), fields: f }, m = [
+    ...p.rows.map((l) => ({ ...l, fields: l.fields.filter((v) => !f.includes(v)) })).filter((l) => l.fields.length >= 2),
+    k
+  ], c = [], S = x(s, i.key).findIndex((l) => l.field === f[0]);
+  r.slice(1).forEach((l, v) => {
+    c.push({ op: "move", from: O(l), to_group_key: i.key, index: S + 1 + v });
   });
-  for (const f of o)
-    E(f.overrides) && d.push({
+  for (const l of r)
+    E(l.overrides) && c.push({
       op: "update_placement",
-      at: v(f),
-      patch: { overrides: C(J(f), G, void 0) }
+      at: O(l),
+      patch: { overrides: A(J(l), G, void 0) }
     });
-  return d.push({
+  return c.push({
     op: "group_update",
     key: i.key,
-    patch: { swap_config: _(i.swap_config, { rows: S }) }
-  }), O(t, {
+    patch: { swap_config: w(i.swap_config, { rows: m }) }
+  }), $(t, {
     ok: !0,
-    ops: d,
-    label: `Put ${b(p.length, "field")} side by side`,
-    notes: [`Under one label: “${u.label}”`],
-    select: { kind: "field", field: p[0], group_key: i.key }
+    ops: c,
+    label: `Put ${_(f.length, "field")} side by side`,
+    notes: [`Under one label: “${k.label}”`],
+    select: { kind: "field", field: f[0], group_key: i.key }
   });
 }
-function ce(t, r, e, s) {
-  const n = a(t, r);
-  if (!n) return y("That section is no longer on this form");
-  const o = m(n.swap_config), i = o.rows.find((p) => p.key === e);
-  if (!i) return y("That row is no longer on this form");
-  const l = s === null ? o.rows.filter((p) => p.key !== e) : o.rows.map((p) => p.key === e ? { ...p, ...s } : p).filter((p) => p.key !== e || p.fields.length >= 2);
-  return O(t, {
+function ue(t, n, e, o) {
+  const s = a(t, n);
+  if (!s) return d("That section is no longer on this form");
+  const r = g(s.swap_config), i = r.rows.find((f) => f.key === e);
+  if (!i) return d("That row is no longer on this form");
+  const p = o === null ? r.rows.filter((f) => f.key !== e) : r.rows.map((f) => f.key === e ? { ...f, ...o } : f).filter((f) => f.key !== e || f.fields.length >= 2);
+  return $(t, {
     ok: !0,
     ops: [
       {
         op: "group_update",
-        key: n.key,
-        patch: { swap_config: _(n.swap_config, { rows: l }) }
+        key: s.key,
+        patch: { swap_config: w(s.swap_config, { rows: p }) }
       }
     ],
-    label: s === null ? `Take the row “${i.label}” apart` : `Change the row “${i.label}”`,
+    label: o === null ? `Take the row “${i.label}” apart` : `Change the row “${i.label}”`,
     notes: []
   });
 }
-function le(t, r, e) {
-  const s = [];
-  let n = 0;
-  for (const o of r) {
-    if (!B(o) || o.group_key === null) continue;
-    const i = a(t, o.group_key);
-    if (e && i && L(m(i.swap_config).rows, o.field)) {
-      n++;
+function de(t, n, e) {
+  const o = [];
+  let s = 0;
+  for (const r of n) {
+    if (!B(r) || r.group_key === null) continue;
+    const i = a(t, r.group_key);
+    if (e && i && L(g(i.swap_config).rows, r.field)) {
+      s++;
       continue;
     }
-    E(o.overrides) !== e && s.push({
+    E(r.overrides) !== e && o.push({
       op: "update_placement",
-      at: v(o),
-      patch: { overrides: C(J(o), G, e ? !0 : void 0) }
+      at: O(r),
+      patch: { overrides: A(J(r), G, e ? !0 : void 0) }
     });
   }
-  return s.length === 0 && n ? y("Fields in a row stay out of the fold") : O(t, {
+  return o.length === 0 && s ? d("Fields in a row stay out of the fold") : $(t, {
     ok: !0,
-    ops: s,
-    label: e ? `Put ${b(s.length, "field")} behind “Show more”` : `Show ${b(s.length, "field")} always`,
-    notes: n ? [`${b(n, "field")} in a row ${n === 1 ? "stays" : "stay"} out`] : []
+    ops: o,
+    label: e ? `Put ${_(o.length, "field")} behind “Show more”` : `Show ${_(o.length, "field")} always`,
+    notes: s ? [`${_(s, "field")} in a row ${s === 1 ? "stays" : "stay"} out`] : []
   });
 }
-function ae(t, r, e) {
-  const s = a(t, r);
-  if (!s) return y("That section is no longer on this form");
-  if (s.type !== "section" || s.parent_key !== null)
-    return y("Only a section at the top level of the form sticks");
-  const n = [], o = [];
+function he(t, n, e) {
+  const o = a(t, n);
+  if (!o) return d("That section is no longer on this form");
+  if (o.type !== "section" || o.parent_key !== null)
+    return d("Only a section at the top level of the form sticks");
+  const s = [], r = [];
   if (e)
     for (const i of t.groups)
-      i.key !== r && m(i.swap_config).sticky && (n.push({
+      i.key !== n && g(i.swap_config).sticky && (s.push({
         op: "group_update",
         key: i.key,
-        patch: { swap_config: _(i.swap_config, { sticky: !1 }) }
-      }), o.push(`${g(i)} stops sticking: one sticky section per form`));
-  return m(s.swap_config).sticky !== e && n.push({
+        patch: { swap_config: w(i.swap_config, { sticky: !1 }) }
+      }), r.push(`${u(i)} stops sticking: one sticky section per form`));
+  return g(o.swap_config).sticky !== e && s.push({
     op: "group_update",
-    key: r,
-    patch: { swap_config: _(s.swap_config, { sticky: e }) }
-  }), O(t, {
+    key: n,
+    patch: { swap_config: w(o.swap_config, { sticky: e }) }
+  }), $(t, {
     ok: !0,
-    ops: n,
-    label: e ? `Pin ${g(s)} to the top` : `Let ${g(s)} scroll`,
-    notes: o
+    ops: s,
+    label: e ? `Pin ${u(o)} to the top` : `Let ${u(o)} scroll`,
+    notes: r
   });
 }
-function ue(t, r) {
+function ye(t, n) {
   return {
     op: "group_update",
     key: t.key,
-    patch: { swap_config: _(t.swap_config, { emptyText: r }) }
+    patch: { swap_config: w(t.swap_config, { emptyText: n }) }
   };
 }
 export {
-  ue as emptyTextOp,
-  le as foldPlan,
-  Q as joinBlocked,
-  fe as joinPlan,
-  R as joinTarget,
-  V as rowBlocked,
-  pe as rowPlan,
-  ce as rowUpdatePlan,
-  q as splitBlocked,
-  ie as splitPlan,
-  ae as stickyPlan
+  ye as emptyTextOp,
+  de as foldPlan,
+  V as joinBlocked,
+  ce as joinPlan,
+  K as joinTarget,
+  X as mergeBlocked,
+  le as mergePlan,
+  Z as rowBlocked,
+  ae as rowPlan,
+  ue as rowUpdatePlan,
+  Q as splitBlocked,
+  pe as splitPlan,
+  he as stickyPlan
 };