stimeo-ui 0.17.0 → 0.18.0

package/dist/controllers/progress_controller.d.ts

@@ -1,19 +1,6 @@
 import { Controller } from '@hotwired/stimulus';
+import { N as NumericValueEvent } from '../coerce-JtZVNG5h.js';
 
-/**
- * Event shape `setValue` accepts: an action param `amount` or a `detail.value`.
- * Both are typed `number | string` because, while Stimulus coerces numeric action
- * params to numbers, a `progress:set` CustomEvent (or a non-numeric-looking param)
- * may carry a string; {@link ProgressController.setValue} normalizes either form.
- */
-type SetValueEvent = Event & {
-    params?: {
-        amount?: number | string;
-    };
-    detail?: {
-        value?: number | string;
-    };
-};
 /**
  * Headless progress-bar behavior backed by the WAI-ARIA `progressbar` role.
  *
@@ -26,7 +13,7 @@ type SetValueEvent = Event & {
  *   </div>
  *
  * This is the *progress over time* role (a task advancing toward completion),
- * deliberately distinct from {@link MeterController}'s point-in-time `meter`. The
+ * deliberately distinct from `stimeo--meter`'s point-in-time `meter`. The
  * controller owns value normalization and ARIA value-attribute synchronization;
  * the bar's width/animation is the consumer's, driven off the
  * `--stimeo--progress-ratio` (0–1) custom property and `data-state`.
@@ -36,8 +23,8 @@ type SetValueEvent = Event & {
  *
  * @remarks
  * Behavior only — no styling is emitted. An indeterminate bar drops
- * `aria-valuenow` (per ARIA) so assistive tech announces "busy" rather than a
- * stale value; the consumer animates the indeterminate look off
+ * `aria-valuenow` (per ARIA) so assistive tech treats the bar as indeterminate
+ * rather than reading a stale value; the consumer animates the indeterminate look off
  * `data-state="indeterminate"`.
  */
 declare class ProgressController extends Controller<HTMLElement> {
@@ -91,14 +78,17 @@ declare class ProgressController extends Controller<HTMLElement> {
     valueTextValue: string;
     announceTextValue: string;
     connect(): void;
-    /** Closes the window in which a queued repaint may still run. */
+    /**
+     * Closes the window in which a queued repaint may still run, and returns
+     * `aria-valuetext` to the authored value unless the page wrote its own meanwhile.
+     */
     disconnect(): void;
     /**
      * Updates the progress value from an action param (`amount`) or a
      * `detail.value` CustomEvent, normalizes it into range, syncs ARIA, and
      * dispatches `change` (always) plus `complete` when `max` is reached.
      */
-    setValue(event: SetValueEvent): void;
+    setValue(event: NumericValueEvent): void;
     /** Repaints when application code (or a Turbo morph) changes `indeterminate` at runtime. */
     indeterminateValueChanged(): void;
     /** Repaints when application code (or a Turbo morph) changes `value` at runtime. */

package/dist/controllers/progress_controller.js

@@ -1,5 +1,12 @@
 import { Controller } from '@hotwired/stimulus';
 
+function fillTemplate(template, values) {
+  return template.replace(/\{([a-zA-Z][a-zA-Z0-9]*)\}/g, (match, name) => {
+    const replacement = Object.hasOwn(values, name) ? values[name] : void 0;
+    return replacement === void 0 ? match : String(replacement);
+  });
+}
+
 function announce(message, options = {}) {
   const text = message.trim();
   if (text.length === 0) return;
@@ -9,12 +16,6 @@ function announce(message, options = {}) {
     })
   );
 }
-function fillTemplate(template, values) {
-  return template.replace(/\{([a-zA-Z][a-zA-Z0-9]*)\}/g, (match, name) => {
-    const replacement = values[name];
-    return replacement === void 0 ? match : String(replacement);
-  });
-}
 
 var NUMBER_BOUNDS = {
   finite: { finite: true }};
@@ -32,6 +33,9 @@ function matchesNumberBounds(value, bounds) {
   return true;
 }
 
+function eventNumber(event) {
+  return toFiniteNumber(event.params?.amount ?? event.detail?.value);
+}
 function toFiniteNumber(raw) {
   if (typeof raw !== "number" && typeof raw !== "string") return null;
   if (typeof raw === "string" && raw.trim().length === 0) return null;
@@ -69,6 +73,9 @@ var MicrotaskCoalescer = class {
     this.#queued = false;
     this.#generation += 1;
   }
+  get pending() {
+    return this.#queued;
+  }
   schedule() {
     if (!this.#active || this.#queued) return;
     this.#queued = true;
@@ -99,6 +106,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();
@@ -133,7 +143,7 @@ var NumberValueReader = class {
 function rangeFraction(value, min, max) {
   const span = max - min;
   if (!(span > 0)) return 0;
-  const clamped = Math.min(max, Math.max(min, value));
+  const clamped = clampRange(value, min, max);
   let fraction;
   if (Number.isFinite(span)) {
     fraction = (clamped - min) / span;
@@ -144,13 +154,254 @@ function rangeFraction(value, min, max) {
   if (!Number.isFinite(fraction)) return 0;
   return Math.min(1, Math.max(0, fraction));
 }
+function clampRange(value, min, max) {
+  return Math.min(max, Math.max(min, value));
+}
+
+function setAttributeIfChanged(element, name, value, beforeWrite) {
+  if (element.getAttribute(name) === value) return false;
+  if (value === null) element.removeAttribute(name);
+  else element.setAttribute(name, value);
+  return true;
+}
+
+function sharedRegistry(key, create) {
+  const symbol = Symbol.for(key);
+  const scope = globalThis;
+  const existing = scope[symbol];
+  if (existing !== void 0) return existing;
+  const registry2 = create();
+  Object.defineProperty(globalThis, symbol, { value: registry2 });
+  return registry2;
+}
+
+var registry = sharedRegistry(
+  "stimeo-ui.attribute-lease.registry.v1",
+  () => ({ stacks: /* @__PURE__ */ new WeakMap(), names: /* @__PURE__ */ new Map() })
+);
+function isAttributeValue(value) {
+  return value === null || typeof value === "string";
+}
+function readLeaseRecord(element, record) {
+  try {
+    const parsed = JSON.parse(element.getAttribute(record) ?? "null");
+    if (!Array.isArray(parsed)) return void 0;
+    const [original, written, ...rest] = parsed;
+    const linked = rest[0] !== false;
+    const beneath = linked ? rest : rest.slice(1);
+    if (!beneath.every((under) => typeof under === "string")) return void 0;
+    return isAttributeValue(original) && isAttributeValue(written) ? { original, written, linked, beneath } : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function attributeStack(element, attribute) {
+  const byAttribute = registry.stacks.get(element) ?? /* @__PURE__ */ new Map();
+  registry.stacks.set(element, byAttribute);
+  const known = byAttribute.get(attribute);
+  if (known) return known;
+  const found = [];
+  for (const record of registry.names.get(attribute) ?? []) {
+    const read = readLeaseRecord(element, record);
+    if (read) found.push({ ...read, record });
+  }
+  const depth = ({ beneath }) => beneath.filter((name) => found.some((other) => other.record === name)).length;
+  const stack = found.sort((one, other) => depth(one) - depth(other)).map(({ record, written, original, linked }, index) => ({
+    lease: null,
+    record,
+    written,
+    original,
+    linked: linked && index > 0
+  }));
+  byAttribute.set(attribute, stack);
+  return stack;
+}
+function findHold(stack, lease, record) {
+  return stack.find((held) => held.lease === lease) ?? stack.find((held) => held.lease === null && held.record === record);
+}
+function readAttributeLease(element, attribute, owner, lease, expected) {
+  const stack = attributeStack(element, attribute);
+  const hold = findHold(stack, lease, `data-${owner}-${attribute}-lease`);
+  const current = element.getAttribute(attribute);
+  const covering = [...stack].reverse().find((other) => other.written === current);
+  const original = (hold ?? covering)?.original;
+  const authored = original === void 0 ? current : original;
+  return {
+    original: authored,
+    allowed: hold ? current === hold.written || stack.slice(stack.indexOf(hold) + 1).some((above) => above.written === current) : authored === expected
+  };
+}
+var AttributeLease = class {
+  #attribute;
+  #record;
+  #base;
+  #preserveAuthor;
+  #held = /* @__PURE__ */ new Set();
+  constructor(attribute, owner, options = {}) {
+    this.#attribute = attribute;
+    this.#record = `data-${owner}-${attribute}-lease`;
+    this.#base = options.base === true;
+    this.#preserveAuthor = options.preserveAuthor === true;
+    const names = registry.names;
+    names.set(attribute, (names.get(attribute) ?? /* @__PURE__ */ new Set()).add(this.#record));
+  }
+  write(element, value) {
+    const stack = attributeStack(element, this.#attribute);
+    const hold = this.#take(stack) ?? this.#acquire(element, stack);
+    this.#held.add(element);
+    const shows = !this.#covered(element, stack, hold);
+    hold.written = value;
+    this.#mark(element, stack);
+    if (shows) this.#reflect(element, value);
+  }
+  return(element) {
+    const held = this.#held.delete(element);
+    const known = registry.stacks.get(element)?.has(this.#attribute);
+    const stack = held || known || element.hasAttribute(this.#record) ? attributeStack(element, this.#attribute) : [];
+    const hold = this.#take(stack);
+    if (!hold) return false;
+    const carries = element.getAttribute(this.#attribute) === hold.written;
+    const owns = carries && !this.#covered(element, stack, hold);
+    const index = stack.indexOf(hold);
+    stack.splice(index, 1);
+    const above = stack[index];
+    if (above) above.linked &&= hold.linked;
+    this.#mark(element, stack);
+    if (!owns) return true;
+    const below = hold.linked ? stack[index - 1] : void 0;
+    this.#reflect(element, below ? below.written : hold.original);
+    return true;
+  }
+  returnAll() {
+    for (const element of Array.from(this.#held)) this.return(element);
+  }
+  #take(stack) {
+    const hold = findHold(stack, this, this.#record);
+    if (hold) hold.lease = this;
+    return hold;
+  }
+  #acquire(element, stack) {
+    const current = element.getAttribute(this.#attribute);
+    const top = stack.at(-1);
+    const bottom = stack[0];
+    const over = top?.written === current ? top : void 0;
+    const from = this.#base ? this.#preserveAuthor && !stack.some((held) => held.written === current) ? void 0 : bottom : over;
+    const hold = {
+      lease: this,
+      record: this.#record,
+      written: current,
+      original: from ? from.original : current,
+      linked: !this.#base && over !== void 0
+    };
+    if (this.#base && bottom) {
+      bottom.linked = true;
+      stack.unshift(hold);
+    } else stack.push(hold);
+    return hold;
+  }
+  #covered(element, stack, hold) {
+    const current = element.getAttribute(this.#attribute);
+    return stack.slice(stack.indexOf(hold) + 1).some((above) => above.written === current);
+  }
+  #mark(element, stack) {
+    const records = /* @__PURE__ */ new Map([[this.#record, null]]);
+    stack.forEach((hold, index) => {
+      const names = stack.slice(0, index).map((under) => under.record);
+      const beneath = [...new Set(names.reverse())].filter((name) => name !== hold.record);
+      const marker = hold.linked || beneath.length === 0 ? [] : [false];
+      records.set(
+        hold.record,
+        hold.written === hold.original && beneath.length === 0 && index === stack.length - 1 ? null : JSON.stringify([hold.original, hold.written, ...marker, ...beneath])
+      );
+    });
+    for (const [name, recorded] of records) {
+      setAttributeIfChanged(element, name, recorded);
+    }
+  }
+  #reflect(element, value) {
+    setAttributeIfChanged(element, this.#attribute, value);
+  }
+};
+
+var TemplateAttributeLease = class {
+  #lease;
+  #record;
+  #attribute;
+  #owner;
+  #states = /* @__PURE__ */ new WeakMap();
+  constructor(attribute, owner) {
+    this.#attribute = attribute;
+    this.#owner = owner;
+    this.#lease = new AttributeLease(attribute, owner, { base: true, preserveAuthor: true });
+    this.#record = `data-${owner}-${attribute}-template`;
+  }
+  render(element, source, value) {
+    let state = this.#read(element);
+    if (!state && source.length === 0) {
+      this.#lease.return(element);
+      return;
+    }
+    if (!state || state.source !== source) {
+      this.#lease.return(element);
+      state = { source, expected: this.#view(element, null).original, yielded: false };
+    }
+    if (source.length === 0 || value === null) {
+      this.#states.set(element, state);
+      this.release(element);
+      return;
+    }
+    if (!state.yielded && this.#continues(element, state)) {
+      this.#lease.write(element, value);
+      state.expected = value;
+    } else {
+      state.yielded = true;
+      this.#lease.return(element);
+    }
+    this.#mark(element, state);
+  }
+  release(element) {
+    const state = this.#read(element);
+    if (state && !state.yielded) {
+      state.yielded = !this.#continues(element, state);
+      if (!state.yielded) state.expected = this.#view(element, null).original;
+    }
+    this.#lease.return(element);
+    if (state) this.#mark(element, state);
+  }
+  #continues(element, state) {
+    const view = this.#view(element, state.expected);
+    return view.allowed || !element.hasAttribute(this.#record) && element.getAttribute(this.#attribute) === view.original;
+  }
+  #view(element, expected) {
+    return readAttributeLease(element, this.#attribute, this.#owner, this.#lease, expected);
+  }
+  #read(element) {
+    const live = this.#states.get(element);
+    if (live) return live;
+    try {
+      const parsed = JSON.parse(element.getAttribute(this.#record) ?? "null");
+      if (!Array.isArray(parsed) || parsed.length !== 3) return void 0;
+      const [source, expected, yielded] = parsed;
+      if (typeof source !== "string" || expected !== null && typeof expected !== "string" || typeof yielded !== "boolean")
+        return void 0;
+      return { source, expected, yielded };
+    } catch {
+      return void 0;
+    }
+  }
+  #mark(element, state) {
+    this.#states.set(element, state);
+    setAttributeIfChanged(
+      element,
+      this.#record,
+      JSON.stringify([state.source, state.expected, state.yielded])
+    );
+  }
+};
 
-var OWNED_VALUE_TEXT = "owns-valuetext";
 var ProgressController = class _ProgressController extends Controller {
   #numbers = new NumberValueReader();
-  get #ownedValueText() {
-    return `data-${this.identifier}-${OWNED_VALUE_TEXT}`;
-  }
+  #valueText = new TemplateAttributeLease("aria-valuetext", this.identifier);
   static targets = ["bar"];
   static values = {
     value: { type: Number, default: 0 },
@@ -176,9 +427,10 @@ var ProgressController = class _ProgressController extends Controller {
   }
   disconnect() {
     this.#repaint.disconnect();
+    this.#valueText.release(this.element);
   }
   setValue(event) {
-    const next = toFiniteNumber(event.params?.amount ?? event.detail?.value);
+    const next = eventNumber(event);
     if (next === null) return;
     const value = this.#clamp(next);
     this.valueValue = value;
@@ -208,7 +460,7 @@ var ProgressController = class _ProgressController extends Controller {
     this.#repaint.schedule();
   }
   #clamp(raw) {
-    return Math.min(this.#safeMax, Math.max(this.#safeMin, raw));
+    return clampRange(raw, this.#safeMin, this.#safeMax);
   }
   get #ratio() {
     return rangeFraction(this.#safeValue, this.#safeMin, this.#safeMax);
@@ -218,7 +470,7 @@ var ProgressController = class _ProgressController extends Controller {
     this.element.setAttribute("aria-valuemax", String(this.#safeMax));
     if (this.indeterminateValue) {
       this.element.removeAttribute("aria-valuenow");
-      this.#clearOwnValueText();
+      this.#valueText.render(this.element, this.valueTextValue, null);
       this.element.style.removeProperty("--stimeo--progress-ratio");
       this.element.setAttribute("data-state", "indeterminate");
       return;
@@ -230,19 +482,11 @@ var ProgressController = class _ProgressController extends Controller {
     this.#applyValueText(value);
   }
   #applyValueText(value) {
-    if (this.valueTextValue.length === 0) {
-      this.#clearOwnValueText();
-      return;
-    }
-    const percent = Math.round(this.#ratio * 100);
-    const text = this.valueTextValue.replaceAll("{value}", String(value)).replaceAll("{percent}", String(percent));
-    this.element.setAttribute("aria-valuetext", text);
-    this.element.setAttribute(this.#ownedValueText, "");
-  }
-  #clearOwnValueText() {
-    if (!this.element.hasAttribute(this.#ownedValueText)) return;
-    this.element.removeAttribute("aria-valuetext");
-    this.element.removeAttribute(this.#ownedValueText);
+    this.#valueText.render(
+      this.element,
+      this.valueTextValue,
+      fillTemplate(this.valueTextValue, { value, percent: Math.round(this.#ratio * 100) })
+    );
   }
   get #safeValue() {
     return this.#numbers.read(