@fundar/data-chart-telling 1.18.0 → 1.20.0

package/dist/plots/ranking/forest/Plot.svelte

@@ -1,5 +1,5 @@
 <script lang="ts" generics="TData extends Record<string, unknown>">
-	import Plot from '../../../layout/plot/Plot.svelte';
+	import AbstractPlot from '../../../layout/plot/AbstractPlot.svelte';
 	import { buildForestDefaults } from './defaults';
 	import type { ForestPlotProps, ForestPlotCoreProps } from '../../../types/plots/ranking/forest/props';
 
@@ -25,7 +25,7 @@
 	}: ForestPlotProps<TData> = $props();
 </script>
 
-<Plot
+<AbstractPlot
 	core={core as ForestPlotCoreProps<TData>}
 	defaults={buildForestDefaults}
 	bind:margins

package/dist/plots/ranking/forest/Plot.svelte.d.ts

@@ -1,4 +1,3 @@
-import Plot from '../../../layout/plot/Plot.svelte';
 import type { ForestPlotProps } from '../../../types/plots/ranking/forest/props';
 declare function $$render<TData extends Record<string, unknown>>(): {
     props: ForestPlotProps<TData>;

package/dist/plots/ranking/lollipop/Plot.svelte

@@ -1,5 +1,5 @@
 <script lang="ts" generics="TData extends Record<string, unknown>">
-	import Plot from '../../../layout/plot/Plot.svelte';
+	import AbstractPlot from '../../../layout/plot/AbstractPlot.svelte';
 	import { buildLollipopDefaults } from './defaults';
 	import type {
 		LollipopPlotProps,
@@ -28,7 +28,7 @@
 	}: LollipopPlotProps<TData> = $props();
 </script>
 
-<Plot
+<AbstractPlot
 	core={core as LollipopPlotCoreProps<TData>}
 	defaults={buildLollipopDefaults}
 	bind:margins

package/dist/plots/ranking/lollipop/Plot.svelte.d.ts

@@ -1,4 +1,3 @@
-import Plot from '../../../layout/plot/Plot.svelte';
 import type { LollipopPlotProps } from '../../../types/plots/ranking/lollipop/props';
 declare function $$render<TData extends Record<string, unknown>>(): {
     props: LollipopPlotProps<TData>;

package/dist/types/layout/context.d.ts

@@ -16,6 +16,8 @@ export type PlotRowContext<TRow = Record<string, unknown>> = {
     value?: number;
     /** The row itself, as the plot drew it: the data's fields, plus whatever its transforms added. */
     row?: TRow;
+    /** Which of the row's values a label writes, on a plot whose rows have several (`styles.values.parts`). */
+    part?: string;
 };
 /** A plot kind's own context of a row: the shared one, with what the kind works out for it. */
 export type KindRowContext<TExtra extends object, TRow = Record<string, unknown>> = PlotRowContext<TRow> & TExtra;

package/dist/types/layout/plot.d.ts

@@ -31,6 +31,8 @@ export type PlotCellContext<TRow extends Record<string, unknown>, TScales extend
     panel?: object;
     /** Where this slice sits among the facet panels - `undefined` when the plot has no facet. */
     facet?: NonNullable<SlicePlace['facet']>;
+    /** The timeline step this slice shows - `undefined` when the plot has no timeline. */
+    time?: TimeValue;
     /** Whether any row - the plot's own or a marker's - belongs in this slice; rows without a slicing field belong in all. */
     keep: (row: TRow) => boolean;
 };

package/dist/types/layout/styles/bullet.d.ts

@@ -1,7 +1,10 @@
+import type { WithValues, BarValueLabel } from './values';
 import type { GapsAwarePlotStylesConfig } from './gaps';
 import type { BarSegmentStyle } from '../../plots/segments/common';
+/** The values of a bullet's row its value labels can write: its bar's, its target, its ranges' bounds. */
+export type BulletValuePart = 'value' | 'target' | 'ranges';
 /** `BulletPlot`'s `styles`: a bar plot's, with the look of its ranges and its target. Each field falls back to `bullet` in the configuration. */
-export type BulletStylesConfig = GapsAwarePlotStylesConfig<BarSegmentStyle> & {
+export type BulletStylesConfig = WithValues<GapsAwarePlotStylesConfig<BarSegmentStyle>, BarValueLabel, BulletValuePart> & {
     /** The bar that shows the value. */
     bar?: {
         /** Its thickness across the category band, in px. */

package/dist/types/layout/styles/geo.d.ts

@@ -1,4 +1,4 @@
-import type { GeoFeature } from '../../plots/data/geo';
+import type { GeoFeature, GeoSliceContext } from '../../plots/data/geo';
 import type { FrameProp } from './frame';
 import type { BasePlotStylesConfig } from './base';
 export type GeoTileLayerConfig = {
@@ -26,8 +26,8 @@ export type GeoStylesConfig<TProps extends Record<string, unknown> = Record<stri
     strokeWidth?: number;
     /** Raster XYZ tile basemap under the vector geometry. Mercator-family projections only. */
     tileLayer?: GeoTileLayerConfig;
-    /** Fired when a base-map feature is clicked. */
-    onFeatureClick?: (feature: GeoFeature<TProps>, event: Event) => void;
+    /** Fired when a base-map feature is clicked, with the slice it was drawn in. */
+    onFeatureClick?: (feature: GeoFeature<TProps>, event: Event, slice: GeoSliceContext) => void;
 };
 /**
  * `GeoTileLayerConfig`, plus `features` - never author-facing (the public

package/dist/types/layout/styles/values.d.ts

@@ -1,4 +1,7 @@
-import type { ValueAnchor } from '../../plots/constants';
+import type { MarkerLabelConfig } from '../../markers/labels/common';
+import type { BoxLabelConfig } from '../../markers/labels/box';
+import type { PointLabelConfig } from '../../markers/labels/point';
+import type { AreaEdgeLabelConfig, PageEdge, PathLabelConfig, RimLabelConfig, StrokeLabelConfig, ValueEdge } from '../../markers/labels/path';
 import type { FontStyle, StrokeStyle } from '../../plots/styling';
 import type { NumberDisplay } from '../numbers';
 import type { PlotRowContext } from '../context';
@@ -14,17 +17,42 @@ export type ValueSelect = 'first' | 'last' | 'min' | 'max';
  * marker over the rows the plot itself draws (after its own `transforms`):
  * one at the end of each series on a line or area plot, one per bar on a bar,
  * pyramid or histogram plot, one per point on a scatter plot and one per cell
- * on a heatmap. The high-level `anchor` sets sensible defaults for placement;
- * `fontStyle` (`dx`, `dy`, `textAnchor`, `lineAnchor`, `lineHeight`, `rotate`,
- * `class`, `textClass`, `fill`, …) overrides those defaults field-by-field when
- * provided - mirrors {@link DeltaConfig}'s `fontStyle`/`strokeStyle` split, so
- * label text and connector-line styling never mix into one flat bag of props.
+ * on a heatmap. `layout` and its options place them as a marker's `label` would (each
+ * plot kind takes the layouts its shapes do, with defaults of its own for each);
+ * `fontStyle` (`fill`, `fontSize`, `lineHeight`, `rotate`, `class`, …) styles
+ * the text, never where it sits - mirrors {@link DeltaConfig}'s
+ * `fontStyle`/`strokeStyle` split, so label text and connector-line styling
+ * never mix into one flat bag of props.
  */
-export type ValuesStyle = NumberDisplay & {
-    /** Whether the labels are drawn. Off by default, except on a heatmap. */
+/** The options of a label that place it, as `styles.values` takes them: its `layout` optional, the kind's by default. */
+type LayoutKey = 'anchor' | 'edge' | 'side' | 'offset' | 'gap';
+export type ValueLayoutOf<TLabel> = TLabel extends {
+    layout?: infer TLayout;
+} ? Pick<TLabel, Extract<keyof TLabel, LayoutKey>> & {
+    layout?: TLayout;
+} : never;
+/**
+ * `TStyles` with its `values` taking only the labels of `TLabel` - the layouts a plot kind's shapes write - and, on a
+ * kind whose rows have several values, the `TPart`s it can label.
+ */
+export type WithValues<TStyles, TLabel extends MarkerLabelConfig, TPart extends string = 'value'> = Omit<TStyles, 'values'> & {
+    values?: ValuesStyle<TLabel, TPart>;
+};
+export type ValuesStyle<TLabel extends MarkerLabelConfig = MarkerLabelConfig, TPart extends string = string> = ValuesOptions & ValueLayoutOf<TLabel> & {
+    parts?: ValueParts<TPart, TLabel>;
+};
+/** What a part's own label sets, over the plot's: where it sits and its text. */
+export type ValuePartOptions<TLabel = MarkerLabelConfig> = Omit<ValueLayoutOf<TLabel>, 'layout'> & Pick<ValuesOptions, 'format'>;
+/**
+ * The parts of each row a plot kind with several values per row labels - a box's `median`, a bullet's `target`: a
+ * list of them, or a record turning each on (`true`) or setting its own options.
+ */
+export type ValueParts<TPart extends string, TLabel = MarkerLabelConfig> = TPart[] | Partial<Record<TPart, boolean | ValuePartOptions<TLabel>>>;
+/** A value label's text style, without what places it: the layout's options do that. */
+export type ValuesFontStyle = Omit<FontStyle, 'textAnchor' | 'lineAnchor' | 'dx' | 'dy'>;
+type ValuesOptions = NumberDisplay & {
+    /** Whether the labels are drawn. Setting any other option of them turns them on; off by default, except on a heatmap. */
     show?: boolean;
-    /** Where each label sits on its mark - see {@link ValueAnchor}. */
-    anchor?: ValueAnchor;
     /**
      * Which rows of each group are labelled: one selector, or a list of them (a
      * row picked by any is labelled) - see {@link ValueSelect}. Each plot has its
@@ -48,7 +76,19 @@ export type ValuesStyle = NumberDisplay & {
     format?: (value: number, number: (value: number) => string, context: PlotRowContext) => string;
     /** Hovering a label dims every other series, like toggling them off in the legend. */
     hoverIsolate?: boolean;
-    fontStyle?: FontStyle;
+    /** The text's look; where it sits is the layout's (`side`, `gap`, `offset`...). */
+    fontStyle?: ValuesFontStyle;
     /** The connectors a line or area plot routes back from labels that had to move apart. */
     strokeStyle?: StrokeStyle;
 };
+/** The labels a plot of bars writes on them: in each, along an edge (its `tip` too) or beside a point of it. */
+export type BarValueLabel = BoxLabelConfig | PathLabelConfig<PageEdge | ValueEdge> | PointLabelConfig;
+/** The labels a plot of boxes with no value direction (a heatmap's cells, a histogram's bins) writes on them. */
+export type CellValueLabel = BoxLabelConfig | PathLabelConfig<PageEdge> | PointLabelConfig;
+/** The labels a plot of lines writes: beside its points, or along its lines. */
+export type LineValueLabel = PointLabelConfig | StrokeLabelConfig;
+/** The labels a plot of areas writes: beside its points, or along their top or bottom edge. */
+export type AreaValueLabel = PointLabelConfig | AreaEdgeLabelConfig;
+/** The labels a plot of dots writes: beside them, or around their rim. */
+export type DotValueLabel = PointLabelConfig | RimLabelConfig;
+export {};

package/dist/types/markers/axis/area.d.ts

@@ -1,3 +1,7 @@
+import type { AreaEdgeLabelConfig } from '../labels/path';
+import type { CommonMarkerConfigWithOrientation } from '../channels/commonMarkerConfigWithOrientation';
+import type { PointLabelConfig } from '../labels/point';
+import type { CommonMarkerConfigWithLabel } from '../channels/commonMarkerConfigWithLabel';
 import type { AreaStyle } from '../../plots/styling';
 import type { CommonMarkerConfigWithArea } from '../channels/commonMarkerConfigWithArea';
 import type { CommonMarkerConfigWithColor } from '../channels/commonMarkerConfigWithColor';
@@ -9,4 +13,4 @@ export type AreaMarkerConfig = {
     curve?: CurveName;
     tension?: number;
     styles?: AreaStyle;
-} & CommonMarkerConfigWithArea & CommonMarkerConfigWithColor & CommonMarkerConfigWithInterval;
+} & CommonMarkerConfigWithOrientation & CommonMarkerConfigWithArea & CommonMarkerConfigWithColor & CommonMarkerConfigWithInterval & CommonMarkerConfigWithLabel<AreaEdgeLabelConfig | PointLabelConfig>;

package/dist/types/markers/axis/bar.d.ts

@@ -1,3 +1,7 @@
+import type { PathLabelConfig, PageEdge, ValueEdge } from '../labels/path';
+import type { BoxLabelConfig } from '../labels/box';
+import type { PointLabelConfig } from '../labels/point';
+import type { CommonMarkerConfigWithOrientation } from '../channels/commonMarkerConfigWithOrientation';
 import type { AxisValue } from '../../layout/mapping';
 import type { AreaStyle, PerRow, InsetStyle } from '../../plots/styling';
 import type { CommonMarkerConfigWithLabel } from '../channels/commonMarkerConfigWithLabel';
@@ -7,8 +11,7 @@ import type { CommonMarkerConfigWithInterval } from '../channels/commonMarkerCon
 export type BarMarkerConfig = {
     type: 'bar';
     role: 'segment' | 'hitArea';
-    isHorizontal: boolean;
     thickness?: number;
     styles?: PerRow<AreaStyle> & InsetStyle;
     category?: AxisValue;
-} & CommonMarkerConfigWithColor & CommonMarkerConfigWithInterval & CommonMarkerConfigWithLabel;
+} & CommonMarkerConfigWithOrientation & CommonMarkerConfigWithColor & CommonMarkerConfigWithInterval & CommonMarkerConfigWithLabel<BoxLabelConfig | PathLabelConfig<PageEdge | ValueEdge> | PointLabelConfig>;

package/dist/types/markers/axis/bollinger.d.ts

@@ -1,6 +1,7 @@
+import type { CommonMarkerConfigWithOrientation } from '../channels/commonMarkerConfigWithOrientation';
 import type { BollingerStatisticOptions } from '../../layout/statistics';
 import type { CommonMarkerConfig } from '../channels/commonMarkerConfig';
 /** A moving-average band (svelteplot's `BollingerX`/`BollingerY`). */
 export type BollingerMarkerConfig = {
     type: 'bollinger';
-} & BollingerStatisticOptions & CommonMarkerConfig;
+} & CommonMarkerConfigWithOrientation & BollingerStatisticOptions & CommonMarkerConfig;

package/dist/types/markers/axis/box.d.ts

@@ -1,3 +1,4 @@
+import type { CommonMarkerConfigWithOrientation } from '../channels/commonMarkerConfigWithOrientation';
 import type { CommonMarkerConfig } from '../channels/commonMarkerConfig';
 /**
  * A box plot (svelteplot's `BoxX`/`BoxY`). Styled per sub-mark through `bar`,
@@ -16,4 +17,4 @@ export type BoxMarkerConfig = {
         index: number;
         count: number;
     };
-} & CommonMarkerConfig;
+} & CommonMarkerConfigWithOrientation & CommonMarkerConfig;

package/dist/types/markers/axis/cell.d.ts

@@ -1,3 +1,6 @@
+import type { PathLabelConfig, PageEdge } from '../labels/path';
+import type { BoxLabelConfig } from '../labels/box';
+import type { PointLabelConfig } from '../labels/point';
 import type { AreaStyle, PerRow, InsetStyle } from '../../plots/styling';
 import type { CommonMarkerConfigWithArea } from '../channels/commonMarkerConfigWithArea';
 import type { CommonMarkerConfigWithLabel } from '../channels/commonMarkerConfigWithLabel';
@@ -6,4 +9,4 @@ import type { CommonMarkerConfigWithColor } from '../channels/commonMarkerConfig
 export type CellMarkerConfig = {
     type: 'cell';
     styles?: PerRow<AreaStyle & Pick<InsetStyle, 'inset'>>;
-} & CommonMarkerConfigWithColor & CommonMarkerConfigWithArea & CommonMarkerConfigWithLabel;
+} & CommonMarkerConfigWithColor & CommonMarkerConfigWithArea & CommonMarkerConfigWithLabel<BoxLabelConfig | PathLabelConfig<PageEdge> | PointLabelConfig>;

package/dist/types/markers/axis/line.d.ts

@@ -1,3 +1,6 @@
+import type { StrokeLabelConfig } from '../labels/path';
+import type { PointLabelConfig } from '../labels/point';
+import type { CommonMarkerConfigWithLabel } from '../channels/commonMarkerConfigWithLabel';
 import type { StrokeStyle } from '../../plots/styling';
 import type { CurveName } from '../../layout/styles/curve';
 import type { CommonMarkerConfigWithColor } from '../channels/commonMarkerConfigWithColor';
@@ -6,4 +9,4 @@ export type LineMarkerConfig = {
     type: 'line';
     curve?: CurveName;
     styles?: StrokeStyle;
-} & CommonMarkerConfigWithColor;
+} & CommonMarkerConfigWithColor & CommonMarkerConfigWithLabel<StrokeLabelConfig | PointLabelConfig>;

package/dist/types/markers/axis/rect.d.ts

@@ -1,3 +1,6 @@
+import type { PathLabelConfig, PageEdge } from '../labels/path';
+import type { BoxLabelConfig } from '../labels/box';
+import type { PointLabelConfig } from '../labels/point';
 import type { AreaStyle, PerRow, InsetStyle } from '../../plots/styling';
 import type { CommonMarkerConfigWithArea } from '../channels/commonMarkerConfigWithArea';
 import type { CommonMarkerConfigWithColor } from '../channels/commonMarkerConfigWithColor';
@@ -8,4 +11,4 @@ export type RectMarkerConfig = {
     type: 'rect';
     interval?: number | string;
     styles?: PerRow<AreaStyle & InsetStyle>;
-} & CommonMarkerConfigWithArea & CommonMarkerConfigWithColor & CommonMarkerConfigWithInterval & CommonMarkerConfigWithLabel;
+} & CommonMarkerConfigWithArea & CommonMarkerConfigWithColor & CommonMarkerConfigWithInterval & CommonMarkerConfigWithLabel<BoxLabelConfig | PathLabelConfig<PageEdge> | PointLabelConfig>;

package/dist/types/markers/axis/regression.d.ts

@@ -1,6 +1,7 @@
+import type { CommonMarkerConfigWithOrientation } from '../channels/commonMarkerConfigWithOrientation';
 import type { RegressionStatisticOptions } from '../../layout/statistics';
 import type { CommonMarkerConfig } from '../channels/commonMarkerConfig';
 /** A fitted regression curve (svelteplot's `RegressionX`/`RegressionY`). */
 export type RegressionMarkerConfig = {
     type: 'regression';
-} & RegressionStatisticOptions & CommonMarkerConfig;
+} & CommonMarkerConfigWithOrientation & RegressionStatisticOptions & CommonMarkerConfig;

package/dist/types/markers/axis/tick.d.ts

@@ -1,3 +1,4 @@
+import type { CommonMarkerConfigWithOrientation } from '../channels/commonMarkerConfigWithOrientation';
 import type { StrokeStyle, PerRow } from '../../plots/styling';
 import type { CommonMarkerConfigWithColor } from '../channels/commonMarkerConfigWithColor';
 /** A short tick per row along one axis (svelteplot's `TickX`/`TickY`). */
@@ -5,4 +6,4 @@ export type TickMarkerConfig = {
     type: 'tick';
     tickLength?: number | ((d: any) => number);
     styles?: PerRow<StrokeStyle>;
-} & CommonMarkerConfigWithColor;
+} & CommonMarkerConfigWithOrientation & CommonMarkerConfigWithColor;

package/dist/types/markers/axis/trail.d.ts

@@ -1,3 +1,6 @@
+import type { StrokeLabelConfig } from '../labels/path';
+import type { PointLabelConfig } from '../labels/point';
+import type { CommonMarkerConfigWithLabel } from '../channels/commonMarkerConfigWithLabel';
 import type { AreaStyle } from '../../plots/styling';
 import type { CommonMarkerConfigWithColor } from '../channels/commonMarkerConfigWithColor';
 import type { CommonMarkerConfigWithRadius } from '../channels/commonMarkerConfigWithRadius';
@@ -10,4 +13,4 @@ export type TrailMarkerConfig = {
     cap?: 'butt' | 'round';
     resolution?: number | 'auto';
     styles?: Pick<AreaStyle, 'fill' | 'fillOpacity'>;
-} & CommonMarkerConfigWithRadius & CommonMarkerConfigWithColor;
+} & CommonMarkerConfigWithRadius & CommonMarkerConfigWithColor & CommonMarkerConfigWithLabel<StrokeLabelConfig | PointLabelConfig>;

package/dist/types/markers/axis/violin.d.ts

@@ -1,3 +1,4 @@
+import type { CommonMarkerConfigWithOrientation } from '../channels/commonMarkerConfigWithOrientation';
 import type { AreaStyle } from '../../plots/styling';
 import type { DensityKernel } from '../../transforms/density';
 import type { CommonMarkerConfig } from '../channels/commonMarkerConfig';
@@ -22,4 +23,4 @@ export type ViolinMarkerConfig = {
         count: number;
     };
     styles?: AreaStyle;
-} & CommonMarkerConfig;
+} & CommonMarkerConfigWithOrientation & CommonMarkerConfig;

package/dist/types/markers/axis/waffle.d.ts

@@ -1,3 +1,7 @@
+import type { PathLabelConfig, PageEdge, ValueEdge } from '../labels/path';
+import type { BoxLabelConfig } from '../labels/box';
+import type { PointLabelConfig } from '../labels/point';
+import type { CommonMarkerConfigWithOrientation } from '../channels/commonMarkerConfigWithOrientation';
 import type { AreaStyle, PerRow } from '../../plots/styling';
 import type { CommonMarkerConfigWithLabel } from '../channels/commonMarkerConfigWithLabel';
 import type { CommonMarkerConfigWithColor } from '../channels/commonMarkerConfigWithColor';
@@ -11,4 +15,4 @@ export type WaffleMarkerConfig = {
     gap?: number;
     round?: boolean;
     styles?: PerRow<AreaStyle>;
-} & CommonMarkerConfigWithColor & CommonMarkerConfigWithInterval & CommonMarkerConfigWithLabel;
+} & CommonMarkerConfigWithOrientation & CommonMarkerConfigWithColor & CommonMarkerConfigWithInterval & CommonMarkerConfigWithLabel<BoxLabelConfig | PathLabelConfig<PageEdge | ValueEdge> | PointLabelConfig>;

package/dist/types/markers/basic/dot.d.ts

@@ -1,3 +1,6 @@
+import type { RimLabelConfig } from '../labels/path';
+import type { PointLabelConfig } from '../labels/point';
+import type { CommonMarkerConfigWithLabel } from '../channels/commonMarkerConfigWithLabel';
 import type { DotStyle, PerRow } from '../../plots/styling';
 import type { CommonMarkerConfigWithColor } from '../channels/commonMarkerConfigWithColor';
 import type { CommonMarkerConfigWithRadius } from '../channels/commonMarkerConfigWithRadius';
@@ -7,4 +10,4 @@ import type { CommonMarkerConfigWithSymbol } from '../channels/commonMarkerConfi
 export type DotMarkerConfig = CommonMarkerConfigWithRowOffset<{
     type: 'dot';
     styles?: PerRow<DotStyle>;
-} & CommonMarkerConfigWithRadius & CommonMarkerConfigWithColor & CommonMarkerConfigWithSymbol>;
+} & CommonMarkerConfigWithRadius & CommonMarkerConfigWithColor & CommonMarkerConfigWithSymbol & CommonMarkerConfigWithLabel<RimLabelConfig | PointLabelConfig>>;

package/dist/types/markers/basic/text.d.ts

@@ -1,16 +1,23 @@
+import type { CoveringShape } from '../labels/point';
 import type { FontStyle, StrokeStyle, PerRow } from '../../plots/styling';
 import type { CommonMarkerConfig } from '../channels/commonMarkerConfig';
 import type { CommonMarkerConfigWithRowOffset } from '../channels/commonMarkerConfigWithRowOffset';
 import type { Margins } from '../../../layout/margins/Margins';
 import type { BandSlice } from '../../layout/hover';
-import type { LabelAnchor, TextAnchor } from '../../plots/constants';
+import type { LabelAnchor, LineAnchor, TextAnchor } from '../../plots/constants';
 import type { NumberDisplay } from '../../layout/numbers';
 /**
- * Spreads labels that would overlap apart vertically, all reaching out to one
- * shared column, each routed back to its own point by an elbow connector.
- * Unset geometry falls back to the configuration's `text.declutter`.
+ * How labels that would overlap are laid out. `'lanes'` spreads them apart
+ * vertically, all reaching out to one shared column, each routed back to its
+ * own point by an elbow connector; `'around'` puts each one on a free spot
+ * around its point (its own side first, then on clockwise),
+ * clear of the other labels and points, and leaves out one with no room.
  */
+export type TextDeclutterMode = 'lanes' | 'around';
+/** {@link TextDeclutterMode}'s options. Unset geometry falls back to the configuration's `text.declutter`. */
 export type TextDeclutterConfig = {
+    /** Defaults to `'lanes'`. */
+    mode?: TextDeclutterMode;
     /** Shortest lane's distance (px) from the point before a connector bends. */
     elbowGap?: number;
     /** Extra distance (px) each further lane sits out from the last. */
@@ -68,8 +75,10 @@ export type TextMarkerConfig = CommonMarkerConfigWithRowOffset<{
     styles?: PerRow<TextRowStyle> & Omit<FontStyle, TextRowStyleKey>;
     /** Which side of its point the text sits on: a value, or a function of the row. Wins over `styles.textAnchor`. */
     textAnchor?: TextAnchor | ((d: any) => TextAnchor);
-    /** Spreads overlapping labels apart - see {@link TextDeclutterConfig}. `true` takes every default. */
-    declutter?: boolean | TextDeclutterConfig;
+    /** Which side of its point the text sits on vertically: a value, or a function of the row. Wins over `styles.lineAnchor`. */
+    lineAnchor?: LineAnchor | ((d: any) => LineAnchor);
+    /** Lays out overlapping labels - see {@link TextDeclutterConfig}. `true` is `'lanes'` with every default. */
+    declutter?: boolean | TextDeclutterMode | TextDeclutterConfig;
     /** Writes each label to fit its box - see {@link TextFitConfig}. `true` takes every default. */
     fit?: boolean | TextFitConfig;
     /**
@@ -80,6 +89,16 @@ export type TextMarkerConfig = CommonMarkerConfigWithRowOffset<{
     edgeAware?: boolean;
     /** The slice of its category band each label sits in (a grouped bar's series); it is drawn off the band's middle, whatever the band's width. */
     bandSlice?: BandSlice;
+    /**
+     * The shape each row's point sits in: a label is left out where the shape of a row drawn after its own covers it,
+     * as a dot drawn over another hides that one's label.
+     */
+    covers?: (d: any, scales: any) => CoveringShape | undefined;
+    /** How far each row's point sits off its `x`/`y`, in pixels: labels, connectors and lanes start there. */
+    origin?: (d: any, scales: any) => {
+        dx: number;
+        dy: number;
+    } | undefined;
     /** Where, in the plot's frame, a label sits on an axis it sets no position for: `{ type: 'text', x: 5, frameAnchor: 'top' }` is at the frame's top edge. */
     frameAnchor?: LabelAnchor;
     /** Grows the plot's margins, on every side the author left open, so the labels fit. */
@@ -87,21 +106,6 @@ export type TextMarkerConfig = CommonMarkerConfigWithRowOffset<{
     /** Reports how far the rendered labels reach past the plot's content box, in pixels, on each side. */
     onoverflow?: (overflow: Margins) => void;
 } & NumberDisplay & CommonMarkerConfig>;
-/** A `text` marker as a shape's `label`: all of it but what the shape sets - its `type`, its rows and the label's position. */
-export type TextLabelConfig = Omit<TextMarkerConfig, 'type' | 'data' | 'x' | 'y' | 'frameAnchor'> & {
-    /**
-     * Where in its shape the label sits: its `'middle'` (the default), against one of its edges (`'top'`, `'bottom'`,
-     * `'left'`, `'right'`) or in one of its corners (`'top-left'`...). The label's `dx` and `dy` move it from there.
-     */
-    anchor?: LabelAnchor;
-    /**
-     * Puts a label anchored to an edge beyond that edge, outside the shape, instead of inside it. A label out there is not
-     * fitted to the shape, and with `fitMargins` the plot's margins grow to hold it.
-     */
-    outside?: boolean;
-    /** Pixels between the label and the edge it is anchored to. Defaults to the configuration's `text.label.gap`, `4`. */
-    gap?: number;
-};
 export type { LabelAnchor };
 /** Where one decluttered label goes - see `Declutter.buildLanes`. */
 export type LabelLane = {

package/dist/types/markers/channels/commonMarkerConfigWithLabel.d.ts

@@ -1,10 +1,6 @@
-import type { TextLabelConfig } from '../basic/text';
-/** The markers that draw a shape per row, which can write a label in each one. */
-export type CommonMarkerConfigWithLabel = {
-    /**
-     * A label for each shape, written by a `text` marker: every option of one but `type`, `data`, `x` and `y`,
-     * which the shape sets. The label is centred on its shape, and fitted to it unless `fit` is `false` - see
-     * {@link TextFitConfig}. It never takes the pointer from the shape under it.
-     */
-    label?: TextLabelConfig;
+import type { MarkerLabelConfig, MarkerLabels } from '../labels/common';
+/** `TLabel` names the layouts the marker kind supports. */
+export type CommonMarkerConfigWithLabel<TLabel extends MarkerLabelConfig> = {
+    /** One label per shape, or a list of them. `layout` defaults to the marker kind's. */
+    label?: MarkerLabels<TLabel>;
 };

package/dist/types/markers/channels/commonMarkerConfigWithOrientation.d.ts

@@ -0,0 +1,5 @@
+/** A marker drawn by svelteplot's `*X` or `*Y` pair. */
+export type CommonMarkerConfigWithOrientation = {
+    /** Defaults to the plot's way, else to its own channels' when the plot has none. */
+    isHorizontal?: boolean;
+};

package/dist/types/markers/channels/commonMarkerConfigWithOrientation.js

@@ -0,0 +1 @@
+export {};

package/dist/types/markers/labels/box.d.ts

@@ -0,0 +1,57 @@
+import type { LabelBaseConfig } from './common';
+import type { TextMarkerConfig } from '../basic/text';
+import type { LabelAnchor } from '../../plots/constants';
+/** A label written in the box of each shape, fitted to it unless `fit` is `false`. */
+export type BoxLabelConfig = LabelBaseConfig & {
+    layout?: 'box';
+    anchor?: LabelAnchor;
+    /** Defaults to the configuration's `text.label.gap`. */
+    gap?: number;
+};
+export type BoxShape = 'edges' | 'cell' | 'band';
+/** A field, a symbol, a function of the row or a literal. */
+export type BoxEdge = unknown;
+export type BoxChannels = {
+    x1: BoxEdge;
+    x2: BoxEdge;
+    y1: BoxEdge;
+    y2: BoxEdge;
+};
+export type BoxScales = Record<string, {
+    type?: string;
+    fn: any;
+} | undefined>;
+export type BoxSizer = (row: unknown, scales: BoxScales) => {
+    width: number;
+    height: number;
+} | undefined;
+export type BoxGeometryOf = {
+    x: unknown;
+    y: unknown;
+    box: BoxChannels | BoxSizer;
+    size?: BoxSizer;
+    /** For a shape that runs along a value: the axis it runs on, and where each row starts (its base) and ends (its tip). */
+    ends?: {
+        axis: 'x' | 'y';
+        from: (row: unknown) => unknown;
+        to: (row: unknown) => unknown;
+    };
+};
+export type BoxLabelMarker = {
+    marker: TextMarkerConfig;
+    box: BoxChannels | BoxSizer;
+};
+export type BoxedMarker = {
+    type?: string;
+    data?: unknown[];
+    x?: BoxEdge;
+    y?: BoxEdge;
+    x1?: BoxEdge;
+    x2?: BoxEdge;
+    y1?: BoxEdge;
+    y2?: BoxEdge;
+    isHorizontal?: boolean;
+    role?: string;
+    thickness?: number;
+    styles?: object;
+};

package/dist/types/markers/labels/box.js

@@ -0,0 +1 @@
+export {};

package/dist/types/markers/labels/common.d.ts

@@ -0,0 +1,15 @@
+import type { TextMarkerConfig } from '../basic/text';
+import type { BoxLabelConfig, BoxShape } from './box';
+import type { PointLabelConfig, PointShape } from './point';
+import type { PathLabelConfig, PathShape } from './path';
+export type LabelLayout = 'box' | 'path' | 'point';
+export type LabelBaseConfig = Omit<TextMarkerConfig, 'type' | 'data' | 'x' | 'y' | 'frameAnchor' | 'origin'>;
+export type MarkerLabelConfig = BoxLabelConfig | PathLabelConfig<string, string> | PointLabelConfig;
+export type MarkerLabels<TLabel extends MarkerLabelConfig = MarkerLabelConfig> = TLabel | TLabel[];
+/** The layout a label takes by default, and the geometry the kind gives each layout it supports. */
+export type MarkerLabelTraits = {
+    default: LabelLayout;
+    box?: BoxShape;
+    path?: PathShape;
+    point?: PointShape;
+};

package/dist/types/markers/labels/common.js

@@ -0,0 +1 @@
+export {};

package/dist/types/markers/labels/path.d.ts

@@ -0,0 +1,52 @@
+import type { LabelAnchor } from '../../plots/constants';
+import type { LabelBaseConfig } from './common';
+/** An edge of a shape as it is drawn on the page. */
+export type PageEdge = 'top' | 'bottom' | 'left' | 'right';
+/** An edge of a shape that runs along a value: the end away from zero, `'tip'`, or the one at zero, `'base'`. */
+export type ValueEdge = 'tip' | 'base';
+/** Where a label sits off a closed shape's edge: beyond it, against it within the shape, or centred on it. */
+export type ShapeSide = 'outside' | 'inside' | 'on';
+/** Where a label sits off an open stroke, as its text reads: above it, below it, or centred on it. */
+export type StrokeSide = 'above' | 'below' | 'on';
+/** A label written along an edge of its shape, read per row: a `'tip'` follows the sign of the row's value. */
+export type PathLabelConfig<TEdge extends string = PageEdge | ValueEdge, TSide extends string = ShapeSide> = LabelBaseConfig & {
+    layout: 'path';
+    /** `'tip'` on a shape that runs along a value, else `'top'`. */
+    edge?: TEdge;
+    /** Defaults to `'outside'` on a shape, `'above'` on a stroke. */
+    side?: TSide;
+    /**
+     * Where along the edge, from its left or top end. On a line or an area, `'max'` and `'min'` are the point of each
+     * one with its highest or lowest value - its peak, its trough. Defaults to `'middle'`.
+     */
+    offset?: 'start' | 'middle' | 'end' | 'max' | 'min' | `${number}%`;
+    /** Defaults to the configuration's `text.label.gap`. */
+    gap?: number;
+};
+/** A label written along each line a marker draws, curving with it. */
+export type StrokeLabelConfig = Omit<PathLabelConfig<never, StrokeSide>, 'edge'>;
+/** A label written along the top (`y2`) or bottom (`y1`) edge of each area, curving with it. */
+export type AreaEdgeLabelConfig = PathLabelConfig<'top' | 'bottom', StrokeSide>;
+/** A label written along the rim of each dot, from its left over its top. */
+export type RimLabelConfig = Omit<PathLabelConfig<never, ShapeSide>, 'edge'>;
+/**
+ * Where a kind writes `'path'` labels: `'box'` along the edges of each row's box, `'stroke'` along each line it
+ * draws, `'area'` along the top or bottom edge of each area, `'rim'` around each dot.
+ */
+export type PathShape = 'box' | 'stroke' | 'area' | 'rim';
+/** Where a plot's value label goes on its shape: in its box at an `anchor`, or along one of its edges. */
+export type ShapePlacement = {
+    anchor: LabelAnchor;
+} | Required<Pick<PathLabelConfig, 'layout' | 'edge' | 'side'>>;
+/** One label along a curve, in pixels: the path its text follows and where on it the text sits. */
+export type CurvedLabel = {
+    d: string;
+    text: string;
+    /** A row it labels: the row of a dot, the first of a line. */
+    row: unknown;
+    startOffset: string;
+    textAnchor: 'start' | 'middle' | 'end';
+    dy: number;
+    baseline: 'auto' | 'hanging' | 'central';
+    fill?: string;
+};

package/dist/types/markers/labels/path.js

@@ -0,0 +1 @@
+export {};