matterviz 0.4.1 → 0.4.3

package/dist/plot/bar/BarPlot.svelte.d.ts

@@ -1,6 +1,7 @@
 import type { D3InterpolateName } from '../../colors';
 import type { Point2D } from '../../math';
 import type { AxisLoadError, BarHandlerProps, BarMode, BarSeries, BarStyle, BasePlotProps, ColorScaleConfig, DataLoaderFn, InternalPoint, LegendConfig, LineStyle, Orientation, PanConfig, PlotConfig, RefLine, RefLineEvent, SizeScaleConfig, UserContentProps } from '..';
+import type { MarginalsProp } from '../core/marginals';
 import type { Snippet } from 'svelte';
 import type { HTMLAttributes } from 'svelte/elements';
 import type { TweenOptions } from 'svelte/motion';
@@ -51,6 +52,7 @@ declare function $$render<Metadata extends Record<string, unknown> = Record<stri
         on_axis_change?: (axis: `x` | `x2` | `y` | `y2`, key: string, new_series: BarSeries<Metadata>[]) => void;
         on_error?: (error: AxisLoadError) => void;
         pan?: PanConfig;
+        marginals?: MarginalsProp;
     };
     exports: {};
     bindings: "display" | "mode" | "orientation" | "show_controls" | "x2_axis" | "y_axis" | "y2_axis" | "fullscreen" | "series" | "hovered" | "ref_lines" | "controls_open" | "x_axis";

package/dist/plot/bar/BarPlotControls.svelte

@@ -26,9 +26,7 @@
     mode?: BarMode
     show_controls?: boolean
     controls_open?: boolean
-    children?: Snippet<
-      [{ orientation: Orientation; mode: BarMode } & Required<PlotConfig>]
-    >
+    children?: Snippet<[{ orientation: Orientation; mode: BarMode } & Required<PlotConfig>]>
   } = $props()
 </script>
 

package/dist/plot/bar/BarPlotControls.svelte.d.ts

@@ -6,12 +6,10 @@ type $$ComponentProps = Omit<PlotControlsProps, `children` | `post_children`> &
     mode?: BarMode;
     show_controls?: boolean;
     controls_open?: boolean;
-    children?: Snippet<[
-        {
-            orientation: Orientation;
-            mode: BarMode;
-        } & Required<PlotConfig>
-    ]>;
+    children?: Snippet<[{
+        orientation: Orientation;
+        mode: BarMode;
+    } & Required<PlotConfig>]>;
 };
 declare const BarPlotControls: import("svelte").Component<$$ComponentProps, {}, "display" | "mode" | "orientation" | "show_controls" | "x2_axis" | "y_axis" | "y2_axis" | "controls_open" | "x_axis">;
 type BarPlotControls = ReturnType<typeof BarPlotControls>;

package/dist/plot/bar/SpacegroupBarPlot.svelte

@@ -10,10 +10,7 @@
   import { SvelteMap } from 'svelte/reactivity'
 
   // Merge tick config with default rotation, preserving user overrides
-  const with_rotation = (
-    tick: TickConfig | undefined,
-    default_rot: number,
-  ): TickConfig => ({
+  const with_rotation = (tick: TickConfig | undefined, default_rot: number): TickConfig => ({
     ...tick,
     label: { ...tick?.label, rotation: tick?.label?.rotation ?? default_rot },
   })
@@ -37,45 +34,25 @@
     data.map(spg.normalize_spacegroup).filter((sg): sg is number => sg !== null),
   )
 
-  // Compute histogram of space group numbers
+  // Histogram of space group number counts
   const histogram = $derived.by(() => {
     const hist = new SvelteMap<number, number>()
-
-    // Count occurrences
-    for (const sg of normalized_data) {
-      hist.set(sg, (hist.get(sg) ?? 0) + 1)
-    }
-
+    for (const sg of normalized_data) hist.set(sg, (hist.get(sg) ?? 0) + 1)
     return hist
   })
 
-  // Group counts by crystal system
-  const crystal_system_stats = $derived.by(() => {
-    const stats = new SvelteMap<
-      CrystalSystem,
-      { count: number; spacegroups: number[] }
-    >()
-
-    for (const system of symmetry.CRYSTAL_SYSTEMS) {
-      stats.set(system, { count: 0, spacegroups: [] })
-    }
-
+  // Total counts per crystal system
+  const crystal_system_counts = $derived.by(() => {
+    const counts = new SvelteMap<CrystalSystem, number>()
     for (const [sg, count] of histogram) {
       const system = spg.spacegroup_to_crystal_sys(sg)
-      if (!system) continue
-      const stat = stats.get(system)
-      if (!stat) continue
-      stat.count += count
-      stat.spacegroups.push(sg)
+      if (system) counts.set(system, (counts.get(system) ?? 0) + count)
     }
-
-    return stats
+    return counts
   })
 
   // Create sorted list of space groups for x-axis
-  const sorted_spacegroups = $derived(
-    Array.from(histogram.keys()).sort((a, b) => a - b),
-  )
+  const sorted_spacegroups = $derived(Array.from(histogram.keys()).sort((a, b) => a - b))
 
   // Smart tick selection: thin out ticks for dense data
   const x_axis_ticks = $derived.by(() => {
@@ -91,36 +68,25 @@
 
   // Build BarSeries - one series per crystal system for proper coloring
   const bar_series = $derived.by<BarSeries[]>(() => {
-    const series_by_system = new SvelteMap<
-      CrystalSystem,
-      { x: number[]; y: number[] }
-    >()
+    const series_by_system = new SvelteMap<CrystalSystem, { x: number[]; y: number[] }>()
 
     // Group data by crystal system
     for (const sg of sorted_spacegroups) {
       const system = spg.spacegroup_to_crystal_sys(sg)
-      if (system) {
-        let series = series_by_system.get(system)
-        if (!series) {
-          series = { x: [], y: [] }
-          series_by_system.set(system, series)
-        }
-        series.x.push(sg)
-        series.y.push(histogram.get(sg) ?? 0)
-      }
+      if (!system) continue
+      let series = series_by_system.get(system)
+      if (!series) series_by_system.set(system, (series = { x: [], y: [] }))
+      series.x.push(sg)
+      series.y.push(histogram.get(sg) ?? 0)
     }
 
     // Convert to BarSeries array, maintaining order of crystal systems
-    const result: BarSeries[] = []
-    for (const system of symmetry.CRYSTAL_SYSTEMS) {
+    return symmetry.CRYSTAL_SYSTEMS.flatMap((system) => {
       const system_data = series_by_system.get(system)
-      if (system_data) {
-        const { x, y } = system_data
-        const color = symmetry.CRYSTAL_SYSTEM_COLORS[system]
-        result.push({ x, y, color, label: system, bar_width: 0.9, visible: true })
-      }
-    }
-    return result
+      if (!system_data) return []
+      const color = symmetry.CRYSTAL_SYSTEM_COLORS[system]
+      return { ...system_data, color, label: system, bar_width: 0.9, visible: true }
+    })
   })
 
   // Always show full space group range (1-230)
@@ -132,8 +98,7 @@
 
     return symmetry.CRYSTAL_SYSTEMS.map((system) => {
       const [sg_start, sg_end] = symmetry.CRYSTAL_SYSTEM_RANGES[system]
-      const stats = crystal_system_stats.get(system)
-      const count = stats?.count ?? 0
+      const count = crystal_system_counts.get(system) ?? 0
       const color = symmetry.CRYSTAL_SYSTEM_COLORS[system]
       return { system, sg_start, sg_end, count, color }
     }).filter(
@@ -145,25 +110,27 @@
 
   // Build axis configurations based on orientation
   const x_axis_config = $derived(
-    orientation === `horizontal` ? { ...x_axis, label: x_axis.label ?? `Counts` } : {
-      ...x_axis,
-      label: x_axis.label ?? `International Spacegroup Number`,
-      range: x_range,
-      ticks: x_axis_ticks,
-      tick: with_rotation(x_axis.tick, 90), // Rotate ticks 90° to avoid overlap
-      label_shift: { x: 0, y: 20, ...x_axis.label_shift }, // Move label down for rotated ticks
-    },
+    orientation === `horizontal`
+      ? { ...x_axis, label: x_axis.label ?? `Counts` }
+      : {
+          ...x_axis,
+          label: x_axis.label ?? `International Spacegroup Number`,
+          range: x_range,
+          ticks: x_axis_ticks,
+          tick: with_rotation(x_axis.tick, 90), // Rotate ticks 90° to avoid overlap
+          label_shift: { x: 0, y: 20, ...x_axis.label_shift }, // Move label down for rotated ticks
+        },
   )
 
   const y_axis_config = $derived(
     orientation === `horizontal`
       ? {
-        ...y_axis,
-        label: y_axis.label ?? `International Spacegroup Number`,
-        range: x_range,
-        ticks: x_axis_ticks,
-        tick: with_rotation(y_axis.tick, 0),
-      }
+          ...y_axis,
+          label: y_axis.label ?? `International Spacegroup Number`,
+          range: x_range,
+          ticks: x_axis_ticks,
+          tick: with_rotation(y_axis.tick, 0),
+        }
       : { ...y_axis, label: y_axis.label ?? `Counts` },
   )
 </script>
@@ -178,7 +145,13 @@
   Count: {format_value(count, `.0f`)}
 {/snippet}
 
-{#snippet user_content({ width, height, x_scale_fn, y_scale_fn, pad }: {
+{#snippet user_content({
+  width,
+  height,
+  x_scale_fn,
+  y_scale_fn,
+  pad,
+}: {
   width: number
   height: number
   x_scale_fn: (x: number) => number
@@ -226,9 +199,7 @@
             font-size="12"
             fill="var(--text-color, black)"
           >
-            {format_num(region.count, `,~`)} ({
-              format_num(region.count / total_count, `.1~%`)
-            })
+            {format_num(region.count, `,~`)} ({format_num(region.count / total_count, `.1~%`)})
           </text>
         {/if}
       {:else}
@@ -270,9 +241,7 @@
             font-size="12"
             fill="var(--text-color, black)"
           >
-            {format_num(region.count, `,~`)} ({
-              format_num(region.count / total_count, `.1~%`)
-            })
+            {format_num(region.count, `,~`)} ({format_num(region.count / total_count, `.1~%`)})
           </text>
         {/if}
       {/if}

package/dist/plot/bar/data.d.ts

@@ -1,3 +1,4 @@
+import type { Vec2 } from '../../math';
 import type { BarMode, BarSeries, Orientation, ScaleType } from '../core/types';
 export type NumericBarSeries<Metadata = Record<string, unknown>> = Omit<BarSeries<Metadata>, `x`> & {
     x: readonly number[];
@@ -27,10 +28,10 @@ export interface BarAutoRangeOpts<Metadata = Record<string, unknown>> {
     y2_scale_type: ScaleType;
 }
 export declare function compute_bar_auto_ranges<Metadata = Record<string, unknown>>(opts: BarAutoRangeOpts<Metadata>): {
-    x: number[];
-    x2: number[];
-    y: number[];
-    y2: number[];
+    x: Vec2;
+    x2: Vec2;
+    y: Vec2;
+    y2: Vec2;
 };
 export declare function compute_stacked_offsets<Metadata = Record<string, unknown>>(internal_series: readonly NumericBarSeries<Metadata>[], mode: BarMode): number[][];
 export interface GroupInfo {

package/dist/plot/bar/data.js

@@ -113,7 +113,8 @@ export function compute_bar_auto_ranges(opts) {
     const x_auto_range = category_count > 0
         ? [-0.5, category_count - 0.5]
         : calc_x_range(visible_series.filter((srs) => (srs.x_axis ?? `x1`) === `x1`), opts.x_range, opts.x_scale_type, opts.x_is_time);
-    const x2_auto_range = calc_x_range(opts.x2_series, opts.x2_range, opts.x2_scale_type, opts.x2_is_time);
+    const { x2_series, x2_range, x2_scale_type, x2_is_time } = opts;
+    const x2_auto_range = calc_x_range(x2_series, x2_range, x2_scale_type, x2_is_time);
     const y1_range = calc_y_range(opts.y1_series, opts.y_range, opts.y_scale_type);
     const y2_auto_range = calc_y_range(opts.y2_series, opts.y2_range, opts.y2_scale_type);
     // Map data ranges to axis ranges depending on orientation