@oliasoft-open-source/charts-library 5.9.0-beta-11 → 5.9.0-beta-13

package/dist/index.d.ts

@@ -133,8 +133,8 @@ export declare interface IBarChartData extends ICommonData {
 }
 
 export declare interface IBarChartDataInput extends Omit<IBarChartData, 'options' | 'data'> {
-    data?: DeepPartial<IBarChartData['data']> & {
-        datasets?: Array<DeepPartial<IBarChartDataset> | Record<string, unknown> | null>;
+    data?: Omit<DeepPartial<IBarChartData['data']>, 'datasets'> & {
+        datasets?: Array<DeepPartial<IBarChartDataset> | object | null>;
     };
     options?: IBarOptionsInput;
 }
@@ -196,7 +196,8 @@ export declare interface IBarOptions extends ICommonOptions {
     dragData?: ICommonDragData;
 }
 
-export declare type IBarOptionsInput = DeepPartial<IBarOptions> & {
+export declare type IBarOptionsInput = Omit<DeepPartial<IBarOptions>, 'title' | 'direction' | 'axes' | 'legend' | 'chartStyling' | 'interactions' | 'annotations'> & {
+    [key: string]: unknown;
     title?: unknown;
     direction?: string;
     axes?: {
@@ -204,18 +205,21 @@ export declare type IBarOptionsInput = DeepPartial<IBarOptions> & {
         y?: ILooseBarAxis[];
         [key: string]: ILooseBarAxis[] | undefined;
     };
-    legend?: DeepPartial<IBarLegend> & {
+    legend?: Omit<DeepPartial<IBarLegend>, 'position' | 'align'> & {
         position?: string;
         align?: string;
-    } & Record<string, unknown>;
+        [key: string]: unknown;
+    };
     chartStyling?: DeepPartial<IBarStyling> & {
         hideControls?: boolean;
         minHeight?: number | string;
-    } & Record<string, unknown>;
+        [key: string]: unknown;
+    };
     interactions?: DeepPartial<ICommonInteractions> & {
         enableZoom?: boolean;
         enablePan?: boolean;
-    } & Record<string, unknown>;
+        [key: string]: unknown;
+    };
     annotations?: (DeepPartial<ICommonAnnotations> & {
         annotationsData?: ILooseBarAnnotation[];
     }) | null;
@@ -642,7 +646,7 @@ export declare interface ILineChartData extends ICommonData {
 }
 
 export declare interface ILineChartDataInput extends Omit<ILineChartData, 'data' | 'options'> {
-    data?: DeepPartial<ILineChartData['data']> & {
+    data?: Omit<DeepPartial<ILineChartData['data']>, 'datasets'> & {
         datasets?: Array<(DeepPartial<ILineChartDataset> & {
             lineTension?: number | string;
             fill?: boolean | string | Record<string, unknown>;
@@ -651,7 +655,8 @@ export declare interface ILineChartDataInput extends Omit<ILineChartData, 'data'
             showPoints?: boolean;
             lineHeight?: number;
             data?: Array<DeepPartial<ICommonDataValue> | null>;
-        } & Record<string, unknown>) | Record<string, unknown> | null>;
+            [key: string]: unknown;
+        }) | object | null> | object;
     };
     options?: ILineChartOptionsInput;
 }
@@ -693,7 +698,8 @@ export declare interface ILineChartOptions extends ICommonOptions {
     depthType?: IDepthType | object;
 }
 
-export declare type ILineChartOptionsInput = DeepPartial<ILineChartOptions> & {
+export declare type ILineChartOptionsInput = Omit<DeepPartial<ILineChartOptions>, 'title' | 'axes' | 'legend' | 'chartStyling' | 'interactions' | 'graph' | 'annotations' | 'additionalAxesOptions'> & {
+    [key: string]: unknown;
     title?: unknown;
     direction?: string;
     axes?: {
@@ -701,24 +707,28 @@ export declare type ILineChartOptionsInput = DeepPartial<ILineChartOptions> & {
         y?: ILooseLineAxis[];
         [key: string]: ILooseLineAxis[] | undefined;
     };
-    legend?: DeepPartial<ILineLegend> & {
+    legend?: Omit<DeepPartial<ILineLegend>, 'position' | 'align'> & {
         position?: string;
         align?: string;
-    } & Record<string, unknown>;
+        [key: string]: unknown;
+    };
     chartStyling?: DeepPartial<ILineChartStyling> & {
         hideControls?: boolean;
         minHeight?: number | string;
-    } & Record<string, unknown>;
+        [key: string]: unknown;
+    };
     interactions?: DeepPartial<ILineInteractions> & {
         enableZoom?: boolean;
         enablePan?: boolean;
-    } & Record<string, unknown>;
+        [key: string]: unknown;
+    };
     graph?: DeepPartial<ILineChartGraph> & {
         tooltip?: unknown;
-    } & Record<string, unknown>;
-    annotations?: (DeepPartial<ICommonAnnotations> & {
+        [key: string]: unknown;
+    };
+    annotations?: (Omit<DeepPartial<ICommonAnnotations>, 'annotationsData'> & {
         annotationsData?: ILooseLineAnnotation[];
-    }) | null;
+    }) | ILooseLineAnnotation[] | null;
     additionalAxesOptions?: DeepPartial<ILineChartAdditionalAxesOptions> & {
         range?: ILineRange | ILineChartRange | Record<string, ILineChartRange | undefined>;
     } & Record<string, unknown>;
@@ -732,8 +742,8 @@ export declare interface ILineChartProps {
 }
 
 export declare interface ILineChartRange {
-    min: number;
-    max: number;
+    min?: number;
+    max?: number;
 }
 
 export declare interface ILineChartStyling extends ICommonStyling {
@@ -764,15 +774,21 @@ export declare interface ILineRange {
     [key: string]: ILineChartRange;
 }
 
-declare type ILooseBarAnnotation = DeepPartial<ICommonAnnotationsData> & Record<string, unknown> & {
+declare type ILooseBarAnnotation = DeepPartial<ICommonAnnotationsData> & {
+    [key: string]: unknown;
+} & {
     annotationAxis?: string;
     type?: string;
     value?: number | string | null;
 };
 
-declare type ILooseBarAxis = DeepPartial<ICommonAxis<string>> & Record<string, unknown>;
+declare type ILooseBarAxis = DeepPartial<ICommonAxis<string>> & {
+    [key: string]: unknown;
+};
 
-declare type ILooseLineAnnotation = DeepPartial<ICommonAnnotations['annotationsData'] extends Array<infer T> ? T : never> & Record<string, unknown> & {
+declare type ILooseLineAnnotation = DeepPartial<ICommonAnnotationsData> & {
+    [key: string]: unknown;
+} & {
     annotationAxis?: string;
     type?: string;
     value?: number | string | null;
@@ -784,15 +800,22 @@ declare type ILooseLineAnnotation = DeepPartial<ICommonAnnotations['annotationsD
     yValue?: number | string | null;
 };
 
-declare type ILooseLineAxis = DeepPartial<ILineChartAxis<string>> & Record<string, unknown>;
+declare type ILooseLineAxis = DeepPartial<ILineChartAxis<string>> & {
+    [key: string]: unknown;
+    stepSize?: unknown;
+};
 
-declare type ILooseScatterAnnotation = DeepPartial<ICommonDataValue> & Record<string, unknown> & {
+declare type ILooseScatterAnnotation = DeepPartial<ICommonAnnotationsData> & {
+    [key: string]: unknown;
+} & {
     annotationAxis?: string;
     type?: string;
     value?: number | string | null;
 };
 
-declare type ILooseScatterAxis = DeepPartial<ICommonAxis<string>> & Record<string, unknown>;
+declare type ILooseScatterAxis = DeepPartial<ICommonAxis<string>> & {
+    [key: string]: unknown;
+};
 
 /**
  * Initialize the charts library with the provided configurations.
@@ -873,8 +896,8 @@ export declare interface IScatterChartData extends ICommonData {
 }
 
 export declare interface IScatterChartDataInput extends Omit<IScatterChartData, 'data' | 'options'> {
-    data?: DeepPartial<IScatterChartData['data']> & {
-        datasets?: Array<DeepPartial<IScatterChartDataset> | Record<string, unknown> | null>;
+    data?: Omit<DeepPartial<IScatterChartData['data']>, 'datasets'> & {
+        datasets?: Array<DeepPartial<IScatterChartDataset> | object | null>;
     };
     options?: IScatterOptionsInput;
 }
@@ -923,7 +946,8 @@ export declare interface IScatterOptions extends ICommonOptions {
     direction?: ChartDirection;
 }
 
-export declare type IScatterOptionsInput = DeepPartial<IScatterOptions> & {
+export declare type IScatterOptionsInput = Omit<DeepPartial<IScatterOptions>, 'title' | 'direction' | 'axes' | 'legend' | 'chartStyling' | 'interactions' | 'annotations'> & {
+    [key: string]: unknown;
     title?: unknown;
     direction?: string;
     axes?: {
@@ -931,16 +955,20 @@ export declare type IScatterOptionsInput = DeepPartial<IScatterOptions> & {
         y?: ILooseScatterAxis[];
         [key: string]: ILooseScatterAxis[] | undefined;
     };
-    legend?: DeepPartial<IScatterLegend> & {
+    legend?: Omit<DeepPartial<IScatterLegend>, 'position' | 'align'> & {
         position?: string;
         align?: string;
-    } & Record<string, unknown>;
-    chartStyling?: Record<string, unknown>;
+        [key: string]: unknown;
+    };
+    chartStyling?: {
+        [key: string]: unknown;
+    };
     interactions?: DeepPartial<ICommonOptions['interactions']> & {
         enableZoom?: boolean;
         enablePan?: boolean;
-    } & Record<string, unknown>;
-    annotations?: (DeepPartial<ICommonOptions['annotations']> & {
+        [key: string]: unknown;
+    };
+    annotations?: (DeepPartial<ICommonAnnotations> & {
         annotationsData?: ILooseScatterAnnotation[];
     }) | null;
 };
@@ -1074,22 +1102,6 @@ export declare type UnusedParameter = unknown;
 export { }
 
 
-declare module 'chart.js' {
-    interface PluginOptionsByType<TType extends ChartType> {
-        annotationDraggerPlugin?: AnnotationDraggerPluginOptions;
-    }
-}
-
-
-declare module 'chart.js' {
-    interface PluginOptionsByType<TType extends ChartType> {
-        calloutConnectorPlugin?: {
-            enableCalloutAnnotation?: boolean;
-        };
-    }
-}
-
-
 /**
  * Vertical Markers Plugin
  *
@@ -1141,3 +1153,19 @@ declare module 'chart.js' {
         } | TVerticalMarkersOptions;
     }
 }
+
+
+declare module 'chart.js' {
+    interface PluginOptionsByType<TType extends ChartType> {
+        annotationDraggerPlugin?: AnnotationDraggerPluginOptions;
+    }
+}
+
+
+declare module 'chart.js' {
+    interface PluginOptionsByType<TType extends ChartType> {
+        calloutConnectorPlugin?: {
+            enableCalloutAnnotation?: boolean;
+        };
+    }
+}

package/dist/index.js

@@ -20062,6 +20062,12 @@ var normalizeCartesianDirection = (direction) => {
 var normalizeChartDirection = (direction) => {
 	return normalizeCartesianDirection(direction) === "horizontal" ? ChartDirection.HORIZONTAL : ChartDirection.VERTICAL;
 };
+var normalizeLegendPosition = (position, fallback) => {
+	return Object.values(Position).includes(String(position)) ? position : fallback;
+};
+var normalizeLegendAlign = (align, fallback) => {
+	return Object.values(AlignOptions).includes(String(align)) ? align : fallback;
+};
 var normalizeDragRange = (range) => ({
 	x: Array.isArray(range?.x) && range.x.length >= 2 ? [range.x[0], range.x[1]] : void 0,
 	y: Array.isArray(range?.y) && range.y.length >= 2 ? [range.y[0], range.y[1]] : void 0
@@ -20091,10 +20097,13 @@ var normalizeUnit = (unit) => {
 		setSelectedUnit: unit.setSelectedUnit ?? (() => {})
 	};
 };
+var normalizeAxisPosition = (position, fallbackPosition) => {
+	return typeof position === "string" && (fallbackPosition === "bottom" || fallbackPosition === "top" ? ["bottom", "top"] : ["left", "right"]).includes(position) ? position : fallbackPosition;
+};
 var normalizeAxis = (axis, fallbackPosition) => ({
 	...defaultAxis(fallbackPosition),
 	...axis || {},
-	position: axis?.position ?? fallbackPosition,
+	position: normalizeAxisPosition(axis?.position, fallbackPosition),
 	color: axis?.color ?? "",
 	unit: normalizeUnit(axis?.unit)
 });
@@ -20162,41 +20171,48 @@ var defaultAnnotationsData$2 = (annotationsData) => {
 	})) : [];
 };
 var defaultAnnotations$2 = (annotations) => ({
-	labelAnnotation: {
-		showLabel: annotations?.labelAnnotation?.showLabel ?? false,
-		text: annotations?.labelAnnotation?.text ?? "",
-		position: annotations?.labelAnnotation?.position ?? TextLabelPosition.BOTTOM_RIGHT,
-		fontSize: annotations?.labelAnnotation?.fontSize ?? 12,
-		xOffset: annotations?.labelAnnotation?.xOffset ?? 5,
-		yOffset: annotations?.labelAnnotation?.yOffset ?? 5,
-		maxWidth: annotations?.labelAnnotation?.maxWidth ?? 300,
-		lineHeight: annotations?.labelAnnotation?.lineHeight ?? 12
-	},
-	showAnnotations: annotations?.showAnnotations ?? false,
-	controlAnnotation: annotations?.controlAnnotation ?? false,
-	enableDragAnnotation: annotations?.enableDragAnnotation ?? false,
-	enableCalloutAnnotation: annotations?.enableCalloutAnnotation ?? false,
-	verticalMarkersAnnotation: {
-		enabled: annotations?.verticalMarkersAnnotation?.enabled ?? false,
-		itemGapPx: annotations?.verticalMarkersAnnotation?.itemGapPx ?? 4,
-		edgePaddingPx: annotations?.verticalMarkersAnnotation?.edgePaddingPx ?? 8,
-		stickToEdge: annotations?.verticalMarkersAnnotation?.stickToEdge ?? true,
-		stickSide: annotations?.verticalMarkersAnnotation?.stickSide ?? "right",
-		reverse: annotations?.verticalMarkersAnnotation?.reverse ?? false,
-		xValue: annotations?.verticalMarkersAnnotation?.xValue,
-		yStartValue: annotations?.verticalMarkersAnnotation?.yStartValue,
-		color: annotations?.verticalMarkersAnnotation?.color ?? "rgba(20,20,20,0.9)",
-		opacity: annotations?.verticalMarkersAnnotation?.opacity ?? 1,
-		lineWidth: annotations?.verticalMarkersAnnotation?.lineWidth ?? 1,
-		lineDash: annotations?.verticalMarkersAnnotation?.lineDash ?? [],
-		items: annotations?.verticalMarkersAnnotation?.items ?? []
-	},
-	annotationsData: defaultAnnotationsData$2(annotations?.annotationsData)
+	...!Array.isArray(annotations) ? annotations : {},
+	...Array.isArray(annotations) ? { annotationsData: annotations } : {},
+	...(() => {
+		const annotationConfig = Array.isArray(annotations) ? void 0 : annotations;
+		return {
+			labelAnnotation: {
+				showLabel: annotationConfig?.labelAnnotation?.showLabel ?? false,
+				text: annotationConfig?.labelAnnotation?.text ?? "",
+				position: annotationConfig?.labelAnnotation?.position ?? TextLabelPosition.BOTTOM_RIGHT,
+				fontSize: annotationConfig?.labelAnnotation?.fontSize ?? 12,
+				xOffset: annotationConfig?.labelAnnotation?.xOffset ?? 5,
+				yOffset: annotationConfig?.labelAnnotation?.yOffset ?? 5,
+				maxWidth: annotationConfig?.labelAnnotation?.maxWidth ?? 300,
+				lineHeight: annotationConfig?.labelAnnotation?.lineHeight ?? 12
+			},
+			showAnnotations: annotationConfig?.showAnnotations ?? false,
+			controlAnnotation: annotationConfig?.controlAnnotation ?? false,
+			enableDragAnnotation: annotationConfig?.enableDragAnnotation ?? false,
+			enableCalloutAnnotation: annotationConfig?.enableCalloutAnnotation ?? false,
+			verticalMarkersAnnotation: {
+				enabled: annotationConfig?.verticalMarkersAnnotation?.enabled ?? false,
+				itemGapPx: annotationConfig?.verticalMarkersAnnotation?.itemGapPx ?? 4,
+				edgePaddingPx: annotationConfig?.verticalMarkersAnnotation?.edgePaddingPx ?? 8,
+				stickToEdge: annotationConfig?.verticalMarkersAnnotation?.stickToEdge ?? true,
+				stickSide: annotationConfig?.verticalMarkersAnnotation?.stickSide ?? "right",
+				reverse: annotationConfig?.verticalMarkersAnnotation?.reverse ?? false,
+				xValue: annotationConfig?.verticalMarkersAnnotation?.xValue,
+				yStartValue: annotationConfig?.verticalMarkersAnnotation?.yStartValue,
+				color: annotationConfig?.verticalMarkersAnnotation?.color ?? "rgba(20,20,20,0.9)",
+				opacity: annotationConfig?.verticalMarkersAnnotation?.opacity ?? 1,
+				lineWidth: annotationConfig?.verticalMarkersAnnotation?.lineWidth ?? 1,
+				lineDash: annotationConfig?.verticalMarkersAnnotation?.lineDash ?? [],
+				items: annotationConfig?.verticalMarkersAnnotation?.items ?? []
+			},
+			annotationsData: defaultAnnotationsData$2(Array.isArray(annotations) ? annotations : annotations?.annotationsData)
+		};
+	})()
 });
 var defaultLegend$3 = (legend) => ({
 	display: legend?.display ?? true,
-	position: legend?.position ?? Position.BottomLeft,
-	align: legend?.align ?? AlignOptions.Center,
+	position: normalizeLegendPosition(legend?.position, Position.BottomLeft),
+	align: normalizeLegendAlign(legend?.align, AlignOptions.Center),
 	customLegend: {
 		customLegendPlugin: legend?.customLegend?.customLegendPlugin && typeof legend.customLegend.customLegendPlugin === "object" && "id" in legend.customLegend.customLegendPlugin ? legend.customLegend.customLegendPlugin : null,
 		customLegendContainerID: typeof legend?.customLegend?.customLegendContainerID === "string" ? legend.customLegend.customLegendContainerID : ""
@@ -20245,10 +20261,13 @@ var normalizeLineChartOptions = (options = {}) => ({
 	dragData: defaultDragData$1(options?.dragData),
 	depthType: options?.depthType ?? {}
 });
-var normalizeLineDatasets = (datasets) => (datasets ?? []).map((dataset) => ({
-	...dataset,
-	data: dataset?.data ?? []
-}));
+var normalizeLineDatasets = (datasets) => (Array.isArray(datasets) ? datasets : []).map((dataset) => {
+	const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
+	return {
+		...normalizedDataset,
+		data: Array.isArray(normalizedDataset.data) ? normalizedDataset.data : []
+	};
+});
 var getDefaultProps$3 = (props) => {
 	const chart = props?.chart || {};
 	const options = chart?.options || {};
@@ -37451,8 +37470,8 @@ var defaultAnnotations$1 = (annotations) => ({
 });
 var defaultLegend$1 = (legend) => ({
 	display: legend?.display ?? true,
-	position: legend?.position || Position.TopLeft,
-	align: legend?.align || AlignOptions.Center,
+	position: normalizeLegendPosition(legend?.position, Position.TopLeft),
+	align: normalizeLegendAlign(legend?.align, AlignOptions.Center),
 	customLegend: {
 		customLegendPlugin: legend?.customLegend?.customLegendPlugin && typeof legend.customLegend.customLegendPlugin === "object" && "id" in legend.customLegend.customLegendPlugin ? legend.customLegend.customLegendPlugin : null,
 		customLegendContainerID: typeof legend?.customLegend?.customLegendContainerID === "string" ? legend.customLegend.customLegendContainerID : ""
@@ -37491,10 +37510,13 @@ var normalizeBarOptions = (options = {}) => ({
 	interactions: defaultInteractions$1(options?.interactions),
 	dragData: defaultDragData(options?.dragData)
 });
-var normalizeBarDatasets = (datasets) => (datasets ?? []).map((dataset) => ({
-	...dataset,
-	data: dataset?.data ?? []
-}));
+var normalizeBarDatasets = (datasets) => (Array.isArray(datasets) ? datasets : []).map((dataset) => {
+	const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
+	return {
+		...normalizedDataset,
+		data: Array.isArray(normalizedDataset.data) ? normalizedDataset.data : []
+	};
+});
 var getDefaultProps$1 = (props) => {
 	const chart = props?.chart || {};
 	const options = chart?.options || {};
@@ -37772,8 +37794,8 @@ var defaultGraph = (graph) => ({
 var defaultLegend = (legend) => ({
 	display: legend?.display ?? true,
 	useDataset: legend?.useDataset ?? false,
-	position: legend?.position ?? Position.BottomLeft,
-	align: legend?.align ?? AlignOptions.Center
+	position: normalizeLegendPosition(legend?.position, Position.BottomLeft),
+	align: normalizeLegendAlign(legend?.align, AlignOptions.Center)
 });
 var defaultChartOptions = (options) => ({
 	enableZoom: options?.enableZoom ?? false,
@@ -37787,10 +37809,13 @@ var defaultInteractions = (interactions) => ({
 });
 var defaultChartData = (data) => ({
 	labels: data?.labels ?? [],
-	datasets: (data?.datasets ?? []).map((dataset) => ({
-		...dataset,
-		data: dataset?.data ?? []
-	}))
+	datasets: (Array.isArray(data?.datasets) ? data.datasets : []).map((dataset) => {
+		const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
+		return {
+			...normalizedDataset,
+			data: Array.isArray(normalizedDataset.data) ? normalizedDataset.data : []
+		};
+	})
 });
 var defaultAnnotationsData = (annotationsData) => (annotationsData ?? []).map((ann) => ({
 	...ann,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/charts-library",
-  "version": "5.9.0-beta-11",
+  "version": "5.9.0-beta-13",
   "description": "React Chart Library (based on Chart.js and react-chart-js-2)",
   "homepage": "https://gitlab.com/oliasoft-open-source/charts-library",
   "bugs": {