Add configurable columns_config schema

Signed-off-by: Andrew Stein <steinlink@gmail.com>

Author: texodus

examples/blocks/src/dataset/index.html

@@ -182,6 +182,13 @@
                 if (state.table) {
                     // await viewer.eject();
                     // await window.psp_workspace.removeTable("superstore");
+                    for (const viewer of window.psp_workspace.children) {
+                        const cfg = await viewer.save();
+                        if (cfg.table === "superstore") {
+                            await viewer.eject();
+                        }
+                    }
+
                     await state.table.then((x) => x.delete({ lazy: true }));
                     state.table = undefined;
                 }

rust/perspective-client/src/rust/virtual_server/data.rs

@@ -578,7 +578,13 @@ impl VirtualDataSlice {
     ///
     /// When `group_by` is active, extracts `__GROUPING_ID__` and
     /// `__ROW_PATH_N__` columns to build `self.row_path`, then removes
-    /// them from the output `RecordBatch`.
+    /// `__GROUPING_ID__` from the output `RecordBatch`. The
+    /// `__ROW_PATH_N__` columns are *kept* in the frozen batch so
+    /// downstream Arrow IPC consumers (`with_typed_arrays`, used by
+    /// viewer-charts to drive its categorical/numeric axis resolvers
+    /// and tree-hierarchy walkers) see them inline — matching the
+    /// native `perspective-server`'s `to_arrow` output when
+    /// `emit_legacy_row_path_names: false`.
     ///
     /// When `split_by` is active, renames data columns by replacing `_`
     /// with `|` (the DuckDB PIVOT separator).
@@ -660,7 +666,22 @@ impl VirtualDataSlice {
         let mut new_arrays: Vec<ArrayRef> = Vec::new();
         for (col_idx, field) in schema.fields().iter().enumerate() {
             let name = field.name();
-            if name == "__GROUPING_ID__" || name.starts_with("__ROW_PATH_") {
+            // `__GROUPING_ID__` is an internal SQL-rollup discriminator
+            // (used in Phase A above to decide which row-path levels
+            // belong to each row). No JS consumer reads it, so it's
+            // dropped from the frozen batch.
+            //
+            // `__ROW_PATH_N__` columns are kept. Phase A copied their
+            // values into `self.row_path` for the JSON sidecar paths
+            // (`render_to_columns_json`, `render_to_rows`), but
+            // viewer-charts' `with_typed_arrays` callback needs the
+            // per-level columns inline in the Arrow stream — its
+            // categorical-axis resolver, numeric-position lookup, and
+            // tree hierarchy walker all do `columns.get(\`__ROW_PATH_${n}__\`)`.
+            // Keeping the columns here lets `render_to_arrow_ipc`
+            // serialize them naturally, matching native
+            // `perspective-server`'s `to_arrow` output.
+            if name == "__GROUPING_ID__" {
                 continue;
             }
 
@@ -801,6 +822,25 @@ impl VirtualDataSlice {
                                 let arr = col.as_any().downcast_ref::<Int32Array>().unwrap();
                                 VirtualDataCell::Integer(Some(arr.value(row_idx)))
                             },
+                            DataType::Int64 => {
+                                // TODO ????
+                                let arr = col.as_any().downcast_ref::<Int64Array>().unwrap();
+                                VirtualDataCell::Float(Some(arr.value(row_idx) as f64))
+                            },
+                            DataType::Time64(TimeUnit::Microsecond) => {
+                                let arr = col
+                                    .as_any()
+                                    .downcast_ref::<Time64MicrosecondArray>()
+                                    .unwrap();
+                                VirtualDataCell::Float(Some(arr.value(row_idx) as f64))
+                            },
+                            DataType::Timestamp(TimeUnit::Microsecond, _) => {
+                                let arr = col
+                                    .as_any()
+                                    .downcast_ref::<Time64MicrosecondArray>()
+                                    .unwrap();
+                                VirtualDataCell::Datetime(Some(arr.value(row_idx) * 1000))
+                            },
                             DataType::Timestamp(TimeUnit::Millisecond, _) => {
                                 let arr = col
                                     .as_any()
@@ -914,6 +954,20 @@ impl VirtualDataSlice {
                             .collect::<Vec<_>>(),
                     )?
                 },
+                DataType::Int64 => {
+                    let arr = col.as_any().downcast_ref::<Int64Array>().unwrap();
+                    serde_json::to_value(
+                        (0..num_rows)
+                            .map(|i| {
+                                if arr.is_null(i) {
+                                    None
+                                } else {
+                                    Some(arr.value(i) as f64)
+                                }
+                            })
+                            .collect::<Vec<_>>(),
+                    )?
+                },
                 DataType::Timestamp(TimeUnit::Millisecond, _) => {
                     let arr = col
                         .as_any()
@@ -931,6 +985,23 @@ impl VirtualDataSlice {
                             .collect::<Vec<_>>(),
                     )?
                 },
+                DataType::Time64(TimeUnit::Microsecond) => {
+                    let arr = col
+                        .as_any()
+                        .downcast_ref::<Time64MicrosecondArray>()
+                        .unwrap();
+                    serde_json::to_value(
+                        (0..num_rows)
+                            .map(|i| {
+                                if arr.is_null(i) {
+                                    None
+                                } else {
+                                    Some(arr.value(i) as f64)
+                                }
+                            })
+                            .collect::<Vec<_>>(),
+                    )?
+                },
                 DataType::Date32 => {
                     let arr = col.as_any().downcast_ref::<Date32Array>().unwrap();
                     serde_json::to_value(

rust/perspective-js/src/rust/virtual_server.rs

@@ -372,7 +372,7 @@ impl VirtualServerHandler for JsServerHandler {
 
         let handler = self.0.clone();
         let view_id = view_id.to_string();
-        let config_value = serde_wasm_bindgen::to_value(config).unwrap();
+        let config_value = JsValue::from_serde_ext(config).unwrap();
         let config = config.clone();
         Box::pin(async move {
             let this = JsServerHandler(handler);
@@ -493,7 +493,7 @@ impl VirtualServerHandler for JsServerHandler {
         let handler = self.0.clone();
         let view_id = view_id.to_string();
         let column_name = column_name.to_string();
-        let config_js = serde_wasm_bindgen::to_value(config).unwrap();
+        let config_js = JsValue::from_serde_ext(config).unwrap();
         Box::pin(async move {
             let this = JsServerHandler(handler);
             let args = Array::new();
@@ -518,8 +518,8 @@ impl VirtualServerHandler for JsServerHandler {
         let handler = self.0.clone();
         let view_id = view_id.to_string();
         let window: JsViewPort = viewport.clone().into();
-        let config_value = serde_wasm_bindgen::to_value(config).unwrap();
-        let window_value = serde_wasm_bindgen::to_value(&window).unwrap();
+        let config_value = JsValue::from_serde_ext(config).unwrap();
+        let window_value = JsValue::from_serde_ext(&window).unwrap();
         let schema_value = JsValue::from_serde_ext(&schema).unwrap();
 
         Box::pin(async move {

rust/perspective-js/src/ts/virtual_servers/duckdb.ts

@@ -115,6 +115,10 @@ function duckdbTypeToPsp(name: string): ColumnType {
         return "string";
     }
 
+    if (name.startsWith("time")) {
+        return "float";
+    }
+
     console.warn(`Unknown type '${name}'`);
     return "string";
 }

rust/perspective-viewer/src/rust/components/column_dropdown.rs

@@ -91,7 +91,9 @@ impl ColumnDropDownElement {
         let width = target.get_bounding_client_rect().width();
         ApiFuture::spawn(async move {
             if !exclude.contains(&input) {
-                let is_expr = session.validate_expr(&input).await?.is_none();
+                let is_expr = crate::queries::validate_expr(&session, &input)
+                    .await?
+                    .is_none();
                 if is_expr {
                     values.push(InPlaceColumn::Expression(Expression::new(
                         None,

rust/perspective-viewer/src/rust/components/column_selector.rs

@@ -45,12 +45,12 @@ use crate::components::containers::scroll_panel_item::ScrollPanelItem;
 use crate::css;
 use crate::dragdrop::*;
 use crate::presentation::ColumnLocator;
+use crate::queries::{
+    ActiveColumnState, ActiveColumnStateData, ColumnsIteratorSet, can_render_column_styles,
+};
 use crate::renderer::*;
 use crate::session::drag_drop_update::*;
 use crate::session::*;
-use crate::tasks::{
-    ActiveColumnState, ActiveColumnStateData, ColumnsIteratorSet, can_render_column_styles,
-};
 use crate::utils::*;
 
 #[derive(Properties)]

rust/perspective-viewer/src/rust/components/column_selector/active_column.rs

@@ -26,9 +26,9 @@ use crate::components::type_icon::TypeIcon;
 use crate::dragdrop::*;
 use crate::js::plugin::*;
 use crate::presentation::ColumnLocator;
+use crate::queries::*;
 use crate::renderer::*;
 use crate::session::*;
-use crate::tasks::*;
 use crate::utils::*;
 
 #[derive(Clone, Properties)]

rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs

@@ -25,11 +25,11 @@ use crate::components::containers::select::*;
 use crate::components::filter_dropdown::FilterDropDownElement;
 use crate::components::style::LocalStyle;
 use crate::components::type_icon::TypeIcon;
+use crate::css;
 use crate::dragdrop::*;
 use crate::renderer::*;
 use crate::session::*;
 use crate::utils::*;
-use crate::{css, maybe};
 
 #[derive(Clone, Properties)]
 pub struct FilterColumnProps {
@@ -101,11 +101,11 @@ impl Component for FilterColumn {
             .unwrap_or_else(|| "".to_owned());
 
         this.filter_ops = Rc::new(
-            maybe! {
-                Some(get_filter_ops(&ctx.props().metadata, col_type?)?
+            try {
+                get_filter_ops(&ctx.props().metadata, col_type?)?
                     .into_iter()
                     .map(SelectItem::Option)
-                    .collect::<Vec<_>>())
+                    .collect::<Vec<_>>()
             }
             .unwrap_or_default(),
         );
@@ -189,11 +189,11 @@ impl Component for FilterColumn {
         if col_type != old_col_type {
             changed = true;
             self.filter_ops = Rc::new(
-                maybe! {
-                    Some(get_filter_ops(&ctx.props().metadata, col_type?)?
+                try {
+                    get_filter_ops(&ctx.props().metadata, col_type?)?
                         .into_iter()
                         .map(SelectItem::Option)
-                        .collect::<Vec<_>>())
+                        .collect::<Vec<_>>()
                 }
                 .unwrap_or_default(),
             );

rust/perspective-viewer/src/rust/components/column_settings_sidebar.rs

@@ -33,14 +33,11 @@ use crate::components::editable_header::EditableHeaderProps;
 use crate::components::expression_editor::ExpressionEditorProps;
 use crate::components::style::LocalStyle;
 use crate::components::type_icon::TypeIconType;
-use crate::custom_events::CustomEvents;
 use crate::presentation::{ColumnLocator, ColumnSettingsTab, Presentation};
+use crate::queries::{can_render_column_styles, locator_name_or_default, locator_view_type};
 use crate::renderer::Renderer;
 use crate::session::{Session, SessionMetadataRc};
-use crate::tasks::{
-    EditExpression, HasCustomEvents, HasPresentation, HasRenderer, HasSession,
-    can_render_column_styles, locator_name_or_default, locator_view_type,
-};
+use crate::tasks::{delete_expr, save_expr, update_expr};
 use crate::utils::PtrEqRc;
 use crate::*;
 
@@ -64,13 +61,13 @@ pub struct ColumnSettingsPanelProps {
     /// View config snapshot — threaded from `SessionProps`.
     pub view_config: PtrEqRc<ViewConfig>,
 
+    /// Per-column stats snapshot — threaded from `SessionProps`.
+    pub column_stats: PtrEqRc<std::collections::HashMap<String, crate::session::ColumnStats>>,
+
     /// Selected theme name, threaded for PortalModal consumers.
     pub selected_theme: Option<String>,
 
     // State
-    #[derivative(Debug = "ignore")]
-    pub custom_events: CustomEvents,
-
     #[derivative(Debug = "ignore")]
     pub presentation: Presentation,
 
@@ -88,34 +85,11 @@ impl PartialEq for ColumnSettingsPanelProps {
             && self.plugin_name == other.plugin_name
             && self.metadata == other.metadata
             && self.view_config == other.view_config
+            && self.column_stats == other.column_stats
             && self.selected_theme == other.selected_theme
     }
 }
 
-impl HasCustomEvents for ColumnSettingsPanelProps {
-    fn custom_events(&self) -> &CustomEvents {
-        &self.custom_events
-    }
-}
-
-impl HasPresentation for ColumnSettingsPanelProps {
-    fn presentation(&self) -> &Presentation {
-        &self.presentation
-    }
-}
-
-impl HasRenderer for ColumnSettingsPanelProps {
-    fn renderer(&self) -> &Renderer {
-        &self.renderer
-    }
-}
-
-impl HasSession for ColumnSettingsPanelProps {
-    fn session(&self) -> &Session {
-        &self.session
-    }
-}
-
 #[derive(Debug)]
 pub enum ColumnSettingsPanelMsg {
     SetExprValue(Rc<String>),
@@ -239,11 +213,20 @@ impl Component for ColumnSettingsPanel {
                     ColumnLocator::Table(_) => {
                         tracing::error!("Tried to save non-expression column!")
                     },
-                    ColumnLocator::Expression(name) => {
-                        ctx.props().update_expr(name.clone(), new_expr)
-                    },
+                    ColumnLocator::Expression(name) => update_expr(
+                        &ctx.props().session,
+                        &ctx.props().renderer,
+                        &ctx.props().presentation,
+                        name.clone(),
+                        new_expr,
+                    ),
                     ColumnLocator::NewExpression => {
-                        if let Err(err) = ctx.props().save_expr(new_expr) {
+                        if let Err(err) = save_expr(
+                            &ctx.props().session,
+                            &ctx.props().renderer,
+                            &ctx.props().presentation,
+                            new_expr,
+                        ) {
                             tracing::warn!("{}", err);
                         }
                     },
@@ -258,7 +241,12 @@ impl Component for ColumnSettingsPanel {
             },
             ColumnSettingsPanelMsg::OnDelete(()) => {
                 if ctx.props().selected_column.is_saved_expr() {
-                    ctx.props().delete_expr(&self.column_name).unwrap_or_log();
+                    delete_expr(
+                        &ctx.props().session,
+                        &ctx.props().renderer,
+                        &self.column_name,
+                    )
+                    .unwrap_or_log();
                 }
 
                 ctx.props().on_close.emit(());
@@ -347,8 +335,8 @@ impl Component for ColumnSettingsPanel {
             group_by_depth: ctx.props().view_config.group_by.len() as u32,
             view_config: ctx.props().view_config.clone(),
             metadata: ctx.props().metadata.clone(),
+            column_stats: ctx.props().column_stats.clone(),
             selected_theme: ctx.props().selected_theme.clone(),
-            custom_events: ctx.props().custom_events.clone(),
             presentation: ctx.props().presentation.clone(),
             renderer: ctx.props().renderer.clone(),
             session: ctx.props().session.clone(),