@perspective-dev/client 4.1.0 → 4.2.0

package/dist/wasm/perspective-js.wasm.d.ts

@@ -1,85 +1,97 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const __wbg_proxysession_free: (a: number, b: number) => void;
-export const proxysession_handle_request: (a: number, b: number) => number;
-export const proxysession_close: (a: number) => number;
 export const __wbg_client_free: (a: number, b: number) => void;
+export const __wbg_genericsqlvirtualservermodel_free: (a: number, b: number) => void;
+export const __wbg_proxysession_free: (a: number, b: number) => void;
+export const __wbg_table_free: (a: number, b: number) => void;
+export const __wbg_view_free: (a: number, b: number) => void;
+export const __wbg_virtualdataslice_free: (a: number, b: number) => void;
+export const __wbg_virtualserver_free: (a: number, b: number) => void;
 export const client___getClassname: (a: number, b: number) => void;
+export const client_get_hosted_table_names: (a: number) => number;
+export const client_handle_error: (a: number, b: number, c: number, d: number) => number;
+export const client_handle_response: (a: number, b: number) => number;
 export const client_new: (a: number, b: number, c: number) => void;
 export const client_new_proxy_session: (a: number, b: number) => number;
-export const client_handle_response: (a: number, b: number) => number;
-export const client_handle_error: (a: number, b: number, c: number, d: number) => number;
 export const client_on_error: (a: number, b: number) => number;
-export const client_table: (a: number, b: number, c: number) => number;
-export const client_terminate: (a: number, b: number) => void;
-export const client_open_table: (a: number, b: number, c: number) => number;
-export const client_get_hosted_table_names: (a: number) => number;
 export const client_on_hosted_tables_update: (a: number, b: number) => number;
+export const client_open_table: (a: number, b: number, c: number) => number;
 export const client_remove_hosted_tables_update: (a: number, b: number) => number;
 export const client_system_info: (a: number) => number;
+export const client_table: (a: number, b: number, c: number) => number;
+export const client_terminate: (a: number, b: number) => void;
+export const genericsqlvirtualservermodel_getHostedTables: (a: number, b: number) => void;
+export const genericsqlvirtualservermodel_new: (a: number, b: number) => void;
+export const genericsqlvirtualservermodel_tableMakeView: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const genericsqlvirtualservermodel_tableSchema: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_tableSize: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_tableValidateExpression: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+export const genericsqlvirtualservermodel_viewColumnSize: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_viewDelete: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_viewGetData: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const genericsqlvirtualservermodel_viewSchema: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_viewSize: (a: number, b: number, c: number, d: number) => void;
+export const init: () => void;
+export const proxysession_close: (a: number) => number;
+export const proxysession_handle_request: (a: number, b: number) => number;
+export const proxysession_new: (a: number, b: number) => number;
 export const table___getClassname: (a: number, b: number) => void;
-export const __wbg_table_free: (a: number, b: number) => void;
-export const table_get_index: (a: number) => number;
-export const table_get_client: (a: number) => number;
-export const table_get_name: (a: number) => number;
-export const table_get_limit: (a: number) => number;
 export const table_clear: (a: number) => number;
-export const table_delete: (a: number, b: number) => number;
-export const table_size: (a: number) => number;
-export const table_schema: (a: number) => number;
 export const table_columns: (a: number) => number;
+export const table_delete: (a: number, b: number) => number;
+export const table_get_client: (a: number) => number;
+export const table_get_index: (a: number) => number;
+export const table_get_limit: (a: number) => number;
+export const table_get_name: (a: number) => number;
 export const table_make_port: (a: number) => number;
 export const table_on_delete: (a: number, b: number) => number;
-export const table_remove_delete: (a: number, b: number) => number;
 export const table_remove: (a: number, b: number, c: number) => number;
+export const table_remove_delete: (a: number, b: number) => number;
 export const table_replace: (a: number, b: number, c: number) => number;
+export const table_schema: (a: number) => number;
+export const table_size: (a: number) => number;
 export const table_update: (a: number, b: number, c: number) => number;
-export const table_view: (a: number, b: number) => number;
 export const table_validate_expressions: (a: number, b: number) => number;
-export const __wbg_view_free: (a: number, b: number) => void;
+export const table_view: (a: number, b: number) => number;
 export const view___get_model: (a: number) => number;
+export const view_collapse: (a: number, b: number) => number;
 export const view_column_paths: (a: number, b: number) => number;
 export const view_delete: (a: number) => number;
 export const view_dimensions: (a: number) => number;
+export const view_expand: (a: number, b: number) => number;
 export const view_expression_schema: (a: number) => number;
 export const view_get_config: (a: number) => number;
 export const view_get_min_max: (a: number, b: number, c: number) => number;
+export const view_num_columns: (a: number) => number;
 export const view_num_rows: (a: number) => number;
+export const view_on_delete: (a: number, b: number) => number;
+export const view_on_update: (a: number, b: number, c: number) => number;
+export const view_remove_delete: (a: number, b: number) => number;
+export const view_remove_update: (a: number, b: number) => number;
 export const view_schema: (a: number) => number;
+export const view_set_depth: (a: number, b: number) => number;
 export const view_to_arrow: (a: number, b: number) => number;
-export const view_to_columns_string: (a: number, b: number) => number;
 export const view_to_columns: (a: number, b: number) => number;
-export const view_to_json_string: (a: number, b: number) => number;
+export const view_to_columns_string: (a: number, b: number) => number;
+export const view_to_csv: (a: number, b: number) => number;
 export const view_to_json: (a: number, b: number) => number;
+export const view_to_json_string: (a: number, b: number) => number;
 export const view_to_ndjson: (a: number, b: number) => number;
-export const view_to_csv: (a: number, b: number) => number;
-export const view_on_update: (a: number, b: number, c: number) => number;
-export const view_remove_update: (a: number, b: number) => number;
-export const view_on_delete: (a: number, b: number) => number;
-export const view_num_columns: (a: number) => number;
-export const view_remove_delete: (a: number, b: number) => number;
-export const view_collapse: (a: number, b: number) => number;
-export const view_expand: (a: number, b: number) => number;
-export const view_set_depth: (a: number, b: number) => number;
-export const __wbg_jsvirtualdataslice_free: (a: number, b: number) => void;
-export const jsvirtualdataslice_new: () => number;
-export const jsvirtualdataslice_setCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
-export const jsvirtualdataslice_setStringCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const jsvirtualdataslice_setIntegerCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const jsvirtualdataslice_setFloatCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const jsvirtualdataslice_setBooleanCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const jsvirtualdataslice_setDatetimeCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const __wbg_jsvirtualserver_free: (a: number, b: number) => void;
-export const jsvirtualserver_new: (a: number, b: number) => void;
-export const jsvirtualserver_handleRequest: (a: number, b: number, c: number) => number;
-export const init: () => void;
-export const proxysession_new: (a: number, b: number) => number;
-export const __wasm_bindgen_func_elem_3509: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_3494: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_553: (a: number, b: number) => number;
-export const __wasm_bindgen_func_elem_123: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_5064: (a: number, b: number, c: number, d: number) => void;
+export const virtualdataslice_new: (a: number) => number;
+export const virtualdataslice_setBooleanCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualdataslice_setCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
+export const virtualdataslice_setDatetimeCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualdataslice_setFloatCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualdataslice_setIntegerCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualdataslice_setStringCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualserver_handleRequest: (a: number, b: number, c: number) => number;
+export const virtualserver_new: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_1421: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_3793: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_5384: (a: number, b: number, c: number, d: number) => void;
+export const __wasm_bindgen_func_elem_3795: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_1668: (a: number, b: number) => number;
 export const __wbindgen_export: (a: number, b: number) => number;
 export const __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export3: (a: number) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perspective-dev/client",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -48,6 +48,7 @@
     "@perspective-dev/esbuild-plugin": "",
     "@perspective-dev/metadata": "",
     "@perspective-dev/test": "",
+    "@clickhouse/client-web": "^1.12.0",
     "@duckdb/duckdb-wasm": "^1.30.0",
     "@playwright/experimental-ct-react": "=1.52.0",
     "@playwright/test": "=1.52.0",

package/src/rust/generic_sql_model.rs

@@ -0,0 +1,189 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+//! WASM bindings for the DuckDB SQL query builder.
+
+use std::str::FromStr;
+
+use indexmap::IndexMap;
+use js_sys::Object;
+use perspective_client::config::ViewConfig;
+use perspective_client::proto::{ColumnType, ViewPort};
+use perspective_client::virtual_server;
+use wasm_bindgen::prelude::*;
+
+use crate::utils::*;
+
+/// JavaScript-facing DuckDB SQL query builder.
+///
+/// This struct wraps the Rust `DuckDBSqlBuilder` and exposes it to JavaScript
+/// via wasm_bindgen.
+#[wasm_bindgen]
+pub struct GenericSQLVirtualServerModel {
+    inner: virtual_server::GenericSQLVirtualServerModel,
+}
+
+#[wasm_bindgen]
+extern "C" {
+    pub type JsGenericSQLVirtualServerModelArgs;
+}
+
+#[wasm_bindgen]
+impl GenericSQLVirtualServerModel {
+    /// Creates a new `JsDuckDBSqlBuilder` instance.
+    #[wasm_bindgen(constructor)]
+    pub fn new(args: Option<JsGenericSQLVirtualServerModelArgs>) -> Result<Self, JsValue> {
+        Ok(Self {
+            inner: virtual_server::GenericSQLVirtualServerModel::new(
+                args.map(|x| x.into_serde_ext())
+                    .transpose()?
+                    .unwrap_or_default(),
+            ),
+        })
+    }
+
+    /// Returns the SQL query to list all hosted tables.
+    #[wasm_bindgen(js_name = "getHostedTables")]
+    pub fn get_hosted_tables(&self) -> Result<String, JsValue> {
+        self.inner
+            .get_hosted_tables()
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to describe a table's schema.
+    #[wasm_bindgen(js_name = "tableSchema")]
+    pub fn table_schema(&self, table_id: &str) -> Result<String, JsValue> {
+        self.inner
+            .table_schema(table_id)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to get the row count of a table.
+    #[wasm_bindgen(js_name = "tableSize")]
+    pub fn table_size(&self, table_id: &str) -> Result<String, JsValue> {
+        self.inner
+            .table_size(table_id)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to get the column count of a view.
+    #[wasm_bindgen(js_name = "viewColumnSize")]
+    pub fn view_column_size(&self, view_id: &str) -> Result<String, JsValue> {
+        self.inner
+            .view_column_size(view_id)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to validate an expression against a table.
+    #[wasm_bindgen(js_name = "tableValidateExpression")]
+    pub fn table_validate_expression(
+        &self,
+        table_id: &str,
+        expression: &str,
+    ) -> Result<String, JsValue> {
+        self.inner
+            .table_validate_expression(table_id, expression)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to delete a view.
+    #[wasm_bindgen(js_name = "viewDelete")]
+    pub fn view_delete(&self, view_id: &str) -> Result<String, JsValue> {
+        self.inner
+            .view_delete(view_id)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to create a view from a table with the given
+    /// configuration.
+    #[wasm_bindgen(js_name = "tableMakeView")]
+    pub fn table_make_view(
+        &self,
+        table_id: &str,
+        view_id: &str,
+        config: JsValue,
+    ) -> Result<String, JsValue> {
+        let config: ViewConfig = serde_wasm_bindgen::from_value(config)
+            .map_err(|e| JsValue::from_str(&e.to_string()))?;
+
+        self.inner
+            .table_make_view(table_id, view_id, &config)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to fetch data from a view with the given viewport.
+    #[wasm_bindgen(js_name = "viewGetData")]
+    pub fn view_get_data(
+        &self,
+        view_id: &str,
+        config: JsValue,
+        viewport: JsValue,
+        schema: JsValue,
+    ) -> Result<String, JsValue> {
+        let config: ViewConfig = serde_wasm_bindgen::from_value(config)
+            .map_err(|e| JsValue::from_str(&e.to_string()))?;
+
+        let viewport: ViewPort = serde_wasm_bindgen::from_value(viewport)
+            .map_err(|e| JsValue::from_str(&e.to_string()))?;
+
+        let schema = self.parse_schema(schema)?;
+
+        self.inner
+            .view_get_data(view_id, &config, &viewport, &schema)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to describe a view's schema.
+    #[wasm_bindgen(js_name = "viewSchema")]
+    pub fn view_schema(&self, view_id: &str) -> Result<String, JsValue> {
+        self.inner
+            .view_schema(view_id)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+
+    /// Returns the SQL query to get the row count of a view.
+    #[wasm_bindgen(js_name = "viewSize")]
+    pub fn view_size(&self, view_id: &str) -> Result<String, JsValue> {
+        self.inner
+            .view_size(view_id)
+            .map_err(|e| JsValue::from_str(&e.to_string()))
+    }
+}
+
+impl GenericSQLVirtualServerModel {
+    fn parse_schema(&self, schema: JsValue) -> Result<IndexMap<String, ColumnType>, JsValue> {
+        let obj = schema.dyn_ref::<Object>().ok_or_else(|| {
+            JsValue::from_str("Schema must be an object mapping column names to types")
+        })?;
+
+        let mut result = IndexMap::new();
+        let entries = Object::entries(obj);
+        for i in 0..entries.length() {
+            let entry = entries.get(i);
+            let entry_array = entry
+                .dyn_ref::<js_sys::Array>()
+                .ok_or_else(|| JsValue::from_str("Invalid schema entry"))?;
+            let key = entry_array
+                .get(0)
+                .as_string()
+                .ok_or_else(|| JsValue::from_str("Column name must be a string"))?;
+            let value = entry_array
+                .get(1)
+                .as_string()
+                .ok_or_else(|| JsValue::from_str("Column type must be a string"))?;
+            let column_type = ColumnType::from_str(&value)
+                .map_err(|_| JsValue::from_str(&format!("Unknown column type: {}", value)))?;
+            result.insert(key, column_type);
+        }
+        Ok(result)
+    }
+}

package/src/rust/lib.rs

@@ -26,20 +26,20 @@
 extern crate alloc;
 
 mod client;
+mod generic_sql_model;
 mod table;
 mod table_data;
 pub mod utils;
 mod view;
-#[cfg(target_arch = "wasm32")]
 mod virtual_server;
 
 #[cfg(feature = "export-init")]
 use wasm_bindgen::prelude::*;
 
 pub use crate::client::Client;
+pub use crate::generic_sql_model::*;
 pub use crate::table::*;
 pub use crate::table_data::*;
-#[cfg(target_arch = "wasm32")]
 pub use crate::virtual_server::*;
 
 #[cfg(feature = "export-init")]

package/src/rust/utils/console_logger.rs

@@ -170,10 +170,10 @@ impl<S: Subscriber + for<'a> LookupSpan<'a>> Layer<S> for WasmLogger {
     }
 
     fn on_record(&self, id: &tracing::Id, values: &tracing::span::Record<'_>, ctx: Context<'_, S>) {
-        if let Some(span_ref) = ctx.span(id) {
-            if let Some(debug_record) = span_ref.extensions_mut().get_mut::<LogLineBuffer>() {
-                values.record(debug_record);
-            }
+        if let Some(span_ref) = ctx.span(id)
+            && let Some(debug_record) = span_ref.extensions_mut().get_mut::<LogLineBuffer>()
+        {
+            values.record(debug_record);
         }
     }
 

package/src/rust/utils/futures.rs

@@ -46,6 +46,12 @@ where
     pub fn new<U: Future<Output = ApiResult<T>> + 'static>(x: U) -> Self {
         Self(Box::pin(x))
     }
+
+    pub fn new_throttled<U: Future<Output = ApiResult<T>> + 'static>(x: U) -> ApiFuture<()> {
+        ApiFuture::<()>(Box::pin(
+            async move { x.await.ignore_view_delete().map(|_| ()) },
+        ))
+    }
 }
 
 impl<T> ApiFuture<T>
@@ -87,7 +93,7 @@ where
         future_to_promise(async move {
             match fut.0.await.ignore_view_delete()? {
                 Some(x) => Ok(x).into_js_result(),
-                None => Ok::<_, JsValue>(()).into_js_result(),
+                None => Err("View not found".into()).into_js_result(),
             }
         })
     }