@fundar/data-chart-telling 1.18.0 → 1.19.0

package/dist/plots/ranking/cleveland/ClevelandMarkers.js

@@ -1,3 +1,4 @@
+import { isGapValue } from '../../utils/gaps';
 import { PlotAxes } from '../../../phases/data/PlotAxes';
 import { ProcessedPositions } from '../../../phases/transforms/ProcessedPositions';
 import { SERIES_KEY } from '../../../phases/transforms/TransformsPhase';
@@ -5,6 +6,7 @@ import { ValueLabels } from '../../../layout/styles/ValueLabels';
 import { ClevelandRanges } from './ClevelandRanges';
 import { ClevelandConnector } from './ClevelandConnector';
 import { BasicStyles } from '../../../layout/styles/BasicStyles';
+import { PointLayout } from '../../../markers/labels/layouts/PointLayout';
 /** The messages already warned about, so a plot that redraws warns once. */
 const warned = new Set();
 /**
@@ -13,7 +15,7 @@ const warned = new Set();
  * highest value (from the baseline, for a lollipop) with a dot at each value.
  * A category with one dot gets a stem in that dot's series color, restyled by
  * the segment its dot belongs to; a category with several gets one neutral
- * connector. The "markers" phase takes its `marks`, `valueLabels` and `reach`.
+ * connector. The "markers" phase takes its `marks` and `reach`.
  */
 export class ClevelandMarkers {
     #options;
@@ -202,12 +204,24 @@ export class ClevelandMarkers {
                 };
             });
         });
+        const values = state.valueLabels?.show ? state.valueLabels : undefined;
+        const labels = values?.writes('value') ? this.#valueLabels(values, state, env) : undefined;
+        // The other parts of a row it labels - an interval's ends - beside them; the dots write the value.
+        const processed = state.processedData;
+        const position = ProcessedPositions.of(processed, PlotAxes.valueOf(state));
+        const parts = values
+            ? values.partMarkers(env, processed.data.filter((row) => !isGapValue(position[PlotAxes.valueOf(state)](row))), ValueLabels.bandPoint(state, position[PlotAxes.categoryOf(state)]), {
+                skip: ['value'],
+                seriesColor: (row) => state.colorForSeries(String(row[SERIES_KEY]))
+            })
+            : [];
         return [
             ...rules,
             ...caps,
             ...arrows,
-            ...dots,
-            ...this.#connectorLabels(state, env, connector, looks, isHorizontal)
+            ...ValueLabels.onMarkers(dots, 'dot', labels),
+            ...this.#connectorLabels(state, env, connector, looks, isHorizontal),
+            ...parts
         ];
     };
     /** The dash, cap and join a connector is drawn with, leaving out what is not set. */
@@ -282,68 +296,72 @@ export class ClevelandMarkers {
         ];
     }
     /**
-     * The value labels of the dots `styles.values.of` picks, one `'text'` marker
-     * per place a dot can hold in its range - past the top end (above, or right
-     * of it), past the bottom end (below, or left of it) and, for the dots
-     * between, beside it - and per series, when they take their series' color.
+     * The value labels of the dots `styles.values` picks, placed by where each dot sits in its range - or on the
+     * `side` the author asks of them all, or around each dot's rim (`'path'`).
      */
-    valueLabels = (labels, state, env) => {
+    #valueLabels(labels, state, env) {
         if (!state.processedData?.data.length)
             return [];
         const { isHorizontal } = ClevelandMarkers.#geometry(state);
-        const { category, value } = ClevelandMarkers.#channels(state);
         const { font, format } = labels;
         const read = ValueLabels.valueOf(state);
         const valueOf = ProcessedPositions.of(state.processedData, PlotAxes.valueOf(state))[PlotAxes.valueOf(state)];
-        const gap = labels.offset(isHorizontal ? 'x' : 'y', env.cfg[this.#options.config].labelGap);
+        const gap = labels.offset(env.cfg[this.#options.config].labelGap);
         const nameOf = (d) => String(d[SERIES_KEY]);
         const picked = this.#picked(state);
-        // Where a label sits from its dot, by role: along the range (past an end) or across it (between).
-        const placement = {
-            max: isHorizontal
-                ? { dx: gap, dy: 0, textAnchor: 'start', lineAnchor: 'middle' }
-                : { dx: 0, dy: -gap, textAnchor: 'middle', lineAnchor: 'bottom' },
-            min: isHorizontal
-                ? { dx: -gap, dy: 0, textAnchor: 'end', lineAnchor: 'middle' }
-                : { dx: 0, dy: gap, textAnchor: 'middle', lineAnchor: 'top' },
-            between: isHorizontal
-                ? { dx: 0, dy: -gap, textAnchor: 'middle', lineAnchor: 'bottom' }
-                : { dx: gap, dy: 0, textAnchor: 'start', lineAnchor: 'middle' }
-        };
-        // What fills the labels of a series: the one fill all share, its own color, or the axis'.
-        const fillOf = (series) => labels.fill ??
-            (labels.color === 'series' ? state.colorForSeries(series) : undefined) ??
-            'currentColor';
-        const names = labels.color === 'series' && !labels.fill
-            ? (state.resolvedSeries ?? []).map((s) => s.name)
-            : [''];
-        return ['max', 'min', 'between'].flatMap((role) => names.flatMap((name) => {
-            const data = picked
-                .filter(({ entry, dot }) => ClevelandRanges.roleOf(entry, dot.value) === role &&
-                (name === '' || dot.series === name))
-                .map(({ dot }) => dot.row);
-            if (data.length === 0)
+        // Along the range past an end, across it between them.
+        const side = labels.placement.side;
+        const own = side && { ...PointLayout.sideOf(side, gap) };
+        const placement = own
+            ? { max: own, min: own, between: own }
+            : {
+                max: isHorizontal
+                    ? { dx: gap, dy: 0, textAnchor: 'start', lineAnchor: 'middle' }
+                    : { dx: 0, dy: -gap, textAnchor: 'middle', lineAnchor: 'bottom' },
+                min: isHorizontal
+                    ? { dx: -gap, dy: 0, textAnchor: 'end', lineAnchor: 'middle' }
+                    : { dx: 0, dy: gap, textAnchor: 'middle', lineAnchor: 'top' },
+                between: isHorizontal
+                    ? { dx: 0, dy: -gap, textAnchor: 'middle', lineAnchor: 'bottom' }
+                    : { dx: gap, dy: 0, textAnchor: 'start', lineAnchor: 'middle' }
+            };
+        const fill = labels.fill ??
+            (labels.color === 'series'
+                ? (d) => state.colorForSeries(nameOf(d))
+                : 'currentColor');
+        if (labels.layout === 'path') {
+            const text = (d) => format(Number(read(d) ?? valueOf(d)), d, nameOf(d));
+            const rim = labels.label(env, text, { fontSize: 12 });
+            return [{ ...rim, styles: { ...rim.styles, fill: font?.fill ?? fill } }];
+        }
+        const { styles: shared, ...hooks } = labels.hooks(env);
+        return ['max', 'min', 'between'].flatMap((role) => {
+            const rows = new Set(picked
+                .filter(({ entry, dot }) => ClevelandRanges.roleOf(entry, dot.value) === role)
+                .map(({ dot }) => dot.row));
+            if (rows.size === 0)
                 return [];
             const at = placement[role];
             return [
                 {
-                    type: 'text',
-                    data,
-                    ...(isHorizontal ? { x: value, y: category } : { x: category, y: value }),
+                    ...hooks,
+                    layout: 'point',
+                    select: (row) => rows.has(row),
                     text: (d) => format(Number(read(d) ?? valueOf(d)), d, nameOf(d)),
                     styles: {
+                        ...shared,
                         ...font,
-                        fill: fillOf(name),
+                        fill,
                         fontSize: font?.fontSize ?? 12,
-                        dx: font?.dx ?? at.dx,
-                        dy: font?.dy ?? at.dy,
-                        textAnchor: labels.textAnchor ?? at.textAnchor,
-                        lineAnchor: font?.lineAnchor ?? at.lineAnchor
+                        dx: at.dx,
+                        dy: at.dy,
+                        textAnchor: at.textAnchor,
+                        lineAnchor: at.lineAnchor
                     }
                 }
             ];
-        }));
-    };
+        });
+    }
     /**
      * Room for the labels past the dots at the end of the value axis, so the
      * farthest one fits inside the figure instead of crossing its edge. Only the
@@ -355,10 +373,10 @@ export class ClevelandMarkers {
         if (top.length === 0)
             return [];
         if (!state.axes?.isHorizontal) {
-            const at = { y: -labels.offset('y', gap) };
+            const at = { y: -labels.offset(gap) };
             return [labels.edgeBox('0', { x: 'middle', y: 'before' }, at, ['top'])];
         }
-        const at = { x: labels.offset('x', gap) };
+        const at = { x: labels.offset(gap) };
         const texts = new Set(top.map(({ dot }) => labels.format(dot.value, dot.row, dot.series)));
         return [...texts].map((text) => labels.edgeBox(text, { x: 'after', y: 'middle' }, at, ['right']));
     };

package/dist/plots/ranking/cleveland/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 { buildClevelandDefaults } from './defaults';
 	import type {
 		ClevelandPlotProps,
@@ -28,7 +28,7 @@
 	}: ClevelandPlotProps<TData> = $props();
 </script>
 
-<Plot
+<AbstractPlot
 	core={core as ClevelandPlotCoreProps<TData>}
 	defaults={buildClevelandDefaults}
 	bind:margins

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

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

package/dist/plots/ranking/cleveland/defaults.js

@@ -1,3 +1,5 @@
+import { ValueLabels } from '../../../layout/styles/ValueLabels';
+import { RowNumbers } from '../../utils/RowNumbers';
 import { ClevelandMarkers } from './ClevelandMarkers';
 import { HoverDefaults } from '../../../layout/hover/HoverDefaults';
 import { ClevelandRanges } from './ClevelandRanges';
@@ -63,8 +65,37 @@ export function buildClevelandDefaults(options = { name: 'ClevelandPlot', config
         },
         // A dot is labelled by what its category's dots say: the first, the highest... of each.
         transforms: { labels: { group: 'category', skip: ClevelandRanges.skipGaps } },
-        styles: { values: { reach: markers.reach } },
-        markers: { marks: markers.marks, valueLabels: markers.valueLabels },
+        // An interval's ends, for its tooltip, hover and value labels to read.
+        context: options.interval
+            ? (state) => {
+                const valueOf = ValueLabels.valueOf(state);
+                return ((row) => {
+                    const [lower, upper] = RowNumbers.interval(state, row, Number(valueOf(row)));
+                    return { lower, upper };
+                });
+            }
+            : undefined,
+        styles: {
+            values: {
+                layout: 'point',
+                layouts: { path: { side: 'outside' } },
+                // An interval's ends sit past it, each on its own side.
+                parts: options.interval
+                    ? {
+                        placements: (state) => {
+                            const sideways = state.axes?.isHorizontal;
+                            return {
+                                lower: { side: sideways ? 'before' : 'below' },
+                                upper: { side: sideways ? 'after' : 'above' }
+                            };
+                        },
+                        default: ['value']
+                    }
+                    : undefined,
+                reach: (labels, state) => (labels.layout === 'point' ? markers.reach(labels, state) : [])
+            }
+        },
+        markers: { marks: markers.marks },
         // A rule along the value axis at the hovered dot, and a dot and a label on each one of its category.
         hover: { marker: (state) => HoverDefaults.valueRule(PlotAxes.valueOf(state)) }
     };

package/dist/plots/ranking/dumbbell/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 { buildDumbbellDefaults } from './defaults';
 	import type {
 		DumbbellPlotProps,
@@ -28,7 +28,7 @@
 	}: DumbbellPlotProps<TData> = $props();
 </script>
 
-<Plot
+<AbstractPlot
 	core={core as DumbbellPlotCoreProps<TData>}
 	defaults={buildDumbbellDefaults}
 	bind:margins

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

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

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/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/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>>;