stimeo-ui 0.16.0 → 0.18.0

package/dist/controllers/skeleton_controller.d.ts

@@ -38,16 +38,39 @@ declare class SkeletonController extends Controller<HTMLElement> {
             default: number;
         };
     };
+    static valueConstraints: {
+        minDuration: {
+            readonly finite: true;
+            readonly min: 0;
+            readonly max: 2147483647;
+        };
+    };
     static actions: readonly ["ready", "reset"];
     static events: readonly ["ready"];
     readonly placeholderTarget: HTMLElement;
+    readonly placeholderTargets: HTMLElement[];
     readonly contentTarget: HTMLElement;
+    readonly contentTargets: HTMLElement[];
     readonly hasPlaceholderTarget: boolean;
     readonly hasContentTarget: boolean;
     minDurationValue: number;
     announceReadyTextValue: string;
     connect(): void;
     disconnect(): void;
+    /** Shows or hides a placeholder that arrives at runtime as the phase calls for. */
+    placeholderTargetConnected(): void;
+    /**
+     * Gives a placeholder that no longer resolves its own `hidden` back, even after
+     * `disconnect()`, and while connected repaints the placeholder that stays.
+     */
+    placeholderTargetDisconnected(placeholder: HTMLElement): void;
+    /** Shows or hides content that arrives at runtime as the phase calls for. */
+    contentTargetConnected(): void;
+    /**
+     * Gives content that no longer resolves its own `hidden` back, even after
+     * `disconnect()`, and while connected repaints the content that stays.
+     */
+    contentTargetDisconnected(content: HTMLElement): void;
     /** Swaps to the real content. Honors `minDuration` to prevent a flash. */
     ready(): void;
     /** Returns to the loading state (e.g. a Turbo Stream re-fetch). */

package/dist/controllers/skeleton_controller.js

@@ -1,8 +1,12 @@
 import { Controller } from '@hotwired/stimulus';
 
-// src/controllers/skeleton_controller.ts
+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);
+  });
+}
 
-// src/utils/announce.ts
 function announce(message, options = {}) {
   const text = message.trim();
   if (text.length === 0) return;
@@ -12,95 +16,210 @@ 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);
-  });
+
+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;
 }
 
-// src/utils/detach_gate.ts
+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);
+}
+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 DetachGate = class _DetachGate {
-  /** Set while a probe is queued, waiting for a reconnect to cancel it. */
   #pending = false;
-  /**
-   * True while a probe is queued — the last disconnect was ambiguous and no
-   * reconnect has cancelled it yet. Read it from `connect()` to tell the
-   * reconnect half of an in-page move from a first connect: a controller whose
-   * initialisation restarts a measurement (a min-duration floor, an elapsed
-   * counter) must skip it for the move, where nothing actually restarted.
-   */
   get pending() {
     return this.#pending;
   }
-  /**
-   * True when the disconnect is definitely a real detach — the element left
-   * the document, or `data-controller` no longer lists the identifier. False
-   * means ambiguous (in-page move or observed-root exit), NOT "alive".
-   */
   static isDetached(host) {
-    if (!host.element.isConnected) return true;
-    const tokens = (host.element.getAttribute("data-controller") ?? "").split(/\s+/);
-    return !tokens.includes(host.identifier);
-  }
-  /**
-   * Call from `disconnect()`: runs `teardown` synchronously on a definite
-   * detach (fast path), otherwise defers it one microtask — a reconnect
-   * ({@link cancel} from `connect()`) keeps the state, no reconnect runs it.
-   * One microtask is the whole probe window: Stimulus reconnects a moved
-   * element within the same mutation batch, before the checkpoint drains.
-   */
+    return !host.element.isConnected || !_DetachGate.#listed(host);
+  }
   disconnected(host, teardown) {
-    if (_DetachGate.isDetached(host)) {
+    const carried = _DetachGate.#carried(host);
+    if (!carried && _DetachGate.isDetached(host)) {
       this.#pending = false;
       teardown();
       return;
     }
     this.#pending = true;
-    queueMicrotask(() => {
+    const probe = () => {
       if (!this.#pending) return;
       this.#pending = false;
       teardown();
-    });
+    };
+    if (carried) setTimeout(probe, 0);
+    else queueMicrotask(probe);
+  }
+  static #carried(host) {
+    const element = host.element;
+    return !element.isConnected && element.closest("[data-turbo-permanent]") !== null && _DetachGate.#listed(host);
+  }
+  static #listed(host) {
+    const tokens = (host.element.getAttribute("data-controller") ?? "").split(/\s+/);
+    return tokens.includes(host.identifier);
   }
-  /**
-   * Disarms a pending probe. Call from `connect()` (the reconnect that proves
-   * an in-page move) and from the head of any teardown path not routed through
-   * {@link disconnected} (disabled-toggle, Escape), so an orphaned probe can
-   * never run the teardown a second time.
-   */
   cancel() {
     this.#pending = false;
   }
 };
 
-// src/utils/min_duration_floor.ts
 var MinDurationFloor = class {
   #timers;
-  /** Pending finish timer id, or `null` when nothing is held back. */
   #timerId = null;
-  /** Epoch ms the floor is measured from. */
   #since = 0;
-  /** @param timers - the controller's registry; the floor schedules into it. */
   constructor(timers) {
     this.#timers = timers;
   }
-  /** Starts the floor: call when the state being held becomes visible. */
   begin() {
     this.#since = Date.now();
   }
-  /** True while a finish is held back waiting for the floor to elapse. */
   get pending() {
     return this.#timerId !== null;
   }
-  /**
-   * Runs `finish` once the floor has elapsed, immediately when it already has.
-   *
-   * A held-back finish is **replaced**, never stacked: only the most recently
-   * queued id is cancellable, so a second timer would outlive every cancel and
-   * end a state that has since restarted. Controllers that want the first signal
-   * to win guard on {@link pending} before calling.
-   */
   schedule(minDuration, finish) {
     this.cancel();
     const remaining = minDuration - (Date.now() - this.#since);
@@ -113,7 +232,6 @@ var MinDurationFloor = class {
       finish();
     }
   }
-  /** Drops a held-back finish. Safe when none is queued, or after a bulk clear. */
   cancel() {
     if (this.#timerId !== null) {
       this.#timers.clear(this.#timerId);
@@ -122,43 +240,70 @@ var MinDurationFloor = class {
   }
 };
 
-// src/utils/safe_timeout.ts
+var MAX_TIMER_DELAY_MS = 2147483647;
+
+var NUMBER_BOUNDS = {
+  timer: { finite: true, min: 0, max: MAX_TIMER_DELAY_MS }};
+function matchesNumberBounds(value, bounds) {
+  if (!Number.isFinite(value)) {
+    const direction = value === Infinity ? "positive" : value === -Infinity ? "negative" : null;
+    if (direction === null) return false;
+    if (bounds.allowInfinity !== "both" && bounds.allowInfinity !== direction) return false;
+  }
+  if (bounds.min !== void 0 && value < bounds.min) return false;
+  if (bounds.max !== void 0 && value > bounds.max) return false;
+  if (bounds.exclusiveMin !== void 0 && value <= bounds.exclusiveMin) return false;
+  if (bounds.integer && !Number.isInteger(value)) return false;
+  if (bounds.allowedValues !== void 0 && !bounds.allowedValues.includes(value)) return false;
+  return true;
+}
+
+function readNumber(raw, fallback, bounds) {
+  return matchesNumberBounds(raw, bounds) ? raw : fallback;
+}
+
+var NumberValueReader = class {
+  #lastRejected = /* @__PURE__ */ new Map();
+  read(owner, name, raw, fallback, bounds) {
+    const resolved = readNumber(raw, fallback, bounds);
+    if (matchesNumberBounds(raw, bounds)) {
+      this.#lastRejected.delete(name);
+      return resolved;
+    }
+    const attribute = `data-${owner.identifier}-${name.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`)}-value`;
+    const literal = owner.element.getAttribute(attribute);
+    if (literal === null) {
+      this.#lastRejected.delete(name);
+      return resolved;
+    }
+    if (this.#lastRejected.get(name) !== literal) {
+      this.#lastRejected.set(name, literal);
+      console.warn(
+        `Stimeo UI: "${owner.identifier}" has an invalid number Value "${name}" declaration ${JSON.stringify(literal)}; using ${fallback}.`
+      );
+    }
+    return resolved;
+  }
+};
+
 var TimerRegistry = class {
-  /** Live timer ids that have not yet been cleared (or, for timeouts, fired). */
   ids = /* @__PURE__ */ new Set();
-  /**
-   * Cancels a single tracked timer.
-   *
-   * No-ops if the id is unknown (already cleared, fired, or never owned by this
-   * registry), so callers can clear defensively without guarding.
-   */
   clear(id) {
     if (this.ids.delete(id)) {
       this.cancel(id);
     }
   }
-  /**
-   * Cancels every tracked timer. Call this from a controller's `disconnect()`
-   * to guarantee no timer outlives the element.
-   */
   clearAll() {
     for (const id of this.ids) {
       this.cancel(id);
     }
     this.ids.clear();
   }
-  /** Number of timers currently tracked (pending). */
   get size() {
     return this.ids.size;
   }
 };
 var SafeTimeout = class extends TimerRegistry {
-  /**
-   * Schedules `callback` after `delay` ms and returns the timer id.
-   *
-   * The id is removed from the registry automatically when the timeout fires,
-   * so {@link TimerRegistry.size | size} reflects only still-pending timers.
-   */
   set(callback, delay) {
     const id = this.schedule(() => {
       this.ids.delete(id);
@@ -175,19 +320,25 @@ var SafeTimeout = class extends TimerRegistry {
   }
 };
 
-// src/controllers/skeleton_controller.ts
-var SkeletonController = class extends Controller {
+var SkeletonController = class _SkeletonController extends Controller {
+  #numbers = new NumberValueReader();
   static targets = ["placeholder", "content"];
   static values = {
     announceReadyText: { type: String, default: "" },
     minDuration: { type: Number, default: 0 }
   };
+  static valueConstraints = {
+    minDuration: NUMBER_BOUNDS.timer
+  };
   static actions = ["ready", "reset"];
   static events = ["ready"];
   #timers = new SafeTimeout();
   #floor = new MinDurationFloor(this.#timers);
   #gate = new DetachGate();
+  #hidden = new AttributeLease("hidden", this.identifier);
+  #connected = false;
   connect() {
+    this.#connected = true;
     const moved = this.#gate.pending;
     this.#gate.cancel();
     if (!moved && this.#state !== "ready") {
@@ -195,57 +346,64 @@ var SkeletonController = class extends Controller {
     }
   }
   disconnect() {
+    this.#connected = false;
     this.#gate.disconnected(this, () => this.#teardown());
   }
-  /** Swaps to the real content. Honors `minDuration` to prevent a flash. */
+  placeholderTargetConnected() {
+    if (this.#connected) this.#reflect(this.#state === "ready");
+  }
+  placeholderTargetDisconnected(placeholder) {
+    if (!this.placeholderTargets.includes(placeholder)) this.#hidden.return(placeholder);
+    if (this.#connected) this.#reflect(this.#state === "ready");
+  }
+  contentTargetConnected() {
+    if (this.#connected) this.#reflect(this.#state === "ready");
+  }
+  contentTargetDisconnected(content) {
+    if (!this.contentTargets.includes(content)) this.#hidden.return(content);
+    if (this.#connected) this.#reflect(this.#state === "ready");
+  }
   ready() {
     if (this.#state === "ready" || this.#floor.pending) return;
-    this.#floor.schedule(this.minDurationValue, () => this.#reveal());
+    this.#floor.schedule(this.#safeMinDuration, () => this.#reveal());
   }
-  /** Returns to the loading state (e.g. a Turbo Stream re-fetch). */
   reset() {
     this.#floor.cancel();
     this.#enterLoading();
   }
-  /** Shows the placeholder, hides content, and marks the region busy. */
   #enterLoading() {
     this.#floor.begin();
-    if (this.hasPlaceholderTarget) this.placeholderTarget.hidden = false;
-    if (this.hasContentTarget) this.contentTarget.hidden = true;
+    this.#reflect(false);
     this.element.setAttribute("aria-busy", "true");
     this.element.setAttribute("data-state", "loading");
   }
-  /**
-   * Hides the placeholder, shows content, and clears the busy state.
-   *
-   * @stimeoRuntimeOnly `announceReadyText` is the wording of the one announcement this reveal
-   *   makes.
-   */
   #reveal() {
-    if (this.hasPlaceholderTarget) this.placeholderTarget.hidden = true;
-    if (this.hasContentTarget) this.contentTarget.hidden = false;
+    this.#reflect(true);
     this.element.setAttribute("aria-busy", "false");
     this.element.setAttribute("data-state", "ready");
     this.dispatch("ready", { detail: {} });
     announce(fillTemplate(this.announceReadyTextValue, {}));
   }
-  /**
-   * Drops the held reveal on a real detach. The markup keeps whatever it last
-   * held: an element on its way out of the document has no reader left, and one
-   * whose `data-controller` dropped the identifier no longer resolves its own
-   * targets, so the rollback could only ever be partial.
-   */
+  #reflect(ready) {
+    if (this.hasPlaceholderTarget) this.#hidden.write(this.placeholderTarget, ready ? "" : null);
+    if (this.hasContentTarget) this.#hidden.write(this.contentTarget, ready ? null : "");
+  }
   #teardown() {
-    this.#gate.cancel();
-    this.#timers.clearAll();
     this.#floor.cancel();
   }
-  /** Current lifecycle phase as reflected on `data-state`. */
   get #state() {
     return this.element.getAttribute("data-state") ?? "loading";
   }
+  get #safeMinDuration() {
+    return this.#numbers.read(
+      this,
+      "minDuration",
+      this.minDurationValue,
+      _SkeletonController.values.minDuration.default,
+      _SkeletonController.valueConstraints.minDuration
+    );
+  }
 };
 
 export { SkeletonController };
-//# sourceMappingURL=skeleton_controller.js.map
 //# sourceMappingURL=skeleton_controller.js.map