@opendata-ai/openchart-core 6.2.0 → 6.3.0

package/dist/index.d.ts

@@ -177,7 +177,7 @@ interface ColumnConfig {
  * - 'tick': strip/rug plot marks
  * - 'rect': heatmaps and 2D binned plots
  */
-type MarkType = 'bar' | 'line' | 'area' | 'point' | 'circle' | 'arc' | 'text' | 'rule' | 'tick' | 'rect';
+type MarkType = 'bar' | 'line' | 'area' | 'point' | 'circle' | 'arc' | 'text' | 'rule' | 'tick' | 'rect' | 'lollipop';
 /** @deprecated Use MarkType instead. Kept for internal migration references. */
 type ChartType = MarkType;
 /**
@@ -618,6 +618,10 @@ interface LegendConfig {
     offset?: AnnotationOffset;
     /** Whether to show the legend. Defaults to true. Set to false to hide. */
     show?: boolean;
+    /** Number of columns for horizontal legend layout. Overrides the default row limit. */
+    columns?: number;
+    /** Max number of legend entries before truncation. Remaining entries show as "+N more". */
+    symbolLimit?: number;
 }
 /** Data row: a plain object with string keys. */
 type DataRow = Record<string, unknown>;
@@ -2342,6 +2346,18 @@ interface LabelCandidate {
  * Detect AABB (axis-aligned bounding box) overlap between two rectangles.
  */
 declare function detectCollision(a: Rect, b: Rect): boolean;
+/** An offset position to try when resolving a label collision. */
+interface OffsetStrategy {
+    dx: number;
+    dy: number;
+}
+/** Offsets to try when a label collides with an existing placement. */
+declare const OFFSET_STRATEGIES: readonly OffsetStrategy[];
+/**
+ * Extended offset strategies with additional vertical spread for dense
+ * multi-series endpoints (e.g. 5+ line series converging at similar y-values).
+ */
+declare const EXTENDED_OFFSET_STRATEGIES: readonly OffsetStrategy[];
 /**
  * Resolve label collisions using a greedy placement algorithm.
  *
@@ -2351,9 +2367,10 @@ declare function detectCollision(a: Rect, b: Rect): boolean;
  * demoted to tooltip-only (visible: false).
  *
  * @param labels - Array of label candidates to position.
+ * @param strategies - Optional offset strategies to use (defaults to OFFSET_STRATEGIES).
  * @returns Array of resolved labels with computed positions and visibility.
  */
-declare function resolveCollisions(labels: LabelCandidate[]): ResolvedLabel[];
+declare function resolveCollisions(labels: LabelCandidate[], strategies?: readonly OffsetStrategy[]): ResolvedLabel[];
 /**
  * Compute the bounding rect of a resolved label from its position and text.
  * Uses heuristic text measurement so it works without DOM access.
@@ -2401,8 +2418,12 @@ type DateGranularity = 'year' | 'quarter' | 'month' | 'week' | 'day' | 'hour' |
  * @param value - Date object, ISO string, or timestamp number.
  * @param locale - Locale string (currently unused, reserved for i18n).
  * @param granularity - Time granularity for format selection.
+ * @param useUtc - Whether to infer granularity and format using UTC methods.
+ *   Pass `false` when formatting ticks from a local-time scale (d3 scaleTime),
+ *   so that e.g. midnight local isn't misread as an intra-day UTC time.
+ *   Defaults to `true` for backward compatibility.
  */
-declare function formatDate(value: Date | string | number, _locale?: string, granularity?: DateGranularity): string;
+declare function formatDate(value: Date | string | number, _locale?: string, granularity?: DateGranularity, useUtc?: boolean): string;
 /**
  * Build a formatter for temporal values using a d3-time-format string (e.g. "%Y", "%b %Y").
  * Returns a function that accepts a Date, string, or number and returns the formatted string.
@@ -2613,4 +2634,4 @@ declare function scatterChart(data: DataRow[], x: FieldRef, y: FieldRef, options
  */
 declare function dataTable(data: DataRow[], options?: TableBuilderOptions): TableSpec;
 
-export { type A11yMetadata, type AggregateOp, type Annotation, type AnnotationAnchor, type AnnotationOffset, type AnnotationPosition, type ArcMark, type AreaMark, type AxisConfig, type AxisLabelDensity, type AxisLayout, type AxisTick, BRAND_FONT_SIZE, BRAND_MIN_WIDTH, BRAND_RESERVE_WIDTH, type BarColumnConfig, type BarTableCell, type BinParams, type BinTransform, type Breakpoint, CATEGORICAL_PALETTE, CHART_ENCODING_RULES, CHART_TYPES, type CalculateExpression, type CalculateTransform, type CategoricalPalette, type CategoryColorsConfig, type CategoryTableCell, type CellStyle, type ChannelRule, type ChartBuilderOptions, type ChartEventHandlers, type ChartLayout, type ChartSpec, type ChartSpecOverride, type ChartSpecWithoutData, type ChartType, type Chrome, type ChromeDefaults, type ChromeKey, type ChromeMode, type ChromeText, type ChromeTextStyle, type ColorBlindnessType, type ColumnConfig, type CompileOptions, type CompileTableOptions, type Condition, type ConditionalValueDef, DEFAULT_THEME, DIVERGING_PALETTES, type DarkMode, type DataRow, type DateGranularity, type DivergingPalette, type ElementEdit, type Encoding, type EncodingChannel, type EncodingRule, type FieldPredicate, type FieldRef, type FieldType, type FilterPredicate, type FilterTransform, type FlagTableCell, GRAPH_ENCODING_RULES, type GraphChannelRule, type GraphEdge, type GraphEdgeLayout, type GraphEncoding, type GraphEncodingChannel, type GraphLayout, type GraphLayoutConfig, type GraphNode, type GraphNodeLayout, type GraphSpec, type GraphSpecWithoutData, type Gridline, type HeatmapColumnConfig, type HeatmapTableCell, type HeightClass, type ImageColumnConfig, type ImageTableCell, type LabelCandidate, type LabelConfig, type LabelDensity, type LabelMode, type LabelPriority, type LayerSpec, type LayoutStrategy, type LegendConfig, type LegendEntry, type LegendLayout, type LegendPosition, type LineMark, type LogicalAnd, type LogicalNot, type LogicalOr, MARK_DISPLAY_NAMES, MARK_ENCODING_RULES, MARK_TYPES, type Margins, type Mark, type MarkAria, type MarkDef, type MarkEvent, type MarkType, type MeasureTextFn, type NodeOverride, type PaginationState, type Point, type PointMark, type RangeAnnotation, type Rect, type RectMark, type RefLineAnnotation, type ResolveConfig, type ResolveMode, type ResolvedAnnotation, type ResolvedChrome, type ResolvedChromeElement, type ResolvedColumn, type ResolvedLabel, type ResolvedTheme, type RuleMarkLayout, SEQUENTIAL_PALETTES, type ScaleConfig, type ScaleType, type SequentialPalette, type SeriesStyle, type SortState, type SparklineColumnConfig, type SparklineData, type SparklineTableCell, type StoredVizSpec, type TableBuilderOptions, type TableCell, type TableCellBase, type TableLayout, type TableRow, type TableSpec, type TableSpecWithoutData, type TextAnnotation, type TextMarkLayout, type TextStyle, type TextTableCell, type Theme, type ThemeChromeDefaults, type ThemeColors, type ThemeConfig, type ThemeFontSizes, type ThemeFontWeights, type ThemeFonts, type ThemeSpacing, type TickMarkLayout, type TimeUnit, type TimeUnitTransform, type TooltipContent, type TooltipField, type Transform, type VizSpec, abbreviateNumber, adaptColorForDarkMode, adaptTheme, areaChart, barChart, buildD3Formatter, buildTemporalFormatter, checkPaletteDistinguishability, columnChart, computeChrome, computeLabelBounds, contrastRatio, dataTable, detectCollision, donutChart, dotChart, estimateTextWidth, findAccessibleColor, formatDate, formatNumber, generateAltText, generateAriaLabels, generateDataTable, getBreakpoint, getHeightClass, getLayoutStrategy, inferFieldType, isChartSpec, isConditionalDef, isEncodingChannel, isGraphSpec, isLayerSpec, isRangeAnnotation, isRefLineAnnotation, isTableSpec, isTextAnnotation, lineChart, meetsAA, pieChart, resolveCollisions, resolveMarkDef, resolveMarkType, resolveTheme, scatterChart, simulateColorBlindness };
+export { type A11yMetadata, type AggregateOp, type Annotation, type AnnotationAnchor, type AnnotationOffset, type AnnotationPosition, type ArcMark, type AreaMark, type AxisConfig, type AxisLabelDensity, type AxisLayout, type AxisTick, BRAND_FONT_SIZE, BRAND_MIN_WIDTH, BRAND_RESERVE_WIDTH, type BarColumnConfig, type BarTableCell, type BinParams, type BinTransform, type Breakpoint, CATEGORICAL_PALETTE, CHART_ENCODING_RULES, CHART_TYPES, type CalculateExpression, type CalculateTransform, type CategoricalPalette, type CategoryColorsConfig, type CategoryTableCell, type CellStyle, type ChannelRule, type ChartBuilderOptions, type ChartEventHandlers, type ChartLayout, type ChartSpec, type ChartSpecOverride, type ChartSpecWithoutData, type ChartType, type Chrome, type ChromeDefaults, type ChromeKey, type ChromeMode, type ChromeText, type ChromeTextStyle, type ColorBlindnessType, type ColumnConfig, type CompileOptions, type CompileTableOptions, type Condition, type ConditionalValueDef, DEFAULT_THEME, DIVERGING_PALETTES, type DarkMode, type DataRow, type DateGranularity, type DivergingPalette, EXTENDED_OFFSET_STRATEGIES, type ElementEdit, type Encoding, type EncodingChannel, type EncodingRule, type FieldPredicate, type FieldRef, type FieldType, type FilterPredicate, type FilterTransform, type FlagTableCell, GRAPH_ENCODING_RULES, type GraphChannelRule, type GraphEdge, type GraphEdgeLayout, type GraphEncoding, type GraphEncodingChannel, type GraphLayout, type GraphLayoutConfig, type GraphNode, type GraphNodeLayout, type GraphSpec, type GraphSpecWithoutData, type Gridline, type HeatmapColumnConfig, type HeatmapTableCell, type HeightClass, type ImageColumnConfig, type ImageTableCell, type LabelCandidate, type LabelConfig, type LabelDensity, type LabelMode, type LabelPriority, type LayerSpec, type LayoutStrategy, type LegendConfig, type LegendEntry, type LegendLayout, type LegendPosition, type LineMark, type LogicalAnd, type LogicalNot, type LogicalOr, MARK_DISPLAY_NAMES, MARK_ENCODING_RULES, MARK_TYPES, type Margins, type Mark, type MarkAria, type MarkDef, type MarkEvent, type MarkType, type MeasureTextFn, type NodeOverride, OFFSET_STRATEGIES, type OffsetStrategy, type PaginationState, type Point, type PointMark, type RangeAnnotation, type Rect, type RectMark, type RefLineAnnotation, type ResolveConfig, type ResolveMode, type ResolvedAnnotation, type ResolvedChrome, type ResolvedChromeElement, type ResolvedColumn, type ResolvedLabel, type ResolvedTheme, type RuleMarkLayout, SEQUENTIAL_PALETTES, type ScaleConfig, type ScaleType, type SequentialPalette, type SeriesStyle, type SortState, type SparklineColumnConfig, type SparklineData, type SparklineTableCell, type StoredVizSpec, type TableBuilderOptions, type TableCell, type TableCellBase, type TableLayout, type TableRow, type TableSpec, type TableSpecWithoutData, type TextAnnotation, type TextMarkLayout, type TextStyle, type TextTableCell, type Theme, type ThemeChromeDefaults, type ThemeColors, type ThemeConfig, type ThemeFontSizes, type ThemeFontWeights, type ThemeFonts, type ThemeSpacing, type TickMarkLayout, type TimeUnit, type TimeUnitTransform, type TooltipContent, type TooltipField, type Transform, type VizSpec, abbreviateNumber, adaptColorForDarkMode, adaptTheme, areaChart, barChart, buildD3Formatter, buildTemporalFormatter, checkPaletteDistinguishability, columnChart, computeChrome, computeLabelBounds, contrastRatio, dataTable, detectCollision, donutChart, dotChart, estimateTextWidth, findAccessibleColor, formatDate, formatNumber, generateAltText, generateAriaLabels, generateDataTable, getBreakpoint, getHeightClass, getLayoutStrategy, inferFieldType, isChartSpec, isConditionalDef, isEncodingChannel, isGraphSpec, isLayerSpec, isRangeAnnotation, isRefLineAnnotation, isTableSpec, isTextAnnotation, lineChart, meetsAA, pieChart, resolveCollisions, resolveMarkDef, resolveMarkType, resolveTheme, scatterChart, simulateColorBlindness };

package/dist/index.js

@@ -44,8 +44,8 @@ var MARK_ENCODING_RULES = {
     detail: optional("nominal")
   },
   point: {
-    x: required("quantitative"),
-    y: required("quantitative"),
+    x: required("quantitative", "temporal", "nominal", "ordinal"),
+    y: required("quantitative", "temporal", "nominal", "ordinal"),
     color: optional("nominal", "ordinal", "quantitative"),
     size: optional("quantitative"),
     shape: optional("nominal", "ordinal"),
@@ -66,6 +66,17 @@ var MARK_ENCODING_RULES = {
     order: optional("quantitative", "ordinal"),
     detail: optional("nominal")
   },
+  lollipop: {
+    x: required("quantitative"),
+    y: required("nominal", "ordinal"),
+    color: optional("nominal", "ordinal", "quantitative"),
+    size: optional("quantitative"),
+    opacity: optional("quantitative"),
+    tooltip: optional(),
+    href: optional(),
+    order: optional("quantitative", "ordinal"),
+    detail: optional("nominal")
+  },
   arc: {
     x: optional(),
     y: required("quantitative"),
@@ -155,7 +166,8 @@ var MARK_TYPES = /* @__PURE__ */ new Set([
   "text",
   "rule",
   "tick",
-  "rect"
+  "rect",
+  "lollipop"
 ]);
 var CHART_TYPES = MARK_TYPES;
 function resolveMarkType(mark) {
@@ -196,7 +208,8 @@ var MARK_DISPLAY_NAMES = {
   text: "Text chart",
   rule: "Rule chart",
   tick: "Tick plot",
-  rect: "Heatmap"
+  rect: "Heatmap",
+  lollipop: "Lollipop chart"
 };
 
 // ../../node_modules/.bun/d3-color@3.1.0/node_modules/d3-color/src/define.js
@@ -1293,7 +1306,22 @@ var OFFSET_STRATEGIES = [
   { dx: -1.1, dy: -1.2 }
   // upper-left
 ];
-function resolveCollisions(labels) {
+var EXTENDED_OFFSET_STRATEGIES = [
+  ...OFFSET_STRATEGIES,
+  { dx: 0, dy: -2.4 },
+  // further above
+  { dx: 0, dy: 2.4 },
+  // further below
+  { dx: 0, dy: -3.6 },
+  // even further above
+  { dx: 0, dy: 3.6 },
+  // even further below
+  { dx: 1.1, dy: -2.4 },
+  // upper-right far
+  { dx: 1.1, dy: 2.4 }
+  // lower-right far
+];
+function resolveCollisions(labels, strategies = OFFSET_STRATEGIES) {
   const sorted = [...labels].sort(
     (a, b) => PRIORITY_ORDER[a.priority] - PRIORITY_ORDER[b.priority]
   );
@@ -1303,7 +1331,7 @@ function resolveCollisions(labels) {
     let bestRect = null;
     let bestX = label.anchorX;
     let bestY = label.anchorY;
-    for (const offset of OFFSET_STRATEGIES) {
+    for (const offset of strategies) {
       const candidateX = label.anchorX + offset.dx * label.width;
       const candidateY = label.anchorY + offset.dy * label.height;
       const candidateRect = {
@@ -2403,16 +2431,16 @@ var GRANULARITY_FORMATS = {
   hour: "%b %d %H:%M",
   minute: "%H:%M"
 };
-function formatDate(value, _locale, granularity) {
+function formatDate(value, _locale, granularity, useUtc = true) {
   const date = value instanceof Date ? value : new Date(value);
   if (Number.isNaN(date.getTime())) return String(value);
-  const gran = granularity ?? inferGranularity(date);
+  const gran = granularity ?? inferGranularity(date, useUtc);
   if (gran === "quarter") {
-    const q = Math.ceil((date.getMonth() + 1) / 3);
+    const q = useUtc ? Math.ceil((date.getUTCMonth() + 1) / 3) : Math.ceil((date.getMonth() + 1) / 3);
     return `Q${q} ${date.getFullYear()}`;
   }
   const formatStr = GRANULARITY_FORMATS[gran];
-  if (["year", "month", "day"].includes(gran)) {
+  if (useUtc) {
     return utcFormat(formatStr)(date);
   }
   return timeFormat(formatStr)(date);
@@ -2426,12 +2454,16 @@ function buildTemporalFormatter(formatStr) {
     return fmt(date);
   };
 }
-function inferGranularity(date) {
-  if (date.getUTCHours() !== 0 || date.getUTCMinutes() !== 0) {
-    return date.getUTCMinutes() !== 0 ? "minute" : "hour";
+function inferGranularity(date, useUtc = true) {
+  const hours = useUtc ? date.getUTCHours() : date.getHours();
+  const minutes = useUtc ? date.getUTCMinutes() : date.getMinutes();
+  const day = useUtc ? date.getUTCDate() : date.getDate();
+  const month = useUtc ? date.getUTCMonth() : date.getMonth();
+  if (hours !== 0 || minutes !== 0) {
+    return minutes !== 0 ? "minute" : "hour";
   }
-  if (date.getUTCDate() !== 1) return "day";
-  if (date.getUTCMonth() !== 0) return "month";
+  if (day !== 1) return "day";
+  if (month !== 0) return "month";
   return "year";
 }
 
@@ -2694,10 +2726,12 @@ export {
   CHART_TYPES,
   DEFAULT_THEME,
   DIVERGING_PALETTES,
+  EXTENDED_OFFSET_STRATEGIES,
   GRAPH_ENCODING_RULES,
   MARK_DISPLAY_NAMES,
   MARK_ENCODING_RULES,
   MARK_TYPES,
+  OFFSET_STRATEGIES,
   SEQUENTIAL_PALETTES,
   abbreviateNumber,
   adaptColorForDarkMode,