@perspective-dev/viewer 5.0.0 → 5.1.0

package/src/rust/utils/browser/dragdrop.rs

@@ -17,6 +17,18 @@ pub enum DragTarget {
     SplitBy,
     Sort,
     Filter,
+    WindowSource,
+    WindowOrderBy,
+    WindowPartitionBy,
+}
+
+impl DragTarget {
+    pub fn is_staged(&self) -> bool {
+        matches!(
+            self,
+            Self::WindowSource | Self::WindowOrderBy | Self::WindowPartitionBy
+        )
+    }
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]

package/src/rust/utils/browser/tests/debounce.rs

@@ -86,6 +86,55 @@ pub async fn test_lock_seq() {
     assert_eq!(cell.get(), 10);
 }
 
+/// A dedicated [`DebounceSlot`]'s task must RUN even when the default slot
+/// has a parked runner — coalescing is scoped per slot. Pre-slot (one
+/// shared parked flag), `t4` would resolve via `t2`'s settle without its
+/// closure ever running: the resize-eaten-by-parked-update bug.
+#[wasm_bindgen_test]
+pub async fn test_slot_isolated_from_default_coalescing() {
+    let debounce_mutex = DebounceMutex::default();
+    let slot = debounce_mutex.slot();
+    let defaults: Rc<Cell<u32>> = Rc::new(Cell::new(0));
+    let slots: Rc<Cell<u32>> = Rc::new(Cell::new(0));
+
+    let t1 = debounce_mutex.lock(async {
+        set_timeout(10).await.unwrap();
+    });
+
+    let t2 = {
+        let defaults = defaults.clone();
+        debounce_mutex.debounce(async move {
+            defaults.set(defaults.get() + 1);
+            Ok(())
+        })
+    };
+
+    let t3 = {
+        let defaults = defaults.clone();
+        debounce_mutex.debounce(async move {
+            defaults.set(defaults.get() + 100);
+            Ok(())
+        })
+    };
+
+    let t4 = {
+        let slots = slots.clone();
+        slot.debounce_with(|_| async move {
+            slots.set(slots.get() + 1);
+            Ok(())
+        })
+    };
+
+    let (_, r2, r3, r4) = futures::join!(t1, t2, t3, t4);
+    r2.unwrap();
+    r3.unwrap();
+    r4.unwrap();
+
+    // `t3` coalesced onto the parked `t2`; `t4` ran its own closure.
+    assert_eq!(defaults.get(), 1);
+    assert_eq!(slots.get(), 1);
+}
+
 #[wasm_bindgen_test]
 pub async fn test_debounce_seq() {
     let debounce_mutex = DebounceMutex::default();

package/src/rust/utils/debounce.rs

@@ -33,16 +33,27 @@ pub struct RenderGuard {
     _private: (),
 }
 
+/// The per-slot debounce bookkeeping: one running + one parked evaluation,
+/// with coalesced callers awaiting the parked runner's settle. Kept
+/// per-[`DebounceSlot`] so coalescing is only expressible WITHIN a kind —
+/// a caller can never be absorbed by a parked runner of a different kind
+/// whose work does not subsume it (the resize-eaten-by-parked-update bug).
 #[derive(Default)]
-struct DebounceMutexData {
+struct SlotState {
     id: Cell<u64>,
-    held: Cell<bool>,
-    mutex: Mutex<u64>,
+    last: Cell<u64>,
     parked: Cell<bool>,
     settled_id: Cell<u64>,
     on_settle: PubSub<()>,
 }
 
+#[derive(Default)]
+struct DebounceMutexData {
+    held: Cell<bool>,
+    mutex: Mutex<()>,
+    default_slot: Rc<SlotState>,
+}
+
 /// Clears the `held` flag on drop, so cancellation of a locked task (its
 /// future dropped mid-await) can't leave [`DebounceMutex::is_held`] stuck
 /// `true`.
@@ -67,25 +78,25 @@ impl Drop for HeldFlag<'_> {
 /// mid-run still frees the parked slot and releases its coalesced waiters,
 /// so they can never be stranded awaiting a settle that no task will emit.
 struct SettleGuard<'a> {
-    data: &'a DebounceMutexData,
+    state: &'a SlotState,
     next: u64,
 }
 
 impl<'a> SettleGuard<'a> {
-    fn park(data: &'a DebounceMutexData, next: u64) -> Self {
-        data.parked.set(true);
-        Self { data, next }
+    fn park(state: &'a SlotState, next: u64) -> Self {
+        state.parked.set(true);
+        Self { state, next }
     }
 }
 
 impl Drop for SettleGuard<'_> {
     fn drop(&mut self) {
-        self.data.parked.set(false);
-        if self.data.settled_id.get() < self.next {
-            self.data.settled_id.set(self.next);
+        self.state.parked.set(false);
+        if self.state.settled_id.get() < self.next {
+            self.state.settled_id.set(self.next);
         }
 
-        self.data.on_settle.emit(());
+        self.state.on_settle.emit(());
     }
 }
 
@@ -123,12 +134,11 @@ impl DebounceMutex {
         F: FnOnce(RenderGuard) -> Fut,
         Fut: Future<Output = T>,
     {
-        let mut last = self.0.mutex.lock().await;
-        let next = self.0.id.get();
+        let guard = self.0.mutex.lock().await;
         let held = HeldFlag::set(&self.0.held);
         let result = f(RenderGuard { _private: () }).await;
         drop(held);
-        *last = next;
+        drop(guard);
         result
     }
 
@@ -144,23 +154,62 @@ impl DebounceMutex {
         F: FnOnce(RenderGuard) -> Fut,
         Fut: Future<Output = ApiResult<T>>,
     {
-        let next = self.0.id.get() + 1;
-        if self.0.parked.get() {
+        DebounceSlot {
+            mutex: self.clone(),
+            state: self.0.default_slot.clone(),
+        }
+        .debounce_with(f)
+        .await
+    }
+
+    /// A NEW debounce slot over this mutex: its tasks serialize against
+    /// every other locked task, but coalesce only among themselves.
+    pub fn slot(&self) -> DebounceSlot {
+        DebounceSlot {
+            mutex: self.clone(),
+            state: Default::default(),
+        }
+    }
+}
+
+/// One debounce KIND over a shared [`DebounceMutex`]. Execution is
+/// exclusive across the whole mutex; coalescing (a caller resolving via a
+/// parked runner instead of queueing) is scoped to the slot. A coalesced
+/// caller's work must be subsumable by any same-slot runner that runs no
+/// earlier than the call — which is why parameterized tasks sharing a slot
+/// must read their parameters at RUN time (e.g. the [`Renderer`] geometry
+/// command cell), never capture them at call time.
+#[derive(Clone)]
+pub struct DebounceSlot {
+    mutex: DebounceMutex,
+    state: Rc<SlotState>,
+}
+
+impl DebounceSlot {
+    pub async fn debounce_with<T, F, Fut>(&self, f: F) -> ApiResult<T>
+    where
+        T: Default,
+        F: FnOnce(RenderGuard) -> Fut,
+        Fut: Future<Output = ApiResult<T>>,
+    {
+        let state = &self.state;
+        let next = state.id.get() + 1;
+        if state.parked.get() {
             self.await_settled(next).await;
             return Ok(T::default());
         }
 
-        let settle = SettleGuard::park(&self.0, next);
-        let mut last = self.0.mutex.lock().await;
-        self.0.parked.set(false);
-        let result = if *last < next {
-            let next = self.0.id.get() + 1;
-            self.0.id.set(next);
-            let held = HeldFlag::set(&self.0.held);
+        let settle = SettleGuard::park(state, next);
+        let guard = self.mutex.0.mutex.lock().await;
+        state.parked.set(false);
+        let result = if state.last.get() < next {
+            let next = state.id.get() + 1;
+            state.id.set(next);
+            let held = HeldFlag::set(&self.mutex.0.held);
             let result = f(RenderGuard { _private: () }).await;
             drop(held);
             if result.is_ok() {
-                *last = next;
+                state.last.set(next);
             }
 
             result
@@ -168,14 +217,14 @@ impl DebounceMutex {
             Ok(T::default())
         };
 
-        drop(last);
+        drop(guard);
         drop(settle);
         result
     }
 
     async fn await_settled(&self, next: u64) {
-        while self.0.settled_id.get() < next {
-            if self.0.on_settle.read_next().await.is_err() {
+        while self.state.settled_id.get() < next {
+            if self.state.on_settle.read_next().await.is_err() {
                 break;
             }
         }

package/src/svg/pin-icon.svg

@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M8 2h6v2l-1 1v4l3 2v2h-4v6l-1 2-1-2v-6H6v-2l3-2V5L8 4z"
+        stroke="#042121" />
+</svg>

package/src/themes/icons.css

@@ -52,6 +52,7 @@ perspective-viewer-tab {
     --psp-icon--sort-none--mask-image: url("../svg/sort-none-icon.svg");
     --psp-icon--add-expression--mask-image: url("../svg/expression.svg");
     --psp-icon--close--mask-image: url("../svg/close-icon.svg");
+    --psp-icon--pin--mask-image: url("../svg/pin-icon.svg");
     --psp-label--inactive-column-selector--content: url("../svg/checkbox-unchecked-icon.svg");
     --psp-label--active-column-selector--content: url("../svg/checkbox-checked-icon.svg");
     --psp-icon--select-arrow-light--mask-image: url("../svg/dropdown-selector-light.svg");

package/src/themes/intl/de.css

@@ -108,6 +108,13 @@ perspective-dropdown {
     /* Tabs */
     --psp-label--style-tab--content: "Stil";
     --psp-label--attributes-tab--content: "Attribute";
+    --psp-label--window-tab--content: "Fenster";
+    --psp-label--window-source--content: "Spalte";
+    --psp-label--window-order-by--content: "Sortieren nach";
+    --psp-label--window-partition-by--content: "Partitionieren nach";
+    --psp-label--window-frame--content: "Rahmen";
+    --psp-label--window-offset--content: "Versatz";
+    --psp-label--window-alpha--content: "Alpha";
     --psp-label--query-tab--content: "Abfrage";
     --psp-label--plugin-tab--content: "Plugin";
     --psp-label--debug-tab--content: "JSON";

package/src/themes/intl/es.css

@@ -108,6 +108,13 @@ perspective-dropdown {
     /* Tabs */
     --psp-label--style-tab--content: "Estilo";
     --psp-label--attributes-tab--content: "Atributos";
+    --psp-label--window-tab--content: "Ventana";
+    --psp-label--window-source--content: "Columna";
+    --psp-label--window-order-by--content: "Ordenar por";
+    --psp-label--window-partition-by--content: "Particionar por";
+    --psp-label--window-frame--content: "Marco";
+    --psp-label--window-offset--content: "Desplazamiento";
+    --psp-label--window-alpha--content: "Alfa";
     --psp-label--query-tab--content: "Consulta";
     --psp-label--plugin-tab--content: "Plugin";
     --psp-label--debug-tab--content: "JSON";

package/src/themes/intl/fr.css

@@ -108,6 +108,13 @@ perspective-dropdown {
     /* Tabs */
     --psp-label--style-tab--content: "Style";
     --psp-label--attributes-tab--content: "Les attributs";
+    --psp-label--window-tab--content: "Fenêtre";
+    --psp-label--window-source--content: "Colonne";
+    --psp-label--window-order-by--content: "Commandé par";
+    --psp-label--window-partition-by--content: "Partitionner par";
+    --psp-label--window-frame--content: "Cadre";
+    --psp-label--window-offset--content: "Décalage";
+    --psp-label--window-alpha--content: "Alpha";
     --psp-label--query-tab--content: "Requête";
     --psp-label--plugin-tab--content: "Plugin";
     --psp-label--debug-tab--content: "JSON";

package/src/themes/intl/ja.css

@@ -108,6 +108,13 @@ perspective-dropdown {
     /* Tabs */
     --psp-label--style-tab--content: "スタイル";
     --psp-label--attributes-tab--content: "属性";
+    --psp-label--window-tab--content: "ウィンドウ";
+    --psp-label--window-source--content: "列";
+    --psp-label--window-order-by--content: "注文方法";
+    --psp-label--window-partition-by--content: "パーティション";
+    --psp-label--window-frame--content: "フレーム";
+    --psp-label--window-offset--content: "オフセット";
+    --psp-label--window-alpha--content: "アルファ";
     --psp-label--query-tab--content: "クエリ";
     --psp-label--plugin-tab--content: "プラグイン";
     --psp-label--debug-tab--content: "JSON";

package/src/themes/intl/pt.css

@@ -108,6 +108,13 @@ perspective-dropdown {
     /* Tabs */
     --psp-label--style-tab--content: "Estilo";
     --psp-label--attributes-tab--content: "Atributos";
+    --psp-label--window-tab--content: "Janela";
+    --psp-label--window-source--content: "Coluna";
+    --psp-label--window-order-by--content: "Ordenar por";
+    --psp-label--window-partition-by--content: "Particionar por";
+    --psp-label--window-frame--content: "Quadro";
+    --psp-label--window-offset--content: "Deslocamento";
+    --psp-label--window-alpha--content: "Alfa";
     --psp-label--query-tab--content: "Consulta";
     --psp-label--plugin-tab--content: "Plugin";
     --psp-label--debug-tab--content: "JSON";

package/src/themes/intl/zh.css

@@ -108,6 +108,13 @@ perspective-dropdown {
     /* Tabs */
     --psp-label--style-tab--content: "风格";
     --psp-label--attributes-tab--content: "属性";
+    --psp-label--window-tab--content: "窗口";
+    --psp-label--window-source--content: "列";
+    --psp-label--window-order-by--content: "订购依据";
+    --psp-label--window-partition-by--content: "分区依据";
+    --psp-label--window-frame--content: "框架";
+    --psp-label--window-offset--content: "偏移";
+    --psp-label--window-alpha--content: "Alpha";
     --psp-label--query-tab--content: "查询";
     --psp-label--plugin-tab--content: "插件";
     --psp-label--debug-tab--content: "JSON";

package/src/themes/intl.css

@@ -103,11 +103,20 @@ perspective-dropdown {
 
     /* Tabs */
     --psp-label--style-tab--content: "Style";
-    --psp-label--attributes-tab--content: "Attributes";
+    --psp-label--attributes-tab--content: "Expression";
+    --psp-label--window-tab--content: "Window";
     --psp-label--query-tab--content: "Query";
     --psp-label--plugin-tab--content: "Plugin";
     --psp-label--debug-tab--content: "JSON";
 
+    /* Window editor */
+    --psp-label--window-source--content: "Column";
+    --psp-label--window-order-by--content: "Order By";
+    --psp-label--window-partition-by--content: "Partition By";
+    --psp-label--window-frame--content: "Frame";
+    --psp-label--window-offset--content: "Offset";
+    --psp-label--window-alpha--content: "Alpha";
+
     /* Plugin settings */
     --psp-label--edit-mode--content: "Edit mode";
     --psp-label--scroll-lock--content: "Scroll lock";

package/src/ts/ts-rs/PanelViewerConfig.ts

@@ -5,6 +5,7 @@ import type { Filter } from "./Filter.js";
 import type { FilterReducer } from "./FilterReducer.js";
 import type { GroupRollupMode } from "./GroupRollupMode.js";
 import type { Sort } from "./Sort.js";
+import type { Windows } from "./Windows.js";
 import type { JsonValue } from "./serde_json/JsonValue.js";
 
 /**
@@ -12,4 +13,4 @@ import type { JsonValue } from "./serde_json/JsonValue.js";
  * element-level `settings` flag. This is the `panels` entry type of the
  * whole-element config format.
  */
-export type PanelViewerConfig<V = string> = { version: V, columns_config: { [key in string]?: { [key in string]?: JsonValue } }, plugin: string, plugin_config: { [key in string]?: JsonValue }, table: string | null, theme: string | null, title: string | null, group_by: Array<string>, split_by: Array<string>, sort: Array<Sort>, filter: Array<Filter>, group_rollup_mode: GroupRollupMode, filter_op?: FilterReducer, expressions: Expressions, columns: Array<string | null>, aggregates: { [key in string]?: Aggregate }, group_by_depth?: number | null, };
+export type PanelViewerConfig<V = string> = { version: V, columns_config: { [key in string]?: { [key in string]?: JsonValue } }, plugin: string, plugin_config: { [key in string]?: JsonValue }, table: string | null, theme: string | null, title: string | null, group_by: Array<string>, split_by: Array<string>, sort: Array<Sort>, filter: Array<Filter>, group_rollup_mode: GroupRollupMode, filter_op?: FilterReducer, expressions: Expressions, windows?: Windows, columns: Array<string | null>, aggregates: { [key in string]?: Aggregate }, group_by_depth?: number | null, };

package/src/ts/ts-rs/ViewerConfig.ts

@@ -5,6 +5,7 @@ import type { Filter } from "./Filter.js";
 import type { FilterReducer } from "./FilterReducer.js";
 import type { GroupRollupMode } from "./GroupRollupMode.js";
 import type { Sort } from "./Sort.js";
+import type { Windows } from "./Windows.js";
 import type { JsonValue } from "./serde_json/JsonValue.js";
 
 /**
@@ -15,4 +16,4 @@ import type { JsonValue } from "./serde_json/JsonValue.js";
  * state there, carried by the top-level `active` field instead), while the
  * single-panel format flattens back to the legacy shape.
  */
-export type ViewerConfig<V = string> = { settings: boolean, version: V, columns_config: { [key in string]?: { [key in string]?: JsonValue } }, plugin: string, plugin_config: { [key in string]?: JsonValue }, table: string | null, theme: string | null, title: string | null, group_by: Array<string>, split_by: Array<string>, sort: Array<Sort>, filter: Array<Filter>, group_rollup_mode: GroupRollupMode, filter_op?: FilterReducer, expressions: Expressions, columns: Array<string | null>, aggregates: { [key in string]?: Aggregate }, group_by_depth?: number | null, };
+export type ViewerConfig<V = string> = { settings: boolean, version: V, columns_config: { [key in string]?: { [key in string]?: JsonValue } }, plugin: string, plugin_config: { [key in string]?: JsonValue }, table: string | null, theme: string | null, title: string | null, group_by: Array<string>, split_by: Array<string>, sort: Array<Sort>, filter: Array<Filter>, group_rollup_mode: GroupRollupMode, filter_op?: FilterReducer, expressions: Expressions, windows?: Windows, columns: Array<string | null>, aggregates: { [key in string]?: Aggregate }, group_by_depth?: number | null, };

package/src/ts/ts-rs/ViewerConfigUpdate.ts

@@ -6,6 +6,7 @@ import type { FilterReducer } from "./FilterReducer.js";
 import type { GroupRollupMode } from "./GroupRollupMode.js";
 import type { OptionalUpdate } from "./OptionalUpdate.js";
 import type { Sort } from "./Sort.js";
+import type { Windows } from "./Windows.js";
 import type { JsonValue } from "./serde_json/JsonValue.js";
 
 export type ViewerConfigUpdate = { version?: OptionalUpdate<string>, plugin?: OptionalUpdate<string>, title?: OptionalUpdate<string>, table?: OptionalUpdate<string>, theme?: OptionalUpdate<string>, settings?: OptionalUpdate<boolean>, plugin_config?: OptionalUpdate<{ [key in string]?: JsonValue }>, columns_config?: OptionalUpdate<{ [key in string]?: { [key in string]?: JsonValue } }>, 
@@ -74,6 +75,14 @@ sort?: Array<Sort>,
  * panel.
  */
 expressions?: Expressions, 
+/**
+ * The `windows` property declares ordered, partitioned rolling
+ * computations (moving aggregates, cumulative sums) as _new_ columns
+ * keyed by output alias (`{"name": {...spec}}`, symmetric with
+ * `expressions`), analogous to SQL window functions. See
+ * [`crate::config::WindowSpec`].
+ */
+windows?: Windows, 
 /**
  * Aggregates perform a calculation over an entire column, and are
  * displayed when one or more [Group By](#group-by) are applied to the

package/src/ts/ts-rs/WindowAggregate.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type WindowAggregate = "sum" | "avg" | "count" | "min" | "max" | "stddev" | "var" | "first" | "last" | "lag" | "lead" | "diff" | "rate" | "ema";

package/src/ts/ts-rs/WindowSort.ts

@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { WindowSortDir } from "./WindowSortDir.js";
+
+/**
+ * The `Table` column which orders each partition, with its direction -
+ * serialized as a two-element array (`["ts", "desc"]`), symmetric with the
+ * `ViewConfig`'s `sort` field.
+ */
+export type WindowSort = [string, WindowSortDir];

package/src/ts/ts-rs/WindowSortDir.ts

@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+/**
+ * A window's order direction. A dedicated two-variant enum rather than
+ * [`crate::config::SortDir`] - the column-sort extras (`col asc`, `abs`,
+ * `none`) are meaningless inside a window frame and unrepresentable here.
+ */
+export type WindowSortDir = "asc" | "desc";

package/src/ts/ts-rs/WindowSpec.ts

@@ -0,0 +1,46 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { WindowAggregate } from "./WindowAggregate.js";
+import type { WindowSort } from "./WindowSort.js";
+
+/**
+ * The serialized form of [`WindowSpec`].
+ */
+export type WindowSpec = { 
+/**
+ * The input column - either a real `Table` column or an expression
+ * alias from the same `ViewConfig`.
+ */
+column: string, aggregate: WindowAggregate, 
+/**
+ * Columns whose distinct value tuples partition the rows; empty
+ * partitions the whole `Table` as one group.
+ */
+partition_by?: Array<string>, 
+/**
+ * The `Table` column which orders each partition, and the direction.
+ */
+order_by?: WindowSort | null, 
+/**
+ * A frame of the `rows` preceding each row, plus the row itself.
+ * Mutually exclusive with `range` and `cumulative`.
+ */
+rows?: number | null, 
+/**
+ * A frame of the rows whose `order_by` value lies within `range` of
+ * each row's, requiring a numeric or temporal `order_by`. Mutually
+ * exclusive with `rows` and `cumulative`.
+ */
+range?: number | null, 
+/**
+ * `true` frames all rows from the partition start through each row.
+ * Default can be omitted.
+ */
+cumulative?: boolean | null, 
+/**
+ * Row offset for `lag`/`lead` (default 1).
+ */
+offset?: number | null, 
+/**
+ * Smoothing factor in `(0, 1]` for `ema`.
+ */
+alpha?: number | null, };

package/src/ts/ts-rs/Windows.ts

@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { WindowSpec } from "./WindowSpec.js";
+
+/**
+ * The window columns of a `ViewConfig`, keyed by output column alias -
+ * symmetric with `expressions` (`{"name": {...spec}}`). An alias must not
+ * collide with a `Table` column, expression alias, or another window's
+ * key.
+ */
+export type Windows = { [key in string]?: WindowSpec };