@marimo-team/islands 0.17.2 → 0.17.4

package/src/plugins/impl/data-explorer/queries/queries.ts

@@ -11,8 +11,7 @@ import type { SpecQuery } from "compassql/build/src/query/spec";
 import { getTopResultTreeItem, isResultTree } from "compassql/build/src/result";
 import type { Schema } from "compassql/build/src/schema";
 import { contains } from "vega-lite";
-import { NONPOSITION_SCALE_CHANNELS } from "vega-lite/build/src/channel";
-import type { NamedData } from "vega-lite/build/src/data";
+import type { NamedData } from "vega-lite/types_unstable/data.js";
 import { type EncodingChannel, fromFieldQuery } from "../encoding";
 import { toSpecQuery } from "../spec";
 import type { ChartSpec } from "../state/types";
@@ -21,13 +20,14 @@ import {
   addQuantitativeField,
   addTemporalField,
 } from "./field-suggestion";
-import type {
-  PlotFieldInfo,
-  QueryCreator,
-  Result,
-  ResultingCharts,
-  ResultPlot,
-  TopLevelFacetedUnitSpec,
+import {
+  NONPOSITION_SCALE_CHANNELS,
+  type PlotFieldInfo,
+  type QueryCreator,
+  type Result,
+  type ResultingCharts,
+  type ResultPlot,
+  type TopLevelFacetedUnitSpec,
 } from "./types";
 import { hasWildcards, isQueryEmpty } from "./utils";
 

package/src/plugins/impl/data-explorer/queries/types.ts

@@ -1,8 +1,9 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 import type { Query } from "compassql/build/src/query";
-import type { VisualizationSpec } from "react-vega";
-import type { NamedData } from "vega-lite/build/src/data";
-import type { FacetedUnitSpec, TopLevel } from "vega-lite/build/src/spec";
+import type { NONPOSITION_SCALE_CHANNELS as NONPOSITION_SCALE_CHANNELS_VEGA } from "vega-lite/types_unstable/channel.js";
+import type { NamedData } from "vega-lite/types_unstable/data.js";
+import type { TopLevel } from "vega-lite/types_unstable/spec/toplevel.js";
+import type { FacetedUnitSpec } from "vega-lite/types_unstable/spec/unit.js";
 import type { EncodingChannel, FieldDefinition } from "../encoding";
 
 export interface PlotFieldInfo {
@@ -16,7 +17,7 @@ export interface ResultPlot {
   /**
    * Spec to be used for rendering.
    */
-  spec: VisualizationSpec;
+  spec: TopLevelFacetedUnitSpec;
 }
 
 export interface Result {
@@ -27,7 +28,7 @@ export interface Result {
   limit: number;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-redundant-type-constituents
 export type TopLevelFacetedUnitSpec = TopLevel<FacetedUnitSpec<any, any>> & {
   data: NamedData;
 };
@@ -52,3 +53,20 @@ export interface QueryCreator {
 
   createQuery(query: Query): Query;
 }
+
+// Define our own because vega-lite types_unstable import path fails in Vite (module resolution issue)
+export const NONPOSITION_SCALE_CHANNELS: typeof NONPOSITION_SCALE_CHANNELS_VEGA =
+  [
+    "color",
+    "fill",
+    "stroke",
+    "opacity",
+    "fillOpacity",
+    "strokeOpacity",
+    "strokeWidth",
+    "size",
+    "shape",
+    "strokeDash",
+    "angle",
+    "time",
+  ] as const;

package/src/plugins/impl/data-frames/DataFramePlugin.tsx

@@ -312,9 +312,10 @@ DataFrameComponent.displayName = "DataFrameComponent";
 
 function getColumnSummaries() {
   return Promise.resolve({
-    stats: {},
     data: null,
+    stats: {},
     bin_values: {},
     value_counts: {},
+    show_charts: false,
   });
 }