@fundar/data-chart-telling 0.0.25 → 0.0.26

package/dist/{plots/geo → layout/coordinates}/zoom.svelte.d.ts

@@ -1,4 +1,4 @@
-import type { GeoZoomConfig } from '../../types/plots/styles/geo';
+import type { GeoZoomConfig } from '../../types/layout/coordinates';
 export type GeoZoomTransform = {
     x: number;
     y: number;

package/dist/layout/geometry/GeometryLayout.svelte

@@ -0,0 +1,231 @@
+<script lang="ts" generics="TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData">
+  import type { Snippet } from 'svelte';
+  import { SvelteMap } from 'svelte/reactivity';
+  import BarMarker from '../../markers/BarMarker.svelte';
+  import LineMarker from '../../markers/LineMarker.svelte';
+  import CellMarker from '../../markers/CellMarker.svelte';
+  import DotMarker from '../../markers/DotMarker.svelte';
+  import TextMarker from '../../markers/TextMarker.svelte';
+  import RuleMarker from '../../markers/RuleMarker.svelte';
+  import HoverMarker from '../../markers/HoverMarker.svelte';
+  import GeoHoverMarker from '../../markers/GeoHoverMarker.svelte';
+  import DeltaMarker from '../../markers/DeltaMarker.svelte';
+  import GeoFeaturesMarker from '../../markers/GeoFeaturesMarker.svelte';
+  import GraticuleMarker from '../../markers/GraticuleMarker.svelte';
+  import SphereMarker from '../../markers/SphereMarker.svelte';
+  import VectorMarker from '../../markers/VectorMarker.svelte';
+  import LinkMarker from '../../markers/LinkMarker.svelte';
+  import ContourMarker from '../../markers/ContourMarker.svelte';
+  import ContourClipMarker from '../../markers/ContourClipMarker.svelte';
+  import InsetMarker from '../../markers/inset/InsetMarker.svelte';
+  import { getConfiguration } from '../../configuration/config.svelte';
+  import { resolveAccessor } from '../../plots/utils/accessors';
+  import type { Series } from '../../types/plots/data/common';
+  import type { HoverMarkerConfig, CustomComponentMarkerConfig } from '../../types/markers/common';
+  import type { MarkerConfig } from '../../types/markers/all';
+  import type { HoverPoint, TooltipAnchorX, TooltipAnchorY } from '../../types/layout/tooltip';
+  import type { ScopedMarkerGroup } from '../../types/layout/geometry';
+  import type { GeoFeature } from '../../types/plots/data/geo';
+
+  /**
+   * Renders every marker in `markers`, in array order, each delegated to the
+   * component that draws it. Owns only routing, plus the few extra props a
+   * marker kind needs beyond its own config (hover-controller state for
+   * `hover`; per-series data/color for a `series`-scoped `hover`/`component`).
+   * `children` (value labels) renders last, on top of everything here.
+   *
+   * A marker scoped to one `series` renders once per matching entry in
+   * `scopedGroups` instead of the plain loop, since it needs that series'
+   * own data/color and resolved segments. `width`/`height`/`numericMargins`/
+   * `geoAllFeatures` are `GeoPlot`-only context an `inset` marker needs
+   * beyond its own config; `data` is `BasePlotLayout`'s own rows, forwarded
+   * for `contour`'s clip and unscoped `geo-component`'s fallback data —
+   * both reachable only through `GeoMarkersConfig`, so `data` is always
+   * `GeoFeature`-shaped there despite the generic `TData` bound.
+   */
+  let {
+    width,
+    height,
+    markers = [],
+    seriesData = [],
+    scopedGroups = [],
+    matchedPoints,
+    activePoint,
+    impliesCrosshairX,
+    impliesCrosshairY,
+    numericMargins,
+    data = [],
+    geoAllFeatures = [],
+    tooltipAnchorX,
+    tooltipAnchorY,
+    children,
+  }: {
+    /** The plot's own outer width/height — `inset` marker only, to size its content box. */
+    width?: number;
+    height?: number;
+    markers?: MarkerConfig[];
+    /** All resolved series, forwarded to unscoped `component`/`delta` markers. Independently generic over `TSeries` (defaults to `TData`). */
+    seriesData?: Series<TSeries>[];
+    /** One entry per series that can own a `series`-scoped marker. Same `TSeries` as `seriesData`. */
+    scopedGroups?: ScopedMarkerGroup<TSeries>[];
+    matchedPoints: HoverPoint<TData>[];
+    /** The specific matched point actually under the cursor. */
+    activePoint: HoverPoint<TData> | null;
+    impliesCrosshairX: boolean;
+    impliesCrosshairY: boolean;
+    /** The plot's own resolved margins — `inset` marker only, to place its content box. */
+    numericMargins?: { top: number; right: number; bottom: number; left: number };
+    /** `BasePlotLayout`'s own rows — `contour` (clip) and unscoped `geo-component` fallback data. */
+    data?: TData[];
+    /** `GeoPlot`'s own untouched, tagged features — `inset` marker only (shows a part the main map may exclude). */
+    geoAllFeatures?: (GeoFeature<Record<string, unknown>> & { __id: string })[];
+    /** The plot's own top-level `tooltip.anchorX`/`anchorY` — `inset` marker only, as the fallback its own tooltip inherits when unset. */
+    tooltipAnchorX?: TooltipAnchorX;
+    tooltipAnchorY?: TooltipAnchorY;
+    /** Rendered last, on top of every marker — typically value labels. Optional; a plot kind may have nothing extra to add. */
+    children?: Snippet;
+  } = $props();
+
+  const cfg = $derived(getConfiguration());
+
+  const geometryMarkers = $derived(
+    markers.filter(
+      (marker) => !((marker.type === 'hover' || marker.type === 'component') && 'series' in marker && marker.series),
+    ),
+  );
+
+  const scopedMarkersByName = $derived.by(() => {
+    const map = new SvelteMap<string, (HoverMarkerConfig | CustomComponentMarkerConfig)[]>();
+    for (const marker of markers) {
+      if ((marker.type === 'hover' || marker.type === 'component') && 'series' in marker && marker.series) {
+        if (!map.has(marker.series)) map.set(marker.series, []);
+        map.get(marker.series)!.push(marker);
+      }
+    }
+    return map;
+  });
+
+  function markerKey(marker: MarkerConfig, i: number): string {
+    if (marker.type === 'rule') return `rule-${marker.axis}-${marker.value}`;
+    if (marker.type === 'bar') return `bar-${marker.role}-${i}`;
+    return `${marker.type}-${i}`;
+  }
+</script>
+
+{#each geometryMarkers as marker, i (markerKey(marker, i))}
+  {#if marker.type === 'bar'}
+    <BarMarker {marker} />
+  {:else if marker.type === 'line'}
+    <LineMarker {marker} />
+  {:else if marker.type === 'cell'}
+    <CellMarker {marker} />
+  {:else if marker.type === 'dot'}
+    <DotMarker
+      data={marker.data}
+      x={resolveAccessor(marker.x)}
+      y={resolveAccessor(marker.y)}
+      r={typeof marker.r === 'number' || marker.r == null ? marker.r : resolveAccessor(marker.r)}
+      fill={marker.fill}
+      value={marker.value ? resolveAccessor(marker.value) : undefined}
+      style={marker.style}
+    />
+  {:else if marker.type === 'text'}
+    <TextMarker
+      data={marker.data}
+      x={resolveAccessor(marker.x)}
+      y={resolveAccessor(marker.y)}
+      text={marker.text}
+      style={marker.style}
+    />
+  {:else if marker.type === 'rule'}
+    <RuleMarker axis={marker.axis} value={marker.value} style={marker.style} />
+  {:else if marker.type === 'geo'}
+    <GeoFeaturesMarker {marker} />
+  {:else if marker.type === 'graticule'}
+    <GraticuleMarker {marker} />
+  {:else if marker.type === 'sphere'}
+    <SphereMarker {marker} />
+  {:else if marker.type === 'vector'}
+    <VectorMarker {marker} />
+  {:else if marker.type === 'link'}
+    <LinkMarker {marker} />
+  {:else if marker.type === 'contour'}
+    <!-- 'contour' only exists in GeoMarkersConfig, so `data` is always GeoFeature-shaped here despite the generic TData bound. -->
+    <ContourClipMarker mode={marker.clip} features={data as unknown as GeoFeature<Record<string, unknown>>[]}>
+      <ContourMarker {marker} />
+    </ContourClipMarker>
+  {:else if marker.type === 'inset'}
+    <InsetMarker
+      {marker}
+      features={geoAllFeatures}
+      width={Math.max(0, (width ?? 0) - (numericMargins?.left ?? 0) - (numericMargins?.right ?? 0))}
+      height={Math.max(0, (height ?? 0) - (numericMargins?.top ?? 0) - (numericMargins?.bottom ?? 0))}
+      left={numericMargins?.left ?? 0}
+      top={numericMargins?.top ?? 0}
+      defaultFill={cfg.palette[0]}
+      {tooltipAnchorX}
+      {tooltipAnchorY}
+    />
+  {:else if marker.type === 'component'}
+    <marker.component {...marker.props} data={marker.data ?? seriesData} />
+  {:else if marker.type === 'geo-component'}
+    <marker.component {...marker.props} data={marker.data ?? data} />
+  {:else if marker.type === 'hover'}
+    <HoverMarker {marker} data={matchedPoints} {activePoint} {impliesCrosshairX} {impliesCrosshairY} />
+  {:else if marker.type === 'geo-hover'}
+    <GeoHoverMarker {marker} data={matchedPoints} />
+  {:else if marker.type === 'delta'}
+    <DeltaMarker {marker} data={seriesData} />
+  {/if}
+{/each}
+
+{#each scopedGroups as group (group.name)}
+  {#each scopedMarkersByName.get(group.name) ?? [] as marker, i (`${group.name}-${marker.type}-${i}`)}
+    {#if marker.type === 'hover'}
+      {@const seriesPoints = matchedPoints.filter((p) => p.series === group.name)}
+      {#if marker.scope === 'segment'}
+        {#each group.segments as seg, segIdx (`${group.name}-hover-segment-${segIdx}`)}
+          <!-- p.row (TData) is always a superset of TSeries in practice, not provable across two independent generics. -->
+          {@const segPoints = seriesPoints.filter((p) => seg.match(p.row as unknown as TSeries))}
+          {#if segPoints.length > 0}
+            <HoverMarker
+              {marker}
+              data={segPoints}
+              activePoint={segPoints[0] ?? null}
+              {impliesCrosshairX}
+              {impliesCrosshairY}
+              seriesColor={seg.color}
+            />
+          {/if}
+        {/each}
+      {:else}
+        <HoverMarker
+          {marker}
+          data={seriesPoints}
+          activePoint={seriesPoints[0] ?? null}
+          {impliesCrosshairX}
+          {impliesCrosshairY}
+          seriesColor={group.segments[0]?.color ?? group.color}
+        />
+      {/if}
+    {:else if marker.type === 'component'}
+      {#if marker.scope === 'segment'}
+        {#each group.segments as seg, segIdx (`${group.name}-component-segment-${segIdx}`)}
+          {@const segmentData = group.data.filter((row) => seg.match(row))}
+          {#if segmentData.length > 0}
+            <marker.component {...marker.props} series={group.name} data={segmentData} seriesColor={seg.color} />
+          {/if}
+        {/each}
+      {:else}
+        <marker.component
+          {...marker.props}
+          series={group.name}
+          data={group.data}
+          seriesColor={group.segments[0]?.color ?? group.color}
+        />
+      {/if}
+    {/if}
+  {/each}
+{/each}
+
+{@render children?.()}

package/dist/layout/geometry/GeometryLayout.svelte.d.ts

@@ -0,0 +1,62 @@
+import type { Snippet } from 'svelte';
+import type { Series } from '../../types/plots/data/common';
+import type { MarkerConfig } from '../../types/markers/all';
+import type { HoverPoint, TooltipAnchorX, TooltipAnchorY } from '../../types/layout/tooltip';
+import type { ScopedMarkerGroup } from '../../types/layout/geometry';
+import type { GeoFeature } from '../../types/plots/data/geo';
+declare function $$render<TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData>(): {
+    props: {
+        /** The plot's own outer width/height — `inset` marker only, to size its content box. */
+        width?: number;
+        height?: number;
+        markers?: MarkerConfig[];
+        /** All resolved series, forwarded to unscoped `component`/`delta` markers. Independently generic over `TSeries` (defaults to `TData`). */
+        seriesData?: Series<TSeries>[];
+        /** One entry per series that can own a `series`-scoped marker. Same `TSeries` as `seriesData`. */
+        scopedGroups?: ScopedMarkerGroup<TSeries>[];
+        matchedPoints: HoverPoint<TData>[];
+        /** The specific matched point actually under the cursor. */
+        activePoint: HoverPoint<TData> | null;
+        impliesCrosshairX: boolean;
+        impliesCrosshairY: boolean;
+        /** The plot's own resolved margins — `inset` marker only, to place its content box. */
+        numericMargins?: {
+            top: number;
+            right: number;
+            bottom: number;
+            left: number;
+        };
+        /** `BasePlotLayout`'s own rows — `contour` (clip) and unscoped `geo-component` fallback data. */
+        data?: TData[];
+        /** `GeoPlot`'s own untouched, tagged features — `inset` marker only (shows a part the main map may exclude). */
+        geoAllFeatures?: (GeoFeature<Record<string, unknown>> & {
+            __id: string;
+        })[];
+        /** The plot's own top-level `tooltip.anchorX`/`anchorY` — `inset` marker only, as the fallback its own tooltip inherits when unset. */
+        tooltipAnchorX?: TooltipAnchorX;
+        tooltipAnchorY?: TooltipAnchorY;
+        /** Rendered last, on top of every marker — typically value labels. Optional; a plot kind may have nothing extra to add. */
+        children?: Snippet;
+    };
+    exports: {};
+    bindings: "";
+    slots: {};
+    events: {};
+};
+declare class __sveltets_Render<TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData> {
+    props(): ReturnType<typeof $$render<TData, TSeries>>['props'];
+    events(): ReturnType<typeof $$render<TData, TSeries>>['events'];
+    slots(): ReturnType<typeof $$render<TData, TSeries>>['slots'];
+    bindings(): "";
+    exports(): {};
+}
+interface $$IsomorphicComponent {
+    new <TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<TData, TSeries>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<TData, TSeries>['props']>, ReturnType<__sveltets_Render<TData, TSeries>['events']>, ReturnType<__sveltets_Render<TData, TSeries>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<TData, TSeries>['bindings']>;
+    } & ReturnType<__sveltets_Render<TData, TSeries>['exports']>;
+    <TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData>(internal: unknown, props: ReturnType<__sveltets_Render<TData, TSeries>['props']> & {}): ReturnType<__sveltets_Render<TData, TSeries>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any, any>['bindings']>;
+}
+declare const GeometryLayout: $$IsomorphicComponent;
+type GeometryLayout<TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData> = InstanceType<typeof GeometryLayout<TData, TSeries>>;
+export default GeometryLayout;