fix: Use correct coordinator query types

manzt · Jun 30, 2024 · bf8f2a8 · bf8f2a8
1 parent d49b737
commit bf8f2a8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/lib/clients/DataTable.css b/lib/clients/DataTable.css
@@ -70,6 +70,7 @@ th {
   border-bottom: solid 1px var(--light-silver);
   border-left: solid 1px var(--light-silver);
   padding: 5px 6px 0 6px;
+  user-select: none;
 }
 
 .number, .date {

diff --git a/lib/deps/mosaic-core.d.ts b/lib/deps/mosaic-core.d.ts
@@ -20,8 +20,12 @@ export class MosaicClient {
 	requestQuery(query: Query): void;
 }
 
+export type ConnectorQuery = { type: "arrow" | "json"; sql: string };
+
 export interface Connector {
-	query(query: Query): Promise<arrow.Table | Record<string, unknown>>;
+	query(
+		query: ConnectorQuery,
+	): Promise<arrow.Table | Record<string, unknown>>;
 }
 
 export class Coordinator {

diff --git a/lib/example.ts b/lib/example.ts
@@ -6,7 +6,7 @@ import { DataTable } from "./clients/DataTable.ts";
 let base = new URL(
 	"https://raw.githubusercontent.com/uwdata/mosaic/main/data/",
 );
-let table: keyof typeof datasets = "metros";
+let table: keyof typeof datasets = "athletes";
 let datasets = {
 	athletes: new URL("athletes.csv", base).href,
 	unemployment: new URL("us-county-unemployment.csv", base).href,

diff --git a/lib/widget.ts b/lib/widget.ts
@@ -17,7 +17,7 @@ type Model = {
 };
 
 interface OpenQuery {
-	query: Query;
+	query: mc.ConnectorQuery;
 	startTime: number;
 	resolve: (x: arrow.Table | Record<string, unknown>) => void;
 	reject: (err?: string) => void;
@@ -38,7 +38,7 @@ export default () => {
 			 * @param reject - the promise reject callback
 			 */
 			function send(
-				query: Query,
+				query: mc.ConnectorQuery,
 				resolve: (value: arrow.Table | Record<string, unknown>) => void,
 				reject: (reason?: string) => void,
 			) {
@@ -88,7 +88,7 @@ export default () => {
 				logger.groupEnd("query");
 			});
 
-			let connector = {
+			coordinator.databaseConnector({
 				query(query) {
 					let { promise, resolve, reject } = defer<
 						arrow.Table | Record<string, unknown>,
@@ -97,9 +97,7 @@ export default () => {
 					send(query, resolve, reject);
 					return promise;
 				},
-			} satisfies mc.Connector;
-
-			coordinator.databaseConnector(connector);
+			});
 
 			// get some initial data to get the schema
 			let empty = await coordinator.query(