fix imports

Author: Light2Dark

frontend/src/components/data-table/chart-spec-model.tsx

@@ -151,6 +151,7 @@ export class ColumnChartSpecModel<T> {
           ...base,
           // Two layers: one with the visible bars, and one with invisible bars
           // that provide a larger tooltip area.
+          // @ts-expect-error 'layer' property not in TopLevelFacetedUnitSpec
           layer: [
             {
               mark: {
@@ -238,6 +239,7 @@ export class ColumnChartSpecModel<T> {
           ...base, // Assuming base contains shared configurations
           // Two layers: one with the visible bars, and one with invisible bars
           // that provide a larger tooltip area.
+          // @ts-expect-error 'layer' property not in TopLevelFacetedUnitSpec
           layer: [
             {
               mark: {

frontend/src/components/data-table/charts/__tests__/__snapshots__/spec-snapshot.test.ts.snap

@@ -2,7 +2,7 @@
 
 exports[`create vega spec > should create and augment a spec 1`] = `
 {
-  "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
+  "$schema": "https://vega.github.io/schema/vega-lite/v6.json",
   "background": "white",
   "config": {
     "axis": {

frontend/src/components/data-table/charts/__tests__/spec-snapshot.test.ts

@@ -1,6 +1,6 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 
-import type { TopLevelSpec } from "vega-lite/build/src/spec";
+import type { TopLevelSpec } from "vega-lite";
 import { describe, expect, it } from "vitest";
 import {
   augmentSpecWithData,

frontend/src/components/data-table/charts/__tests__/spec.test.ts

@@ -1,6 +1,6 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 
-import type { PositionDef } from "vega-lite/build/src/channeldef";
+import type { PositionDef } from "vega-lite/types_unstable/channeldef.js";
 import { describe, expect, it } from "vitest";
 import {
   getAggregate,

frontend/src/components/data-table/charts/chart-spec/spec.ts

@@ -6,10 +6,10 @@ import type {
   Field,
   PolarDef,
   PositionDef,
-} from "vega-lite/build/src/channeldef";
-import type { Encoding } from "vega-lite/build/src/encoding";
-import type { Resolve } from "vega-lite/build/src/resolve";
-import type { FacetFieldDef } from "vega-lite/build/src/spec/facet";
+} from "vega-lite/types_unstable/channeldef.js";
+import type { Encoding } from "vega-lite/types_unstable/encoding.js";
+import type { Resolve } from "vega-lite/types_unstable/resolve.js";
+import type { FacetFieldDef } from "vega-lite/types_unstable/spec/facet.js";
 import type { z } from "zod";
 import type { ResolvedTheme } from "@/theme/useTheme";
 import type { TypedString } from "@/utils/typed";
@@ -284,7 +284,7 @@ function getBaseSpec(
   }
 
   return {
-    $schema: "https://vega.github.io/schema/vega-lite/v5.json",
+    $schema: "https://vega.github.io/schema/vega-lite/v6.json",
     background: theme === "dark" ? "dark" : "white",
     title: title,
     data: { values: [] },

frontend/src/components/data-table/charts/chart-spec/types.ts

@@ -1,6 +1,6 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 
-import type { StandardType } from "vega-lite/build/src/type";
+import type { StandardType } from "vega-lite/types_unstable/type.js";
 import type { DataType } from "@/core/kernel/messages";
 import type { Mark } from "@/plugins/impl/vega/types";
 import { logNever } from "@/utils/assertNever";

frontend/src/components/tracing/tracing-spec.ts

@@ -31,7 +31,7 @@ export function createGanttBaseSpec(
   theme: ResolvedTheme,
 ): Readonly<TopLevelSpec> {
   return {
-    $schema: "https://vega.github.io/schema/vega-lite/v5.json",
+    $schema: "https://vega.github.io/schema/vega-lite/v6.json",
     background: theme === "dark" ? "black" : undefined,
     mark: {
       type: "bar",

frontend/src/plugins/impl/data-explorer/functions/function.ts

@@ -1,7 +1,7 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 /* eslint-disable @typescript-eslint/no-base-to-string */
 import type { FieldQuery } from "compassql/build/src/query/encoding";
-import { isAggregateOp } from "vega-lite/build/src/aggregate";
+import { isAggregateOp } from "vega-lite/types_unstable/aggregate.js";
 import type { FieldFunction, TimeUnitOp } from "./types";
 
 // This code is adapted and simplified from https://github.com/vega/voyager

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

@@ -11,8 +11,8 @@ 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 { NONPOSITION_SCALE_CHANNELS } from "vega-lite/types_unstable/channel.js";
+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";

frontend/src/plugins/impl/vega/types.ts

@@ -13,7 +13,6 @@ export type { Field } from "vega-lite/types_unstable/channeldef.js";
 export type { SharedCompositeEncoding } from "vega-lite/types_unstable/compositemark/index.js";
 export type { DataFormat } from "vega-lite/types_unstable/data.js";
 export type { AnyMark, MarkDef } from "vega-lite/types_unstable/mark.js";
-export { Mark } from "vega-lite/types_unstable/mark.js";
 export type {
   SelectionParameter,
   SelectionType,
@@ -30,3 +29,23 @@ export type VegaLiteUnitSpec = TopLevelUnitSpec<Field>;
 export type GenericVegaSpec = GenericUnitSpec<any, any, any>;
 export type EncodingType = keyof Encoding<Field>;
 export type Encodings = Encoding<Field>;
+
+// import type { Mark } from "vega-lite/types_unstable/mark.js";
+// Mark has issues with types so we manually define
+export const Mark = {
+  arc: "arc",
+  area: "area",
+  bar: "bar",
+  image: "image",
+  line: "line",
+  point: "point",
+  rect: "rect",
+  rule: "rule",
+  text: "text",
+  tick: "tick",
+  trail: "trail",
+  circle: "circle",
+  square: "square",
+  geoshape: "geoshape",
+} as const;
+export type Mark = keyof typeof Mark;