Merge pull request #1579 from mozeryansky/isFulfilledData

Split `isFulfilledData` into `isFulfilledBarData` and `isFulfilledLineData` to allow `WhitespaceData` with extra properties
tradingview · Jul 25, 2024 · 6e70f54 · 6e70f54
2 parents f934911 + 0e1ea7d
commit 6e70f54
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/model/data-consumer.ts b/src/model/data-consumer.ts
@@ -184,10 +184,19 @@ export function isWhitespaceData<HorzScaleItem = Time>(data: SeriesDataItemTypeM
 export function isFulfilledData<HorzScaleItem, T extends SeriesDataItemTypeMap<HorzScaleItem>[SeriesType]>(
 	data: T
 ): data is Extract<T, BarData<HorzScaleItem> | LineData<HorzScaleItem> | HistogramData<HorzScaleItem>> {
-	return (
-		(data as Partial<BarData<HorzScaleItem>>).open !== undefined ||
-		(data as Partial<LineData<HorzScaleItem>>).value !== undefined
-	);
+	return isFulfilledBarData(data) || isFulfilledLineData(data);
+}
+
+export function isFulfilledBarData<HorzScaleItem, T extends SeriesDataItemTypeMap<HorzScaleItem>[SeriesType]>(
+	data: T
+): data is Extract<T, BarData<HorzScaleItem>> {
+	return (data as Partial<BarData<HorzScaleItem>>).open !== undefined;
+}
+
+export function isFulfilledLineData<HorzScaleItem, T extends SeriesDataItemTypeMap<HorzScaleItem>[SeriesType]>(
+	data: T
+): data is Extract<T, LineData<HorzScaleItem> | HistogramData<HorzScaleItem>> {
+	return (data as Partial<LineData<HorzScaleItem>>).value !== undefined;
 }
 
 /**

diff --git a/src/model/data-validators.ts b/src/model/data-validators.ts
@@ -2,7 +2,7 @@
 
 import { assert } from '../helpers/assertions';
 
-import { isFulfilledData, SeriesDataItemTypeMap } from './data-consumer';
+import { isFulfilledBarData, isFulfilledLineData, SeriesDataItemTypeMap } from './data-consumer';
 import { IHorzScaleBehavior } from './ihorz-scale-behavior';
 import { CreatePriceLineOptions } from './price-line-options';
 import { SeriesMarker } from './series-markers';
@@ -66,7 +66,7 @@ function checkBarItem<HorzScaleItem>(
 	type: 'Bar' | 'Candlestick',
 	barItem: SeriesDataItemTypeMap<HorzScaleItem>[typeof type]
 ): void {
-	if (!isFulfilledData(barItem)) {
+	if (!isFulfilledBarData(barItem)) {
 		return;
 	}
 
@@ -104,7 +104,7 @@ function checkLineItem<HorzScaleItem>(
 	type: 'Area' | 'Baseline' | 'Line' | 'Histogram',
 	lineItem: SeriesDataItemTypeMap<HorzScaleItem>[typeof type]
 ): void {
-	if (!isFulfilledData(lineItem)) {
+	if (!isFulfilledLineData(lineItem)) {
 		return;
 	}