ggaction 0.0.13 → 0.0.15

package/types/program.d.ts

@@ -2,8 +2,32 @@ import type { RegisteredExtensionActions } from "./extension.js";
 
 export type TemporalInputUnit = "auto" | "year" | "timestamp";
 export type ThemeName = "light" | "dark";
+export interface ThemeTokens {
+  background: string;
+  mark: string;
+  text: string;
+  strongText: string;
+  mutedText: string;
+  axis: string;
+  axisTitle: string;
+  grid: string;
+  border: string;
+  sizeSymbol: string;
+  regressionBand: string;
+  boxLine: string;
+  boxMedian: string;
+  referenceLine: string;
+  referenceBand: string;
+  gradientCenter: string;
+  highlight: string;
+  fontFamily: string;
+}
+export type ThemeDefinition =
+  | ThemeName
+  | { base: ThemeName; tokens: Partial<ThemeTokens> };
 export interface ApplyThemeOptions {
-  theme: ThemeName;
+  theme: ThemeDefinition;
+  scope?: "self" | "descendants";
 }
 export type FieldType = "quantitative" | "temporal" | "ordinal" | "nominal";
 export type GraphicType =
@@ -144,11 +168,15 @@ export interface FacetScaleResolutions {
   y?: FacetScaleResolution;
   xOffset?: FacetScaleResolution;
   yOffset?: FacetScaleResolution;
+  theta?: FacetScaleResolution;
+  r?: FacetScaleResolution;
   color?: FacetScaleResolution;
+  stroke?: FacetScaleResolution;
   size?: FacetScaleResolution;
   shape?: FacetScaleResolution;
   opacity?: FacetScaleResolution;
   strokeDash?: FacetScaleResolution;
+  parallelDimensions?: FacetScaleResolution;
 }
 export interface FacetGuideOptions {
   axes?: "each" | "outer";
@@ -185,7 +213,7 @@ export interface FacetGridOptions {
 export interface RepeatChartsOptions {
   id?: string;
   target?: string;
-  channel: "x" | "y";
+  channel: "x" | "y" | "theta" | "r" | { parallelDimension: string };
   fields: readonly [string, ...string[]];
   columns?: number;
   gap?: number;
@@ -201,7 +229,14 @@ export interface EditFacetHeadersOptions {
   fontWeight?: string | number;
   color?: string;
   offset?: number;
-}
+  role?: FacetHeaderRole;
+  labelMap?: DisplayLabelMap | "auto";
+  side?: FacetHeaderSide;
+  align?: FacetHeaderAlign;
+}
+export type FacetHeaderRole = "all" | "row" | "column";
+export type FacetHeaderSide = "top" | "bottom" | "left" | "right";
+export type FacetHeaderAlign = "start" | "center" | "end";
 export interface ConcatCompositionSpec {
   readonly id: string;
   readonly direction: "horizontal" | "vertical";
@@ -237,7 +272,7 @@ export interface FacetCompositionSpec {
     };
     readonly repeat?: {
       readonly target: string;
-      readonly channel: "x" | "y";
+      readonly channel: "x" | "y" | "theta" | "r" | { readonly parallelDimension: string };
       readonly fields: readonly string[];
     };
     readonly scales: Readonly<Required<FacetScaleResolutions>>;
@@ -254,6 +289,10 @@ export type DensityKernel =
   | "uniform"
   | "triangular";
 export type DensityNormalization = "unit" | "count";
+export interface StatisticalWeight {
+  readonly field: string;
+  readonly kind: "frequency" | "reliability";
+}
 export type DensityPlacementSide =
   | "both"
   | "left"
@@ -300,6 +339,13 @@ export type FilterDataOptions = {
   field: string;
 } & FilterModeOptions;
 export type DatasetScalar = string | number | boolean | null;
+export type DisplayLabelMap = ReadonlyArray<Readonly<{
+  value: DatasetScalar;
+  label: string;
+}>>;
+export interface DisplayLabelOptions {
+  labelMap?: DisplayLabelMap | "auto";
+}
 export type DatasetFilterTransform = {
   type: "filter";
   field: string;
@@ -351,6 +397,7 @@ export interface DatasetDensityTransform {
   steps: number;
   kernel?: DensityKernel;
   normalization?: DensityNormalization;
+  weight?: StatisticalWeight;
   as: readonly [string, string];
   resolve: "shared";
   placement?: {
@@ -368,10 +415,22 @@ export interface DatasetDensityTransform {
     };
   };
   resolved?: {
-    readonly bandwidth: number;
     readonly extent: readonly [number, number];
     readonly splitDomain?: readonly [unknown, unknown];
-  };
+  } & (
+    | {
+        readonly bandwidth: number;
+        readonly bandwidths?: never;
+      }
+    | {
+        readonly bandwidth?: never;
+        readonly bandwidths: readonly {
+          readonly group?: unknown;
+          readonly split?: unknown;
+          readonly bandwidth: number;
+        }[];
+      }
+  );
 }
 export type HorizonResolution = "shared" | "independent";
 export type HorizonMissingPolicy = "break" | "error";
@@ -451,6 +510,22 @@ export interface WindowSort {
   field: string;
   order?: WindowSortOrder;
 }
+export type RowWindowFrame = {
+  preceding: number;
+  following?: number;
+  duration?: never;
+};
+export type DurationWindowUnit = "millisecond" | "second" | "minute" | "hour" | "day";
+export type DurationWindowFrame = {
+  preceding?: never;
+  following?: never;
+  duration: {
+    preceding: number;
+    following?: number;
+    unit: DurationWindowUnit;
+  };
+};
+export type WindowFrame = RowWindowFrame | DurationWindowFrame;
 export type WindowOperation =
   | { op: "rowNumber" | "rank" | "denseRank"; as: string }
   | { op: "cumulativeSum"; field: string; as: string }
@@ -465,10 +540,9 @@ export type WindowOperation =
       op: "movingMean" | "movingSum";
       field: string;
       as: string;
-      frame: {
-        preceding: number;
-        following?: number;
-      };
+      frame: WindowFrame;
+      minPeriods?: number;
+      missing?: "error" | "skip";
     };
 export interface DatasetWindowSort {
   readonly field: string;
@@ -492,16 +566,27 @@ export type DatasetWindowOperation =
       readonly op: "movingMean" | "movingSum";
       readonly field: string;
       readonly as: string;
-      readonly frame: {
-        readonly preceding: number;
-        readonly following: number;
-      };
+      readonly frame:
+        | {
+            readonly preceding: number;
+            readonly following: number;
+          }
+        | {
+            readonly duration: {
+              readonly preceding: number;
+              readonly following: number;
+              readonly unit: DurationWindowUnit;
+            };
+          };
+      readonly minPeriods: number;
+      readonly missing: "error" | "skip";
     };
 export interface DatasetWindowTransform {
   readonly type: "window";
   readonly partitionBy: readonly string[];
   readonly sortBy: readonly DatasetWindowSort[];
   readonly operations: readonly DatasetWindowOperation[];
+  readonly temporalUnit?: TemporalInputUnit;
 }
 export interface ECDFOutputFields {
   value: string;
@@ -531,14 +616,28 @@ export type TimeUnit =
   | "day"
   | "hour"
   | "minute"
-  | "second";
-export interface DatasetTimeUnitTransform {
+  | "second"
+  | "week"
+  | "weekday";
+type DatasetTimeUnitTransformBase = {
   readonly type: "timeUnit";
   readonly field: string;
-  readonly unit: TimeUnit;
   readonly temporalUnit?: TemporalInputUnit;
   readonly as: string;
-}
+  readonly timeZone?: string;
+};
+export type DatasetTimeUnitTransform = DatasetTimeUnitTransformBase & (
+  | {
+      readonly unit: Exclude<TimeUnit, "week">;
+      readonly weekStartsOn?: never;
+      readonly weekRule?: never;
+    }
+  | {
+      readonly unit: "week";
+      readonly weekStartsOn: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+      readonly weekRule: "calendar" | "iso";
+    }
+);
 export interface Bin2DCounts {
   x: number;
   y: number;
@@ -600,6 +699,7 @@ export interface DatasetBinTransform {
   readonly zero: boolean;
   readonly includeEmpty: boolean;
   readonly members: boolean;
+  readonly weight?: StatisticalWeight;
   readonly as: {
     readonly lower: string;
     readonly upper: string;
@@ -622,21 +722,111 @@ export interface DatasetFoldTransform {
 }
 export type ComputedExpression =
   | { readonly field: string }
-  | { readonly constant: number }
+  | { readonly constant: number | string | boolean | null }
   | {
-      readonly op: "negate" | "absolute";
+      readonly op: "negate" | "absolute" | "log" | "sqrt" | "not" | "isNull";
       readonly operand: ComputedExpression;
     }
   | {
-      readonly op: "add" | "subtract" | "multiply" | "divide";
+      readonly op: "add" | "subtract" | "multiply" | "divide" |
+        "eq" | "neq" | "lt" | "lte" | "gt" | "gte";
       readonly left: ComputedExpression;
       readonly right: ComputedExpression;
+    }
+  | {
+      readonly op: "and" | "or" | "coalesce";
+      readonly operands: readonly [ComputedExpression, ComputedExpression, ...ComputedExpression[]];
+    }
+  | {
+      readonly op: "concat";
+      readonly operands: readonly [ComputedExpression, ...ComputedExpression[]];
+    }
+  | {
+      readonly op: "if";
+      readonly condition: ComputedExpression;
+      readonly then: ComputedExpression;
+      readonly else: ComputedExpression;
     };
 export interface DatasetComputedTransform {
   readonly type: "computed";
   readonly as: string;
   readonly expression: ComputedExpression;
 }
+export type NormalizeMethod =
+  | "share"
+  | "zscore"
+  | "minmax"
+  | "index"
+  | "change"
+  | "percentChange";
+export type NormalizeZeroDenominator = "error" | "null" | "zero";
+export type NormalizeBaseline =
+  | { readonly position: "first" | "last" }
+  | { readonly value: number };
+type DatasetNormalizedBaseTransform = {
+  readonly type: "normalize";
+  readonly field: string;
+  readonly as: string;
+  readonly groupBy: readonly string[];
+};
+type DatasetNormalizeBaselineTransform = {
+  readonly baseline: NormalizeBaseline;
+  readonly sortBy: readonly WindowSort[];
+};
+export type DatasetNormalizedTransform = DatasetNormalizedBaseTransform & (
+  | {
+      readonly method: "share" | "minmax";
+      readonly zeroDenominator: NormalizeZeroDenominator;
+    }
+  | {
+      readonly method: "zscore";
+      readonly variance: "population" | "sample";
+      readonly zeroDenominator: NormalizeZeroDenominator;
+    }
+  | ({
+      readonly method: "index" | "percentChange";
+      readonly zeroDenominator: NormalizeZeroDenominator;
+    } & DatasetNormalizeBaselineTransform)
+  | ({ readonly method: "change" } & DatasetNormalizeBaselineTransform)
+);
+export type DatasetCompleteTransform = {
+  readonly type: "complete";
+  readonly key: string;
+  readonly groupBy: readonly string[];
+  readonly fill: Readonly<Record<string, DatasetScalar>>;
+  readonly members?: string;
+} & (
+  | { readonly values: readonly DatasetScalar[]; readonly sequence?: never }
+  | {
+      readonly sequence: { readonly start: number; readonly end: number; readonly step: number };
+      readonly values?: never;
+    }
+  | { readonly values?: never; readonly sequence?: never }
+);
+type DatasetImputedBaseTransform = {
+  readonly type: "impute";
+  readonly fields: readonly string[];
+  readonly groupBy: readonly string[];
+  readonly edges: "keep" | "error";
+  readonly maxGap?: number;
+};
+export type DatasetImputedTransform = DatasetImputedBaseTransform & (
+  | {
+      readonly method: "constant";
+      readonly value: DatasetScalar;
+      readonly sortBy: readonly DatasetWindowSort[];
+    }
+  | {
+      readonly method: "forward" | "backward";
+      readonly value?: never;
+      readonly sortBy: readonly [DatasetWindowSort, ...DatasetWindowSort[]];
+    }
+  | {
+      readonly method: "linear";
+      readonly value?: never;
+      readonly sortBy: readonly [{ readonly field: string; readonly order: "ascending" }];
+    }
+);
 export type StackDataMode = "stack" | "fill" | "center" | "diverging";
 export interface StackDataOutputFields {
   start?: string;
@@ -652,10 +842,17 @@ export interface DatasetStackTransform {
   readonly mode: StackDataMode;
   readonly as: Required<StackDataOutputFields>;
 }
+interface DatasetStatisticalReferenceTransform {
+  readonly type: "statisticalReference";
+  readonly target: string;
+}
 export type DatasetTransform =
   | DatasetBinTransform
   | DatasetBin2DTransform
+  | DatasetCompleteTransform
   | DatasetComputedTransform
+  | DatasetImputedTransform
+  | DatasetNormalizedTransform
   | DatasetFilterTransform
   | DatasetFoldTransform
   | DatasetRegressionTransform
@@ -665,8 +862,20 @@ export type DatasetTransform =
   | DatasetIntervalTransform
   | DatasetSummaryTransform
   | DatasetStackTransform
+  | DatasetStatisticalReferenceTransform
   | DatasetTimeUnitTransform
   | DatasetWindowTransform;
+type RequestedTransform<T> = T extends unknown ? Omit<T, "resolved"> : never;
+export type RequestedDatasetTransform = RequestedTransform<Exclude<
+  DatasetTransform,
+  DatasetHorizonTransform | DatasetStatisticalReferenceTransform
+>>;
+export type DerivedDataDependents = "reject" | "recompute";
+export interface EditDerivedDataOptions {
+  target: string;
+  definition: RequestedDatasetTransform;
+  dependents?: DerivedDataDependents;
+}
 export interface CreateDerivedDataOptions {
   id: string;
   source: string;
@@ -677,6 +886,7 @@ export interface DatasetSummaryTransform {
   groupBy: readonly string[];
   aggregates: readonly SummaryAggregateOptions[];
   members?: string;
+  weight?: StatisticalWeight;
 }
 export interface SummaryAggregateOptions {
   op: AggregateOperation;
@@ -689,11 +899,16 @@ export interface SummaryDataOptions {
   groupBy?: string | readonly string[];
   aggregates: readonly SummaryAggregateOptions[];
   members?: string;
+  weight?: StatisticalWeight;
 }
 export interface BindMarkDataOptions {
   target: string;
   data: string;
 }
+
+export interface RemoveResourceOptions {
+  readonly id: string;
+}
 export type MarkGraphicProperty =
   | "x" | "y" | "width" | "height" | "radius"
   | "x1" | "y1" | "x2" | "y2"
@@ -702,7 +917,7 @@ export type MarkSelector = {
   grain?: "item" | "stack";
 } & (
   | { field: string; channel?: never; property?: never }
-  | { channel: "x" | "y" | "x2" | "y2" | "xOffset" | "yOffset" | "theta" | "radius" | "color" | "strokeDash" | "strokeWidth" | "size" | "shape" | "group" | "opacity"; field?: never; property?: never }
+  | { channel: "x" | "y" | "x2" | "y2" | "xOffset" | "yOffset" | "theta" | "radius" | "color" | "stroke" | "strokeDash" | "strokeWidth" | "size" | "shape" | "group" | "opacity"; field?: never; property?: never }
   | { property: MarkGraphicProperty; field?: never; channel?: never }
 ) & (
   | { op: "eq" | "neq" | "gt" | "gte" | "lt" | "lte"; value: unknown }
@@ -804,6 +1019,14 @@ export type PointShape =
   | "star"
   | "hexagon"
   | "wye";
+export type StrokeStyleDetails = {
+  lineCap?: "butt" | "round" | "square";
+  lineJoin?: "miter" | "round" | "bevel";
+  miterLimit?: number;
+};
+export type RectStyleDetails = StrokeStyleDetails & {
+  cornerRadius?: number;
+};
 export type PaletteName =
   | "accent"
   | "category10" | "category20" | "category20b" | "category20c"
@@ -834,6 +1057,11 @@ export type ScaleRange = "auto" | readonly unknown[] | {
   readonly palette: Palette;
 };
 export type ActionOptions = Record<string, unknown>;
+/**
+ * One semantic assignment or removal. Complete unreferenced source datasets and
+ * coordinates can be removed; source values remain immutable. Domain removal
+ * actions own full resource/configuration lifecycle checks and cleanup.
+ */
 export type EditSemanticOptions =
   | { property: string; value: unknown; remove?: false }
   | { property: string; remove: true; value?: never };
@@ -878,7 +1106,9 @@ export interface SemanticScale {
 
 export interface SemanticCoordinate {
   readonly id: string;
-  readonly type?: "cartesian" | "polar";
+  readonly type?: "cartesian" | "polar" | "parallel";
+  readonly aspect?: CoordinateAspect;
+  readonly polarFrame?: Exclude<PolarFrameOptions, "auto">;
   readonly layers?: readonly string[];
   readonly [key: string]: unknown;
 }
@@ -976,7 +1206,7 @@ export interface AxisTicksAndLabelsOptions<P extends string> {
   count?: number;
   values?: readonly AxisValue[];
   ticks?: AxisTickStyleOptions;
-  labels?: AxisLabelStyleOptions & AxisLabelLayoutOptions;
+  labels?: AxisLabelStyleOptions & AxisLabelLayoutOptions & DisplayLabelOptions;
 }
 export interface AxisTitleOptions<P extends string> {
   text?: string;
@@ -1016,7 +1246,7 @@ export interface AxisTickOptions<P extends string>
   values?: readonly AxisValue[];
 }
 export interface AxisLabelOptions<P extends string>
-  extends AxisLabelStyleOptions, AxisLabelLayoutOptions {
+  extends AxisLabelStyleOptions, AxisLabelLayoutOptions, DisplayLabelOptions {
   scale?: string;
   position?: P;
   count?: number;
@@ -1072,6 +1302,11 @@ export interface PolarTicksAndLabelsOptions {
   ticks?: AxisTickStyleOptions;
   labels?: AxisLabelStyleOptions;
 }
+export type ThetaAxisLabelOptions = PolarLabelOptions & DisplayLabelOptions;
+export interface ThetaTicksAndLabelsOptions
+  extends Omit<PolarTicksAndLabelsOptions, "labels"> {
+  labels?: AxisLabelStyleOptions & DisplayLabelOptions;
+}
 export interface PolarTitleOptions {
   text?: string;
   offset?: number;
@@ -1094,7 +1329,8 @@ export type CreateThetaAxisTicksOptions = Omit<PolarTickOptions, "count" | "valu
 export type CreateRadialAxisTicksOptions = Omit<PolarTickOptions, "count" | "values"> &
   PolarAxisTickSelection & PolarGuideResourceOptions;
 export type CreateThetaAxisLabelsOptions = Omit<PolarLabelOptions, "count" | "values"> &
-  PolarAxisTickSelection & Omit<PolarGuideResourceOptions, "angle">;
+  PolarAxisTickSelection & Omit<PolarGuideResourceOptions, "angle"> &
+  DisplayLabelOptions;
 export type CreateRadialAxisLabelsOptions = Omit<PolarLabelOptions, "count" | "values"> &
   PolarAxisTickSelection & PolarGuideResourceOptions;
 export type CreateThetaAxisTitleOptions = PolarTitleOptions &
@@ -1105,6 +1341,10 @@ export interface CompletePolarAxisOptions extends Omit<PolarGuideResourceOptions
   ticksAndLabels?: false | PolarTicksAndLabelsOptions;
   title?: false | PolarTitleOptions;
 }
+export interface CompleteThetaAxisOptions
+  extends Omit<CompletePolarAxisOptions, "ticksAndLabels"> {
+  ticksAndLabels?: false | ThetaTicksAndLabelsOptions;
+}
 export interface CompleteRadialAxisOptions
   extends Omit<CompletePolarAxisOptions, "title"> {
   angle?: number;
@@ -1118,6 +1358,11 @@ export interface EditPolarAxisOptions {
   ticksAndLabels?: false | PolarTicksAndLabelsOptions;
   title?: false | PolarTitleOptions;
 }
+export interface EditThetaAxisOptions
+  extends Omit<EditPolarAxisOptions, "angle" | "labels" | "ticksAndLabels"> {
+  labels?: false | ThetaAxisLabelOptions;
+  ticksAndLabels?: false | ThetaTicksAndLabelsOptions;
+}
 export interface EditRadialAxisOptions
   extends Omit<EditPolarAxisOptions, "title"> {
   title?: false | RadialTitleOptions;
@@ -1180,6 +1425,16 @@ type CartesianAxesOptions = Omit<
 > & {
   coordinate?: { id?: string; type?: "auto" | "cartesian" };
 };
+type CAxisTicks<P extends string> = Omit<AxisTicksAndLabelsOptions<P>, "labels"> & {
+  labels?: AxisLabelStyleOptions & AxisLabelLayoutOptions;
+};
+type CAxis<P extends string> = Omit<CompleteAxisOptions<P>, "ticksAndLabels"> & {
+  ticksAndLabels?: false | Omit<CAxisTicks<P>, "scale" | "position">;
+};
+type CAxes = Omit<CartesianAxesOptions, "x" | "y"> & {
+  x?: false | CAxis<XAxisPosition>;
+  y?: false | CAxis<YAxisPosition>;
+};
 type CartesianGridOptions = Pick<CreateGridOptions, "horizontal" | "vertical">;
 type FilledMarkLegendOptions = Omit<LegendOptions, "symbol"> & {
   symbol?: "auto"
@@ -1194,7 +1449,10 @@ type CategoricalLegendTextOptions = {
   fontWeight?: string | number;
   format?: "auto";
 };
-type PathLegendOptions = Omit<LegendOptions, "symbol" | "gradient" | "count" | "labels"> & {
+type PathLegendOptions = Omit<
+  LegendOptions,
+  "symbol" | "gradient" | "count" | "values" | "labels"
+> & {
   symbol?: "auto" | { length?: number; lineWidth?: number }
     | { layers: readonly LegendSymbolLayer[] };
   labels?: CategoricalLegendTextOptions;
@@ -1210,12 +1468,23 @@ type CartesianPathGuideOptions = Omit<CartesianGuideOptions, "legend"> & {
 type CartesianCategoricalGuideOptions = Omit<CartesianGuideOptions, "legend"> & {
   legend?: false | (Omit<
     FilledMarkLegendOptions,
-    "count" | "gradient" | "labels" | "order"
+    "count" | "values" | "gradient" | "labels" | "order"
   > & {
     labels?: CategoricalLegendTextOptions;
     order?: CartesianLegendOrder;
   });
 };
+type CPathGuides = Omit<CartesianPathGuideOptions, "axes"> & {
+  axes?: false | CAxes;
+};
+type CCategoricalGuides = Omit<CartesianCategoricalGuideOptions, "axes"> & {
+  axes?: false | CAxes;
+};
+type ColorGuides = Omit<CartesianGuideOptions, "legend"> & {
+  legend?: false | (Omit<FilledMarkLegendOptions, "values" | "order"> & {
+    order?: CartesianLegendOrder;
+  });
+};
 type BoxPlotGuideOptions = Omit<CartesianGuideOptions, "legend"> & { legend?: false };
 type GradientPlotDensityLegendOptions = {
   title?: string;
@@ -1238,6 +1507,34 @@ export interface CreateCoordinateOptions {
   layers?: readonly string[];
 }
 
+export type CoordinateAspectAlign = "start" | "center" | "end";
+export type CoordinateAspect = "auto" | {
+  mode: "frame" | "data";
+  ratio: number;
+  alignX?: CoordinateAspectAlign;
+  alignY?: CoordinateAspectAlign;
+};
+
+export type PolarFrameCenter = {
+  x: number;
+  y: number;
+};
+export type PolarFrameRadius =
+  | { unit: "fraction"; value: number }
+  | { unit: "px"; value: number };
+export type PolarFrameOptions = "auto" | {
+  center?: PolarFrameCenter;
+  radius?: PolarFrameRadius;
+};
+
+type EditCoordinateTarget = {
+  target: string;
+};
+export type EditCoordinateOptions = EditCoordinateTarget & (
+  | { aspect: CoordinateAspect; polarFrame?: PolarFrameOptions }
+  | { aspect?: CoordinateAspect; polarFrame: PolarFrameOptions }
+);
+
 export type RadialMapping = "area" | "radius-length";
 
 export interface ScaleOptions {
@@ -1323,12 +1620,59 @@ export type NonPointCategoricalColorScaleOptions = ScaleFields<"id" | "palette">
 };
 export type CategoricalColorScaleOptions =
   NonPointCategoricalColorScaleOptions & { unknown?: string };
-export type SizeScaleOptions = ScaleFields<"id"> & {
-  type?: "linear";
-  domain?: "auto" | readonly [number, number];
-  range?: "auto" | readonly [number, number];
+type SizeScaleCommonOptions = ScaleFields<"id" | "reverse"> & {
   unknown?: number;
 };
+type ContinuousSizeScaleOptions = SizeScaleCommonOptions &
+  ScaleFields<"clamp"> & {
+    domain?: "auto" | readonly [number, number];
+    range?: "auto" | readonly [number, number];
+  };
+export type SizeScaleOptions =
+  | (ContinuousSizeScaleOptions & {
+      type?: "linear";
+      base?: never;
+      exponent?: never;
+    })
+  | (ContinuousSizeScaleOptions & {
+      type: "log";
+      base?: number;
+      exponent?: never;
+    })
+  | (ContinuousSizeScaleOptions & {
+      type: "sqrt";
+      base?: never;
+      exponent?: never;
+    })
+  | (ContinuousSizeScaleOptions & {
+      type: "pow";
+      exponent: number;
+      base?: never;
+    })
+  | (SizeScaleCommonOptions & {
+      type: "quantize";
+      domain?: "auto" | readonly [number, number];
+      range: readonly [number, number, ...number[]];
+      clamp?: never;
+      base?: never;
+      exponent?: never;
+    })
+  | (SizeScaleCommonOptions & {
+      type: "quantile";
+      domain?: "auto" | readonly [number, ...number[]];
+      range: readonly [number, number, ...number[]];
+      clamp?: never;
+      base?: never;
+      exponent?: never;
+    })
+  | (SizeScaleCommonOptions & {
+      type: "threshold";
+      domain: readonly [number, ...number[]];
+      range: readonly [number, number, ...number[]];
+      clamp?: never;
+      base?: never;
+      exponent?: never;
+    });
 export type ShapeScaleOptions = ScaleFields<"id"> & {
   type?: "ordinal";
   domain?: "auto" | readonly unknown[];
@@ -1361,6 +1705,76 @@ export interface EditScaleOptions {
   unknown?: unknown;
 }
 
+type FocusedScaleSelection = { id?: string; target?: string };
+export type EditXScaleOptions = FocusedScaleSelection & WithoutScaleId<
+  QuantitativePositionScaleOptions | TemporalPositionScaleOptions | CategoricalPositionScaleOptions
+>;
+export type EditYScaleOptions = EditXScaleOptions;
+export type OffsetScaleEditPatch = Pick<
+  ScaleOptions,
+  "domain" | "reverse" | "padding" | "paddingInner" | "paddingOuter" | "align"
+>;
+export type EditXOffsetScaleOptions = { target: string } & OffsetScaleEditPatch;
+export type EditYOffsetScaleOptions = EditXOffsetScaleOptions;
+export type EditParallelScaleOptions = {
+  target: string;
+  dimension: string;
+} & WithoutScaleId<
+  QuantitativePositionScaleOptions | CategoricalPositionScaleOptions
+>;
+export type EditThetaScaleOptions = FocusedScaleSelection & WithoutScaleId<ThetaScaleOptions>;
+export type EditRScaleOptions = FocusedScaleSelection & WithoutScaleId<RadiusScaleOptions> & {
+  radialMapping?: RadialMapping;
+};
+export type EditColorScaleOptions = FocusedScaleSelection & WithoutScaleId<
+  CategoricalColorScaleOptions | ContinuousColorScaleOptions | DiscretizedColorScaleOptions
+>;
+export type EditStrokeScaleOptions = { target: string } & Omit<
+  EditColorScaleOptions,
+  "id" | "target"
+>;
+type ExistingSizeScaleEditPatch = {
+  type?: never;
+  domain?: "auto" | readonly [number, ...number[]];
+  range?: "auto" | readonly [number, number, ...number[]];
+  unknown?: number;
+  clamp?: boolean;
+  reverse?: boolean;
+  base?: number;
+  exponent?: number;
+};
+type SizeScaleTypeEditPatch =
+  | (Omit<WithoutScaleId<SizeScaleOptions>, "type"> & { type?: "linear" })
+  | (Omit<Extract<WithoutScaleId<SizeScaleOptions>, { type: "log" }>, "type"> & {
+      type: "log";
+    })
+  | (Omit<Extract<WithoutScaleId<SizeScaleOptions>, { type: "sqrt" }>, "type"> & {
+      type: "sqrt";
+    })
+  | (Omit<Extract<WithoutScaleId<SizeScaleOptions>, { type: "pow" }>, "type" | "exponent"> & {
+      type: "pow";
+      exponent?: number;
+    })
+  | (Omit<Extract<WithoutScaleId<SizeScaleOptions>, { type: "quantize" }>, "type" | "range"> & {
+      type: "quantize";
+      range?: readonly [number, number, ...number[]];
+    })
+  | (Omit<Extract<WithoutScaleId<SizeScaleOptions>, { type: "quantile" }>, "type" | "range"> & {
+      type: "quantile";
+      range?: readonly [number, number, ...number[]];
+    })
+  | (Omit<Extract<WithoutScaleId<SizeScaleOptions>, { type: "threshold" }>, "type" | "domain" | "range"> & {
+      type: "threshold";
+      domain?: readonly [number, ...number[]];
+      range?: readonly [number, number, ...number[]];
+    });
+export type EditSizeScaleOptions = FocusedScaleSelection &
+  (ExistingSizeScaleEditPatch | SizeScaleTypeEditPatch);
+export type EditOpacityScaleOptions = FocusedScaleSelection & WithoutScaleId<OpacityScaleOptions>;
+export type EditShapeScaleOptions = FocusedScaleSelection & WithoutScaleId<ShapeScaleOptions>;
+export type EditStrokeWidthScaleOptions = FocusedScaleSelection & WithoutScaleId<StrokeWidthScaleOptions>;
+export type EditStrokeDashScaleOptions = FocusedScaleSelection & WithoutScaleId<DashScaleOptions>;
+
 interface PositionEncodingBase {
   field: string;
   target?: string;
@@ -1467,7 +1881,7 @@ export type RadialEncodingOptions = {
   fieldType?: "quantitative";
   coordinate?: string;
 } & (
-  | { field: string; mapping?: never; aggregate?: never; scale?: RadiusScaleOptions }
+  | { field: string; mapping?: false; aggregate?: never; scale?: RadiusScaleOptions }
   | { field: string; mapping?: RadialMapping; aggregate: "sum"; scale?: MeasuredRadiusScaleOptions }
   | { field?: never; mapping?: RadialMapping; aggregate: "count"; scale?: MeasuredRadiusScaleOptions }
 );
@@ -1557,6 +1971,7 @@ export type HistogramEncodingOptions = {
   stack?: StackMode;
   xScale?: NonPointQuantitativePositionScaleOptions;
   yScale?: NonPointZeroSupportingPositionScaleOptions;
+  weight?: StatisticalWeight;
 } & (
   | { maxBins?: number; binStep?: never; binBoundaries?: never }
   | { maxBins?: never; binStep: number; binBoundaries?: never }
@@ -1586,6 +2001,7 @@ export interface DensityDataOptions {
   steps?: number;
   kernel?: DensityKernel;
   normalization?: DensityNormalization;
+  weight?: StatisticalWeight;
   as?: readonly [string, string];
 }
 
@@ -1690,6 +2106,7 @@ export interface WindowDataOptions {
   partitionBy?: string | readonly string[];
   sortBy?: readonly WindowSort[];
   operations: readonly WindowOperation[];
+  temporalUnit?: TemporalInputUnit;
 }
 
 export interface ECDFDataOptions {
@@ -1702,14 +2119,31 @@ export interface ECDFDataOptions {
   as?: ECDFOutputFields;
 }
 
-export interface TimeUnitDataOptions {
+type TimeUnitDataBaseOptions = {
   id: string;
   source?: string;
   field: string;
-  unit: TimeUnit;
   temporalUnit?: TemporalInputUnit;
   as: string;
-}
+  timeZone?: string;
+};
+export type TimeUnitDataOptions = TimeUnitDataBaseOptions & (
+  | {
+      unit: Exclude<TimeUnit, "week">;
+      weekStartsOn?: never;
+      weekRule?: never;
+    }
+  | {
+      unit: "week";
+      weekRule?: "calendar";
+      weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+    }
+  | {
+      unit: "week";
+      weekRule: "iso";
+      weekStartsOn?: 1;
+    }
+);
 
 export interface BinDataOutputFields {
   lower?: string;
@@ -1734,6 +2168,7 @@ export type BinDataOptions = {
   zero?: boolean;
   includeEmpty?: boolean;
   members?: boolean;
+  weight?: StatisticalWeight;
   as?: BinDataOutputFields;
 } & BinDataMode;
 
@@ -1753,6 +2188,79 @@ export interface ComputedDataOptions {
   as: string;
   expression: ComputedExpression;
 }
+type NormalizedDataBaseOptions = {
+  id: string;
+  source?: string;
+  field: string;
+  as: string;
+  groupBy?: string | readonly string[];
+};
+type NormalizeBaselineOptions =
+  | {
+      baseline?: { position: "first" | "last" };
+      sortBy: readonly [WindowSort, ...WindowSort[]];
+    }
+  | {
+      baseline: { value: number };
+      sortBy?: readonly WindowSort[];
+    };
+export type NormalizedDataOptions = NormalizedDataBaseOptions & (
+  | {
+      method: "share" | "minmax";
+      zeroDenominator?: NormalizeZeroDenominator;
+    }
+  | {
+      method: "zscore";
+      variance?: "population" | "sample";
+      zeroDenominator?: NormalizeZeroDenominator;
+    }
+  | ({
+      method: "index" | "percentChange";
+      zeroDenominator?: NormalizeZeroDenominator;
+    } & NormalizeBaselineOptions)
+  | ({ method: "change" } & NormalizeBaselineOptions)
+);
+type CompleteDataBaseOptions = {
+  id: string;
+  source?: string;
+  key: string;
+  groupBy?: string | readonly string[];
+  fill?: Readonly<Record<string, DatasetScalar>>;
+  members?: string;
+};
+export type CompleteDataOptions = CompleteDataBaseOptions & (
+  | { values: readonly [DatasetScalar, ...DatasetScalar[]]; sequence?: never }
+  | {
+      values?: never;
+      sequence: { start: number; end: number; step: number };
+    }
+  | { values?: never; sequence?: never }
+);
+type ImputedDataBaseOptions = {
+  id: string;
+  source?: string;
+  fields: string | readonly [string, ...string[]];
+  groupBy?: string | readonly string[];
+  edges?: "keep" | "error";
+  maxGap?: number;
+};
+export type ImputedDataOptions = ImputedDataBaseOptions & (
+  | {
+      method: "constant";
+      value: DatasetScalar;
+      sortBy?: readonly WindowSort[];
+    }
+  | {
+      method: "forward" | "backward";
+      value?: never;
+      sortBy: readonly [WindowSort, ...WindowSort[]];
+    }
+  | {
+      method: "linear";
+      value?: never;
+      sortBy: readonly [{ field: string; order?: "ascending" }];
+    }
+);
 export interface StackDataOptions {
   id: string;
   source?: string;
@@ -1785,8 +2293,51 @@ export interface EditBin2DDataOptions {
   includeEmpty?: boolean;
   members?: boolean;
   as?: DatasetBin2DOutputFields;
+  dependents?: DerivedDataDependents;
 }
 
+type FocusedDerivedDataPatch<T> = T extends unknown
+  ? Partial<Omit<T, "id" | "source">>
+  : never;
+type FocusedDerivedDataEdit<T> = {
+  target: string;
+  dependents?: DerivedDataDependents;
+} & FocusedDerivedDataPatch<T>;
+type FocusedWeightedDerivedDataEdit<T, Weight> = {
+  target: string;
+  dependents?: DerivedDataDependents;
+} & (T extends unknown
+  ? Omit<FocusedDerivedDataPatch<T>, "weight"> & { weight?: Weight | false }
+  : never);
+
+export type EditComputedDataOptions = FocusedDerivedDataEdit<ComputedDataOptions>;
+export type EditFilteredDataOptions = FocusedDerivedDataEdit<FilterDataOptions>;
+export type EditFoldDataOptions = FocusedDerivedDataEdit<FoldDataOptions>;
+export type EditSummaryDataOptions = FocusedWeightedDerivedDataEdit<
+  SummaryDataOptions,
+  StatisticalWeight
+>;
+export type EditBinDataOptions = FocusedWeightedDerivedDataEdit<
+  BinDataOptions,
+  StatisticalWeight
+>;
+export type EditTimeUnitDataOptions = FocusedDerivedDataEdit<TimeUnitDataOptions>;
+export type EditWindowDataOptions = FocusedDerivedDataEdit<WindowDataOptions>;
+export type EditDensityDataOptions = FocusedWeightedDerivedDataEdit<
+  DensityDataOptions,
+  StatisticalWeight
+>;
+export type EditStackDataOptions = FocusedDerivedDataEdit<StackDataOptions>;
+export type EditRegressionDataOptions = FocusedDerivedDataEdit<RegressionDataOptions>;
+export type EditIntervalDataOptions = FocusedDerivedDataEdit<IntervalDataOptions>;
+export type EditECDFDataOptions = FocusedWeightedDerivedDataEdit<
+  ECDFDataOptions,
+  string
+>;
+export type EditNormalizedDataOptions = FocusedDerivedDataEdit<NormalizedDataOptions>;
+export type EditCompleteDataOptions = FocusedDerivedDataEdit<CompleteDataOptions>;
+export type EditImputedDataOptions = FocusedDerivedDataEdit<ImputedDataOptions>;
+
 export type ErrorBarPositionChannel = { field?: string } & (
   | {
       fieldType?: "nominal" | "ordinal";
@@ -1831,7 +2382,7 @@ export interface ErrorBarOffsetChannel {
   paddingOuter?: number;
 }
 
-export interface ErrorBarOptions {
+export interface ErrorBarOptions extends StrokeStyleDetails {
   id?: string;
   target?: string;
   data?: string;
@@ -1849,7 +2400,7 @@ export interface ErrorBarOptions {
   opacity?: number;
 }
 
-export interface EditErrorBarOptions {
+export interface EditErrorBarOptions extends StrokeStyleDetails {
   target?: string;
   data?: string;
   x?: ErrorBarPositionChannel | ErrorBarIntervalChannel;
@@ -1901,17 +2452,17 @@ export interface BoxPlotOptions {
   whisker?: BoxPlotWhisker;
   width?: { band?: number };
   outliers?: boolean;
-  box?: {
+  box?: RectStyleDetails & {
     fill?: string;
     opacity?: number;
     stroke?: string;
     strokeWidth?: number;
   };
-  median?: {
+  median?: StrokeStyleDetails & {
     stroke?: string;
     strokeWidth?: number;
   };
-  outlier?: {
+  outlier?: StrokeStyleDetails & {
     shape?: PointShape;
     radius?: number;
     opacity?: number;
@@ -1927,17 +2478,17 @@ export interface EditBoxPlotOptions {
   whisker?: BoxPlotWhisker;
   width?: { band?: number };
   outliers?: boolean;
-  box?: {
+  box?: RectStyleDetails & {
     fill?: string;
     opacity?: number;
     stroke?: string;
     strokeWidth?: number;
   };
-  median?: {
+  median?: StrokeStyleDetails & {
     stroke?: string;
     strokeWidth?: number;
   };
-  outlier?: {
+  outlier?: StrokeStyleDetails & {
     shape?: PointShape;
     radius?: number;
     opacity?: number;
@@ -1959,7 +2510,7 @@ export interface GradientPlotAppearanceOptions {
   opacity?: readonly [number, number];
 }
 
-export interface GradientPlotCenterOptions {
+export interface GradientPlotCenterOptions extends StrokeStyleDetails {
   type?: "mean" | "median";
   stroke?: string;
   strokeWidth?: number;
@@ -2001,6 +2552,7 @@ export type ViolinPlotPositionChannel =
 
 export interface ViolinPlotDensityOptions
   extends GradientPlotDensityOptions {
+  weight?: StatisticalWeight;
   width?: DensityPlacementWidth;
   side?: "both" | "left" | "right" | "top" | "bottom";
 }
@@ -2020,7 +2572,7 @@ export type ViolinPlotColorOptions =
       layout?: "overlay";
     };
 
-export interface ViolinPlotAreaOptions {
+export interface ViolinPlotAreaOptions extends StrokeStyleDetails {
   fill?: string;
   opacity?: number;
   stroke?: string;
@@ -2047,7 +2599,9 @@ export interface EditViolinPlotOptions {
   x?: ViolinPlotPositionChannel;
   y?: ViolinPlotPositionChannel;
   split?: false | ViolinPlotSplitOptions;
-  density?: ViolinPlotDensityOptions;
+  density?: Omit<ViolinPlotDensityOptions, "weight"> & {
+    weight?: StatisticalWeight | false;
+  };
 }
 
 export interface EditGradientPlotOptions {
@@ -2279,7 +2833,7 @@ export interface CreateParallelCoordinatesOptions {
   missing?: ParallelMissingPolicy;
   color?: LineCategoricalColorChannel;
   strokeDash?: BasicStrokeDashChannel;
-  line?: {
+  line?: StrokeStyleDetails & {
     strokeWidth?: number;
     stroke?: string;
     opacity?: number;
@@ -2298,7 +2852,7 @@ export interface CreateScatterPlotOptions {
   color?: BasicColorChannel;
   size?: BasicSizeChannel;
   shape?: BasicShapeChannel;
-  point?: {
+  point?: StrokeStyleDetails & {
     radius?: number;
     shape?: PointShape;
     fill?: string;
@@ -2309,7 +2863,7 @@ export interface CreateScatterPlotOptions {
   guides?: false | CartesianGuideOptions;
 }
 
-export interface IntervalPlotErrorBarOptions {
+export interface IntervalPlotErrorBarOptions extends StrokeStyleDetails {
   caps?: boolean;
   capSize?: number;
   stroke?: string;
@@ -2431,7 +2985,7 @@ export interface CreateECDFPlotOptions {
   missing?: "drop" | "error";
   as?: ECDFOutputFields;
   color?: string | LineCategoricalColorChannel;
-  line?: { strokeWidth?: number; stroke?: string; opacity?: number };
+  line?: StrokeStyleDetails & { strokeWidth?: number; stroke?: string; opacity?: number };
   labels?: false | EndpointLabelOptions;
   guides?: false | CartesianPathGuideOptions;
 }
@@ -2516,7 +3070,8 @@ type CategoricalThetaTicksAndLabelsOptions = Omit<
   "count" | "labels"
 > & {
   count?: never;
-  labels?: Omit<AxisLabelStyleOptions, "format"> & { format?: "auto" };
+  labels?: Omit<AxisLabelStyleOptions, "format"> & DisplayLabelOptions &
+    { format?: "auto" };
 };
 type CategoricalThetaAxisOptions = Omit<CompletePolarAxisOptions, "ticksAndLabels"> & {
   ticksAndLabels?: false | CategoricalThetaTicksAndLabelsOptions;
@@ -2582,13 +3137,14 @@ export type RugMeasureChannel = string | (
       scale?: NonPointTemporalPositionScaleOptions;
     }
 );
-export interface RugTickOptions {
+export interface RugTickOptions extends StrokeStyleDetails {
   length?: number;
   stroke?: string;
   strokeWidth?: number;
   opacity?: number;
 }
-export type RugGuideOptions = Omit<CartesianGuideOptions, "legend"> & {
+export type RugGuideOptions = Omit<CartesianGuideOptions, "axes" | "legend"> & {
+  axes?: false | CAxes;
   legend?: false;
 };
 export type CreateRugPlotOptions = {
@@ -2624,7 +3180,7 @@ export type CreateStripPlotOptions = {
   color?: BasicColorChannel;
   size?: BasicSizeChannel;
   shape?: BasicShapeChannel;
-  point?: {
+  point?: StrokeStyleDetails & {
     radius?: number;
     shape?: PointShape;
     fill?: string;
@@ -2651,7 +3207,7 @@ export type CreateBeeswarmPlotOptions = {
   color?: BasicColorChannel;
   size?: BasicSizeChannel;
   shape?: BasicShapeChannel;
-  point?: {
+  point?: StrokeStyleDetails & {
     radius?: number;
     shape?: PointShape;
     fill?: string;
@@ -2765,7 +3321,7 @@ export type CreateAreaPlotOptions = {
   groupBy?: string | readonly [string, ...string[]];
   layout?: Exclude<ColorLayout, "group">; missing?: "error" | "break";
   color?: string | { field: string; fieldType?: "nominal" | "ordinal"; scale?: NonPointCategoricalColorScaleOptions; palette?: Palette };
-  area?: { fill?: string; opacity?: number; stroke?: string; strokeWidth?: number; curve?: CurveInterpolation };
+  area?: StrokeStyleDetails & { fill?: string; opacity?: number; stroke?: string; strokeWidth?: number; curve?: CurveInterpolation };
   guides?: false | DensityPlotGuideOptions;
 } & (
   | { valueChannel?: "y"; x: AreaPlotIndependentChannel; y: Exclude<AreaPlotMeasureChannel, { lower: unknown }>; baseline?: number }
@@ -2783,14 +3339,14 @@ export interface CreateLinePlotOptions {
   color?: LineCategoricalColorChannel;
   groupBy?: string | readonly [string, ...string[]];
   strokeDash?: BasicStrokeDashChannel;
-  line?: {
+  line?: StrokeStyleDetails & {
     strokeWidth?: number;
     curve?: CurveInterpolation;
     stroke?: string;
     opacity?: number;
     closed?: false;
   };
-  guides?: false | CartesianPathGuideOptions;
+  guides?: false | CPathGuides;
 }
 
 type BasicHistogramEncoding =
@@ -2810,13 +3366,13 @@ export interface CreateBarPlotOptions {
   y: BarYPositionChannel;
   color?: BarColorChannel;
   width?: Omit<BarWidthOptions, "target">;
-  bar?: {
+  bar?: RectStyleDetails & {
     fill?: string;
     opacity?: number;
     stroke?: FilledMarkStroke;
     strokeWidth?: number;
   };
-  guides?: false | CartesianGuideOptions;
+  guides?: false | ColorGuides;
 }
 
 export type CreateHistogramOptions = BasicHistogramEncoding & {
@@ -2825,7 +3381,7 @@ export type CreateHistogramOptions = BasicHistogramEncoding & {
   coordinate?: string;
   field: string;
   color?: HistogramCategoricalColorChannel;
-  bar?: {
+  bar?: RectStyleDetails & {
     fill?: string;
     opacity?: number;
     stroke?: FilledMarkStroke;
@@ -2835,7 +3391,7 @@ export type CreateHistogramOptions = BasicHistogramEncoding & {
 };
 
 export type HorizonPlotGuideOptions = {
-  axes?: false | (Omit<CartesianAxesOptions, "y"> & { y?: false });
+  axes?: false | (Omit<CAxes, "y"> & { y?: false });
   grid?: false | (Pick<CartesianGridOptions, "vertical"> & { horizontal?: false });
   legend?: false;
 };
@@ -2853,12 +3409,12 @@ export interface CreateHorizonPlotOptions {
   missing?: HorizonMissingPolicy;
   overflow?: HorizonOverflowPolicy;
   palette?: HorizonPaletteOptions;
-  area?: { opacity?: number; stroke?: string; strokeWidth?: number; curve?: CurveInterpolation };
+  area?: StrokeStyleDetails & { opacity?: number; stroke?: string; strokeWidth?: number; curve?: CurveInterpolation };
   guides?: false | HorizonPlotGuideOptions;
 }
 
 export type DensityPlotLegendOptions = Omit<PieLegendOptions, "order"> & { order?: LegendValueOrder };
-export type DensityPlotGuideOptions = Omit<CartesianCategoricalGuideOptions, "legend"> & {
+export type DensityPlotGuideOptions = Omit<CCategoricalGuides, "legend"> & {
   legend?: false | DensityPlotLegendOptions;
 };
 export interface CreateDensityPlotOptions {
@@ -2872,6 +3428,7 @@ export interface CreateDensityPlotOptions {
   steps?: number;
   kernel?: DensityKernel;
   normalization?: DensityNormalization;
+  weight?: StatisticalWeight;
   as?: readonly [string, string];
   densityChannel?: "x" | "y";
   valueScale?: NonPointQuantitativePositionScaleOptions;
@@ -2883,7 +3440,7 @@ export interface CreateDensityPlotOptions {
     palette?: Palette;
     layout?: "overlay";
   };
-  area?: { fill?: string; opacity?: number; stroke?: string; strokeWidth?: number; curve?: CurveInterpolation };
+  area?: StrokeStyleDetails & { fill?: string; opacity?: number; stroke?: string; strokeWidth?: number; curve?: CurveInterpolation };
   guides?: false | DensityPlotGuideOptions;
 }
 
@@ -2900,7 +3457,7 @@ export type PieColor = string | {
 };
 export type PieLegendOptions = Omit<
   FilledMarkLegendOptions,
-  "count" | "gradient" | "channels" | "order" | "labels"
+  "count" | "values" | "gradient" | "channels" | "order" | "labels"
 > & {
   channels?: readonly ["color"];
   order?: LegendValueOrder | { channel: "theta"; values?: never };
@@ -2912,7 +3469,7 @@ export type CreatePiePlotOptions = {
   coordinate?: string;
   category: PieCategory;
   color?: false | PieColor;
-  arc?: { innerRadius?: number; padAngle?: number; fill?: string; opacity?: number; stroke?: string; strokeWidth?: number };
+  arc?: StrokeStyleDetails & { innerRadius?: number; padAngle?: number; fill?: string; opacity?: number; stroke?: string; strokeWidth?: number };
   guides?: false | { axes?: false; grid?: false; legend?: false | PieLegendOptions };
 } & ({ value?: never; aggregate?: "count" } | { value: string; aggregate: "sum" });
 
@@ -2923,7 +3480,7 @@ export type MeasuredRadialGuideOptions = {
 };
 export type CreateRosePlotOptions = Omit<CreatePiePlotOptions, "guides" | "arc" | "aggregate" | "value"> & {
   radiusScale?: MeasuredRadiusScaleOptions;
-  arc?: { innerRadius?: number; padAngle?: 0; fill?: string; opacity?: number; stroke?: string; strokeWidth?: number };
+  arc?: StrokeStyleDetails & { innerRadius?: number; padAngle?: 0; fill?: string; opacity?: number; stroke?: string; strokeWidth?: number };
   guides?: false | MeasuredRadialGuideOptions;
 } & ({ value?: never; aggregate?: "count" } | { value: string; aggregate: "sum" });
 export type CreateRadialBarPlotOptions = CreateRosePlotOptions;
@@ -2932,7 +3489,7 @@ export interface HeatmapBaseOptions {
   id?: string;
   data?: string;
   coordinate?: string;
-  rect?: {
+  rect?: RectStyleDetails & {
     opacity?: number;
     stroke?: string | false;
     strokeWidth?: number;
@@ -3017,7 +3574,7 @@ export type ErrorBandIntervalChannel =
   | ErrorBandStatisticalIntervalChannel
   | ErrorBandExplicitIntervalChannel;
 
-export interface ErrorBandOptions {
+export interface ErrorBandOptions extends StrokeStyleDetails {
   id?: string;
   target?: string;
   data?: string;
@@ -3028,16 +3585,16 @@ export interface ErrorBandOptions {
   fill?: string;
   opacity?: number;
   curve?: CurveInterpolation;
-  boundaries?: false | {
+  boundaries?: false | (StrokeStyleDetails & {
     stroke?: string;
     strokeWidth?: number;
     strokeDash?: DashStyle | DashPattern;
     opacity?: number;
     curve?: CurveInterpolation;
-  };
+  });
 }
 
-export interface EditErrorBandOptions {
+export interface EditErrorBandOptions extends StrokeStyleDetails {
   target?: string;
   data?: string;
   x?: ErrorBandPositionChannel | ErrorBandIntervalChannel;
@@ -3052,16 +3609,16 @@ export interface EditErrorBandOptions {
     method?: ConfidenceIntervalMethod;
     level?: number;
   };
-  boundaries?: false | {
+  boundaries?: false | (StrokeStyleDetails & {
     stroke?: string;
     strokeWidth?: number;
     strokeDash?: DashStyle | DashPattern;
     opacity?: number;
     curve?: CurveInterpolation;
-  };
+  });
 }
 
-export interface EditErrorBandBoundaryOptions {
+export interface EditErrorBandBoundaryOptions extends StrokeStyleDetails {
   target?: string;
   boundary?: "both" | "lower" | "upper";
   stroke?: string;
@@ -3081,6 +3638,7 @@ export interface EditDensityOptions {
   steps?: number;
   kernel?: DensityKernel;
   normalization?: DensityNormalization;
+  weight?: StatisticalWeight | false;
   densityChannel?: "x" | "y";
   valueScale?: NonPointQuantitativePositionScaleOptions;
   placement?: DensityPlacement;
@@ -3090,7 +3648,11 @@ export interface OffsetScaleOptions {
   id?: string;
   type?: "ordinal";
   domain?: "auto" | readonly unknown[];
-  range?: "auto" | readonly [number, number];
+  reverse?: boolean;
+  padding?: number;
+  paddingInner?: number;
+  paddingOuter?: number;
+  align?: number;
 }
 
 export interface OffsetEncodingOptions {
@@ -3139,6 +3701,27 @@ export interface LabelLeaderOptions {
   opacity?: number;
 }
 
+export type MarkLabelAnchor =
+  | "center"
+  | "insideStart"
+  | "insideEnd"
+  | "outsideStart"
+  | "outsideEnd";
+
+export interface MarkLabelPlacementLeaderOptions {
+  stroke?: string;
+  strokeWidth?: number;
+}
+
+export interface MarkLabelPlacement {
+  anchor: MarkLabelAnchor;
+  /** Pixel gap between the source boundary and the nearest text edge. Defaults to 4. */
+  gap?: number;
+  /** Inside-fit behavior. Defaults to hide. */
+  overflow?: "hide" | "outside" | "allow";
+  leader?: false | MarkLabelPlacementLeaderOptions;
+}
+
 export interface LabelLayoutOptions {
   target?: string;
   axis?: LabelLayoutAxis;
@@ -3152,7 +3735,7 @@ export interface RemoveLabelLayoutOptions {
   target?: string;
 }
 
-export interface RectMarkOptions {
+export interface RectMarkOptions extends RectStyleDetails {
   id?: string;
   data?: string;
   fill?: string;
@@ -3176,15 +3759,39 @@ export type TextEncodingOptions = {
 );
 
 /** Attached final-item labels; lower text actions own subsequent edits. */
+export type MarkLabelSelectionOptions =
+  | { select?: never; selection?: never }
+  | { select: MarkSelector; selection?: never }
+  | { selection: string; select?: never };
+
 export type CreateMarkLabelsOptions = Omit<TextMarkOptions, "data" | "text"> & {
   layout?: false | Omit<LabelLayoutOptions, "target">;
+  placement?: MarkLabelPlacement;
 } & (
   | (TextEncodingOptions extends infer Options
       ? Options extends TextEncodingOptions ? Omit<Options, "target"> : never
       : never)
   | { field?: never; value?: never; content?: never; normalizeBy?: never; format?: TextFormat }
+) & MarkLabelSelectionOptions;
+
+/** Replace the requested final-item membership of one attached label layer. */
+export type EditMarkLabelSelectionOptions = { target: string } & (
+  | { select: MarkSelector; selection?: never; all?: never }
+  | { selection: string; select?: never; all?: never }
+  | { all: true; select?: never; selection?: never }
 );
 
+/** Replace semantic placement or reset one attached label layer to its legacy anchor. */
+export interface EditMarkLabelPlacementOptions {
+  target: string;
+  placement: MarkLabelPlacement | "auto";
+}
+
+/** Remove one attached label layer or every attached label owned by a source mark. */
+export type RemoveMarkLabelsOptions =
+  | { target: string; source?: never }
+  | { source: string; target?: never };
+
 type AnnotationBaseOptions = Omit<TextMarkOptions, "id" | "data" | "source" | "text"> & {
   id?: string;
   text: unknown;
@@ -3320,6 +3927,42 @@ export type ColorEncodingOptions =
       layout?: never;
     };
 
+export type StrokeEncodingOptions =
+  | {
+      target?: string;
+      value: string;
+      field?: never;
+      fieldType?: never;
+      temporalUnit?: never;
+      scale?: never;
+    }
+  | {
+      target?: string;
+      field: string;
+      value?: never;
+      fieldType?: "nominal" | "ordinal";
+      temporalUnit?: never;
+      scale?: CategoricalColorScaleOptions;
+    }
+  | {
+      target?: string;
+      field: string;
+      value?: never;
+      fieldType: "quantitative";
+      temporalUnit?: never;
+      scale?: ContinuousColorScaleOptions | DiscretizedColorScaleOptions;
+    }
+  | {
+      target?: string;
+      field: string;
+      value?: never;
+      fieldType: "temporal";
+      temporalUnit?: TemporalInputUnit;
+      scale?: Omit<ContinuousColorScaleOptions, "midpoint"> & {
+        midpoint?: "auto";
+      };
+    };
+
 export type OpacityScaleOptions = ScaleFields<
   "id" | "nice" | "zero" | "clamp" | "reverse"
 > & {
@@ -3341,7 +3984,7 @@ export type OpacityEncodingOptions =
 
 export type StrokeWidthScaleOptions = NonPointQuantitativePositionScaleOptions;
 
-export interface RuleStyleOptions {
+export interface RuleStyleOptions extends StrokeStyleDetails {
   stroke?: string;
   strokeWidth?: number;
   strokeDash?: DashStyle | DashPattern;
@@ -3355,10 +3998,33 @@ type ReferenceBinding<DataValue, PlotValue> =
   | ({ space: "plot"; data?: string; coordinate?: string;
        source?: never; temporalUnit?: never } & ReferenceAxis<PlotValue>);
 
-export type CreateReferenceLineOptions = { id?: string } & RuleStyleOptions &
-  ReferenceBinding<unknown, number>;
-export type CreateReferenceBandOptions = Omit<RectMarkOptions, "data"> &
-  ReferenceBinding<readonly [unknown, unknown], readonly [number, number]>;
+export type ReferenceStatistic =
+  | { readonly op: "mean" | "median" | "min" | "max"; readonly p?: never }
+  | { readonly op: "quantile"; readonly p: number };
+type DynamicReferenceBinding = {
+  readonly id?: string;
+  readonly source: string;
+  readonly axis: "x" | "y";
+  readonly population?: "boundData" | "visibleItems";
+  readonly field?: string;
+  readonly x?: never;
+  readonly y?: never;
+  readonly space?: never;
+  readonly data?: never;
+  readonly coordinate?: never;
+  readonly temporalUnit?: never;
+};
+export type CreateReferenceLineOptions =
+  | ({ id?: string } & RuleStyleOptions & ReferenceBinding<unknown, number>)
+  | (DynamicReferenceBinding & RuleStyleOptions & {
+      readonly statistic: ReferenceStatistic;
+    });
+export type CreateReferenceBandOptions =
+  | (Omit<RectMarkOptions, "data"> &
+      ReferenceBinding<readonly [unknown, unknown], readonly [number, number]>)
+  | (DynamicReferenceBinding & Omit<RectMarkOptions, "id" | "data" | "source"> & {
+      readonly statistics: readonly [ReferenceStatistic, ReferenceStatistic];
+    });
 
 export type StrokeWidthEncodingOptions =
   | {
@@ -3376,10 +4042,63 @@ export type StrokeWidthEncodingOptions =
       scale?: StrokeWidthScaleOptions;
     };
 
+export type SizeEncodingOptions = {
+  field: string;
+  target?: string;
+  fieldType?: "quantitative";
+  scale?: SizeScaleOptions;
+};
+
+export type ShapeEncodingOptions = {
+  field: string;
+  target?: string;
+  fieldType?: "nominal";
+  scale?: ShapeScaleOptions;
+};
+
+export type AngleEncodingOptions =
+  | { target?: string; value: number; field?: never; fieldType?: never }
+  | { target?: string; field: string; fieldType?: "quantitative"; value?: never };
+
+type WithoutEncodingTarget<T> = T extends unknown
+  ? Omit<T, "target" | "coordinate">
+  : never;
+
+export interface EncodingChannelAssignments {
+  x?: WithoutEncodingTarget<PositionEncodingOptions | DatumPositionEncodingOptions>;
+  y?: WithoutEncodingTarget<YPositionEncodingOptions | DatumPositionEncodingOptions>;
+  x2?: WithoutEncodingTarget<SecondaryPositionEncodingOptions>;
+  y2?: WithoutEncodingTarget<SecondaryPositionEncodingOptions>;
+  theta?: WithoutEncodingTarget<ThetaEncodingOptions>;
+  r?: WithoutEncodingTarget<RadialEncodingOptions>;
+  xOffset?: WithoutEncodingTarget<XOffsetEncodingOptions>;
+  yOffset?: WithoutEncodingTarget<YOffsetEncodingOptions>;
+  group?: WithoutEncodingTarget<GroupEncodingOptions>;
+  pathOrder?: WithoutEncodingTarget<PathOrderEncodingOptions>;
+  color?: WithoutEncodingTarget<ColorEncodingOptions>;
+  stroke?: WithoutEncodingTarget<StrokeEncodingOptions>;
+  size?: WithoutEncodingTarget<SizeEncodingOptions>;
+  shape?: WithoutEncodingTarget<ShapeEncodingOptions>;
+  opacity?: WithoutEncodingTarget<OpacityEncodingOptions>;
+  strokeWidth?: WithoutEncodingTarget<StrokeWidthEncodingOptions>;
+  strokeDash?: WithoutEncodingTarget<StrokeDashEncodingOptions>;
+  angle?: WithoutEncodingTarget<AngleEncodingOptions>;
+  text?: WithoutEncodingTarget<TextEncodingOptions>;
+}
+
+type AtLeastOne<T> = {
+  [K in keyof T]-?: Required<Pick<T, K>> & Partial<Omit<T, K>>
+}[keyof T];
+
+export interface EncodeChannelsOptions {
+  target: string;
+  channels: AtLeastOne<EncodingChannelAssignments>;
+}
+
 export type RegressionMethod = "linear" | "polynomial" | "loess";
 export type RegressionInterval = "mean" | "prediction";
 
-export interface RegressionBandOptions {
+export interface RegressionBandOptions extends StrokeStyleDetails {
   color?: string;
   opacity?: number;
   stroke?: string;
@@ -3387,7 +4106,7 @@ export interface RegressionBandOptions {
   curve?: CurveInterpolation;
 }
 
-export interface CreateRegressionBandOptions {
+export interface CreateRegressionBandOptions extends StrokeStyleDetails {
   id: string;
   data: string;
   x: string;
@@ -3404,7 +4123,7 @@ export interface CreateRegressionBandOptions {
   curve?: CurveInterpolation;
 }
 
-export interface CreateRegressionLineOptions {
+export interface CreateRegressionLineOptions extends StrokeStyleDetails {
   id: string;
   data: string;
   x: string;
@@ -3460,7 +4179,7 @@ type RegressionCommonOptions = {
   x?: string;
   y?: string;
   groupBy?: string | false;
-  line?: { strokeWidth?: number; curve?: CurveInterpolation };
+  line?: StrokeStyleDetails & { strokeWidth?: number; curve?: CurveInterpolation };
 };
 
 export type RegressionOptions = RegressionCommonOptions & (
@@ -3489,7 +4208,7 @@ export interface EditRegressionOptions {
   confidence?: number;
   interval?: RegressionInterval;
   band?: false | RegressionBandOptions;
-  line?: { strokeWidth?: number; curve?: CurveInterpolation };
+  line?: StrokeStyleDetails & { strokeWidth?: number; curve?: CurveInterpolation };
 }
 
 export interface RemoveAxisOptions {
@@ -3507,7 +4226,7 @@ export interface RemoveGridOptions {
 export interface RemoveLegendOptions {
   target?: string;
   /** Remove selected content, including part of a combined categorical legend; omission removes every owned block. */
-  channels?: readonly ("color" | "strokeDash" | "strokeWidth" | "shape" | "size" | "opacity")[];
+  channels?: readonly ("color" | "stroke" | "strokeDash" | "strokeWidth" | "shape" | "size" | "opacity")[];
 }
 
 export interface RemoveMarkOptions {
@@ -3580,7 +4299,7 @@ export interface LegendOptions {
   order?: LegendOrder;
   target?: string;
   /** Exact requested content; omission infers encoded point color/shape/size. Explicit subsets include size only when listed. */
-  channels?: readonly ("color" | "strokeDash" | "strokeWidth" | "shape" | "size" | "opacity")[];
+  channels?: readonly ("color" | "stroke" | "strokeDash" | "strokeWidth" | "shape" | "size" | "opacity")[];
   position?: "right" | "left" | "bottom" | "top";
   /** Single top/bottom edge: align complete occupied bounds, including border strokes, to the plot. Side positions require center. */
   align?: "left" | "center" | "right";
@@ -3592,6 +4311,8 @@ export interface LegendOptions {
   offset?: number;
   titlePosition?: "top" | "left";
   title?: string;
+  /** Exact ascending samples for continuous size, opacity, or stroke-width legends. Cannot be combined with count. */
+  values?: readonly number[];
   count?: number;
   gradient?: { length?: number; thickness?: number };
   symbol?: LegendSymbolRecipe;
@@ -3602,11 +4323,44 @@ export interface LegendOptions {
   border?: boolean | LegendBorderOptions;
 }
 
+export type LegendChannel = NonNullable<LegendOptions["channels"]>[number];
+
+export interface LegendBlockTextPatch {
+  fontSize?: number;
+  fontFamily?: string;
+  fontWeight?: string | number;
+  color?: string;
+}
+
+export interface LegendBlockSymbolPatch {
+  /** Point glyph area in square pixels. */
+  size?: number;
+  fill?: string;
+  stroke?: string;
+  strokeWidth?: number;
+  opacity?: number;
+}
+
+export interface EditLegendBlockOptions {
+  target: string;
+  channel: LegendChannel;
+  title?: string;
+  values?: readonly [number, ...number[]] | "auto";
+  count?: number;
+  order?: readonly CategoryValue[];
+  gap?: number;
+  text?: LegendBlockTextPatch;
+  symbol?: LegendBlockSymbolPatch;
+  labelMap?: DisplayLabelMap | "auto";
+}
+
 export interface EditLegendOptions
-  extends Omit<LegendOptions, "title"> {
+  extends Omit<LegendOptions, "title" | "values"> {
   /** Exact final content set for the whole target; omission preserves content. */
   channels?: LegendOptions["channels"];
   title?: string | "auto" | false;
+  /** Replace exact samples, or reset them to the remembered automatic count. */
+  values?: readonly number[] | "auto";
 }
 
 export interface EditLegendLayoutOptions {
@@ -3738,6 +4492,9 @@ export class ChartProgram {
   applyTheme(options: ApplyThemeOptions): ChartProgram;
   removeTheme(): ChartProgram;
   createData(options: { id?: string; values: readonly unknown[] }): ChartProgram;
+  removeData(options: RemoveResourceOptions): ChartProgram;
+  removeScale(options: RemoveResourceOptions): ChartProgram;
+  removeCoordinate(options: RemoveResourceOptions): ChartProgram;
   bindMarkData(options: BindMarkDataOptions): ChartProgram;
   filterData(options: FilterDataOptions): ChartProgram;
   filterMarks(options: FilterMarksOptions): ChartProgram;
@@ -3752,6 +4509,9 @@ export class ChartProgram {
   createBinData(options: BinDataOptions): ChartProgram;
   createFoldData(options: FoldDataOptions): ChartProgram;
   createComputedData(options: ComputedDataOptions): ChartProgram;
+  createNormalizedData(options: NormalizedDataOptions): ChartProgram;
+  createCompleteData(options: CompleteDataOptions): ChartProgram;
+  createImputedData(options: ImputedDataOptions): ChartProgram;
   createStackData(options: StackDataOptions): ChartProgram;
   createRegressionData(options: RegressionDataOptions): ChartProgram;
   createIntervalData(options: IntervalDataOptions): ChartProgram;
@@ -3759,9 +4519,25 @@ export class ChartProgram {
   createTimeUnitData(options: TimeUnitDataOptions): ChartProgram;
   createWindowData(options: WindowDataOptions): ChartProgram;
   createBin2DData(options: Bin2DDataOptions): ChartProgram;
+  editDerivedData(options: EditDerivedDataOptions): ChartProgram;
+  editComputedData(options: EditComputedDataOptions): ChartProgram;
+  editFilteredData(options: EditFilteredDataOptions): ChartProgram;
+  editFoldData(options: EditFoldDataOptions): ChartProgram;
+  editSummaryData(options: EditSummaryDataOptions): ChartProgram;
+  editBinData(options: EditBinDataOptions): ChartProgram;
+  editTimeUnitData(options: EditTimeUnitDataOptions): ChartProgram;
+  editWindowData(options: EditWindowDataOptions): ChartProgram;
+  editDensityData(options: EditDensityDataOptions): ChartProgram;
+  editStackData(options: EditStackDataOptions): ChartProgram;
+  editRegressionData(options: EditRegressionDataOptions): ChartProgram;
+  editIntervalData(options: EditIntervalDataOptions): ChartProgram;
+  editECDFData(options: EditECDFDataOptions): ChartProgram;
+  editNormalizedData(options: EditNormalizedDataOptions): ChartProgram;
+  editCompleteData(options: EditCompleteDataOptions): ChartProgram;
+  editImputedData(options: EditImputedDataOptions): ChartProgram;
   editBin2DData(options: EditBin2DDataOptions): ChartProgram;
 
-  createPointMark(options?: {
+  createPointMark(options?: StrokeStyleDetails & {
     id?: string;
     data?: string;
     shape?: PointShape;
@@ -3770,7 +4546,7 @@ export class ChartProgram {
     stroke?: FilledMarkStroke;
     strokeWidth?: number;
   }): ChartProgram;
-  editPointMark(options: {
+  editPointMark(options: StrokeStyleDetails & {
     target?: string;
     shape?: PointShape;
     fill?: string;
@@ -3778,7 +4554,7 @@ export class ChartProgram {
     stroke?: FilledMarkStroke;
     strokeWidth?: number;
   }): ChartProgram;
-  createTickMark(options?: {
+  createTickMark(options?: StrokeStyleDetails & {
     id?: string;
     data?: string;
     length?: number;
@@ -3786,7 +4562,7 @@ export class ChartProgram {
     strokeWidth?: number;
     opacity?: number;
   }): ChartProgram;
-  editTickMark(options: {
+  editTickMark(options: StrokeStyleDetails & {
     target?: string;
     length?: number;
     stroke?: string;
@@ -3797,7 +4573,7 @@ export class ChartProgram {
   removeJitter(options?: RemoveJitterOptions): ChartProgram;
   packPoints(options: PackPointsOptions): ChartProgram;
   removePointPacking(options?: RemovePointPackingOptions): ChartProgram;
-  createLineMark(options?: {
+  createLineMark(options?: StrokeStyleDetails & {
     id?: string;
     data?: string;
     strokeWidth?: number;
@@ -3806,7 +4582,7 @@ export class ChartProgram {
     opacity?: number;
     closed?: boolean;
   }): ChartProgram;
-  editLineMark(options: {
+  editLineMark(options: StrokeStyleDetails & {
     target?: string;
     strokeWidth?: number;
     curve?: CurveInterpolation;
@@ -3814,7 +4590,7 @@ export class ChartProgram {
     opacity?: number;
     closed?: boolean;
   }): ChartProgram;
-  createBarMark(options?: {
+  createBarMark(options?: RectStyleDetails & {
     id?: string;
     data?: string;
     fill?: string;
@@ -3822,14 +4598,14 @@ export class ChartProgram {
     stroke?: FilledMarkStroke;
     strokeWidth?: number;
   }): ChartProgram;
-  editBarMark(options: {
+  editBarMark(options: RectStyleDetails & {
     target?: string;
     fill?: string;
     opacity?: number;
     stroke?: FilledMarkStroke;
     strokeWidth?: number;
   }): ChartProgram;
-  createAreaMark(options?: {
+  createAreaMark(options?: StrokeStyleDetails & {
     id?: string;
     data?: string;
     fill?: string;
@@ -3839,7 +4615,7 @@ export class ChartProgram {
     curve?: CurveInterpolation;
     missing?: "error" | "break";
   }): ChartProgram;
-  createArcMark(options?: {
+  createArcMark(options?: StrokeStyleDetails & {
     id?: string;
     data?: string;
     innerRadius?: number;
@@ -3849,7 +4625,7 @@ export class ChartProgram {
     stroke?: string;
     strokeWidth?: number;
   }): ChartProgram;
-  editArcMark(options: {
+  editArcMark(options: StrokeStyleDetails & {
     target?: string;
     innerRadius?: number;
     padAngle?: number;
@@ -3864,13 +4640,16 @@ export class ChartProgram {
   editRuleMark(options: { target?: string } & RuleStyleOptions): ChartProgram;
   createTextMark(options?: TextMarkOptions): ChartProgram;
   createMarkLabels(options?: CreateMarkLabelsOptions): ChartProgram;
+  editMarkLabelSelection(options: EditMarkLabelSelectionOptions): ChartProgram;
+  editMarkLabelPlacement(options: EditMarkLabelPlacementOptions): ChartProgram;
+  removeMarkLabels(options: RemoveMarkLabelsOptions): ChartProgram;
   createAnnotation(options: CreateAnnotationOptions): ChartProgram;
   createReferenceLine(options: CreateReferenceLineOptions): ChartProgram;
   createReferenceBand(options: CreateReferenceBandOptions): ChartProgram;
   editTextMark(options: EditTextMarkOptions): ChartProgram;
   layoutLabels(options?: LabelLayoutOptions): ChartProgram;
   removeLabelLayout(options?: RemoveLabelLayoutOptions): ChartProgram;
-  editAreaMark(options: {
+  editAreaMark(options: StrokeStyleDetails & {
     target?: string;
     fill?: string;
     opacity?: number;
@@ -3887,12 +4666,9 @@ export class ChartProgram {
   encodeX2(options: SecondaryPositionEncodingOptions): ChartProgram;
   encodeColor(options: ColorEncodingOptions): ChartProgram;
   encodeStrokeDash(options: StrokeDashEncodingOptions): ChartProgram;
-  encodeSize(options: { field: string; target?: string; fieldType?: "quantitative"; scale?: SizeScaleOptions }): ChartProgram;
-  encodeShape(options: { field: string; target?: string; fieldType?: "nominal"; scale?: ShapeScaleOptions }): ChartProgram;
-  encodeAngle(options:
-    | { target?: string; value: number; field?: never; fieldType?: never }
-    | { target?: string; field: string; fieldType?: "quantitative"; value?: never }
-  ): ChartProgram;
+  encodeSize(options: SizeEncodingOptions): ChartProgram;
+  encodeShape(options: ShapeEncodingOptions): ChartProgram;
+  encodeAngle(options: AngleEncodingOptions): ChartProgram;
   encodeOpacity(options: OpacityEncodingOptions): ChartProgram;
   encodeRadius(options: { value: number; target?: string }): ChartProgram;
   encodePointRadius(options: { value: number; target?: string }): ChartProgram;
@@ -3913,7 +4689,7 @@ export class ChartProgram {
     target?: string;
     channel:
       | "x" | "y" | "x2" | "y2" | "xOffset" | "yOffset"
-      | "theta" | "radius" | "color" | "strokeDash" | "strokeWidth"
+      | "theta" | "radius" | "color" | "stroke" | "strokeDash" | "strokeWidth"
       | "size" | "shape" | "angle" | "group" | "opacity" | "text";
   }): ChartProgram;
   encodeText(options: TextEncodingOptions): ChartProgram;
@@ -3923,8 +4699,9 @@ export class ChartProgram {
   encodeHorizon(options?: HorizonEncodingOptions): ChartProgram;
   editHorizon(options: EditHorizonOptions): ChartProgram;
   encodeBarWidth(options?: BarWidthOptions): ChartProgram;
-  encodeStroke(options: { target?: string; value: string }): ChartProgram;
+  encodeStroke(options: StrokeEncodingOptions): ChartProgram;
   encodeStrokeWidth(options: StrokeWidthEncodingOptions): ChartProgram;
+  encodeChannels(options: EncodeChannelsOptions): ChartProgram;
 
   createRegression(options?: RegressionOptions): ChartProgram;
   editRegression(options: EditRegressionOptions): ChartProgram;
@@ -3976,7 +4753,7 @@ export class ChartProgram {
   createAxes(options?: CreateAxesOptions): ChartProgram;
   createXAxis(options?: CompleteAxisOptions<XAxisPosition>): ChartProgram;
   createYAxis(options?: CompleteAxisOptions<YAxisPosition>): ChartProgram;
-  createThetaAxis(options?: CompletePolarAxisOptions): ChartProgram;
+  createThetaAxis(options?: CompleteThetaAxisOptions): ChartProgram;
   createRadialAxis(options?: CompleteRadialAxisOptions): ChartProgram;
   createThetaAxisLine(options?: CreateThetaAxisLineOptions): ChartProgram;
   createRadialAxisLine(options?: CreateRadialAxisLineOptions): ChartProgram;
@@ -3990,7 +4767,7 @@ export class ChartProgram {
   editRadialAxisLine(options?: AxisLineStyleOptions): ChartProgram;
   editThetaAxisTicks(options?: PolarTickOptions): ChartProgram;
   editRadialAxisTicks(options?: PolarTickOptions): ChartProgram;
-  editThetaAxisLabels(options?: PolarLabelOptions): ChartProgram;
+  editThetaAxisLabels(options?: ThetaAxisLabelOptions): ChartProgram;
   editRadialAxisLabels(options?: PolarLabelOptions): ChartProgram;
   editThetaAxisTitle(options?: PolarTitleOptions): ChartProgram;
   editRadialAxisTitle(options?: RadialTitleOptions): ChartProgram;
@@ -4016,7 +4793,7 @@ export class ChartProgram {
   editYAxisTitle(options?: Omit<AxisTitleOptions<YAxisPosition>, "scale">): ChartProgram;
   editXAxis(options: EditAxisOptions<XAxisPosition>): ChartProgram;
   editYAxis(options: EditAxisOptions<YAxisPosition>): ChartProgram;
-  editThetaAxis(options: Omit<EditPolarAxisOptions, "angle">): ChartProgram;
+  editThetaAxis(options: EditThetaAxisOptions): ChartProgram;
   editRadialAxis(options: EditRadialAxisOptions): ChartProgram;
   removeXAxis(options?: RemoveAxisOptions): ChartProgram;
   removeYAxis(options?: RemoveAxisOptions): ChartProgram;
@@ -4036,6 +4813,7 @@ export class ChartProgram {
   /** Combined categorical and size legends support all four edges with layout "edge". */
   createLegend(options?: LegendOptions): ChartProgram;
   editLegend(options: EditLegendOptions): ChartProgram;
+  editLegendBlock(options: EditLegendBlockOptions): ChartProgram;
   editLegendLayout(options: EditLegendLayoutOptions): ChartProgram;
   editLegendLabels(options: EditLegendLabelsOptions): ChartProgram;
   editLegendTitle(options: EditLegendTitleOptions): ChartProgram;
@@ -4048,11 +4826,26 @@ export class ChartProgram {
   removeTitle(): ChartProgram;
 
   createCoordinate(options?: CreateCoordinateOptions): ChartProgram;
+  editCoordinate(options: EditCoordinateOptions): ChartProgram;
   createScale(options: CreateScaleOptions): ChartProgram;
   editScale(options: EditScaleOptions): ChartProgram;
+  editXScale(options: EditXScaleOptions): ChartProgram;
+  editYScale(options: EditYScaleOptions): ChartProgram;
+  editXOffsetScale(options: EditXOffsetScaleOptions): ChartProgram;
+  editYOffsetScale(options: EditYOffsetScaleOptions): ChartProgram;
+  editParallelScale(options: EditParallelScaleOptions): ChartProgram;
+  editThetaScale(options: EditThetaScaleOptions): ChartProgram;
+  editRScale(options: EditRScaleOptions): ChartProgram;
+  editColorScale(options: EditColorScaleOptions): ChartProgram;
+  editStrokeScale(options: EditStrokeScaleOptions): ChartProgram;
+  editSizeScale(options: EditSizeScaleOptions): ChartProgram;
+  editOpacityScale(options: EditOpacityScaleOptions): ChartProgram;
+  editShapeScale(options: EditShapeScaleOptions): ChartProgram;
+  editStrokeWidthScale(options: EditStrokeWidthScaleOptions): ChartProgram;
+  editStrokeDashScale(options: EditStrokeDashScaleOptions): ChartProgram;
   createDerivedData(options: CreateDerivedDataOptions): ChartProgram;
   createRegressionBand(options: CreateRegressionBandOptions): ChartProgram;
-  editRegressionBand(options: {
+  editRegressionBand(options: StrokeStyleDetails & {
     target?: string;
     color?: string;
     opacity?: number;
@@ -4061,7 +4854,7 @@ export class ChartProgram {
     curve?: CurveInterpolation;
   }): ChartProgram;
   createRegressionLine(options: CreateRegressionLineOptions): ChartProgram;
-  editRegressionLine(options: {
+  editRegressionLine(options: StrokeStyleDetails & {
     target?: string;
     strokeWidth?: number;
     curve?: CurveInterpolation;