@opendata-ai/openchart-engine 6.10.0 → 6.12.0

package/src/compiler/normalize.ts

@@ -215,6 +215,7 @@ function normalizeChartSpec(spec: ChartSpec, warnings: string[]): NormalizedChar
     darkMode: spec.darkMode ?? 'off',
     hiddenSeries: spec.hiddenSeries ?? [],
     seriesStyles: spec.seriesStyles ?? {},
+    watermark: spec.watermark ?? true,
   };
 }
 
@@ -233,6 +234,7 @@ function normalizeTableSpec(spec: TableSpec, _warnings: string[]): NormalizedTab
     compact: spec.compact ?? false,
     responsive: spec.responsive ?? true,
     animation: spec.animation,
+    watermark: spec.watermark ?? true,
   };
 }
 
@@ -254,6 +256,7 @@ function normalizeSankeySpec(spec: SankeySpec, _warnings: string[]): NormalizedS
     animation: spec.animation,
     valueFormat: spec.valueFormat,
     linkOpacity: spec.linkOpacity,
+    watermark: spec.watermark ?? true,
   };
 }
 
@@ -282,6 +285,7 @@ function normalizeGraphSpec(spec: GraphSpec, _warnings: string[]): NormalizedGra
     annotations: normalizeAnnotations(spec.annotations),
     theme: spec.theme ?? {},
     darkMode: spec.darkMode ?? 'off',
+    watermark: spec.watermark ?? true,
   };
 }
 
@@ -338,6 +342,7 @@ export function flattenLayers(
   parentData?: DataRow[],
   parentEncoding?: Encoding,
   parentTransforms?: import('@opendata-ai/openchart-core').Transform[],
+  parentWatermark?: boolean,
 ): ChartSpec[] {
   const resolvedData = spec.data ?? parentData;
   const resolvedEncoding: Encoding | undefined =
@@ -345,13 +350,23 @@ export function flattenLayers(
       ? { ...parentEncoding, ...spec.encoding }
       : (spec.encoding ?? parentEncoding);
   const resolvedTransforms = [...(parentTransforms ?? []), ...(spec.transform ?? [])];
+  // Layer-level watermark propagates to children (child can still override)
+  const resolvedWatermark = spec.watermark ?? parentWatermark;
 
   const leaves: ChartSpec[] = [];
 
   for (const child of spec.layer) {
     if (isLayerSpec(child)) {
       // Nested layer: recurse with merged context
-      leaves.push(...flattenLayers(child, resolvedData, resolvedEncoding, resolvedTransforms));
+      leaves.push(
+        ...flattenLayers(
+          child,
+          resolvedData,
+          resolvedEncoding,
+          resolvedTransforms,
+          resolvedWatermark,
+        ),
+      );
     } else {
       // Leaf ChartSpec: merge inherited properties
       const mergedData = child.data ?? resolvedData ?? [];
@@ -365,6 +380,10 @@ export function flattenLayers(
         data: mergedData,
         encoding: mergedEncoding,
         transform: mergedTransforms.length > 0 ? mergedTransforms : undefined,
+        // Inherit parent watermark if child doesn't explicitly set one
+        ...(child.watermark === undefined && resolvedWatermark !== undefined
+          ? { watermark: resolvedWatermark }
+          : {}),
       });
     }
   }

package/src/compiler/types.ts

@@ -78,6 +78,8 @@ export interface NormalizedChartSpec {
   responsive: boolean;
   theme: ThemeConfig;
   darkMode: DarkMode;
+  /** Whether the tryOpenData.ai watermark is enabled. */
+  watermark: boolean;
   /** Series names to hide from rendering. */
   hiddenSeries: string[];
   /** Per-series visual style overrides. */
@@ -93,6 +95,7 @@ export interface NormalizedTableSpec {
   chrome: NormalizedChrome;
   theme: ThemeConfig;
   darkMode: DarkMode;
+  watermark: boolean;
   search: boolean;
   pagination: boolean | { pageSize: number };
   stickyFirstColumn: boolean;
@@ -113,6 +116,7 @@ export interface NormalizedGraphSpec {
   annotations: Annotation[];
   theme: ThemeConfig;
   darkMode: DarkMode;
+  watermark: boolean;
 }
 
 /** Discriminated union of all normalized spec types. */

package/src/graphs/compile-graph.ts

@@ -194,6 +194,10 @@ export function compileGraph(spec: unknown, options: CompileOptions): GraphCompi
 
   const graphSpec = normalized as NormalizedGraphSpec;
 
+  // Resolve watermark: explicit spec value wins, then options fallback, then default true.
+  const rawWatermark = (spec as Record<string, unknown>).watermark;
+  const watermark = rawWatermark !== undefined ? graphSpec.watermark : (options.watermark ?? true);
+
   // 2. Resolve theme
   const mergedThemeConfig = options.theme
     ? { ...graphSpec.theme, ...options.theme }
@@ -288,6 +292,9 @@ export function compileGraph(spec: unknown, options: CompileOptions): GraphCompi
     theme,
     options.width,
     options.measureText,
+    'full',
+    undefined,
+    watermark,
   );
 
   // 12. Return compilation
@@ -304,6 +311,7 @@ export function compileGraph(spec: unknown, options: CompileOptions): GraphCompi
       height: options.height,
     },
     simulationConfig,
+    watermark,
   };
 }
 

package/src/graphs/types.ts

@@ -101,4 +101,6 @@ export interface GraphCompilation {
   dimensions: { width: number; height: number };
   /** Force simulation configuration. */
   simulationConfig: SimulationConfig;
+  /** Whether to show the brand watermark. */
+  watermark: boolean;
 }

package/src/layout/dimensions.ts

@@ -96,6 +96,7 @@ export function computeDimensions(
   legendLayout: LegendLayout,
   theme: ResolvedTheme,
   strategy?: LayoutStrategy,
+  watermark: boolean = true,
 ): LayoutDimensions {
   const { width, height } = options;
 
@@ -111,6 +112,7 @@ export function computeDimensions(
     options.measureText,
     chromeMode,
     padding,
+    watermark,
   );
 
   // Start with the total rect
@@ -334,6 +336,7 @@ export function computeDimensions(
       options.measureText,
       fallbackMode as 'compact' | 'hidden',
       padding,
+      watermark,
     );
 
     // Recalculate top/bottom margins with stripped chrome

package/src/layout/scales.ts

@@ -99,8 +99,8 @@ export interface ResolvedScales {
   y?: ResolvedScale;
   color?: ResolvedScale;
   size?: ResolvedScale;
-  /** Default color for single-series charts (first categorical palette color). */
-  defaultColor?: string;
+  /** Default color for single-series charts (first categorical palette color or markDef.fill gradient). */
+  defaultColor?: string | import('@opendata-ai/openchart-core').GradientDef;
 }
 
 // ---------------------------------------------------------------------------

package/src/legend/compute.ts

@@ -150,6 +150,7 @@ export function computeLegend(
   strategy: LayoutStrategy,
   theme: ResolvedTheme,
   chartArea: Rect,
+  watermark: boolean = true,
 ): LegendLayout {
   // Legend explicitly hidden via show: false, or height strategy says no legend
   if (spec.legend?.show === false || strategy.legendMaxHeight === 0) {
@@ -259,7 +260,8 @@ export function computeLegend(
 
   // Top/bottom-positioned legend: horizontal flow with overflow protection.
   // Reserve space on the right so legend entries don't overlap the brand watermark.
-  const availableWidth = chartArea.width - LEGEND_PADDING * 2 - BRAND_RESERVE_WIDTH;
+  const availableWidth =
+    chartArea.width - LEGEND_PADDING * 2 - (watermark ? BRAND_RESERVE_WIDTH : 0);
 
   // Apply symbolLimit first if set (minimum 1), then fit remaining entries to available rows.
   if (spec.legend?.symbolLimit != null) {

package/src/sankey/compile-sankey.ts

@@ -211,6 +211,10 @@ export function compileSankey(spec: unknown, options: CompileOptions): SankeyLay
 
   const sankeySpec = normalized as NormalizedSankeySpec;
 
+  // Resolve watermark: explicit spec value wins, then options fallback, then default true.
+  const rawWatermark = (spec as Record<string, unknown>).watermark;
+  const watermark = rawWatermark !== undefined ? sankeySpec.watermark : (options.watermark ?? true);
+
   // 2. Resolve theme
   const mergedThemeConfig = options.theme
     ? { ...sankeySpec.theme, ...options.theme }
@@ -241,6 +245,9 @@ export function compileSankey(spec: unknown, options: CompileOptions): SankeyLay
     theme,
     options.width,
     options.measureText,
+    'full',
+    undefined,
+    watermark,
   );
 
   // 4. Compute drawing area (total space minus chrome)
@@ -254,7 +261,7 @@ export function compileSankey(spec: unknown, options: CompileOptions): SankeyLay
 
   // Guard against negative dimensions
   if (fullArea.width <= 0 || fullArea.height <= 0) {
-    return emptyLayout(fullArea, chrome, theme, options);
+    return emptyLayout(fullArea, chrome, theme, options, watermark);
   }
 
   // 5. Extract encoding fields
@@ -298,7 +305,7 @@ export function compileSankey(spec: unknown, options: CompileOptions): SankeyLay
   };
 
   if (area.height <= 0) {
-    return emptyLayout(area, chrome, theme, options);
+    return emptyLayout(area, chrome, theme, options, watermark);
   }
 
   // 6. Run d3-sankey layout (may re-run once if labels overflow)
@@ -473,6 +480,7 @@ export function compileSankey(spec: unknown, options: CompileOptions): SankeyLay
       height: options.height,
     },
     animation: resolvedAnimation,
+    watermark,
   };
 }
 
@@ -631,6 +639,7 @@ function emptyLayout(
   chrome: ReturnType<typeof computeChrome>,
   theme: ResolvedTheme,
   options: CompileOptions,
+  watermark: boolean,
 ): SankeyLayout {
   return {
     area,
@@ -664,5 +673,6 @@ function emptyLayout(
       width: options.width,
       height: options.height,
     },
+    watermark,
   };
 }

package/src/sankey/types.ts

@@ -33,6 +33,7 @@ export interface NormalizedSankeySpec {
   legend?: LegendConfig;
   theme: ThemeConfig;
   darkMode: DarkMode;
+  watermark: boolean;
   animation?: AnimationSpec;
   valueFormat?: string;
   linkOpacity?: number;

package/src/tables/compile-table.ts

@@ -382,6 +382,7 @@ export function compileTableLayout(
   });
 
   // 9. Compute chrome
+  const watermark = spec.watermark;
   const chrome = computeChrome(
     {
       title: spec.chrome.title,
@@ -393,6 +394,9 @@ export function compileTableLayout(
     theme,
     options.width,
     options.measureText,
+    'full',
+    undefined,
+    watermark,
   );
 
   // 10. Build a11y
@@ -418,5 +422,6 @@ export function compileTableLayout(
     },
     theme,
     animation: resolveAnimation(spec.animation),
+    watermark,
   };
 }

package/src/tooltips/compute.ts

@@ -19,7 +19,12 @@ import type {
   TooltipContent,
   TooltipField,
 } from '@opendata-ai/openchart-core';
-import { buildTemporalFormatter, formatDate, formatNumber } from '@opendata-ai/openchart-core';
+import {
+  buildTemporalFormatter,
+  formatDate,
+  formatNumber,
+  getRepresentativeColor,
+} from '@opendata-ai/openchart-core';
 import { format as d3Format } from 'd3-format';
 
 import type { NormalizedChartSpec } from '../compiler/types';
@@ -155,7 +160,7 @@ function tooltipsForPoint(
   markIndex: number,
 ): Array<[string, TooltipContent]> {
   const title = getTooltipTitle(mark.data, encoding);
-  const fields = buildFields(mark.data, encoding, mark.fill);
+  const fields = buildFields(mark.data, encoding, getRepresentativeColor(mark.fill));
 
   return [[`point-${markIndex}`, { title, fields }]];
 }
@@ -166,7 +171,7 @@ function tooltipsForRect(
   markIndex: number,
 ): Array<[string, TooltipContent]> {
   const title = getTooltipTitle(mark.data, encoding);
-  const fields = buildFields(mark.data, encoding, mark.fill);
+  const fields = buildFields(mark.data, encoding, getRepresentativeColor(mark.fill));
 
   return [[`rect-${markIndex}`, { title, fields }]];
 }
@@ -187,14 +192,14 @@ function tooltipsForArc(
       fields.push({
         label: categoryName,
         value: formatValue(row[encoding.y.field], encoding.y.type, encoding.y.axis?.format),
-        color: mark.fill,
+        color: getRepresentativeColor(mark.fill),
       });
     }
   } else if (encoding.y) {
     fields.push({
       label: encoding.y.field,
       value: formatValue(row[encoding.y.field], encoding.y.type, encoding.y.axis?.format),
-      color: mark.fill,
+      color: getRepresentativeColor(mark.fill),
     });
   }
 
@@ -214,7 +219,7 @@ function tooltipsForArea(
     for (const dp of mark.dataPoints) {
       dp.tooltip = {
         title: getTooltipTitle(dp.datum, encoding),
-        fields: buildFields(dp.datum, encoding, mark.fill),
+        fields: buildFields(dp.datum, encoding, getRepresentativeColor(mark.fill)),
       };
     }
   }