@richardmcquiston01/dashboard-widgets-toolkit 0.13.0 → 0.14.0

package/dist/core.js

@@ -87,12 +87,14 @@ var WIDGET_FILLS = ["height", "width", "both"];
 var NOT_LOCKED = Object.freeze({
   move: false,
   hide: false,
-  minimize: false
+  minimize: false,
+  options: false
 });
 var FULLY_LOCKED = Object.freeze({
   move: true,
   hide: true,
-  minimize: true
+  minimize: true,
+  options: true
 });
 function resolveWidgetLock(definition) {
   const setting = definition.locked;
@@ -101,7 +103,8 @@ function resolveWidgetLock(definition) {
   return {
     move: setting.move === true,
     hide: setting.hide === true,
-    minimize: setting.minimize === true
+    minimize: setting.minimize === true,
+    options: setting.options === true
   };
 }
 function defineWidget(definition) {
@@ -683,6 +686,546 @@ function placeAndFillRows(items, columns, spanOf) {
   return { spans, rows };
 }
 
+// src/core/options.ts
+var DATE_RANGE_PRESETS = [
+  "today",
+  "yesterday",
+  "last7",
+  "last30",
+  "last90",
+  "thisMonth",
+  "lastMonth",
+  "thisYear",
+  "lastYear"
+];
+var WIDGET_OPTION_TYPES = [
+  "choice",
+  "number",
+  "boolean",
+  "text",
+  "dateRange",
+  "color",
+  "sort",
+  "columns"
+];
+var MAX_WIDGET_OPTIONS = 20;
+var MAX_TEXT_OPTION_LENGTH = 500;
+var OPTION_KEY_PATTERN = /^[A-Za-z][A-Za-z0-9_-]{0,39}$/;
+var COLOR_PATTERN = /^#[0-9a-fA-F]{6}$/;
+var INTERVAL_PATTERN = /^(\d{4}-\d{2}-\d{2})\/(\d{4}-\d{2}-\d{2})$/;
+var CONTROL_CHARACTERS = /[\u0000-\u001f\u007f]/;
+function isColumnKeyFor(kind, key) {
+  if (kind === "TABLE") return /^c\d+$/.test(key);
+  if (kind === "BAR_LIST") return key === "label" || key === "value";
+  return false;
+}
+function isClientApplied(option) {
+  return (option.type === "sort" || option.type === "columns") && option.apply === "client";
+}
+function civilToday(context) {
+  const now = context.now ?? Date.now();
+  let timeZone = context.timeZone ?? "UTC";
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone });
+  } catch {
+    timeZone = "UTC";
+  }
+  const parts = new Intl.DateTimeFormat("en-US", {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  }).formatToParts(new Date(now));
+  const pick = (type) => Number(parts.find((part) => part.type === type)?.value ?? "0");
+  return { year: pick("year"), month: pick("month"), day: pick("day") };
+}
+function toIso(epochMs) {
+  return new Date(epochMs).toISOString().slice(0, 10);
+}
+var DAY_MS = 864e5;
+function parseIsoDay(text) {
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(text);
+  if (match === null) return void 0;
+  const epoch = Date.UTC(
+    Number(match[1]),
+    Number(match[2]) - 1,
+    Number(match[3])
+  );
+  return toIso(epoch) === text ? epoch : void 0;
+}
+function isIsoInterval(value) {
+  const match = INTERVAL_PATTERN.exec(value);
+  if (match === null) return false;
+  const start = parseIsoDay(match[1]);
+  const end = parseIsoDay(match[2]);
+  return start !== void 0 && end !== void 0 && start <= end;
+}
+function isPreset(value) {
+  return DATE_RANGE_PRESETS.includes(value);
+}
+function resolveDateRange(value, context = {}) {
+  if (isIsoInterval(value)) return value;
+  if (!isPreset(value)) return void 0;
+  const today = civilToday(context);
+  const todayMs = Date.UTC(today.year, today.month - 1, today.day);
+  const range = (startMs, endMs) => `${toIso(startMs)}/${toIso(endMs)}`;
+  switch (value) {
+    case "today":
+      return range(todayMs, todayMs);
+    case "yesterday":
+      return range(todayMs - DAY_MS, todayMs - DAY_MS);
+    case "last7":
+      return range(todayMs - 6 * DAY_MS, todayMs);
+    case "last30":
+      return range(todayMs - 29 * DAY_MS, todayMs);
+    case "last90":
+      return range(todayMs - 89 * DAY_MS, todayMs);
+    case "thisMonth":
+      return range(Date.UTC(today.year, today.month - 1, 1), todayMs);
+    case "lastMonth":
+      return range(
+        Date.UTC(today.year, today.month - 2, 1),
+        Date.UTC(today.year, today.month - 1, 1) - DAY_MS
+      );
+    case "thisYear":
+      return range(Date.UTC(today.year, 0, 1), todayMs);
+    case "lastYear":
+      return range(
+        Date.UTC(today.year - 1, 0, 1),
+        Date.UTC(today.year, 0, 1) - DAY_MS
+      );
+  }
+}
+function onStepGrid(option, value) {
+  if (option.step === void 0) return true;
+  const steps = (value - option.min) / option.step;
+  return Math.abs(steps - Math.round(steps)) < 1e-9;
+}
+function parseSortValue(value) {
+  const separator = value.lastIndexOf(":");
+  if (separator <= 0) return void 0;
+  const column = value.slice(0, separator);
+  const direction = value.slice(separator + 1);
+  if (direction !== "asc" && direction !== "desc") return void 0;
+  return { column, direction };
+}
+function sortFromOptions(definition, values) {
+  if (values === void 0) return void 0;
+  const sortOption = definition.options?.find(
+    (option) => option.type === "sort"
+  );
+  if (sortOption === void 0) return void 0;
+  const chosen = values[sortOption.key];
+  return typeof chosen === "string" ? parseSortValue(chosen) : void 0;
+}
+function coerceOptionValue(option, value, context = {}) {
+  switch (option.type) {
+    case "choice":
+      return typeof value === "string" && option.choices.some((choice) => choice.value === value) ? value : void 0;
+    case "number":
+      return typeof value === "number" && Number.isFinite(value) && value >= option.min && value <= option.max && onStepGrid(option, value) ? value : void 0;
+    case "boolean":
+      return typeof value === "boolean" ? value : void 0;
+    case "text": {
+      if (typeof value !== "string") return void 0;
+      const trimmed = value.trim();
+      return trimmed.length <= option.maxLength && !CONTROL_CHARACTERS.test(trimmed) ? trimmed : void 0;
+    }
+    case "dateRange": {
+      if (typeof value !== "string") return void 0;
+      if (isPreset(value) && option.presets !== void 0 && !option.presets.some((preset) => preset.value === value)) {
+        return void 0;
+      }
+      return resolveDateRange(value, context);
+    }
+    case "color":
+      return typeof value === "string" && COLOR_PATTERN.test(value) ? value.toLowerCase() : void 0;
+    case "sort": {
+      if (typeof value !== "string") return void 0;
+      const sort = parseSortValue(value);
+      return sort !== void 0 && option.columns.some((column) => column.key === sort.column) ? value : void 0;
+    }
+    case "columns": {
+      if (!Array.isArray(value) || value.length === 0) return void 0;
+      const keys = value;
+      const allowed = new Set(option.columns.map((c) => c.key));
+      const seen = /* @__PURE__ */ new Set();
+      for (const key of keys) {
+        if (typeof key !== "string" || !allowed.has(key) || seen.has(key)) {
+          return void 0;
+        }
+        seen.add(key);
+      }
+      return [...seen];
+    }
+  }
+}
+function defaultOptionValue(option, context = {}) {
+  switch (option.type) {
+    case "dateRange":
+      return resolveDateRange(option.default, context);
+    case "sort":
+      return option.default;
+    case "columns":
+      return [...option.default];
+    default:
+      return option.default;
+  }
+}
+var NO_VALUES = Object.freeze({});
+function resolveOptionValues(definition, chosen, context = {}) {
+  const options = definition.options;
+  if (options === void 0 || options.length === 0) return NO_VALUES;
+  const values = {};
+  for (const option of options) {
+    const picked = chosen?.[option.key];
+    const value = (picked === void 0 ? void 0 : coerceOptionValue(option, picked, context)) ?? defaultOptionValue(option, context);
+    if (value !== void 0) values[option.key] = value;
+  }
+  return values;
+}
+function sameValue(a, b) {
+  if (Array.isArray(a) && Array.isArray(b)) {
+    return a.length === b.length && a.every((item, i) => item === b[i]);
+  }
+  return a === b;
+}
+function sameOptionValues(a, b) {
+  const keys = Object.keys({ ...a, ...b });
+  return keys.every((key) => sameValue(a[key], b[key]));
+}
+function optionsCacheSuffix(definition, values, context = {}) {
+  const parts = [];
+  for (const option of definition.options ?? []) {
+    if (isClientApplied(option)) continue;
+    const value = values[option.key];
+    if (sameValue(value, defaultOptionValue(option, context))) continue;
+    parts.push(
+      `${option.key}=${encodeURIComponent(JSON.stringify(value ?? null))}`
+    );
+  }
+  parts.sort();
+  return parts.length === 0 ? "" : `?${parts.join("&")}`;
+}
+function tableColumnIndex(key) {
+  const match = /^c(\d+)$/.exec(key);
+  return match === null ? void 0 : Number(match[1]);
+}
+function sortBarItems(items, sort) {
+  const sign = sort.direction === "desc" ? -1 : 1;
+  return items.map((item, index) => ({ item, index })).sort((a, b) => {
+    const order = sort.column === "value" ? a.item.value - b.item.value : a.item.label.localeCompare(b.item.label);
+    return order * sign || a.index - b.index;
+  }).map(({ item }) => item);
+}
+function applyClientOptions(definition, data, values) {
+  const options = definition.options ?? [];
+  const sortOption = options.find(
+    (o) => o.type === "sort" && o.apply === "client"
+  );
+  const columnsOption = options.find(
+    (o) => o.type === "columns" && o.apply === "client"
+  );
+  const sortValue = sortOption === void 0 ? void 0 : values[sortOption.key];
+  const columnsValue = columnsOption === void 0 ? void 0 : values[columnsOption.key];
+  let next = data;
+  if (typeof sortValue === "string") {
+    const sort = parseSortValue(sortValue);
+    if (sort !== void 0 && next.kind === "BAR_LIST") {
+      if (sort.column === "label" || sort.column === "value") {
+        next = { ...next, items: sortBarItems(next.items, sort) };
+      }
+    } else if (sort !== void 0 && next.kind === "TABLE") {
+      const index = tableColumnIndex(sort.column);
+      if (index !== void 0 && index < next.columns.length) {
+        const sorted = queryRows(tableDetailData(next), {
+          page: 1,
+          pageSize: Math.max(1, next.rows.length),
+          sort
+        });
+        if (sorted.ok) next = { ...next, rows: sorted.value.rows };
+      }
+    }
+  }
+  if (Array.isArray(columnsValue) && next.kind === "TABLE") {
+    const table = next;
+    const indexes = columnsValue.map(tableColumnIndex).filter(
+      (index) => index !== void 0 && index < table.columns.length
+    );
+    if (indexes.length > 0) {
+      next = {
+        ...table,
+        columns: indexes.map((i) => table.columns[i]),
+        rows: table.rows.map((row) => indexes.map((i) => row[i]))
+      };
+    }
+  }
+  return next;
+}
+
+// src/core/settings.ts
+var MAX_WIDGET_TITLE_LENGTH = 80;
+var MAX_PARSED_SETTINGS = 500;
+var MAX_COLUMN_LIST = 100;
+var MAX_VALUE_LENGTH = 500;
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseOptionValue(value) {
+  if (typeof value === "string") {
+    return value.length <= MAX_VALUE_LENGTH ? value : void 0;
+  }
+  if (typeof value === "number")
+    return Number.isFinite(value) ? value : void 0;
+  if (typeof value === "boolean") return value;
+  if (Array.isArray(value) && value.length <= MAX_COLUMN_LIST) {
+    return value.every(
+      (entry) => typeof entry === "string" && entry.length <= MAX_VALUE_LENGTH
+    ) ? value : void 0;
+  }
+  return void 0;
+}
+function parseOne(raw) {
+  if (!isRecord(raw)) return void 0;
+  const title = raw["title"];
+  const width = raw["width"];
+  const flexible = raw["flexible"];
+  const options = raw["options"];
+  const cleanTitle = typeof title === "string" ? title.trim().slice(0, MAX_WIDGET_TITLE_LENGTH) : "";
+  const chosen = {};
+  if (isRecord(options)) {
+    for (const [key, value] of Object.entries(options)) {
+      const parsed = parseOptionValue(value);
+      if (parsed !== void 0) chosen[key] = parsed;
+    }
+  }
+  const settings = {
+    ...cleanTitle === "" ? {} : { title: cleanTitle },
+    ...isWidgetWidth(width) ? { width } : {},
+    ...typeof flexible === "boolean" ? { flexible } : {},
+    ...Object.keys(chosen).length === 0 ? {} : { options: chosen }
+  };
+  return Object.keys(settings).length === 0 ? void 0 : settings;
+}
+function parseSettings(raw) {
+  if (!isRecord(raw)) return void 0;
+  const parsed = {};
+  for (const [key, value] of Object.entries(raw).slice(
+    0,
+    MAX_PARSED_SETTINGS
+  )) {
+    if (key === "") continue;
+    const one = parseOne(value);
+    if (one !== void 0) parsed[key] = one;
+  }
+  return Object.keys(parsed).length === 0 ? void 0 : parsed;
+}
+function serializeSettings(settings) {
+  if (settings === void 0) return void 0;
+  const out = {};
+  for (const key of Object.keys(settings)) {
+    const one = settings[key];
+    if (one === void 0) continue;
+    const piece = {
+      ...one.title === void 0 ? {} : { title: one.title },
+      ...one.width === void 0 ? {} : { width: one.width },
+      ...one.flexible === void 0 ? {} : { flexible: one.flexible },
+      ...one.options === void 0 || Object.keys(one.options).length === 0 ? {} : { options: { ...one.options } }
+    };
+    if (Object.keys(piece).length > 0) out[key] = piece;
+  }
+  return Object.keys(out).length === 0 ? void 0 : out;
+}
+function widthRange(item) {
+  const min = isWidgetWidth(item.minWidth) ? item.minWidth : MIN_WIDGET_WIDTH;
+  const max = isWidgetWidth(item.maxWidth) ? item.maxWidth : MAX_WIDGET_WIDTH;
+  return { min, max: Math.max(min, max) };
+}
+var WIDTH_SHARES = {
+  2: "1/6",
+  3: "1/4",
+  4: "1/3",
+  5: "5/12",
+  6: "1/2",
+  7: "7/12",
+  8: "2/3",
+  9: "3/4",
+  10: "5/6",
+  11: "11/12",
+  12: "Full"
+};
+function widthShareLabel(width) {
+  return WIDTH_SHARES[width] ?? `${width}/12`;
+}
+function isOptionsLocked(item) {
+  return resolveWidgetLock(item).options;
+}
+function fillWith(fill, flexible) {
+  const heightToo = fill === "height" || fill === "both";
+  if (flexible) return heightToo ? "both" : "width";
+  return heightToo ? "height" : void 0;
+}
+function isFlexible(item, settings) {
+  if (settings?.flexible !== void 0) return settings.flexible;
+  return item.fill === "width" || item.fill === "both";
+}
+function applySettings(definition, settings) {
+  if (settings === void 0) return definition;
+  const range = widthRange(definition);
+  const width = settings.width === void 0 ? void 0 : Math.min(range.max, Math.max(range.min, settings.width));
+  const title = settings.title === void 0 || settings.title.trim() === "" ? void 0 : settings.title;
+  const flexibleChanged = settings.flexible !== void 0 && settings.flexible !== isFlexible(definition, void 0);
+  if (title === void 0 && width === void 0 && !flexibleChanged) {
+    return definition;
+  }
+  const next = { ...definition };
+  if (title !== void 0) next.title = title;
+  if (width !== void 0) next.width = width;
+  if (flexibleChanged) {
+    const fill = fillWith(
+      definition.fill,
+      settings.flexible === true
+    );
+    if (fill === void 0) {
+      delete next.fill;
+    } else {
+      next.fill = fill;
+    }
+  }
+  return next;
+}
+function effectiveDefinitions(definitions, layout, options = {}) {
+  return definitions.map(
+    (definition) => options.overrideLocks !== true && isOptionsLocked(definition) ? definition : applySettings(definition, layout.settings?.[definition.key])
+  );
+}
+function widgetOptionValues(definition, settings) {
+  const declared = definition.options ?? [];
+  const values = {};
+  for (const option of declared) {
+    const picked = settings?.options?.[option.key];
+    const value = (picked === void 0 ? void 0 : coerceOptionValue(option, picked)) ?? defaultOptionValue(option);
+    if (value !== void 0) values[option.key] = value;
+  }
+  return values;
+}
+function optionValuesFromLayout(definitions, layout, options = {}) {
+  const out = {};
+  for (const definition of definitions) {
+    if (definition.options === void 0 || definition.options.length === 0) {
+      continue;
+    }
+    const locked = options.overrideLocks !== true && isOptionsLocked(definition);
+    out[definition.key] = locked ? {} : layout.settings?.[definition.key]?.options ?? {};
+  }
+  return out;
+}
+function sameSettings(a, b) {
+  if (a === b) return true;
+  return a?.title === b?.title && a?.width === b?.width && a?.flexible === b?.flexible && sameOptionValues(a?.options ?? {}, b?.options ?? {});
+}
+function setWidgetSettings(layout, key, patch) {
+  const before = layout.settings?.[key];
+  const draft = { ...before };
+  for (const field of ["title", "width", "flexible", "options"]) {
+    if (!(field in patch)) continue;
+    const value = patch[field];
+    if (value === void 0) {
+      delete draft[field];
+    } else {
+      draft[field] = value;
+    }
+  }
+  const merged = parseOne(draft);
+  if (sameSettings(before, merged)) return layout;
+  const rest = { ...layout.settings };
+  if (merged === void 0) {
+    delete rest[key];
+  } else {
+    rest[key] = merged;
+  }
+  const { settings: _previous, ...others } = layout;
+  return Object.keys(rest).length === 0 ? others : { ...others, settings: rest };
+}
+function clearWidgetSettings(layout, key) {
+  if (layout.settings?.[key] === void 0) return layout;
+  return setWidgetSettings(layout, key, {
+    title: void 0,
+    width: void 0,
+    flexible: void 0,
+    options: void 0
+  });
+}
+function normalizeTitle(title) {
+  return title.normalize("NFKC").trim().toLowerCase();
+}
+function isTitleInUse(definitions, layout, key, title) {
+  const wanted = normalizeTitle(title);
+  if (wanted === "") return false;
+  return effectiveDefinitions(definitions, layout, {
+    overrideLocks: true
+  }).some(
+    (other) => other.key !== key && normalizeTitle(other.title ?? other.key) === wanted
+  );
+}
+function uniqueTitle(taken, title) {
+  if (!taken.has(normalizeTitle(title))) return title;
+  for (let n = 2; ; n += 1) {
+    const suffix = ` (#${n})`;
+    const candidate = `${title.slice(0, MAX_WIDGET_TITLE_LENGTH - suffix.length)}${suffix}`;
+    if (!taken.has(normalizeTitle(candidate))) return candidate;
+  }
+}
+function normalizeSettings(definitions, layout, options = {}) {
+  const settings = layout.settings;
+  if (settings === void 0) return layout;
+  const cleaned = {};
+  const taken = /* @__PURE__ */ new Set();
+  for (const definition of definitions) {
+    const renamed = settings[definition.key]?.title !== void 0 && (options.overrideLocks === true || !isOptionsLocked(definition));
+    if (!renamed) taken.add(normalizeTitle(definition.title ?? definition.key));
+  }
+  for (const definition of definitions) {
+    const one = settings[definition.key];
+    if (one === void 0) continue;
+    if (options.overrideLocks !== true && isOptionsLocked(definition)) continue;
+    const range = widthRange(definition);
+    const chosen = {};
+    for (const option of definition.options ?? []) {
+      const picked = one.options?.[option.key];
+      if (picked === void 0) continue;
+      const value = coerceOptionValue(option, picked);
+      if (value !== void 0) {
+        chosen[option.key] = option.type === "dateRange" ? picked : value;
+      }
+    }
+    let title = one.title;
+    if (title !== void 0) {
+      title = title.trim().slice(0, MAX_WIDGET_TITLE_LENGTH);
+      if (title === "") {
+        title = void 0;
+      } else {
+        title = uniqueTitle(taken, title);
+        taken.add(normalizeTitle(title));
+      }
+    }
+    const next = {
+      ...title === void 0 ? {} : { title },
+      ...one.width === void 0 ? {} : { width: Math.min(range.max, Math.max(range.min, one.width)) },
+      ...one.flexible === void 0 ? {} : { flexible: one.flexible },
+      ...Object.keys(chosen).length === 0 ? {} : { options: chosen }
+    };
+    if (Object.keys(next).length > 0) {
+      cleaned[definition.key] = sameSettings(one, next) ? one : next;
+    }
+  }
+  const keys = Object.keys(cleaned);
+  const unchanged = keys.length === Object.keys(settings).length && keys.every((key) => cleaned[key] === settings[key]);
+  if (unchanged) return layout;
+  const { settings: _previous, ...others } = layout;
+  return keys.length === 0 ? others : { ...others, settings: cleaned };
+}
+
 // src/core/layout.ts
 var MAX_PAGE_TITLE_LENGTH = 30;
 var MAX_PARSED_PAGES = 50;
@@ -717,18 +1260,23 @@ function parseLayout(raw) {
   const hidden = uniqueStrings(record["hidden"]);
   const minimized = uniqueStrings(record["minimized"]);
   const pages = parsePages(record["pages"]);
+  const settings = parseSettings(
+    record["settings"]
+  );
+  const withSettings = settings === void 0 ? {} : { settings };
   if (pages.length > 0) {
     return {
       order: EMPTY_LAYOUT.order,
       hidden: EMPTY_LAYOUT.hidden,
       minimized: EMPTY_LAYOUT.minimized,
-      pages
+      pages,
+      ...withSettings
     };
   }
   if (order.length === 0 && hidden.length === 0 && minimized.length === 0) {
-    return EMPTY_LAYOUT;
+    return settings === void 0 ? EMPTY_LAYOUT : { ...EMPTY_LAYOUT, settings };
   }
-  return { order, hidden, minimized };
+  return { order, hidden, minimized, ...withSettings };
 }
 function parsePages(value) {
   if (!Array.isArray(value)) return [];
@@ -775,7 +1323,8 @@ function serializeLayout(layout) {
         minimized: [...page.minimized],
         ...page.maxRows === void 0 ? {} : { maxRows: page.maxRows }
       }))
-    }
+    },
+    ...serializeSettings(layout.settings) === void 0 ? {} : { settings: serializeSettings(layout.settings) }
   });
 }
 function bySortOrder(items) {
@@ -843,378 +1392,101 @@ function freeSlotIndexes(ordered) {
   ordered.forEach((item, index) => {
     if (!isPinned(item)) slots.push(index);
   });
-  return slots;
-}
-function moveWidgetBy(definitions, layout, key, offset) {
-  const current = visibleWidgets(definitions, layout);
-  const fromIndex = current.findIndex((d) => d.key === key);
-  if (fromIndex === -1) return layout;
-  const freeSlots = freeSlotIndexes(current);
-  const fromFree = freeSlots.indexOf(fromIndex);
-  if (fromFree === -1) return layout;
-  const toFree = Math.max(
-    0,
-    Math.min(freeSlots.length - 1, fromFree + Math.trunc(offset))
-  );
-  return moveWidget(definitions, layout, key, freeSlots[toFree]);
-}
-function moveWidgetUp(definitions, layout, key) {
-  return moveWidgetBy(definitions, layout, key, -1);
-}
-function moveWidgetDown(definitions, layout, key) {
-  return moveWidgetBy(definitions, layout, key, 1);
-}
-function isHidden(layout, key) {
-  return layout.hidden.includes(key);
-}
-function isMinimized(layout, key) {
-  return layout.minimized.includes(key);
-}
-function hideWidget(layout, key) {
-  if (isHidden(layout, key)) return layout;
-  return { ...layout, hidden: [...layout.hidden, key] };
-}
-function showWidget(layout, key) {
-  if (!isHidden(layout, key)) return layout;
-  return {
-    ...layout,
-    hidden: layout.hidden.filter((k) => k !== key),
-    minimized: layout.minimized.filter((k) => k !== key)
-  };
-}
-function toggleHidden(layout, key) {
-  return isHidden(layout, key) ? showWidget(layout, key) : hideWidget(layout, key);
-}
-function minimizeWidget(layout, key) {
-  if (isMinimized(layout, key)) return layout;
-  return { ...layout, minimized: [...layout.minimized, key] };
-}
-function restoreWidget(layout, key) {
-  if (!isMinimized(layout, key)) return layout;
-  return { ...layout, minimized: layout.minimized.filter((k) => k !== key) };
-}
-function toggleMinimized(layout, key) {
-  return isMinimized(layout, key) ? restoreWidget(layout, key) : minimizeWidget(layout, key);
-}
-function pruneLayout(definitions, layout) {
-  const known = new Set(definitions.map((d) => d.key));
-  const keep = (keys) => keys.every((k) => known.has(k)) ? keys : keys.filter((k) => known.has(k));
-  return mapLayoutLists(layout, (lists) => ({
-    order: keep(lists.order),
-    hidden: keep(lists.hidden),
-    minimized: keep(lists.minimized)
-  }));
-}
-function mapLayoutLists(layout, change) {
-  const top = change(layout);
-  const pages = layout.pages?.map((page) => {
-    const next = change(page);
-    return next.order === page.order && next.hidden === page.hidden && next.minimized === page.minimized ? page : { ...page, ...next };
-  });
-  const pagesChanged = pages !== void 0 && pages.some((page, i) => page !== layout.pages?.[i]);
-  if (top.order === layout.order && top.hidden === layout.hidden && top.minimized === layout.minimized && !pagesChanged) {
-    return layout;
-  }
-  return {
-    ...layout,
-    ...top,
-    ...pages === void 0 ? {} : { pages }
-  };
-}
-function enforceLocks(definitions, layout, options = {}) {
-  if (options.overrideLocks === true) return layout;
-  const noMove = /* @__PURE__ */ new Set();
-  const noHide = /* @__PURE__ */ new Set();
-  const noMinimize = /* @__PURE__ */ new Set();
-  for (const definition of definitions) {
-    const lock = resolveWidgetLock(definition);
-    if (lock.move) noMove.add(definition.key);
-    if (lock.hide) noHide.add(definition.key);
-    if (lock.minimize) noMinimize.add(definition.key);
-  }
-  const without2 = (keys, drop) => keys.some((key) => drop.has(key)) ? keys.filter((key) => !drop.has(key)) : keys;
-  return mapLayoutLists(layout, (lists) => ({
-    order: without2(lists.order, noMove),
-    hidden: without2(lists.hidden, noHide),
-    minimized: without2(lists.minimized, noMinimize)
-  }));
-}
-
-// src/core/options.ts
-var DATE_RANGE_PRESETS = [
-  "today",
-  "yesterday",
-  "last7",
-  "last30",
-  "last90",
-  "thisMonth",
-  "lastMonth",
-  "thisYear",
-  "lastYear"
-];
-var WIDGET_OPTION_TYPES = [
-  "choice",
-  "number",
-  "boolean",
-  "text",
-  "dateRange",
-  "color",
-  "sort",
-  "columns"
-];
-var MAX_WIDGET_OPTIONS = 20;
-var MAX_TEXT_OPTION_LENGTH = 500;
-var OPTION_KEY_PATTERN = /^[A-Za-z][A-Za-z0-9_-]{0,39}$/;
-var COLOR_PATTERN = /^#[0-9a-fA-F]{6}$/;
-var INTERVAL_PATTERN = /^(\d{4}-\d{2}-\d{2})\/(\d{4}-\d{2}-\d{2})$/;
-var CONTROL_CHARACTERS = /[\u0000-\u001f\u007f]/;
-function isColumnKeyFor(kind, key) {
-  if (kind === "TABLE") return /^c\d+$/.test(key);
-  if (kind === "BAR_LIST") return key === "label" || key === "value";
-  return false;
-}
-function isClientApplied(option) {
-  return (option.type === "sort" || option.type === "columns") && option.apply === "client";
-}
-function civilToday(context) {
-  const now = context.now ?? Date.now();
-  let timeZone = context.timeZone ?? "UTC";
-  try {
-    new Intl.DateTimeFormat("en-US", { timeZone });
-  } catch {
-    timeZone = "UTC";
-  }
-  const parts = new Intl.DateTimeFormat("en-US", {
-    timeZone,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit"
-  }).formatToParts(new Date(now));
-  const pick = (type) => Number(parts.find((part) => part.type === type)?.value ?? "0");
-  return { year: pick("year"), month: pick("month"), day: pick("day") };
-}
-function toIso(epochMs) {
-  return new Date(epochMs).toISOString().slice(0, 10);
-}
-var DAY_MS = 864e5;
-function parseIsoDay(text) {
-  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(text);
-  if (match === null) return void 0;
-  const epoch = Date.UTC(
-    Number(match[1]),
-    Number(match[2]) - 1,
-    Number(match[3])
-  );
-  return toIso(epoch) === text ? epoch : void 0;
-}
-function isIsoInterval(value) {
-  const match = INTERVAL_PATTERN.exec(value);
-  if (match === null) return false;
-  const start = parseIsoDay(match[1]);
-  const end = parseIsoDay(match[2]);
-  return start !== void 0 && end !== void 0 && start <= end;
-}
-function isPreset(value) {
-  return DATE_RANGE_PRESETS.includes(value);
-}
-function resolveDateRange(value, context = {}) {
-  if (isIsoInterval(value)) return value;
-  if (!isPreset(value)) return void 0;
-  const today = civilToday(context);
-  const todayMs = Date.UTC(today.year, today.month - 1, today.day);
-  const range = (startMs, endMs) => `${toIso(startMs)}/${toIso(endMs)}`;
-  switch (value) {
-    case "today":
-      return range(todayMs, todayMs);
-    case "yesterday":
-      return range(todayMs - DAY_MS, todayMs - DAY_MS);
-    case "last7":
-      return range(todayMs - 6 * DAY_MS, todayMs);
-    case "last30":
-      return range(todayMs - 29 * DAY_MS, todayMs);
-    case "last90":
-      return range(todayMs - 89 * DAY_MS, todayMs);
-    case "thisMonth":
-      return range(Date.UTC(today.year, today.month - 1, 1), todayMs);
-    case "lastMonth":
-      return range(
-        Date.UTC(today.year, today.month - 2, 1),
-        Date.UTC(today.year, today.month - 1, 1) - DAY_MS
-      );
-    case "thisYear":
-      return range(Date.UTC(today.year, 0, 1), todayMs);
-    case "lastYear":
-      return range(
-        Date.UTC(today.year - 1, 0, 1),
-        Date.UTC(today.year, 0, 1) - DAY_MS
-      );
-  }
+  return slots;
 }
-function onStepGrid(option, value) {
-  if (option.step === void 0) return true;
-  const steps = (value - option.min) / option.step;
-  return Math.abs(steps - Math.round(steps)) < 1e-9;
+function moveWidgetBy(definitions, layout, key, offset) {
+  const current = visibleWidgets(definitions, layout);
+  const fromIndex = current.findIndex((d) => d.key === key);
+  if (fromIndex === -1) return layout;
+  const freeSlots = freeSlotIndexes(current);
+  const fromFree = freeSlots.indexOf(fromIndex);
+  if (fromFree === -1) return layout;
+  const toFree = Math.max(
+    0,
+    Math.min(freeSlots.length - 1, fromFree + Math.trunc(offset))
+  );
+  return moveWidget(definitions, layout, key, freeSlots[toFree]);
 }
-function parseSortValue(value) {
-  const separator = value.lastIndexOf(":");
-  if (separator <= 0) return void 0;
-  const column = value.slice(0, separator);
-  const direction = value.slice(separator + 1);
-  if (direction !== "asc" && direction !== "desc") return void 0;
-  return { column, direction };
+function moveWidgetUp(definitions, layout, key) {
+  return moveWidgetBy(definitions, layout, key, -1);
 }
-function sortFromOptions(definition, values) {
-  if (values === void 0) return void 0;
-  const sortOption = definition.options?.find(
-    (option) => option.type === "sort"
-  );
-  if (sortOption === void 0) return void 0;
-  const chosen = values[sortOption.key];
-  return typeof chosen === "string" ? parseSortValue(chosen) : void 0;
+function moveWidgetDown(definitions, layout, key) {
+  return moveWidgetBy(definitions, layout, key, 1);
 }
-function coerceOptionValue(option, value, context = {}) {
-  switch (option.type) {
-    case "choice":
-      return typeof value === "string" && option.choices.some((choice) => choice.value === value) ? value : void 0;
-    case "number":
-      return typeof value === "number" && Number.isFinite(value) && value >= option.min && value <= option.max && onStepGrid(option, value) ? value : void 0;
-    case "boolean":
-      return typeof value === "boolean" ? value : void 0;
-    case "text": {
-      if (typeof value !== "string") return void 0;
-      const trimmed = value.trim();
-      return trimmed.length <= option.maxLength && !CONTROL_CHARACTERS.test(trimmed) ? trimmed : void 0;
-    }
-    case "dateRange": {
-      if (typeof value !== "string") return void 0;
-      if (isPreset(value) && option.presets !== void 0 && !option.presets.some((preset) => preset.value === value)) {
-        return void 0;
-      }
-      return resolveDateRange(value, context);
-    }
-    case "color":
-      return typeof value === "string" && COLOR_PATTERN.test(value) ? value.toLowerCase() : void 0;
-    case "sort": {
-      if (typeof value !== "string") return void 0;
-      const sort = parseSortValue(value);
-      return sort !== void 0 && option.columns.some((column) => column.key === sort.column) ? value : void 0;
-    }
-    case "columns": {
-      if (!Array.isArray(value) || value.length === 0) return void 0;
-      const keys = value;
-      const allowed = new Set(option.columns.map((c) => c.key));
-      const seen = /* @__PURE__ */ new Set();
-      for (const key of keys) {
-        if (typeof key !== "string" || !allowed.has(key) || seen.has(key)) {
-          return void 0;
-        }
-        seen.add(key);
-      }
-      return [...seen];
-    }
-  }
+function isHidden(layout, key) {
+  return layout.hidden.includes(key);
 }
-function defaultOptionValue(option, context = {}) {
-  switch (option.type) {
-    case "dateRange":
-      return resolveDateRange(option.default, context);
-    case "sort":
-      return option.default;
-    case "columns":
-      return [...option.default];
-    default:
-      return option.default;
-  }
+function isMinimized(layout, key) {
+  return layout.minimized.includes(key);
 }
-var NO_VALUES = Object.freeze({});
-function resolveOptionValues(definition, chosen, context = {}) {
-  const options = definition.options;
-  if (options === void 0 || options.length === 0) return NO_VALUES;
-  const values = {};
-  for (const option of options) {
-    const picked = chosen?.[option.key];
-    const value = (picked === void 0 ? void 0 : coerceOptionValue(option, picked, context)) ?? defaultOptionValue(option, context);
-    if (value !== void 0) values[option.key] = value;
-  }
-  return values;
+function hideWidget(layout, key) {
+  if (isHidden(layout, key)) return layout;
+  return { ...layout, hidden: [...layout.hidden, key] };
 }
-function sameValue(a, b) {
-  if (Array.isArray(a) && Array.isArray(b)) {
-    return a.length === b.length && a.every((item, i) => item === b[i]);
-  }
-  return a === b;
+function showWidget(layout, key) {
+  if (!isHidden(layout, key)) return layout;
+  return {
+    ...layout,
+    hidden: layout.hidden.filter((k) => k !== key),
+    minimized: layout.minimized.filter((k) => k !== key)
+  };
 }
-function sameOptionValues(a, b) {
-  const keys = Object.keys({ ...a, ...b });
-  return keys.every((key) => sameValue(a[key], b[key]));
+function toggleHidden(layout, key) {
+  return isHidden(layout, key) ? showWidget(layout, key) : hideWidget(layout, key);
 }
-function optionsCacheSuffix(definition, values, context = {}) {
-  const parts = [];
-  for (const option of definition.options ?? []) {
-    if (isClientApplied(option)) continue;
-    const value = values[option.key];
-    if (sameValue(value, defaultOptionValue(option, context))) continue;
-    parts.push(
-      `${option.key}=${encodeURIComponent(JSON.stringify(value ?? null))}`
-    );
-  }
-  parts.sort();
-  return parts.length === 0 ? "" : `?${parts.join("&")}`;
+function minimizeWidget(layout, key) {
+  if (isMinimized(layout, key)) return layout;
+  return { ...layout, minimized: [...layout.minimized, key] };
 }
-function tableColumnIndex(key) {
-  const match = /^c(\d+)$/.exec(key);
-  return match === null ? void 0 : Number(match[1]);
+function restoreWidget(layout, key) {
+  if (!isMinimized(layout, key)) return layout;
+  return { ...layout, minimized: layout.minimized.filter((k) => k !== key) };
 }
-function sortBarItems(items, sort) {
-  const sign = sort.direction === "desc" ? -1 : 1;
-  return items.map((item, index) => ({ item, index })).sort((a, b) => {
-    const order = sort.column === "value" ? a.item.value - b.item.value : a.item.label.localeCompare(b.item.label);
-    return order * sign || a.index - b.index;
-  }).map(({ item }) => item);
+function toggleMinimized(layout, key) {
+  return isMinimized(layout, key) ? restoreWidget(layout, key) : minimizeWidget(layout, key);
 }
-function applyClientOptions(definition, data, values) {
-  const options = definition.options ?? [];
-  const sortOption = options.find(
-    (o) => o.type === "sort" && o.apply === "client"
-  );
-  const columnsOption = options.find(
-    (o) => o.type === "columns" && o.apply === "client"
-  );
-  const sortValue = sortOption === void 0 ? void 0 : values[sortOption.key];
-  const columnsValue = columnsOption === void 0 ? void 0 : values[columnsOption.key];
-  let next = data;
-  if (typeof sortValue === "string") {
-    const sort = parseSortValue(sortValue);
-    if (sort !== void 0 && next.kind === "BAR_LIST") {
-      if (sort.column === "label" || sort.column === "value") {
-        next = { ...next, items: sortBarItems(next.items, sort) };
-      }
-    } else if (sort !== void 0 && next.kind === "TABLE") {
-      const index = tableColumnIndex(sort.column);
-      if (index !== void 0 && index < next.columns.length) {
-        const sorted = queryRows(tableDetailData(next), {
-          page: 1,
-          pageSize: Math.max(1, next.rows.length),
-          sort
-        });
-        if (sorted.ok) next = { ...next, rows: sorted.value.rows };
-      }
-    }
+function pruneLayout(definitions, layout) {
+  const known = new Set(definitions.map((d) => d.key));
+  const keep = (keys) => keys.every((k) => known.has(k)) ? keys : keys.filter((k) => known.has(k));
+  return mapLayoutLists(layout, (lists) => ({
+    order: keep(lists.order),
+    hidden: keep(lists.hidden),
+    minimized: keep(lists.minimized)
+  }));
+}
+function mapLayoutLists(layout, change) {
+  const top = change(layout);
+  const pages = layout.pages?.map((page) => {
+    const next = change(page);
+    return next.order === page.order && next.hidden === page.hidden && next.minimized === page.minimized ? page : { ...page, ...next };
+  });
+  const pagesChanged = pages !== void 0 && pages.some((page, i) => page !== layout.pages?.[i]);
+  if (top.order === layout.order && top.hidden === layout.hidden && top.minimized === layout.minimized && !pagesChanged) {
+    return layout;
   }
-  if (Array.isArray(columnsValue) && next.kind === "TABLE") {
-    const table = next;
-    const indexes = columnsValue.map(tableColumnIndex).filter(
-      (index) => index !== void 0 && index < table.columns.length
-    );
-    if (indexes.length > 0) {
-      next = {
-        ...table,
-        columns: indexes.map((i) => table.columns[i]),
-        rows: table.rows.map((row) => indexes.map((i) => row[i]))
-      };
-    }
+  return {
+    ...layout,
+    ...top,
+    ...pages === void 0 ? {} : { pages }
+  };
+}
+function enforceLocks(definitions, layout, options = {}) {
+  if (options.overrideLocks === true) return layout;
+  const noMove = /* @__PURE__ */ new Set();
+  const noHide = /* @__PURE__ */ new Set();
+  const noMinimize = /* @__PURE__ */ new Set();
+  for (const definition of definitions) {
+    const lock = resolveWidgetLock(definition);
+    if (lock.move) noMove.add(definition.key);
+    if (lock.hide) noHide.add(definition.key);
+    if (lock.minimize) noMinimize.add(definition.key);
   }
-  return next;
+  const without2 = (keys, drop) => keys.some((key) => drop.has(key)) ? keys.filter((key) => !drop.has(key)) : keys;
+  return mapLayoutLists(layout, (lists) => ({
+    order: without2(lists.order, noMove),
+    hidden: without2(lists.hidden, noHide),
+    minimized: without2(lists.minimized, noMinimize)
+  }));
 }
 
 // src/core/validate.ts
@@ -1227,7 +1499,7 @@ function describeType2(value) {
   }
   return typeof value;
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function join(path, field) {
@@ -1309,7 +1581,7 @@ function requireOneOf(record, field, options, path, problems) {
 function eachRecord(items, path, problems, check) {
   items.forEach((item, index) => {
     const itemPath = `${path}[${index}]`;
-    if (isRecord(item)) {
+    if (isRecord2(item)) {
       check(item, itemPath);
     } else {
       problems.push(
@@ -1458,7 +1730,7 @@ function checkPayloadFields(kind, data, problems) {
 }
 function checkDetailOption(detail, problems) {
   if (detail === void 0 || typeof detail === "boolean") return;
-  if (!isRecord(detail)) {
+  if (!isRecord2(detail)) {
     problems.push(
       `detail must be true, false or an options object, got ${describeType2(detail)}.`
     );
@@ -1477,13 +1749,13 @@ function checkDetailOption(detail, problems) {
 }
 function checkTableControlsOption(controls, kind, problems) {
   if (controls === void 0 || controls === false) return;
-  if (typeof controls !== "boolean" && !isRecord(controls)) {
+  if (typeof controls !== "boolean" && !isRecord2(controls)) {
     problems.push(
       `tableControls must be true, false or an options object, got ${describeType2(controls)}.`
     );
     return;
   }
-  if (isRecord(controls)) {
+  if (isRecord2(controls)) {
     optionalBoolean(controls, "search", "tableControls", problems);
     optionalBoolean(controls, "sort", "tableControls", problems);
   }
@@ -1493,9 +1765,39 @@ function checkTableControlsOption(controls, kind, problems) {
     );
   }
 }
+function checkWidthLimits(value, problems) {
+  for (const field of ["minWidth", "maxWidth"]) {
+    const limit = value[field];
+    if (limit !== void 0 && !isWidgetWidth(limit)) {
+      problems.push(
+        `${field} must be an integer from ${MIN_WIDGET_WIDTH} to ${MAX_WIDGET_WIDTH} (twelfths of the row), got ${typeof limit === "number" ? String(limit) : describeType2(limit)}.`
+      );
+      return;
+    }
+  }
+  const { minWidth, maxWidth, width } = value;
+  if (isWidgetWidth(minWidth) && isWidgetWidth(maxWidth) && minWidth > maxWidth) {
+    problems.push(
+      `minWidth (${minWidth}) must not be more than maxWidth (${maxWidth}).`
+    );
+    return;
+  }
+  if (isWidgetWidth(width)) {
+    if (isWidgetWidth(minWidth) && width < minWidth) {
+      problems.push(
+        `width (${width}) must not be less than minWidth (${minWidth}).`
+      );
+    }
+    if (isWidgetWidth(maxWidth) && width > maxWidth) {
+      problems.push(
+        `width (${width}) must not be more than maxWidth (${maxWidth}).`
+      );
+    }
+  }
+}
 function checkLockedOption(locked, problems) {
   if (locked === void 0 || typeof locked === "boolean") return;
-  if (!isRecord(locked)) {
+  if (!isRecord2(locked)) {
     problems.push(
       `locked must be true, false or an object, got ${describeType2(locked)}.`
     );
@@ -1504,6 +1806,7 @@ function checkLockedOption(locked, problems) {
   optionalBoolean(locked, "move", "locked", problems);
   optionalBoolean(locked, "hide", "locked", problems);
   optionalBoolean(locked, "minimize", "locked", problems);
+  optionalBoolean(locked, "options", "locked", problems);
 }
 function checkOptionColumns(option, path, kind, problems) {
   const columns = option["columns"];
@@ -1516,7 +1819,7 @@ function checkOptionColumns(option, path, kind, problems) {
   const keys = [];
   columns.forEach((entry, index) => {
     const entryPath = `${path}.columns[${index}]`;
-    if (!isRecord(entry)) {
+    if (!isRecord2(entry)) {
       problems.push(
         `${entryPath} must be an object, got ${describeType2(entry)}.`
       );
@@ -1541,7 +1844,7 @@ function checkOptionColumns(option, path, kind, problems) {
   return keys;
 }
 function checkOption(option, path, kind, seenKeys, seenTypes, problems) {
-  if (!isRecord(option)) {
+  if (!isRecord2(option)) {
     problems.push(`${path} must be an object, got ${describeType2(option)}.`);
     return;
   }
@@ -1573,7 +1876,7 @@ function checkOption(option, path, kind, seenKeys, seenTypes, problems) {
       } else {
         choices.forEach((choice, index) => {
           const choicePath = `${path}.choices[${index}]`;
-          if (!isRecord(choice)) {
+          if (!isRecord2(choice)) {
             problems.push(
               `${choicePath} must be an object, got ${describeType2(choice)}.`
             );
@@ -1663,7 +1966,7 @@ function checkOption(option, path, kind, seenKeys, seenTypes, problems) {
         } else {
           presets.forEach((preset, index) => {
             const presetPath = `${path}.presets[${index}]`;
-            if (!isRecord(preset)) {
+            if (!isRecord2(preset)) {
               problems.push(
                 `${presetPath} must be an object, got ${describeType2(preset)}.`
               );
@@ -1790,7 +2093,7 @@ function formatProblems(prefix, problems) {
 }
 function validateWidgetData(value, options = {}) {
   const subject = options.widgetKey === void 0 ? "Widget data" : `Widget ${JSON.stringify(options.widgetKey)}`;
-  if (!isRecord(value)) {
+  if (!isRecord2(value)) {
     return err(`${subject}: must be an object, got ${describeType2(value)}.`);
   }
   if (value["empty"] === true) {
@@ -1820,7 +2123,7 @@ function validateWidgetData(value, options = {}) {
   return ok(value);
 }
 function validateWidgetDefinition(value) {
-  if (!isRecord(value)) {
+  if (!isRecord2(value)) {
     return err(
       `Widget definition: must be an object, got ${describeType2(value)}.`
     );
@@ -1854,6 +2157,7 @@ function validateWidgetDefinition(value) {
       `width must be an integer from ${MIN_WIDGET_WIDTH} to ${MAX_WIDGET_WIDTH} (twelfths of the row), got ${typeof value["width"] === "number" ? String(value["width"]) : describeType2(value["width"])}.`
     );
   }
+  checkWidthLimits(value, problems);
   checkDetailOption(value["detail"], problems);
   checkTableControlsOption(value["tableControls"], value["kind"], problems);
   checkLockedOption(value["locked"], problems);
@@ -2515,7 +2819,7 @@ function withoutLockField(definition) {
   delete copy.locked;
   return copy;
 }
-function uniqueTitle(taken, title, index) {
+function uniqueTitle2(taken, title, index) {
   let base = title.trim().slice(0, MAX_PAGE_TITLE_LENGTH);
   if (base === "") base = `Page ${index + 1}`;
   let candidate = base;
@@ -2536,9 +2840,18 @@ function samePages(a, b) {
 }
 function normalizeLayout(definitions, layout, options = {}) {
   const known = pruneLayout(definitions, layout);
-  const locked = enforceLocks(definitions, known, options);
+  const enforced = enforceLocks(definitions, known, options);
+  const locked = normalizeSettings(
+    definitions,
+    enforced,
+    options
+  );
   if (!hasPages(locked)) return locked === layout ? layout : locked;
-  const defs = options.overrideLocks === true ? definitions.map(withoutLockField) : definitions;
+  const defs = effectiveDefinitions(
+    options.overrideLocks === true ? definitions.map(withoutLockField) : definitions,
+    locked,
+    options
+  );
   const taken = /* @__PURE__ */ new Set();
   const seenKeys = /* @__PURE__ */ new Set();
   const held = /* @__PURE__ */ new Set();
@@ -2551,7 +2864,7 @@ function normalizeLayout(definitions, layout, options = {}) {
     ];
     const next = {
       ...page,
-      title: uniqueTitle(taken, page.title, index),
+      title: uniqueTitle2(taken, page.title, index),
       order: keep(page.order),
       hidden: keep(page.hidden),
       minimized: keep(page.minimized)
@@ -2639,7 +2952,7 @@ function normalizeLayout(definitions, layout, options = {}) {
     }
     if (!placed) {
       const key = nextPageKey(work());
-      const title = uniqueTitle(
+      const title = uniqueTitle2(
         new Set(pages.map((p) => normalizedTitle(p.title))),
         `Page ${pages.length + 1}`,
         pages.length
@@ -2651,7 +2964,7 @@ function normalizeLayout(definitions, layout, options = {}) {
     }
   }
   const result = work();
-  return samePages(layout.pages ?? [], pages) && sameKeys(layout.order, result.order) ? layout : result;
+  return samePages(layout.pages ?? [], pages) && sameKeys(layout.order, result.order) && locked.settings === layout.settings ? layout : result;
 }
 
 // src/core/scale.ts
@@ -3483,6 +3796,6 @@ function indent(block) {
   return block.split("\n").map((line) => `  ${line}`).join("\n");
 }
 
-export { DATE_RANGE_PRESETS, DEFAULT_COMPARISON_LABEL, DEFAULT_CURRENCY, DEFAULT_DETAIL_PAGE_SIZE, DEFAULT_EMPTY_TEXT, DEFAULT_MAX_LAYOUT_BYTES, DEFAULT_PAGE_KEY, DEFAULT_PAGE_ROWS, DETAIL_MODES, EMPTY_LAYOUT, LAYOUT_ENVELOPE_VERSION, MAX_DETAIL_PAGE_SIZE, MAX_GRAPH_SERIES, MAX_PAGE_ROWS, MAX_PAGE_TITLE_LENGTH, MAX_PARSED_PAGES, MAX_REPORTED_PROBLEMS, MAX_TEXT_OPTION_LENGTH, MAX_WIDGET_OPTIONS, MAX_WIDGET_WIDTH, MIN_WIDGET_WIDTH, OPTION_KEY_PATTERN, THEME_TOKEN_VARIABLES, VALUE_FORMATS, WIDGET_FILLS, WIDGET_KINDS, WIDGET_OPTION_TYPES, WIDGET_SIZES, WIDTH_COLUMNS, addPage, applyClientOptions, assignPages, baseColumnSpan, cacheKeyFor, coerceOptionValue, createLayoutPersistence, createTheme, createWidgetLoader, defaultDetailQuery, defaultOptionValue, defineWidget, deriveDetailData, describeUnknownError, emptyTextFor, emptyWidget, enforceLocks, err, failedWidget, fillColumnSpans, fillWidthSpans, fillsHeight, fillsWidth, finalizeWidget, fitCount, formatCount, formatPercentChange, formatValue, fromLegacyDefinition, hasPages, hiddenWidgets, hideWidget, isClientApplied, isColumnKeyFor, isHidden, isIsoInterval, isMinimized, isSafeHref, isSafeImageUrl, isWidgetEmptyState, isWidgetKind, isWidgetVisibleTo, isWidgetWidth, itemWidth, kpiDelta, labelStride, loadingWidgets, memoryAdapter, minimizeWidget, movePage, moveWidget, moveWidgetBy, moveWidgetDown, moveWidgetToPage, moveWidgetUp, nextPageKey, niceDomain, niceStep, normalizeLayout, ok, optionValuesFor, optionsCacheSuffix, pageLayout, pageList, pageOf, pageRoom, pageWidgets, parseDetailQuery, parseLayout, parseSortValue, percentChange, placeRows, pruneLayout, queryRows, readOnly, removePage, renamePage, resolveDateRange, resolveDetailOptions, resolveOptionValues, resolvePageKey, resolvePayload, resolveTableControls, resolveWidget, resolveWidgetLock, resolveWidgetUnapplied, resolveWidgets, restoreWidget, sameOptionValues, serializeDetailQuery, serializeLayout, shareOf, showWidget, sortDefinitions, sortFromOptions, tableDetailData, toggleHidden, toggleMinimized, upgradeLegacyWidgetData, usesWidthColumns, utf8Length, validateDetailData, validateWidgetData, validateWidgetDefinition, visibleWidgets, widgetsFor, widthForSize, withEncoding, withFallback, withLogging, withPageLayout, withPrefix, withReadCache, withRetry };
+export { DATE_RANGE_PRESETS, DEFAULT_COMPARISON_LABEL, DEFAULT_CURRENCY, DEFAULT_DETAIL_PAGE_SIZE, DEFAULT_EMPTY_TEXT, DEFAULT_MAX_LAYOUT_BYTES, DEFAULT_PAGE_KEY, DEFAULT_PAGE_ROWS, DETAIL_MODES, EMPTY_LAYOUT, LAYOUT_ENVELOPE_VERSION, MAX_DETAIL_PAGE_SIZE, MAX_GRAPH_SERIES, MAX_PAGE_ROWS, MAX_PAGE_TITLE_LENGTH, MAX_PARSED_PAGES, MAX_PARSED_SETTINGS, MAX_REPORTED_PROBLEMS, MAX_TEXT_OPTION_LENGTH, MAX_WIDGET_OPTIONS, MAX_WIDGET_TITLE_LENGTH, MAX_WIDGET_WIDTH, MIN_WIDGET_WIDTH, OPTION_KEY_PATTERN, THEME_TOKEN_VARIABLES, VALUE_FORMATS, WIDGET_FILLS, WIDGET_KINDS, WIDGET_OPTION_TYPES, WIDGET_SIZES, WIDTH_COLUMNS, addPage, applyClientOptions, applySettings, assignPages, baseColumnSpan, cacheKeyFor, clearWidgetSettings, coerceOptionValue, createLayoutPersistence, createTheme, createWidgetLoader, defaultDetailQuery, defaultOptionValue, defineWidget, deriveDetailData, describeUnknownError, effectiveDefinitions, emptyTextFor, emptyWidget, enforceLocks, err, failedWidget, fillColumnSpans, fillWidthSpans, fillsHeight, fillsWidth, finalizeWidget, fitCount, formatCount, formatPercentChange, formatValue, fromLegacyDefinition, hasPages, hiddenWidgets, hideWidget, isClientApplied, isColumnKeyFor, isFlexible, isHidden, isIsoInterval, isMinimized, isOptionsLocked, isSafeHref, isSafeImageUrl, isTitleInUse, isWidgetEmptyState, isWidgetKind, isWidgetVisibleTo, isWidgetWidth, itemWidth, kpiDelta, labelStride, loadingWidgets, memoryAdapter, minimizeWidget, movePage, moveWidget, moveWidgetBy, moveWidgetDown, moveWidgetToPage, moveWidgetUp, nextPageKey, niceDomain, niceStep, normalizeLayout, normalizeSettings, normalizeTitle, ok, optionValuesFor, optionValuesFromLayout, optionsCacheSuffix, pageLayout, pageList, pageOf, pageRoom, pageWidgets, parseDetailQuery, parseLayout, parseSettings, parseSortValue, percentChange, placeRows, pruneLayout, queryRows, readOnly, removePage, renamePage, resolveDateRange, resolveDetailOptions, resolveOptionValues, resolvePageKey, resolvePayload, resolveTableControls, resolveWidget, resolveWidgetLock, resolveWidgetUnapplied, resolveWidgets, restoreWidget, sameOptionValues, serializeDetailQuery, serializeLayout, serializeSettings, setWidgetSettings, shareOf, showWidget, sortDefinitions, sortFromOptions, tableDetailData, toggleHidden, toggleMinimized, upgradeLegacyWidgetData, usesWidthColumns, utf8Length, validateDetailData, validateWidgetData, validateWidgetDefinition, visibleWidgets, widgetOptionValues, widgetsFor, widthForSize, widthRange, widthShareLabel, withEncoding, withFallback, withLogging, withPageLayout, withPrefix, withReadCache, withRetry };
 //# sourceMappingURL=core.js.map
 //# sourceMappingURL=core.js.map