diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index b9b1e6f..066dda0 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: dart-lang/setup-dart@v1 - name: Dart version run: | @@ -25,8 +25,8 @@ jobs: run: dart analyze --fatal-infos --fatal-warnings . - name: dependency_validator run: dart run dependency_validator - - name: Run tests (Chrome) - run: dart test --platform chrome + - name: Run tests (VM + Chrome) + run: dart test --platform vm,chrome # - name: dartdoc # run: dartdoc --no-generate-docs - name: dart pub publish --dry-run diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f1f5cf..a99b7ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,52 @@ +## 3.0.0 + +- `RenderedChart`: + - Fix `chartJSObject`/`hasChartJSObject` (and therefore `refresh`), which + always threw: the `isJSObject` extension was called on a `dynamic`. +- `ChartData`: + - Fix `xAxisScale`/`yAxisScale` for typed data (ex.: `ChartSet`), + which failed casting `ScaleNum` to `Scale`. + - Fix `ChartData.from` with untyped map literals. + - Fix `matchesSeries`/`matchesTimeSeries`/`matchesSeriesPair` (and + `matchesChartData`) throwing for non-`Iterable` values. +- `ChartSeries.seriesSortedByCategory`/`ChartSet.setSorted`: fix sorting of + untyped (`dynamic`) categories (`ChartOptions.sortCategories`). +- `ChartSeriesOptions.copy`: also copy `steppedLines`. +- `DateAdapter.format`: fix the `Do` token and multiple `[...]` literals. +- Fix `ChartEngine.VERSION`. +- Tests: + - New unit tests for `ChartData` implementations, options and `DateAdapter`. + - New browser integration tests rendering every chart type with ChartJS and + ApexCharts, plus `ChartEngineSwitchable` and ChartJS financial charts. +- CI: run tests on VM and Chrome. + +- sdk: '>=3.10.0 <4.0.0' + +- swiss_knife: ^3.3.14 +- dom_tools: ^3.1.0 +- amdjs: ^3.0.0 +- intl: ^0.20.3 +- web_utils: ^1.1.0 +- lints: ^6.1.0 +- test: ^1.32.0 +- dependency_validator: ^5.1.0 +- build_runner: ^2.16.2 +- build_web_compilers: ^4.8.11 + +## 3.0.0-beta.1 + +- Migrate `dart:html` (deprecated) to package `web`. + +- sdk: '>=3.6.0 <4.0.0' + +- swiss_knife: ^3.3.0 +- dom_tools: ^3.0.0-beta.6 +- amdjs: ^3.0.0-beta.2 +- web: ^1.1.0 +- web_utils: ^1.0.9 +- js_interop_utils: ^1.0.5 +- intl: ^0.20.2 + ## 2.1.1 - sdk: '>=3.5.0 <4.0.0' diff --git a/example/main.dart b/example/main.dart index 88f7962..89368c9 100644 --- a/example/main.dart +++ b/example/main.dart @@ -1,11 +1,11 @@ -// ignore: deprecated_member_use -import 'dart:html'; - import 'package:chart_engine/chart_engine_all.dart'; +import 'package:web_utils/web_utils.dart'; void main() async { - querySelector('#apexcharts_version')!.text = ChartEngineApexCharts().version; - querySelector('#chartjs_version')!.text = ChartEngineChartJS().version; + document.querySelector('#apexcharts_version')!.text = + ChartEngineApexCharts().version; + document.querySelector('#chartjs_version')!.text = + ChartEngineChartJS().version; await createLineChart(); await createTimeSeriesChart(); @@ -19,19 +19,18 @@ void main() async { await createFinancialChart(); - querySelector('#chart-version')!.text = ChartEngine.VERSION; + document.querySelector('#chart-version')!.text = ChartEngine.VERSION; } Future createLineChart() async { - var series = ChartSeries([ - 'Jan', - 'Feb', - 'Mar' - ], { - 'A': [10, 20, 5], - 'B': [15, 25, 55], - 'C': [100, 130, 140] - }); + var series = ChartSeries( + ['Jan', 'Feb', 'Mar'], + { + 'A': [10, 20, 5], + 'B': [15, 25, 55], + 'C': [100, 130, 140], + }, + ); series.title = 'Line Chart Example'; series.xTitle = 'Months'; @@ -47,15 +46,25 @@ Future createLineChart() async { await charEngine2.load(); charEngine1.renderLineChart( - querySelector('#apexcharts-line1-output')!, series); - charEngine2.renderLineChart(querySelector('#chartjs-line1-output')!, series); + document.querySelector('#apexcharts-line1-output') as HTMLElement, + series, + ); + charEngine2.renderLineChart( + document.querySelector('#chartjs-line1-output') as HTMLElement, + series, + ); series.options.fillLines = true; series.options.verticalLines = [VerticalLine(1, label: 'Mark', yPosition: 1)]; charEngine1.renderLineChart( - querySelector('#apexcharts-line2-output')!, series); - charEngine2.renderLineChart(querySelector('#chartjs-line2-output')!, series); + document.querySelector('#apexcharts-line2-output') as HTMLElement, + series, + ); + charEngine2.renderLineChart( + document.querySelector('#chartjs-line2-output') as HTMLElement, + series, + ); } Future createTimeSeriesChart() async { @@ -66,21 +75,21 @@ Future createTimeSeriesChart() async { [DateTime(2020, 03, 31), 20], [DateTime(2020, 04, 01), 5], [DateTime(2020, 04, 02), -10], - [DateTime(2020, 04, 03), 1] + [DateTime(2020, 04, 03), 1], ], 'B': [ [DateTime(2020, 03, 30), 15], [DateTime(2020, 03, 31), 25], [DateTime(2020, 04, 01), 55], [DateTime(2020, 04, 02), 30], - [DateTime(2020, 04, 03), -10] + [DateTime(2020, 04, 03), -10], ], 'C': [ [100, DateTime(2020, 03, 30)], [DateTime(2020, 03, 31), 130], [DateTime(2020, 04, 01), 140], [DateTime(2020, 04, 02), -20], - [DateTime(2020, 04, 03), -55] + [DateTime(2020, 04, 03), -55], ], }); @@ -97,21 +106,24 @@ Future createTimeSeriesChart() async { await Future.wait([charEngine1.load(), charEngine2.load()]); charEngine1.renderTimeSeriesChart( - querySelector('#apexcharts-time_series-output')!, series); + document.querySelector('#apexcharts-time_series-output') as HTMLElement, + series, + ); charEngine2.renderTimeSeriesChart( - querySelector('#chartjs-time_series-output')!, series); + document.querySelector('#chartjs-time_series-output') as HTMLElement, + series, + ); } Future createBarChart() async { - var series = ChartSeries([ - 'Jan', - 'Feb', - 'Mar' - ], { - 'A': [10, 20, 5], - 'B': [15, 25, 55], - 'C': [100, 130, 140], - }); + var series = ChartSeries( + ['Jan', 'Feb', 'Mar'], + { + 'A': [10, 20, 5], + 'B': [15, 25, 55], + 'C': [100, 130, 140], + }, + ); series.xTitle = 'Months'; series.yTitle = 'Count'; @@ -125,14 +137,24 @@ Future createBarChart() async { await Future.wait([charEngine1.load(), charEngine2.load()]); series.title = 'Bar Chart Example'; - charEngine1.renderBarChart(querySelector('#apexcharts-bar-output')!, series); - charEngine2.renderBarChart(querySelector('#chartjs-bar-output')!, series); + charEngine1.renderBarChart( + document.querySelector('#apexcharts-bar-output') as HTMLElement, + series, + ); + charEngine2.renderBarChart( + document.querySelector('#chartjs-bar-output') as HTMLElement, + series, + ); series.title = 'Horizontal Bar Chart Example'; charEngine1.renderHorizontalBarChart( - querySelector('#apexcharts-horizontal-bar-output')!, series); + document.querySelector('#apexcharts-horizontal-bar-output') as HTMLElement, + series, + ); charEngine2.renderHorizontalBarChart( - querySelector('#chartjs-horizontal-bar-output')!, series); + document.querySelector('#chartjs-horizontal-bar-output') as HTMLElement, + series, + ); } Future createScatterChart() async { @@ -143,21 +165,21 @@ Future createScatterChart() async { [171.75, 66.77], [174.96, 75.11], [175.79, 88.40], - [173.48, 78.86] + [173.48, 78.86], ], 'B': [ [175.77, 50.87], [174.98, 72.38], [166.27, 52.59], [172.75, 66.85], - [184.17, 90.71] + [184.17, 90.71], ], 'C': [ [180.59, 98.12], [165.89, 58.20], [166.42, 50.33], [181.33, 78.01], - [181.66, 101.91] + [181.66, 101.91], ], }); @@ -177,9 +199,13 @@ Future createScatterChart() async { await Future.wait([charEngine1.load(), charEngine2.load()]); charEngine1.renderScatterChart( - querySelector('#apexcharts-scatter-output')!, series2); + document.querySelector('#apexcharts-scatter-output') as HTMLElement, + series2, + ); charEngine2.renderScatterChart( - querySelector('#chartjs-scatter-output')!, series2); + document.querySelector('#chartjs-scatter-output') as HTMLElement, + series2, + ); } Future createScatterTimedChart() async { @@ -190,21 +216,21 @@ Future createScatterTimedChart() async { [DateTime(2020, 03, 31), 20], [DateTime(2020, 04, 01, 10), 5], [DateTime(2020, 04, 02, 3), -10], - [DateTime(2020, 04, 03, 11), 1] + [DateTime(2020, 04, 03, 11), 1], ], 'B': [ [DateTime(2020, 03, 30, 2), 15], [DateTime(2020, 03, 31, 3), 25], [DateTime(2020, 04, 01, 12), 55], [DateTime(2020, 04, 02, 14), 30], - [DateTime(2020, 04, 03, 2), -10] + [DateTime(2020, 04, 03, 2), -10], ], 'C': [ [100, DateTime(2020, 03, 30, 5)], [DateTime(2020, 03, 31, 4), 130], [DateTime(2020, 04, 01, 20), 140], [DateTime(2020, 04, 02, 23), -20], - [DateTime(2020, 04, 03, 18), -55] + [DateTime(2020, 04, 03, 18), -55], ], }); @@ -221,19 +247,19 @@ Future createScatterTimedChart() async { await Future.wait([charEngine1.load(), charEngine2.load()]); charEngine1.renderScatterTimedChart( - querySelector('#apexcharts-scatter_timed-output')!, series); + document.querySelector('#apexcharts-scatter_timed-output') as HTMLElement, + series, + ); charEngine2.renderScatterTimedChart( - querySelector('#chartjs-scatter_timed-output')!, series); + document.querySelector('#chartjs-scatter_timed-output') as HTMLElement, + series, + ); } Future createGaugeChart() async { // Using Set: 1 value per category. // For Gauge needs to be in range of 0% to 100%. - var set = ChartSet({ - 'A': 60, - 'B': 75, - 'C': 50, - }); + var set = ChartSet({'A': 60, 'B': 75, 'C': 50}); set.title = 'Gauge Chart Example'; @@ -243,8 +269,14 @@ Future createGaugeChart() async { // Simultaneous load engines: await Future.wait([charEngine1.load(), charEngine2.load()]); - charEngine1.renderGaugeChart(querySelector('#apexcharts-gauge-output')!, set); - charEngine2.renderGaugeChart(querySelector('#chartjs-gauge-output')!, set); + charEngine1.renderGaugeChart( + document.querySelector('#apexcharts-gauge-output') as HTMLElement, + set, + ); + charEngine2.renderGaugeChart( + document.querySelector('#chartjs-gauge-output') as HTMLElement, + set, + ); } Future createFinancialChart() async { @@ -259,7 +291,7 @@ Future createFinancialChart() async { [DateTime(2020, 04, 05, 12), 25, 60, 25, 55], [DateTime(2020, 04, 06, 12), 55, 60, 40, 55], [DateTime(2020, 04, 07, 12), 55, 60, -10, -10], - [DateTime(2020, 04, 08, 12), -10, -10, 0, 0] + [DateTime(2020, 04, 08, 12), -10, -10, 0, 0], ], 'StockY': [ [DateTime(2020, 03, 30, 12), 100, 200, 100, 200], @@ -271,7 +303,7 @@ Future createFinancialChart() async { [DateTime(2020, 04, 05, 12), 250, 600, 250, 550], [DateTime(2020, 04, 06, 12), 550, 550, 300, 300], [DateTime(2020, 04, 07, 12), 300, 300, 20, 30], - [DateTime(2020, 04, 08, 12), 30, 40, 0, 20] + [DateTime(2020, 04, 08, 12), 30, 40, 0, 20], ], }); @@ -287,11 +319,15 @@ Future createFinancialChart() async { series.title = 'Financial Chart (OHLC) Example'; charEngine2.renderFinancialChart( - querySelector('#chartjs-financial-ohlc-output')!, series, - ohlc: true); + document.querySelector('#chartjs-financial-ohlc-output') as HTMLElement, + series, + ohlc: true, + ); series.title = 'Financial Chart (Candlestick) Example'; charEngine2.renderFinancialChart( - querySelector('#chartjs-financial-candle-output')!, series, - candlestick: true); + document.querySelector('#chartjs-financial-candle-output') as HTMLElement, + series, + candlestick: true, + ); } diff --git a/lib/src/chart_engine_apexcharts.dart b/lib/src/chart_engine_apexcharts.dart index bbf94f9..c3b6ad8 100644 --- a/lib/src/chart_engine_apexcharts.dart +++ b/lib/src/chart_engine_apexcharts.dart @@ -1,11 +1,9 @@ -// ignore: deprecated_member_use -import 'dart:html'; -// ignore: deprecated_member_use -import 'dart:js'; +import 'dart:js_interop_unsafe'; import 'package:amdjs/amdjs.dart'; import 'package:color_palette_generator/color_palette_generator.dart'; import 'package:swiss_knife/swiss_knife.dart'; +import 'package:web_utils/web_utils.dart'; import 'chart_engine_base.dart'; import 'chart_engine_series.dart'; @@ -33,8 +31,9 @@ class ChartEngineApexCharts extends ChartEngine { @override String get version => VERSION; - static final LoadController _loadController = - LoadController('ChartEngineApexCharts'); + static final LoadController _loadController = LoadController( + 'ChartEngineApexCharts', + ); @override bool get isLoaded => @@ -43,19 +42,24 @@ class ChartEngineApexCharts extends ChartEngine { @override EventStream get onLoad => _loadController.onLoad; - static JsObject? _jsWrapper; + static JSObject? _jsWrapper; /// Loads ApexCharts (`apexcharts.amd.js`) and engine wrapper. @override Future load() { return _loadController.load(() async { - var okJS = await AMDJS.require('ApexCharts', - jsFullPath: JS_PATH, globalJSVariableName: 'ApexCharts'); - var okWrapper = await AMDJS.require(JS_WRAPPER_GLOBAL_NAME, - jsFullPath: ENGINE_WRAPPER_PATH, - globalJSVariableName: JS_WRAPPER_GLOBAL_NAME); - - _jsWrapper = context[JS_WRAPPER_GLOBAL_NAME] as JsObject?; + var okJS = await AMDJS.require( + 'ApexCharts', + jsFullPath: JS_PATH, + globalJSVariableName: 'ApexCharts', + ); + var okWrapper = await AMDJS.require( + JS_WRAPPER_GLOBAL_NAME, + jsFullPath: ENGINE_WRAPPER_PATH, + globalJSVariableName: JS_WRAPPER_GLOBAL_NAME, + ); + + _jsWrapper = globalContext[JS_WRAPPER_GLOBAL_NAME] as JSObject?; return okJS && okWrapper; }); @@ -67,26 +71,26 @@ class ChartEngineApexCharts extends ChartEngine { /// Ensures that DOM element to render is a div. If not will insert a div /// inside the element and use it. - DivElement asDivElement(Element element) { - if (element is DivElement) return element; + HTMLDivElement asDivElement(Element element) { + if (element.isA()) return element as HTMLDivElement; - var div = DivElement(); - element.children.add(div); + var div = HTMLDivElement(); + element.appendChild(div); return div; } - static JsObject? _xAxisMinMax(ChartData chartData) { + static JSObject? _xAxisMinMax(ChartData chartData) { var minMax = chartData.options.xAxisMinMax; - return minMax != null ? JsObject.jsify(minMax) : null; + return minMax?.toJSDeep; } - static JsObject? _yAxisMinMax(ChartData chartData) { + static JSObject? _yAxisMinMax(ChartData chartData) { var minMax = chartData.options.yAxisMinMax; - return minMax != null ? JsObject.jsify(minMax) : null; + return minMax?.toJSDeep; } - JsObject? _verticalLines(ChartData chartData) { + JSObject? _verticalLines(ChartData chartData) { var lines = chartData.options.verticalLines; if (isNotEmptyObject(lines)) { @@ -119,18 +123,21 @@ class ChartEngineApexCharts extends ChartEngine { 'borderColor': color, }, 'text': label, - } + }, }); } - return JsObject.jsify(verticalLinesConfig); + return verticalLinesConfig.toJSDeep; } return null; } @override - RenderedApexCharts renderLineChart(Element output, ChartSeries chartData) { + RenderedApexCharts renderLineChart( + HTMLElement output, + ChartSeries chartData, + ) { checkRenderParameters(output, chartData); checkLoaded(); @@ -151,17 +158,20 @@ class ChartEngineApexCharts extends ChartEngine { chartData.title, chartData.xTitle, chartData.yTitle, - JsObject.jsify(chartData.xLabels), + chartData.xLabels.toJSDeep, _xAxisMinMax(chartData), _yAxisMinMax(chartData), - JsObject.jsify(series), + series.toJSDeep, _verticalLines(chartData), - JsObject.jsify(colors), + colors.toJSDeep, chartData.options.fillLines, - chartData.options.straightLines + chartData.options.straightLines, ]; - var chartObject = _jsWrapper!.callMethod('renderLine', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderLine'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedApexCharts(this, 'line', chartObject, chartData); } @@ -171,15 +181,18 @@ class ChartEngineApexCharts extends ChartEngine { @override RenderedApexCharts renderTimeSeriesChart( - Element output, ChartTimeSeries chartData) { + HTMLElement output, + ChartTimeSeries chartData, + ) { checkRenderParameters(output, chartData); checkLoaded(); var div = asDivElement(output); var timeSeries = chartData.seriesAsPairsOfList( - sortSeriesByCategory: chartData.options.sortCategories, - mapDateTimeToMillis: true); + sortSeriesByCategory: chartData.options.sortCategories, + mapDateTimeToMillis: true, + ); timeSeries = _reverseSeries(timeSeries); @@ -194,31 +207,39 @@ class ChartEngineApexCharts extends ChartEngine { chartData.yTitle, _xAxisMinMax(chartData), _yAxisMinMax(chartData), - JsObject.jsify(timeSeries), + timeSeries.toJSDeep, _verticalLines(chartData), - JsObject.jsify(colors), + colors.toJSDeep, chartData.options.fillLines, - chartData.options.straightLines + chartData.options.straightLines, ]; - var chartObject = _jsWrapper!.callMethod('renderTimeSeries', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderTimeSeries'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedApexCharts(this, 'time-series', chartObject, chartData); } @override - RenderedApexCharts renderBarChart(Element output, ChartSeries chartData) { + RenderedApexCharts renderBarChart(HTMLElement output, ChartSeries chartData) { return _renderBarChartImpl(false, output, chartData); } @override RenderedApexCharts renderHorizontalBarChart( - Element output, ChartSeries chartData) { + HTMLElement output, + ChartSeries chartData, + ) { return _renderBarChartImpl(true, output, chartData); } RenderedApexCharts _renderBarChartImpl( - bool horizontal, Element output, ChartSeries chartSeries) { + bool horizontal, + HTMLElement output, + ChartSeries chartSeries, + ) { checkRenderParameters(output, chartSeries); checkLoaded(); @@ -238,31 +259,36 @@ class ChartEngineApexCharts extends ChartEngine { chartSeries.title, chartSeries.xTitle, chartSeries.yTitle, - JsObject.jsify(chartSeries.xLabels), + chartSeries.xLabels.toJSDeep, _xAxisMinMax(chartSeries), _yAxisMinMax(chartSeries), - JsObject.jsify(set), - JsObject.jsify(colors), + set.toJSDeep, + colors.toJSDeep, ]; - var chartObject = _jsWrapper!.callMethod('renderBar', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderBar'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedApexCharts( - this, - 'bar-${horizontal ? 'horizontal' : 'vertical'}', - chartObject, - chartSeries); + this, + 'bar-${horizontal ? 'horizontal' : 'vertical'}', + chartObject, + chartSeries, + ); } @override - RenderedApexCharts renderGaugeChart(Element output, ChartSet chartData) { + RenderedApexCharts renderGaugeChart(HTMLElement output, ChartSet chartData) { checkRenderParameters(output, chartData); checkLoaded(); var div = asDivElement(output); - var set = - chartData.options.sortCategories ? chartData.setSorted : chartData.set; + var set = chartData.options.sortCategories + ? chartData.setSorted + : chartData.set; chartData.ensureColors(colorGenerator); @@ -273,28 +299,34 @@ class ChartEngineApexCharts extends ChartEngine { chartData.title, chartData.xTitle, chartData.yTitle, - JsObject.jsify(chartData.xLabels), + chartData.xLabels.toJSDeep, _xAxisMinMax(chartData), _yAxisMinMax(chartData), - JsObject.jsify(set), - JsObject.jsify(colors), + set.toJSDeep, + colors.toJSDeep, ]; - var chartObject = _jsWrapper!.callMethod('renderGauge', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderGauge'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedApexCharts(this, 'gauge', chartObject, chartData); } @override RenderedApexCharts renderScatterChart( - Element output, ChartSeriesPair chartSeries) { + HTMLElement output, + ChartSeriesPair chartSeries, + ) { checkRenderParameters(output, chartSeries); checkLoaded(); var div = asDivElement(output); var seriesPairs = chartSeries.seriesAsPairsOfList( - sortSeriesByCategory: chartSeries.options.sortCategories); + sortSeriesByCategory: chartSeries.options.sortCategories, + ); chartSeries.ensureColors(colorGenerator); @@ -305,36 +337,42 @@ class ChartEngineApexCharts extends ChartEngine { var yMin = yAxisScale.minimumNice; var yMax = yAxisScale.maximumNice; - var renderArgs = [ + var renderArgs = [ div, chartSeries.title, chartSeries.xTitle, chartSeries.yTitle, _xAxisMinMax(chartSeries), _yAxisMinMax(chartSeries), - JsObject.jsify(seriesPairs), + seriesPairs.toJSDeep, _verticalLines(chartSeries), - JsObject.jsify(colors), + colors.toJSDeep, yMin, - yMax + yMax, ]; - var chartObject = _jsWrapper!.callMethod('renderScatter', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderScatter'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedApexCharts(this, 'scatter', chartObject, chartSeries); } @override RenderedApexCharts renderScatterTimedChart( - Element output, ChartTimeSeries chartSeries) { + HTMLElement output, + ChartTimeSeries chartSeries, + ) { checkRenderParameters(output, chartSeries); checkLoaded(); var div = asDivElement(output); var timeSeries = chartSeries.seriesAsPairsOfList( - sortSeriesByCategory: chartSeries.options.sortCategories, - mapDateTimeToMillis: true); + sortSeriesByCategory: chartSeries.options.sortCategories, + mapDateTimeToMillis: true, + ); chartSeries.ensureColors(colorGenerator); @@ -345,42 +383,56 @@ class ChartEngineApexCharts extends ChartEngine { var yMin = yAxisScale.minimumNice; var yMax = yAxisScale.maximumNice; - var renderArgs = [ + var renderArgs = [ div, chartSeries.title, chartSeries.xTitle, chartSeries.yTitle, _xAxisMinMax(chartSeries), _yAxisMinMax(chartSeries), - JsObject.jsify(timeSeries), + timeSeries.toJSDeep, _verticalLines(chartSeries), - JsObject.jsify(colors), + colors.toJSDeep, yMin, yMax, - true + true, ]; - var chartObject = _jsWrapper!.callMethod('renderScatter', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderScatter'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedApexCharts( - this, 'scatter-time-series', chartObject, chartSeries); + this, + 'scatter-time-series', + chartObject, + chartSeries, + ); } @override RenderedApexCharts renderFinancialChart( - Element output, ChartTimeSeries chartSeries, - {bool? ohlc, bool? candlestick}) { + HTMLElement output, + ChartTimeSeries chartSeries, { + bool? ohlc, + bool? candlestick, + }) { throw UnsupportedError('Not supported: FinancialChart!'); } } class RenderedApexCharts extends RenderedChart { RenderedApexCharts( - super.engine, super.type, super.chartObject, super.chartData); + super.engine, + super.type, + super.chartObject, + super.chartData, + ); @override void refresh() { - if (!hasChartJsObject) return; - chartJsObject!.callMethod('render'); + if (!hasChartJSObject) return; + chartJSObject!.callMethod('render'.toJS); } } diff --git a/lib/src/chart_engine_base.dart b/lib/src/chart_engine_base.dart index acf7812..dab8ef3 100644 --- a/lib/src/chart_engine_base.dart +++ b/lib/src/chart_engine_base.dart @@ -1,10 +1,6 @@ -// ignore: deprecated_member_use -import 'dart:html'; -// ignore: deprecated_member_use -import 'dart:js'; - import 'package:color_palette_generator/color_palette_generator.dart'; import 'package:swiss_knife/swiss_knife.dart'; +import 'package:web_utils/web_utils.dart'; import 'chart_engine_series.dart'; @@ -16,7 +12,7 @@ final String CHART_ENGINE_PACKAGE_PATH = 'packages/chart_engine'; abstract class ChartEngine { /// `chart_engine` package version. // ignore: non_constant_identifier_names - static final String VERSION = '2.0.3'; + static final String VERSION = '3.0.0'; String get version; @@ -37,10 +33,10 @@ abstract class ChartEngine { } } - void checkRenderParameters(Element output, ChartData chartData) {} + void checkRenderParameters(HTMLElement output, ChartData chartData) {} /// Renders at [output] a [chartData], selecting the correct render method. - RenderedChart? render(Element output, ChartData chartData) { + RenderedChart? render(HTMLElement output, ChartData chartData) { _checkOutput(output); checkLoaded(); @@ -58,8 +54,8 @@ abstract class ChartEngine { return null; } - void _checkOutput(Element output) { - var parent = output.parent; + void _checkOutput(HTMLElement output) { + var parent = output.parentElement; if (parent == null) { print('WARNING: Chart output has no parent: $output'); @@ -72,35 +68,48 @@ abstract class ChartEngine { G getColorGeneratorAs() => colorGenerator as G; /// Renders a Line Chart: - RenderedChart renderLineChart(Element output, ChartSeries chartData); + RenderedChart renderLineChart(HTMLElement output, ChartSeries chartData); /// Renders a Time Series using Line Chart: RenderedChart renderTimeSeriesChart( - Element output, ChartTimeSeries chartData); + HTMLElement output, + ChartTimeSeries chartData, + ); /// Renders a Bar Chart: - RenderedChart renderBarChart(Element output, ChartSeries chartData); + RenderedChart renderBarChart(HTMLElement output, ChartSeries chartData); /// Renders a Horizontal Bar Chart: - RenderedChart renderHorizontalBarChart(Element output, ChartSeries chartData); + RenderedChart renderHorizontalBarChart( + HTMLElement output, + ChartSeries chartData, + ); /// Renders a Horizontal Bar Chart: - RenderedChart renderGaugeChart(Element output, ChartSet chartData); + RenderedChart renderGaugeChart(HTMLElement output, ChartSet chartData); /// Renders a Scatter Chart with X,Y pairs: - RenderedChart renderScatterChart(Element output, ChartSeriesPair chartSeries); + RenderedChart renderScatterChart( + HTMLElement output, + ChartSeriesPair chartSeries, + ); /// Renders a Scatter Chart Timed with DateTime values in X axis: RenderedChart renderScatterTimedChart( - Element output, ChartTimeSeries chartSeries); + HTMLElement output, + ChartTimeSeries chartSeries, + ); /// Renders financial chart. /// /// [ohlc] Renders a OHLC chart (default). /// [candlestick] Renders a Candlestick chart. RenderedChart renderFinancialChart( - Element output, ChartTimeSeries chartSeries, - {bool? ohlc, bool? candlestick}); + HTMLElement output, + ChartTimeSeries chartSeries, { + bool? ohlc, + bool? candlestick, + }); Future _ensureLoaded() async { if (!isLoaded) { @@ -110,56 +119,72 @@ abstract class ChartEngine { /// Same as [render], but [async]. Future renderAsync( - Element output, ChartData chartData) async { + HTMLElement output, + ChartData chartData, + ) async { await _ensureLoaded(); return render(output, chartData); } /// Same as [renderLineChart], but [async]. Future renderLineChartAsync( - Element output, ChartSeries chartData) async { + HTMLElement output, + ChartSeries chartData, + ) async { await _ensureLoaded(); return renderLineChart(output, chartData); } /// Same as [renderTimeSeriesChart], but [async]. Future renderTimeSeriesChartAsync( - Element output, ChartTimeSeries chartData) async { + HTMLElement output, + ChartTimeSeries chartData, + ) async { await _ensureLoaded(); return renderTimeSeriesChart(output, chartData); } /// Same as [renderBarChart], but [async]. Future renderBarChartAsync( - Element output, ChartSeries chartData) async { + HTMLElement output, + ChartSeries chartData, + ) async { await _ensureLoaded(); return renderBarChart(output, chartData); } /// Same as [renderHorizontalBarChart], but [async]. Future renderHorizontalBarChartAsync( - Element output, ChartSeries chartData) async { + HTMLElement output, + ChartSeries chartData, + ) async { await _ensureLoaded(); return renderHorizontalBarChart(output, chartData); } /// Same as [renderGaugeChart], but [async]. Future renderGaugeChartAsync( - Element output, ChartSet chartData) async { + HTMLElement output, + ChartSet chartData, + ) async { await _ensureLoaded(); return renderGaugeChart(output, chartData); } /// Same as [renderScatterChart], but [async]. Future renderScatterChartAsync( - Element output, ChartSeriesPair chartSeries) async { + HTMLElement output, + ChartSeriesPair chartSeries, + ) async { await _ensureLoaded(); return renderScatterChart(output, chartSeries); } /// Same as [renderScatterTimedChart], but [async]. Future renderScatterTimedChartAsync( - Element output, ChartTimeSeries chartSeries) async { + HTMLElement output, + ChartTimeSeries chartSeries, + ) async { await _ensureLoaded(); return renderScatterTimedChart(output, chartSeries); } @@ -174,8 +199,11 @@ class ChartEngineSwitchable extends ChartEngine { ChartEngine? _mainEngine; - ChartEngineSwitchable(this.engines, - {Type? mainEngineType, ChartEngine? mainEngine}) { + ChartEngineSwitchable( + this.engines, { + Type? mainEngineType, + ChartEngine? mainEngine, + }) { if (engines.isEmpty) throw ArgumentError('Should have 1 or more engines'); if (mainEngine != null) { @@ -239,7 +267,10 @@ class ChartEngineSwitchable extends ChartEngine { /// Renders using engine of [engineType]. RenderedChart? renderWithEngineType( - Type engineType, Element output, ChartData chartData) { + Type engineType, + HTMLElement output, + ChartData chartData, + ) { var prevMainEngine = _mainEngine; setMainEngineByType(engineType); var ok = render(output, chartData); @@ -248,7 +279,10 @@ class ChartEngineSwitchable extends ChartEngine { } /// Renders using engine of type [T]. - RenderedChart? renderOfEngineType(Element output, ChartData chartData) { + RenderedChart? renderOfEngineType( + HTMLElement output, + ChartData chartData, + ) { var prevMainEngine = _mainEngine; setMainEngineOfType(); var ok = render(output, chartData); @@ -257,50 +291,68 @@ class ChartEngineSwitchable extends ChartEngine { } @override - RenderedChart renderLineChart(Element output, ChartSeries chartData) { + RenderedChart renderLineChart(HTMLElement output, ChartSeries chartData) { return mainEngine!.renderLineChart(output, chartData); } @override - RenderedChart renderTimeSeriesChart(Element output, ChartSeries chartData) { + RenderedChart renderTimeSeriesChart( + HTMLElement output, + ChartSeries chartData, + ) { return mainEngine!.renderTimeSeriesChart( - output, chartData as ChartTimeSeries); + output, + chartData as ChartTimeSeries, + ); } @override - RenderedChart renderBarChart(Element output, ChartSeries chartData) { + RenderedChart renderBarChart(HTMLElement output, ChartSeries chartData) { return mainEngine!.renderBarChart(output, chartData); } @override RenderedChart renderHorizontalBarChart( - Element output, ChartSeries chartData) { + HTMLElement output, + ChartSeries chartData, + ) { return mainEngine!.renderHorizontalBarChart(output, chartData); } @override - RenderedChart renderGaugeChart(Element output, ChartSet chartData) { + RenderedChart renderGaugeChart(HTMLElement output, ChartSet chartData) { return mainEngine!.renderGaugeChart(output, chartData); } @override RenderedChart renderScatterChart( - Element output, ChartSeriesPair chartSeries) { + HTMLElement output, + ChartSeriesPair chartSeries, + ) { return mainEngine!.renderScatterChart(output, chartSeries); } @override RenderedChart renderScatterTimedChart( - Element output, ChartTimeSeries chartSeries) { + HTMLElement output, + ChartTimeSeries chartSeries, + ) { return mainEngine!.renderScatterTimedChart(output, chartSeries); } @override RenderedChart renderFinancialChart( - Element output, ChartTimeSeries chartSeries, - {bool? ohlc, bool? candlestick}) { - return mainEngine!.renderFinancialChart(output, chartSeries, - ohlc: ohlc, candlestick: candlestick); + HTMLElement output, + ChartTimeSeries chartSeries, { + bool? ohlc, + bool? candlestick, + }) { + return mainEngine!.renderFinancialChart( + output, + chartSeries, + ohlc: ohlc, + candlestick: candlestick, + ); } } @@ -314,18 +366,22 @@ abstract class RenderedChart { late InteractionCompleter _interactionCompleter; RenderedChart(this.engine, this.type, this.chartObject, this.chartData) { - _interactionCompleter = InteractionCompleter('RenderedChart:refreshDelayed', - triggerDelay: Duration(milliseconds: 200), - functionToTrigger: () => refresh()); + _interactionCompleter = InteractionCompleter( + 'RenderedChart:refreshDelayed', + triggerDelay: Duration(milliseconds: 200), + functionToTrigger: () => refresh(), + ); if (chartData.populateLastRenderedChart) { chartData.lastRenderedChart = this; } } - JsObject? get chartJsObject => chartObject is JsObject ? chartObject : null; + // `chartObject` is `dynamic`: cast it so the extension getter is resolved + // statically (extensions are not available through dynamic calls). + JSObject? get chartJSObject => (chartObject as Object?).asJSObject; - bool get hasChartJsObject => chartJsObject != null; + bool get hasChartJSObject => chartJSObject != null; @override String toString() { diff --git a/lib/src/chart_engine_chartjs.dart b/lib/src/chart_engine_chartjs.dart index 5bda684..7b31585 100644 --- a/lib/src/chart_engine_chartjs.dart +++ b/lib/src/chart_engine_chartjs.dart @@ -1,11 +1,9 @@ -// ignore: deprecated_member_use -import 'dart:html'; -// ignore: deprecated_member_use -import 'dart:js'; +import 'dart:js_interop_unsafe'; import 'package:amdjs/amdjs.dart'; import 'package:dom_tools/dom_tools.dart'; import 'package:swiss_knife/swiss_knife.dart'; +import 'package:web_utils/web_utils.dart'; import 'chart_engine_base.dart'; import 'chart_engine_date.dart'; @@ -48,8 +46,9 @@ class ChartEngineChartJS extends ChartEngine { @override String get version => VERSION; - static final LoadController _loadController = - LoadController('ChartEngineChartJS'); + static final LoadController _loadController = LoadController( + 'ChartEngineChartJS', + ); @override bool get isLoaded => @@ -58,20 +57,25 @@ class ChartEngineChartJS extends ChartEngine { @override EventStream get onLoad => _loadController.onLoad; - static JsObject? _jsWrapper; + static JSObject? _jsWrapper; /// Loads ChartJS (`chart.js`) and engine wrapper. @override Future load() { return _loadController.load(() async { var jsFullPath = minified ? JS_PATH_MIN : JS_PATH; - var okJS = await AMDJS.require('chartjs', - jsFullPath: jsFullPath, globalJSVariableName: 'Chart'); - var okWrapper = await AMDJS.require(JS_WRAPPER_GLOBAL_NAME, - jsFullPath: ENGINE_WRAPPER_PATH, - globalJSVariableName: JS_WRAPPER_GLOBAL_NAME); - - _jsWrapper = context[JS_WRAPPER_GLOBAL_NAME] as JsObject?; + var okJS = await AMDJS.require( + 'chartjs', + jsFullPath: jsFullPath, + globalJSVariableName: 'Chart', + ); + var okWrapper = await AMDJS.require( + JS_WRAPPER_GLOBAL_NAME, + jsFullPath: ENGINE_WRAPPER_PATH, + globalJSVariableName: JS_WRAPPER_GLOBAL_NAME, + ); + + _jsWrapper = globalContext[JS_WRAPPER_GLOBAL_NAME] as JSObject?; _allowInterop(); @@ -84,19 +88,47 @@ class ChartEngineChartJS extends ChartEngine { throw StateError("Can't allowInterop _DateAdapter: null _jsWrapper"); } - _jsWrapper!['_DateAdapter__parse'] = ([a, b]) => DateAdapter.parse(a, b); - _jsWrapper!['_DateAdapter__format'] = ([a, b]) => DateAdapter.format(a, b); + _jsWrapper!['_DateAdapter__parse'] = + (([JSAny? a, JSAny? b]) => DateAdapter.parse( + a.dartify(), + b.dartify(), + )).toJS; + _jsWrapper!['_DateAdapter__format'] = + (([JSAny? a, JSAny? b]) => DateAdapter.format( + a.dartify(), + b.dartify(), + )).toJS; _jsWrapper!['_DateAdapter__startOf'] = - ([a, b, c]) => DateAdapter.startOf(a, b, c); - _jsWrapper!['_DateAdapter__endOf'] = ([a, b]) => DateAdapter.endOf(a, b); - _jsWrapper!['_DateAdapter__add'] = ([a, b, c]) => DateAdapter.add(a, b, c); + (([JSAny? a, JSAny? b, JSAny? c]) => DateAdapter.startOf( + a.dartify(), + b.dartify(), + c.dartify(), + )).toJS; + _jsWrapper!['_DateAdapter__endOf'] = + (([JSAny? a, JSAny? b]) => DateAdapter.endOf( + a.dartify(), + b.dartify(), + )).toJS; + _jsWrapper!['_DateAdapter__add'] = + (([JSAny? a, JSAny? b, JSAny? c]) => DateAdapter.add( + a.dartify(), + b.dartify(), + c.dartify(), + )).toJS; _jsWrapper!['_DateAdapter__diff'] = - ([a, b, c]) => DateAdapter.diff(a, b, c); - _jsWrapper!['_DateAdapter__create'] = ([a]) => DateAdapter.create(a); + (([JSAny? a, JSAny? b, JSAny? c]) => DateAdapter.diff( + a.dartify(), + b.dartify(), + c.dartify(), + )).toJS; + _jsWrapper!['_DateAdapter__create'] = (([JSAny? a]) => DateAdapter.create( + a.dartify(), + )).toJS; } - static final LoadController _loadControllerFinancial = - LoadController('ChartEngineChartJS:financial'); + static final LoadController _loadControllerFinancial = LoadController( + 'ChartEngineChartJS:financial', + ); /// Returns [true] if financial module is loaded. bool get isLoadedFinancial => @@ -108,7 +140,8 @@ class ChartEngineChartJS extends ChartEngine { if (!isLoadedFinancial) { throw StateError( - 'Trying to render before loadFinancial() of engine[$runtimeType]!'); + 'Trying to render before loadFinancial() of engine[$runtimeType]!', + ); } } @@ -119,8 +152,11 @@ class ChartEngineChartJS extends ChartEngine { if (!okChartJS) return false; var jsFullPath = minified ? FINANCIAL_JS_PATH_MIN : FINANCIAL_JS_PATH; - var okJS = await AMDJS.require('chartjs_financial', - jsFullPath: jsFullPath, globalJSVariableName: 'Chart.Financial'); + var okJS = await AMDJS.require( + 'chartjs_financial', + jsFullPath: jsFullPath, + globalJSVariableName: 'Chart.Financial', + ); return okChartJS && okJS; }); @@ -132,40 +168,44 @@ class ChartEngineChartJS extends ChartEngine { /// Ensures that DOM element to render is a canvas. If not will insert a canvas /// inside the element and use it. - CanvasElement asCanvasElement(Element element) { - if (element is CanvasElement) return element; + HTMLCanvasElement asCanvasElement(HTMLElement element) { + if (element.isA()) return element as HTMLCanvasElement; + + var w = getElementWidth(element, 640) ?? 640; + var h = getElementHeight(element, 480) ?? 480; - var w = getElementWidth(element, 640); - var h = getElementHeight(element, 480); + var canvas = HTMLCanvasElement() + ..width = w + ..height = h; - var canvas = CanvasElement(width: w, height: h); - element.children.add(canvas); + element.appendChild(canvas); return canvas; } - static JsObject? _xAxisMinMax(ChartData chartData) { + static JSArray? _xAxisMinMax(ChartData chartData) { var minMax = chartData.options.xAxisMinMax; - return minMax != null ? JsObject.jsify(minMax) : null; + return minMax?.toJS; } - static JsObject? _yAxisMinMax(ChartData chartData) { + static JSArray? _yAxisMinMax(ChartData chartData) { var minMax = chartData.options.yAxisMinMax; - return minMax != null ? JsObject.jsify(minMax) : null; + return minMax?.toJS; } static Function? _onClick(ChartData chartData) { var onClick = chartData.options.onClick; if (onClick == null) return null; - return (activeItems, xItems, yItems) { + return (Object? activeItems, Object? xItems, Object? yItems) { onClick( - jsToDart(activeItems) as List?, - jsToDart(xItems) as List?, - jsToDart(yItems) as List?); + activeItems.objectDartify() as List?, + xItems.objectDartify() as List?, + yItems.objectDartify() as List?, + ); }; } - static JsObject? _verticalLinesConfig(ChartData chartData) { + static JSObject? _verticalLinesConfig(ChartData chartData) { var lines = chartData.options.verticalLines; if (isNotEmptyObject(lines)) { @@ -185,18 +225,18 @@ class ChartEngineChartJS extends ChartEngine { 'label': label, 'color': color, 'y': yPos, - 'textAlign': textAlign + 'textAlign': textAlign, }; } - return JsObject.jsify(verticalLinesConfig); + return verticalLinesConfig.toJSDeep; } return null; } @override - RenderedChartJS renderLineChart(Element output, ChartSeries chartData) { + RenderedChartJS renderLineChart(HTMLElement output, ChartSeries chartData) { checkRenderParameters(output, chartData); checkLoaded(); @@ -215,34 +255,40 @@ class ChartEngineChartJS extends ChartEngine { chartData.title, chartData.xTitle, chartData.yTitle, - JsObject.jsify(chartData.xLabels), + chartData.xLabels.toJSDeep, _xAxisMinMax(chartData), _yAxisMinMax(chartData), - JsObject.jsify(series), + series.toJSDeep, _verticalLinesConfig(chartData), - JsObject.jsify(colors), + colors.toJSDeep, chartData.options.fillLines, chartData.options.straightLines, chartData.options.steppedLines, - _onClick(chartData) + _onClick(chartData), ]; - var chartObject = _jsWrapper!.callMethod('renderLine', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderLine'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedChartJS(this, 'line', chartObject, chartData); } @override RenderedChartJS renderTimeSeriesChart( - Element output, ChartTimeSeries chartData) { + HTMLElement output, + ChartTimeSeries chartData, + ) { checkRenderParameters(output, chartData); checkLoaded(); var canvas = asCanvasElement(output); var timeSeries = chartData.seriesAsPairsOfMap( - sortSeriesByCategory: chartData.options.sortCategories, - mapDateTimeToMillis: true); + sortSeriesByCategory: chartData.options.sortCategories, + mapDateTimeToMillis: true, + ); chartData.ensureColors(colorGenerator); @@ -255,33 +301,41 @@ class ChartEngineChartJS extends ChartEngine { chartData.yTitle, _xAxisMinMax(chartData), _yAxisMinMax(chartData), - JsObject.jsify(timeSeries), + timeSeries.toJSDeep, _verticalLinesConfig(chartData), - JsObject.jsify(colors), + colors.toJSDeep, chartData.options.fillLines, chartData.options.straightLines, chartData.options.steppedLines, - _onClick(chartData) + _onClick(chartData), ]; - var chartObject = _jsWrapper!.callMethod('renderTimeSeries', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderTimeSeries'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedChartJS(this, 'time-series', chartObject, chartData); } @override - RenderedChartJS renderBarChart(Element output, ChartSeries chartData) { + RenderedChartJS renderBarChart(HTMLElement output, ChartSeries chartData) { return _renderBarChartImpl(false, output, chartData); } @override RenderedChartJS renderHorizontalBarChart( - Element output, ChartSeries chartData) { + HTMLElement output, + ChartSeries chartData, + ) { return _renderBarChartImpl(true, output, chartData); } RenderedChartJS _renderBarChartImpl( - bool horizontal, Element output, ChartSeries chartSeries) { + bool horizontal, + HTMLElement output, + ChartSeries chartSeries, + ) { checkRenderParameters(output, chartSeries); checkLoaded(); @@ -301,32 +355,37 @@ class ChartEngineChartJS extends ChartEngine { chartSeries.title, chartSeries.xTitle, chartSeries.yTitle, - JsObject.jsify(chartSeries.xLabels), + chartSeries.xLabels.toJSDeep, _xAxisMinMax(chartSeries), _yAxisMinMax(chartSeries), - JsObject.jsify(series), - JsObject.jsify(colors), - _onClick(chartSeries) + series.toJSDeep, + colors.toJSDeep, + _onClick(chartSeries), ]; - var chartObject = _jsWrapper!.callMethod('renderBar', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderBar'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedChartJS( - this, - 'bar-${horizontal ? 'horizontal' : 'vertical'}', - chartObject, - chartSeries); + this, + 'bar-${horizontal ? 'horizontal' : 'vertical'}', + chartObject, + chartSeries, + ); } @override - RenderedChartJS renderGaugeChart(Element output, ChartSet chartData) { + RenderedChartJS renderGaugeChart(HTMLElement output, ChartSet chartData) { checkRenderParameters(output, chartData); checkLoaded(); var canvas = asCanvasElement(output); - var set = - chartData.options.sortCategories ? chartData.setSorted : chartData.set; + var set = chartData.options.sortCategories + ? chartData.setSorted + : chartData.set; chartData.ensureColors(colorGenerator); @@ -338,28 +397,34 @@ class ChartEngineChartJS extends ChartEngine { chartData.title, chartData.xTitle, chartData.yTitle, - JsObject.jsify(chartData.xLabels), - JsObject.jsify(set), - JsObject.jsify(colors), - JsObject.jsify(disabledColors), - _onClick(chartData) + chartData.xLabels.toJSDeep, + set.toJSDeep, + colors.toJSDeep, + disabledColors.toJSDeep, + _onClick(chartData), ]; - var chartObject = _jsWrapper!.callMethod('renderGauge', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderGauge'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedChartJS(this, 'gauge', chartObject, chartData); } @override RenderedChartJS renderScatterChart( - Element output, ChartSeriesPair chartSeries) { + HTMLElement output, + ChartSeriesPair chartSeries, + ) { checkRenderParameters(output, chartSeries); checkLoaded(); var canvas = asCanvasElement(output); var seriesPairs = chartSeries.seriesAsPairsOfMap( - sortSeriesByCategory: chartSeries.options.sortCategories); + sortSeriesByCategory: chartSeries.options.sortCategories, + ); chartSeries.ensureColors(colorGenerator); @@ -372,28 +437,34 @@ class ChartEngineChartJS extends ChartEngine { chartSeries.yTitle, _xAxisMinMax(chartSeries), _yAxisMinMax(chartSeries), - JsObject.jsify(seriesPairs), + seriesPairs.toJSDeep, _verticalLinesConfig(chartSeries), - JsObject.jsify(colors), - _onClick(chartSeries) + colors.toJSDeep, + _onClick(chartSeries), ]; - var chartObject = _jsWrapper!.callMethod('renderScatter', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderScatter'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedChartJS(this, 'scatter', chartObject, chartSeries); } @override RenderedChartJS renderScatterTimedChart( - Element output, ChartTimeSeries chartSeries) { + HTMLElement output, + ChartTimeSeries chartSeries, + ) { checkRenderParameters(output, chartSeries); checkLoaded(); var canvas = asCanvasElement(output); var seriesPairs = chartSeries.seriesAsPairsOfMap( - sortSeriesByCategory: chartSeries.options.sortCategories, - mapDateTimeToMillis: true); + sortSeriesByCategory: chartSeries.options.sortCategories, + mapDateTimeToMillis: true, + ); chartSeries.ensureColors(colorGenerator); @@ -406,17 +477,24 @@ class ChartEngineChartJS extends ChartEngine { chartSeries.yTitle, _xAxisMinMax(chartSeries), _yAxisMinMax(chartSeries), - JsObject.jsify(seriesPairs), + seriesPairs.toJSDeep, _verticalLinesConfig(chartSeries), - JsObject.jsify(colors), + colors.toJSDeep, true, - _onClick(chartSeries) + _onClick(chartSeries), ]; - var chartObject = _jsWrapper!.callMethod('renderScatter', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderScatter'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); return RenderedChartJS( - this, 'scatter-time-series', chartObject, chartSeries); + this, + 'scatter-time-series', + chartObject, + chartSeries, + ); } /// Renders financial chart. @@ -425,8 +503,11 @@ class ChartEngineChartJS extends ChartEngine { /// [candlestick] Renders a Candlestick chart. @override RenderedChartJS renderFinancialChart( - Element output, ChartTimeSeries chartSeries, - {bool? ohlc, bool? candlestick}) { + HTMLElement output, + ChartTimeSeries chartSeries, { + bool? ohlc, + bool? candlestick, + }) { checkRenderParameters(output, chartSeries); checkLoadedFinancial(); @@ -435,14 +516,16 @@ class ChartEngineChartJS extends ChartEngine { if (ohlc && candlestick) { print( - 'renderFinancialChart> Conflicting parameters: ohlc = $ohlc ; candlestick = $candlestick! Will use ohlc as primary.'); + 'renderFinancialChart> Conflicting parameters: ohlc = $ohlc ; candlestick = $candlestick! Will use ohlc as primary.', + ); } var canvas = asCanvasElement(output); var seriesPairs = chartSeries.seriesAsEntriesOfTOHLC( - sortSeriesByCategory: chartSeries.options.sortCategories, - mapDateTimeToMillis: true); + sortSeriesByCategory: chartSeries.options.sortCategories, + mapDateTimeToMillis: true, + ); chartSeries.ensureColors(colorGenerator); @@ -458,20 +541,27 @@ class ChartEngineChartJS extends ChartEngine { chartSeries.yTitle, _xAxisMinMax(chartSeries), _yAxisMinMax(chartSeries), - JsObject.jsify(seriesPairs), + seriesPairs.toJSDeep, _verticalLinesConfig(chartSeries), - JsObject.jsify(colors), - JsObject.jsify(colorsUp), - JsObject.jsify(colorsDown), - JsObject.jsify(colorsUnchanged), + colors.toJSDeep, + colorsUp.toJSDeep, + colorsDown.toJSDeep, + colorsUnchanged.toJSDeep, ohlc, - _onClick(chartSeries) + _onClick(chartSeries), ]; - var chartObject = _jsWrapper!.callMethod('renderFinancial', renderArgs); + var chartObject = _jsWrapper!.callMethodVarArgs( + 'renderFinancial'.toJS, + renderArgs.map((e) => e.toJSDeep).toList(), + ); - return RenderedChartJS(this, 'financial-${ohlc ? 'ohlc' : 'candlestick'}', - chartObject, chartSeries); + return RenderedChartJS( + this, + 'financial-${ohlc ? 'ohlc' : 'candlestick'}', + chartObject, + chartSeries, + ); } } @@ -480,40 +570,58 @@ class RenderedChartJS extends RenderedChart { @override void refresh() { - if (!hasChartJsObject) return; - chartJsObject!.callMethod('update'); + if (!hasChartJSObject) return; + chartJSObject!.callMethod('update'.toJS); } void addDateValue(dynamic date, dynamic value) { var dateTime = parseDateTime(date)!; - var args = [chartObject, dateTime.millisecondsSinceEpoch, 0, value]; + var args = [ + chartObject, + dateTime.millisecondsSinceEpoch, + 0, + value, + ]; - ChartEngineChartJS._jsWrapper!.callMethod('addData_date_value', args); + ChartEngineChartJS._jsWrapper!.callMethodVarArgs( + 'addData_date_value'.toJS, + args.map((e) => e.toJSDeep).toList(), + ); } - void addOHLC(dynamic series, dynamic time, double open, double high, - double lower, double close, - {int? timeTolerance, preserveTimeOfOverwrittenValue}) { + void addOHLC( + dynamic series, + dynamic time, + double open, + double high, + double lower, + double close, { + int? timeTolerance, + preserveTimeOfOverwrittenValue, + }) { var dateTime = parseDateTime(time)!; preserveTimeOfOverwrittenValue ??= false; - var args = [ + var args = [ chartObject, series, - JsObject.jsify({ + { 't': dateTime.millisecondsSinceEpoch, 'o': open, 'h': high, 'l': lower, - 'c': close - }), + 'c': close, + }.toJSDeep, timeTolerance, - preserveTimeOfOverwrittenValue + preserveTimeOfOverwrittenValue, ]; - ChartEngineChartJS._jsWrapper!.callMethod('addData_tohlc', args); + ChartEngineChartJS._jsWrapper!.callMethodVarArgs( + 'addData_tohlc'.toJS, + args.map((e) => e.toJSDeep).toList(), + ); } void addData(dynamic xVal, dynamic yVal) {} diff --git a/lib/src/chart_engine_date.dart b/lib/src/chart_engine_date.dart index 38eb8e7..1e45d0e 100644 --- a/lib/src/chart_engine_date.dart +++ b/lib/src/chart_engine_date.dart @@ -26,19 +26,21 @@ abstract class DateAdapter { if (formatStr.isNotEmpty) { formatStr = formatStr.replaceAllMapped( - RegExp(r'(?:\[(.*)\]|(YYYY|YY|DD|D)|(Do)|(SSS))'), (m) { - if (m[1] != null) { - return "'${m[1]}'"; - } else if (m[2] != null) { - return m[2]!.toLowerCase(); - } else if (m[3] != null) { - return 'dd'; - } else if (m[4] != null) { - return ''; - } else { - return m[0]!; - } - }); + RegExp(r'(?:\[(.*?)\]|(Do)|(YYYY|YY|DD|D)|(SSS))'), + (m) { + if (m[1] != null) { + return "'${m[1]}'"; + } else if (m[2] != null) { + return 'dd'; + } else if (m[3] != null) { + return m[3]!.toLowerCase(); + } else if (m[4] != null) { + return ''; + } else { + return m[0]!; + } + }, + ); } var dateFormat = formatStr.isNotEmpty @@ -67,8 +69,11 @@ abstract class DateAdapter { weekFirstDay = getDateTimeWeekDayByName(weekday); } - var dateTimeRange = - getDateTimeRange(DateRangeType.thisWeek, dateTime, weekFirstDay); + var dateTimeRange = getDateTimeRange( + DateRangeType.thisWeek, + dateTime, + weekFirstDay, + ); start = dateTimeRange.a; } else { diff --git a/lib/src/chart_engine_series.dart b/lib/src/chart_engine_series.dart index 325cbd9..1550f6e 100644 --- a/lib/src/chart_engine_series.dart +++ b/lib/src/chart_engine_series.dart @@ -5,10 +5,10 @@ import 'package:swiss_knife/swiss_knife.dart'; import 'chart_engine_base.dart'; -void _sorteEntriesByKey(List> entries) { +void _sortEntriesByKey(List> entries) { entries.sort((a, b) { - var c1 = a.key; - var c2 = b.key; + var c1 = a.key as Comparable; + var c2 = b.key as Comparable; return c1.compareTo(c2); }); } @@ -43,25 +43,29 @@ abstract class ChartData { static bool isListOfPairs(Iterable list) { if (list.isEmpty) return false; return listMatchesAll( - list, - (dynamic e) => - e is List && e.length == 2 && listMatchesAll(e, isValidValue)); + list, + (dynamic e) => + e is List && e.length == 2 && listMatchesAll(e, isValidValue), + ); } /// Returns [true] if [list] is a [List] of time pairs (X: DateTime, Y: value). static bool isListOfTimedPairs(Iterable list) { if (list.isEmpty) return false; return listMatchesAll( - list, - (dynamic e) => - e is List && e.length == 2 && isTimeValue(e[0]) && e[1] is num); + list, + (dynamic e) => + e is List && e.length == 2 && isTimeValue(e[0]) && e[1] is num, + ); } /// Returns [true] if [list] elements are valid values. static bool isListOfValidValues(Iterable list) { if (list.isEmpty) return false; return listMatchesAll( - list, (dynamic e) => e is List && listMatchesAll(e, isValidValue)); + list, + (dynamic e) => e is List && listMatchesAll(e, isValidValue), + ); } /// Returns [true] if [map] is valid for [ChartSet]. @@ -72,19 +76,25 @@ abstract class ChartData { /// Returns [true] if [map] is valid for [ChartSeries]. static bool matchesSeries(Map map) { return listMatchesAll( - map.values, (dynamic values) => isListOfValidValues(values)); + map.values, + (dynamic values) => values is Iterable && isListOfValidValues(values), + ); } /// Returns [true] if [map] is valid for [ChartTimeSeries]. static bool matchesTimeSeries(Map map) { return listMatchesAll( - map.values, (dynamic values) => isListOfTimedPairs(values)); + map.values, + (dynamic values) => values is Iterable && isListOfTimedPairs(values), + ); } /// Returns [true] if [map] is valid for [ChartSeriesPair]. static bool matchesSeriesPair(Map map) { return listMatchesAll( - map.values, (dynamic values) => isListOfPairs(values)); + map.values, + (dynamic values) => values is Iterable && isListOfPairs(values), + ); } /// Returns [true] if [map] is valid for a [ChartData] implementation. @@ -99,11 +109,11 @@ abstract class ChartData { if (matchesSet(map)) { return ChartSet(map); } else if (matchesTimeSeries(map)) { - return ChartTimeSeries(map as Map>); + return ChartTimeSeries(Map>.from(map)); } else if (matchesSeriesPair(map)) { - return ChartSeriesPair(map as Map>); + return ChartSeriesPair(Map>.from(map)); } else if (matchesSeries(map)) { - return ChartSeries([], map as Map>); + return ChartSeries([], Map>.from(map)); } else { return null; } @@ -123,15 +133,15 @@ abstract class ChartData { /// Lighter colors of each category. Map get colorsLighter => colors!.map((key, color) { - var htmlColor = HTMLColor.from(color)!.brighter(); - return MapEntry(key, htmlColor.toString()); - }); + var htmlColor = HTMLColor.from(color)!.brighter(); + return MapEntry(key, htmlColor.toString()); + }); /// Darker colors of each category. Map get colorsDarker => colors!.map((key, color) { - var htmlColor = HTMLColor.from(color)!.darker(); - return MapEntry(key, htmlColor.toString()); - }); + var htmlColor = HTMLColor.from(color)!.darker(); + return MapEntry(key, htmlColor.toString()); + }); /// Colors of each category when disabled. Map? disabledColors; @@ -145,15 +155,17 @@ abstract class ChartData { /// Set the Colors Map using a [colorGenerator]. void setColors(ColorGenerator colorGenerator) { colors = colorGenerator.buildColors(List.from(categories).cast()); - disabledColors = - colorGenerator.buildDisabledColors(List.from(categories).cast()); + disabledColors = colorGenerator.buildDisabledColors( + List.from(categories).cast(), + ); } /// Ensure that the Colors Map is set, using a [colorGenerator]. void ensureColors(ColorGenerator colorGenerator) { colors ??= colorGenerator.buildColors(List.from(categories).cast()); - disabledColors ??= - colorGenerator.buildDisabledColors(List.from(categories).cast()); + disabledColors ??= colorGenerator.buildDisabledColors( + List.from(categories).cast(), + ); } /// The options to render this data in the chart. @@ -171,29 +183,36 @@ abstract class ChartData { Scale? _xAxisScale; /// Returns the [Scale] of axis X. - Scale? get xAxisScale { - if (_xAxisScale == null) { - var values = xAxisAllValues; - _xAxisScale = isNumList(values) - ? ScaleNum.from(values.cast()) as Scale? - : Scale.from(values) as Scale?; - } - - return _xAxisScale; - } + Scale? get xAxisScale => _xAxisScale ??= _scaleFrom(xAxisAllValues); Scale? _yAxisScale; /// Returns the [Scale] of axis Y. - Scale? get yAxisScale { - if (_yAxisScale == null) { - var values = yAxisAllValues; - _yAxisScale = isNumList(values) - ? ScaleNum.from(values.cast()) as Scale? - : Scale.from(values) as Scale?; + Scale? get yAxisScale => _yAxisScale ??= _scaleFrom(yAxisAllValues); + + /// Builds a [Scale] typed as [T] (`Scale.from`/`ScaleNum.from` return + /// `Scale`/`ScaleNum`, which can't be cast to `Scale`). + static Scale? _scaleFrom(Iterable values) { + if (values.isEmpty) return null; + + if (isNumList(values)) { + var nums = values.cast(); + var min = nums.reduce((a, b) => a < b ? a : b); + var max = nums.reduce((a, b) => a > b ? a : b); + + Scale scale; + if ([] is List) { + scale = ScaleNum(min, max); + } else if ([] is List) { + scale = ScaleNum(min, max); + } else { + scale = ScaleNum(min, max); + } + return scale as Scale; } - return _yAxisScale; + var sorted = values.toList()..sort(); + return Scale(sorted.first, sorted.last); } /// Returns [true] if this is empty. @@ -221,7 +240,7 @@ class ChartSeries extends ChartData { final List xLabels; ChartSeries(this.xLabels, this.series, {ChartSeriesOptions? options}) - : options = options ?? ChartSeriesOptions(); + : options = options ?? ChartSeriesOptions(); @override bool get isEmpty => series.isEmpty; @@ -230,9 +249,9 @@ class ChartSeries extends ChartData { List get categories => series.keys.toList().cast(); Map> get seriesSortedByCategory { - var l = series.entries.cast>().toList(); - _sorteEntriesByKey(l); - return Map.fromEntries(l).cast(); + var l = series.entries.toList(); + _sortEntriesByKey(l); + return Map.fromEntries(l); } @override @@ -261,7 +280,7 @@ class ChartSeriesPair extends ChartSeries { 't', 'date', 'key', - 'k' + 'k', ]; /// Default Y keys in Map. @@ -295,24 +314,29 @@ class ChartSeriesPair extends ChartSeries { @override Iterable get xAxisAllValues => UnmodifiableListView( - series.values.expand((e) => e).map((e) => getPairX(e)).whereType()); + series.values.expand((e) => e).map((e) => getPairX(e)).whereType(), + ); @override X? getXAxisValue(int index) { - var seriesValues = - series.values.firstWhere((e) => index < e.length, orElse: () =>

[]); + var seriesValues = series.values.firstWhere( + (e) => index < e.length, + orElse: () =>

[], + ); var value = seriesValues[index]; return getPairX(value); } @override Iterable get yAxisAllValues => UnmodifiableListView( - series.values.expand((e) => e).map((e) => getPairY(e)).whereType()); + series.values.expand((e) => e).map((e) => getPairY(e)).whereType(), + ); /// Copies this series swapping the XY pairs. ChartSeriesPair swapXY() { - var seriesSwapped = - series.map((key, value) => MapEntry(key, swapListOfPairs(value))); + var seriesSwapped = series.map( + (key, value) => MapEntry(key, swapListOfPairs(value)), + ); var copy = ChartSeriesPair(seriesSwapped); @@ -340,7 +364,8 @@ class ChartSeriesPair extends ChartSeries { return pair.split(stringPairDelimiterPattern)[0] as X; } else { throw UnsupportedError( - "Can't handle pair of type ${pair.runtimeType}: $pair"); + "Can't handle pair of type ${pair.runtimeType}: $pair", + ); } } @@ -358,7 +383,8 @@ class ChartSeriesPair extends ChartSeries { return pair.split(stringPairDelimiterPattern)[1] as Y; } else { throw UnsupportedError( - "Can't handle pair of type ${pair.runtimeType}: $pair"); + "Can't handle pair of type ${pair.runtimeType}: $pair", + ); } } @@ -386,7 +412,8 @@ class ChartSeriesPair extends ChartSeries { return; } else { throw UnsupportedError( - "Can't handle pair of type ${pair.runtimeType}: $pair"); + "Can't handle pair of type ${pair.runtimeType}: $pair", + ); } } @@ -414,17 +441,20 @@ class ChartSeriesPair extends ChartSeries { String? delimiter = ''; - s.splitMapJoin(stringPairDelimiterPattern, - onNonMatch: (p) => '', - onMatch: (m) { - delimiter = m[0]; - return ''; - }); + s.splitMapJoin( + stringPairDelimiterPattern, + onNonMatch: (p) => '', + onMatch: (m) { + delimiter = m[0]; + return ''; + }, + ); return '$x$delimiter$y' as P; } else { throw UnsupportedError( - "Can't handle pair of type ${pair.runtimeType}: $pair"); + "Can't handle pair of type ${pair.runtimeType}: $pair", + ); } } @@ -446,7 +476,8 @@ class ChartSeriesPair extends ChartSeries { return swapPairAsString(pair); } else { throw UnsupportedError( - "Can't swap pair of type ${pair.runtimeType}: $pair"); + "Can't swap pair of type ${pair.runtimeType}: $pair", + ); } } @@ -467,8 +498,9 @@ class ChartSeriesPair extends ChartSeries { return pair.swapAB(); } - static final RegExp _defaultStringPairDelimiterPattern = - RegExp(r'\s*[,;:|]\s*'); + static final RegExp _defaultStringPairDelimiterPattern = RegExp( + r'\s*[,;:|]\s*', + ); RegExp stringPairDelimiterPattern = _defaultStringPairDelimiterPattern; @@ -477,13 +509,17 @@ class ChartSeriesPair extends ChartSeries { var parts = []; String? delimiter = ''; - pair.splitMapJoin(stringPairDelimiterPattern, onMatch: (m) { - delimiter = m.group(0); - return ''; - }, onNonMatch: (s) { - parts.add(s); - return ''; - }); + pair.splitMapJoin( + stringPairDelimiterPattern, + onMatch: (m) { + delimiter = m.group(0); + return ''; + }, + onNonMatch: (s) { + parts.add(s); + return ''; + }, + ); while (parts.length < 2) { parts.add(''); @@ -495,19 +531,24 @@ class ChartSeriesPair extends ChartSeries { } /// Returns [series] as pairs of [List]. - Map>> seriesAsPairsOfList( - {bool sortSeriesByCategory = false, bool mapDateTimeToMillis = true}) { + Map>> seriesAsPairsOfList({ + bool sortSeriesByCategory = false, + bool mapDateTimeToMillis = true, + }) { var series = sortSeriesByCategory ? seriesSortedByCategory : this.series; return seriesPairsAsList( - series: series, mapDateTimeToMillis: mapDateTimeToMillis); + series: series, + mapDateTimeToMillis: mapDateTimeToMillis, + ); } /// Used to normalize series for engines that requires a pair as List[a,b]. - Map>> seriesPairsAsList( - {Map>? series, - TypeMapper? xMapper, - TypeMapper? yMapper, - bool mapDateTimeToMillis = false}) { + Map>> seriesPairsAsList({ + Map>? series, + TypeMapper? xMapper, + TypeMapper? yMapper, + bool mapDateTimeToMillis = false, + }) { series ??= this.series; if (mapDateTimeToMillis) { @@ -515,27 +556,36 @@ class ChartSeriesPair extends ChartSeries { yMapper ??= _mapDateTimeToMillis; } - return series.map((key, value) => MapEntry( - key, toListOfPairsAsList(value, xMapper: xMapper, yMapper: yMapper))); + return series.map( + (key, value) => MapEntry( + key, + toListOfPairsAsList(value, xMapper: xMapper, yMapper: yMapper), + ), + ); } - static dynamic _mapDateTimeToMillis(o) => + static dynamic _mapDateTimeToMillis(Object? o) => o is DateTime ? o.millisecondsSinceEpoch : parseInt(o, 0); /// Returns [series] as pairs of [Map]. - Map>> seriesAsPairsOfMap( - {bool sortSeriesByCategory = false, bool mapDateTimeToMillis = true}) { + Map>> seriesAsPairsOfMap({ + bool sortSeriesByCategory = false, + bool mapDateTimeToMillis = true, + }) { var series = sortSeriesByCategory ? seriesSortedByCategory : this.series; return seriesPairsAsMap( - series: series, mapDateTimeToMillis: mapDateTimeToMillis); + series: series, + mapDateTimeToMillis: mapDateTimeToMillis, + ); } /// Used to normalize series for engines that requires a pair as Map{x,y}. - Map>> seriesPairsAsMap( - {Map>? series, - TypeMapper? xMapper, - TypeMapper? yMapper, - bool mapDateTimeToMillis = false}) { + Map>> seriesPairsAsMap({ + Map>? series, + TypeMapper? xMapper, + TypeMapper? yMapper, + bool mapDateTimeToMillis = false, + }) { series ??= this.series; if (mapDateTimeToMillis) { @@ -543,8 +593,12 @@ class ChartSeriesPair extends ChartSeries { yMapper ??= _mapDateTimeToMillis; } - return series.map((key, value) => MapEntry( - key, toListOfPairsAsMap(value, xMapper: xMapper, yMapper: yMapper))); + return series.map( + (key, value) => MapEntry( + key, + toListOfPairsAsMap(value, xMapper: xMapper, yMapper: yMapper), + ), + ); } /// Returns the [DataTime] minimum and maximum value of all series. @@ -554,10 +608,12 @@ class ChartSeriesPair extends ChartSeries { } /// Returns the [DataTime] minimum and maximum value for each series. - Map> seriesDateTimeMinMax( - {bool sortSeriesByCategory = false}) { - var seriesDates = - seriesDateTime(sortSeriesByCategory: sortSeriesByCategory); + Map> seriesDateTimeMinMax({ + bool sortSeriesByCategory = false, + }) { + var seriesDates = seriesDateTime( + sortSeriesByCategory: sortSeriesByCategory, + ); var entries = seriesDates.entries.map((e) { var datesMinMax = _datesMinMax(e.value); return datesMinMax != null ? MapEntry(e.key, datesMinMax) : null; @@ -581,8 +637,9 @@ class ChartSeriesPair extends ChartSeries { Map> seriesDateTime({bool sortSeriesByCategory = false}) { var series = sortSeriesByCategory ? seriesSortedByCategory : this.series; - var series2 = - series.map((key, value) => MapEntry(key, toListOfDateTime(value))); + var series2 = series.map( + (key, value) => MapEntry(key, toListOfDateTime(value)), + ); return series2; } @@ -625,69 +682,89 @@ class ChartSeriesPair extends ChartSeries { } /// Returns [series] as entries of TOHLC Maps. - Map>> seriesAsEntriesOfTOHLC( - {bool sortSeriesByCategory = false, bool mapDateTimeToMillis = true}) { + Map>> seriesAsEntriesOfTOHLC({ + bool sortSeriesByCategory = false, + bool mapDateTimeToMillis = true, + }) { var series = sortSeriesByCategory ? seriesSortedByCategory : this.series; return seriesEntriesAsTOHLC( - series: series, mapDateTimeToMillis: mapDateTimeToMillis); - } - - Map>> seriesEntriesAsTOHLC( - {Map>? series, - TypeMapper? tMapper, - TypeMapper? oMapper, - TypeMapper? hMapper, - TypeMapper? lMapper, - TypeMapper? cMapper, - bool mapDateTimeToMillis = false}) { + series: series, + mapDateTimeToMillis: mapDateTimeToMillis, + ); + } + + Map>> seriesEntriesAsTOHLC({ + Map>? series, + TypeMapper? tMapper, + TypeMapper? oMapper, + TypeMapper? hMapper, + TypeMapper? lMapper, + TypeMapper? cMapper, + bool mapDateTimeToMillis = false, + }) { series ??= this.series; if (mapDateTimeToMillis) { tMapper ??= (e) => _mapDateTimeToMillis(_getObjectValue(e, 0, 't', null)); } - var series2 = series.map((key, value) => MapEntry( + var series2 = series.map( + (key, value) => MapEntry( key, - toListOfTOHLC(value, - tMapper: tMapper, - oMapper: oMapper, - hMapper: hMapper, - lMapper: lMapper, - cMapper: cMapper))); + toListOfTOHLC( + value, + tMapper: tMapper, + oMapper: oMapper, + hMapper: hMapper, + lMapper: lMapper, + cMapper: cMapper, + ), + ), + ); return series2; } - List> toListOfPairsAsList(List

listOfPairs, - {TypeMapper? xMapper, TypeMapper? yMapper}) { + List> toListOfPairsAsList( + List

listOfPairs, { + TypeMapper? xMapper, + TypeMapper? yMapper, + }) { return listOfPairs .map((e) => toPairAsList(e, xMapper: xMapper, yMapper: yMapper)) .whereType>() .toList(); } - List> toListOfPairsAsMap(List

listOfPairs, - {TypeMapper? xMapper, TypeMapper? yMapper}) { + List> toListOfPairsAsMap( + List

listOfPairs, { + TypeMapper? xMapper, + TypeMapper? yMapper, + }) { return listOfPairs .map((e) => toPairAsMap(e, xMapper: xMapper, yMapper: yMapper)) .toList() .cast(); } - List> toListOfTOHLC(List

listOfPairs, - {TypeMapper? tMapper, - TypeMapper? oMapper, - TypeMapper? hMapper, - TypeMapper? lMapper, - TypeMapper? cMapper}) { + List> toListOfTOHLC( + List

listOfPairs, { + TypeMapper? tMapper, + TypeMapper? oMapper, + TypeMapper? hMapper, + TypeMapper? lMapper, + TypeMapper? cMapper, + }) { var list = listOfPairs - .map((e) => { - 't': _getObjectValue(e, 0, 't', tMapper), - 'o': _getObjectValue(e, 1, 'o', oMapper), - 'h': _getObjectValue(e, 2, 'h', hMapper), - 'l': _getObjectValue(e, 3, 'l', lMapper), - 'c': _getObjectValue(e, 4, 'c', cMapper), - }) + .map( + (e) => { + 't': _getObjectValue(e, 0, 't', tMapper), + 'o': _getObjectValue(e, 1, 'o', oMapper), + 'h': _getObjectValue(e, 2, 'h', hMapper), + 'l': _getObjectValue(e, 3, 'l', lMapper), + 'c': _getObjectValue(e, 4, 'c', cMapper), + }, + ) .toList(); list.sort((a, b) { @@ -700,7 +777,11 @@ class ChartSeriesPair extends ChartSeries { } dynamic _getObjectValue( - dynamic o, int index, String key, TypeMapper? mapper) { + dynamic o, + int index, + String key, + TypeMapper? mapper, + ) { if (mapper != null) return mapper(o); if (o == null) return null; if (o is List) return o[index]; @@ -708,8 +789,11 @@ class ChartSeriesPair extends ChartSeries { return o; } - List? toPairAsList(P pair, - {TypeMapper? xMapper, TypeMapper? yMapper}) { + List? toPairAsList( + P pair, { + TypeMapper? xMapper, + TypeMapper? yMapper, + }) { if (xMapper == null && yMapper == null) { return toPair(pair, (X? x, Y? y) => [x, y]); } else { @@ -719,8 +803,11 @@ class ChartSeriesPair extends ChartSeries { } } - Map? toPairAsMap(P pair, - {TypeMapper? xMapper, TypeMapper? yMapper}) { + Map? toPairAsMap( + P pair, { + TypeMapper? xMapper, + TypeMapper? yMapper, + }) { if (xMapper == null && yMapper == null) { return toPair(pair, (X? x, Y? y) => {'x': x, 'y': y}); } else { @@ -764,7 +851,7 @@ class ChartSeriesPair extends ChartSeries { /// Time Series, for Time Series Charts. Each entry should be a pair of DateTime and Value. class ChartTimeSeries extends ChartSeriesPair { ChartTimeSeries(Map> series) - : super(series.map((key, value) => MapEntry(key, value))) { + : super(series.map((key, value) => MapEntry(key, value))) { _normalizePairs(); } @@ -871,7 +958,7 @@ class ChartSet extends ChartData { List get xLabels => categories; ChartSet(this.set, {ChartSetOptions? options}) - : options = options ?? ChartSetOptions(); + : options = options ?? ChartSetOptions(); @override bool get isEmpty => set.isEmpty; @@ -880,9 +967,9 @@ class ChartSet extends ChartData { List get categories => set.keys.toList().cast(); Map get setSorted { - var l = set.entries.cast>().toList(); - _sorteEntriesByKey(l); - return Map.fromEntries(l).cast(); + var l = set.entries.toList(); + _sortEntriesByKey(l); + return Map.fromEntries(l); } @override @@ -920,8 +1007,13 @@ class VerticalLine { /// The text align with the vertical line: `center`, 'left', 'right'. final String? textAlign; - VerticalLine(this.index, - {this.label, this.color, this.yPosition, this.textAlign}) { + VerticalLine( + this.index, { + this.label, + this.color, + this.yPosition, + this.textAlign, + }) { if (index < 0) { throw ArgumentError('Invalid index: $index'); } @@ -979,8 +1071,9 @@ abstract class ChartOptions { copy.yAxisMin = yAxisMin; copy.yAxisMax = yAxisMax; - copy.verticalLines = - verticalLines != null ? List.from(verticalLines!) : null; + copy.verticalLines = verticalLines != null + ? List.from(verticalLines!) + : null; copy.verticalLinesDefaultColor = verticalLinesDefaultColor; @@ -1005,6 +1098,7 @@ class ChartSeriesOptions extends ChartOptions { _copyBase(copy); + copy.steppedLines = steppedLines; copy.straightLines = straightLines; copy.fillLines = fillLines; diff --git a/pubspec.yaml b/pubspec.yaml index 13d705e..045b57f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,25 +1,26 @@ name: chart_engine description: Chart generator with interchangeable chart engines, like ChartJS and ApexCharts. -version: 2.1.1 +version: 3.0.0 homepage: https://github.com/Colossus-Services/chart_engine environment: - sdk: '>=3.5.0 <4.0.0' + sdk: '>=3.10.0 <4.0.0' dependencies: - swiss_knife: ^3.2.3 - dom_tools: ^2.3.2 + swiss_knife: ^3.3.14 + dom_tools: ^3.1.0 color_palette_generator: ^2.0.1 - amdjs: ^2.0.4 - intl: ^0.19.0 + amdjs: ^3.0.0 + intl: ^0.20.3 + web_utils: ^1.1.0 dev_dependencies: - lints: ^5.1.1 - test: ^1.25.15 + lints: ^6.1.0 + test: ^1.32.0 path: ^1.9.1 - dependency_validator: ^3.2.3 - build_runner: ^2.4.15 - build_web_compilers: ^4.1.1 + dependency_validator: ^5.1.0 + build_runner: ^2.16.2 + build_web_compilers: ^4.8.11 collection: ^1.19.1 #dependency_overrides: diff --git a/test/chart_engine_browser_test.dart b/test/chart_engine_browser_test.dart deleted file mode 100644 index 2ef6eef..0000000 --- a/test/chart_engine_browser_test.dart +++ /dev/null @@ -1,70 +0,0 @@ -@TestOn('browser') -library; - -// ignore: deprecated_member_use -import 'dart:html'; - -import 'package:chart_engine/chart_engine_all.dart'; -import 'package:test/test.dart'; - -Future _sleep(int sleepMs) async { - if (sleepMs <= 0) return; - print('SLEEP> ${sleepMs}ms'); - await Future.delayed(Duration(milliseconds: sleepMs), () {}); -} - -void _createLineChart(ChartEngine charEngine) async { - var series = ChartSeries([ - 'Jan', - 'Feb', - 'Mar' - ], { - 'A': [10, 20, 5], - 'B': [15, 25, 55], - 'C': [100, 130, 140] - }); - - var output = document.body!.append(DivElement()..style.width = '100%'); - - expect(output.nodes.isEmpty, isTrue); - - charEngine.renderLineChart(output as Element, series); - - await _sleep(500); - - expect(output.nodes.isEmpty, isFalse); -} - -void main() { - group('ChartEngine Browser', () { - setUp(() {}); - - test('ChartJS', () async { - var engine = ChartEngineChartJS(); - - expect(engine.isLoaded, isFalse); - - var loadOK = await engine.load(); - - expect(loadOK, isTrue); - - expect(engine.isLoaded, isTrue); - - _createLineChart(engine); - }); - - test('Apexcharts', () async { - var engine = ChartEngineApexCharts(); - - expect(engine.isLoaded, isFalse); - - var loadOK = await engine.load(); - - expect(loadOK, isTrue); - - expect(engine.isLoaded, isTrue); - - _createLineChart(engine); - }); - }); -} diff --git a/test/chart_engine_data_test.dart b/test/chart_engine_data_test.dart new file mode 100644 index 0000000..8d3c392 --- /dev/null +++ b/test/chart_engine_data_test.dart @@ -0,0 +1,641 @@ +@TestOn('browser') +library; + +import 'package:chart_engine/chart_engine.dart'; +import 'package:swiss_knife/swiss_knife.dart'; +import 'package:test/test.dart'; + +void main() { + group('ChartData static checks', () { + test('isValueInUnixEpochRange', () { + expect(ChartData.isValueInUnixEpochRange(1600000000000), isTrue); + expect(ChartData.isValueInUnixEpochRange(1000), isFalse); + expect(ChartData.isValueInUnixEpochRange(1600000000, false), isTrue); + expect(ChartData.isValueInUnixEpochRange(1600000000000, false), isFalse); + }); + + test('isTimeValue / isValidValue', () { + expect(ChartData.isTimeValue(DateTime(2020)), isTrue); + expect(ChartData.isTimeValue(1600000000000), isTrue); + expect(ChartData.isTimeValue(10), isFalse); + expect(ChartData.isTimeValue('2020-01-01'), isFalse); + + expect(ChartData.isValidValue(10), isTrue); + expect(ChartData.isValidValue(1.5), isTrue); + expect(ChartData.isValidValue(DateTime(2020)), isTrue); + expect(ChartData.isValidValue('x'), isFalse); + expect(ChartData.isValidValue(null), isFalse); + }); + + test('isListOfPairs', () { + expect( + ChartData.isListOfPairs([ + [1, 2], + [3, 4], + ]), + isTrue, + ); + expect(ChartData.isListOfPairs([]), isFalse); + expect( + ChartData.isListOfPairs([ + [1, 2, 3], + ]), + isFalse, + ); + expect( + ChartData.isListOfPairs([ + [1, 'a'], + ]), + isFalse, + ); + }); + + test('isListOfTimedPairs', () { + expect( + ChartData.isListOfTimedPairs([ + [DateTime(2020), 1], + [1600000000000, 2.5], + ]), + isTrue, + ); + expect(ChartData.isListOfTimedPairs([]), isFalse); + expect( + ChartData.isListOfTimedPairs([ + [1, 2], + ]), + isFalse, + ); + }); + + test('matches*', () { + expect(ChartData.matchesSet({'a': 1, 'b': 2.5}), isTrue); + expect( + ChartData.matchesSet({ + 'a': [1], + }), + isFalse, + ); + + expect( + ChartData.matchesTimeSeries({ + 'a': [ + [DateTime(2020), 1], + ], + }), + isTrue, + ); + + expect( + ChartData.matchesSeriesPair({ + 'a': [ + [1, 2], + ], + }), + isTrue, + ); + + expect(ChartData.matchesChartData({'a': 1}), isTrue); + expect(ChartData.matchesChartData({'a': 'x'}), isFalse); + }); + + test('from', () { + expect(ChartData.from({'a': 1, 'b': 2}), isA()); + + expect( + ChartData.from({ + 'a': [ + [DateTime(2020, 1, 1), 1], + [DateTime(2020, 1, 2), 2], + ], + }), + isA(), + ); + + var pair = ChartData.from({ + 'a': [ + [1, 2], + [3, 4], + ], + }); + expect(pair, isA()); + expect(pair, isNot(isA())); + + expect( + ChartData.from({ + 'a': [ + [1, 2, 3], + ], + }), + allOf(isA(), isNot(isA())), + ); + + expect(ChartData.from({'a': 'x'}), isNull); + }); + }); + + group('ChartSeries', () { + ChartSeries newSeries() => ChartSeries( + ['jan', 'feb', 'mar'], + { + 'b': [10, 20, 30], + 'c': [5, 50, 15], + 'a': [1, 2, 3], + }, + ); + + test('basic accessors', () { + var s = newSeries(); + + expect(s.isEmpty, isFalse); + expect(s.isNotEmpty, isTrue); + expect(s.categories, equals(['b', 'c', 'a'])); + expect(s.categoriesAsStrings, equals(['b', 'c', 'a'])); + expect(s.getXAxisValue(1), equals('feb')); + expect(s.xAxisAllValues, equals(['jan', 'feb', 'mar'])); + expect(s.yAxisAllValues, equals([10, 20, 30, 5, 50, 15, 1, 2, 3])); + expect(s.options, isA()); + + expect(ChartSeries([], {}).isEmpty, isTrue); + }); + + test('seriesSortedByCategory', () { + var s = newSeries(); + expect(s.seriesSortedByCategory.keys, equals(['a', 'b', 'c'])); + expect(s.seriesSortedByCategory['c'], equals([5, 50, 15])); + // Original order is untouched: + expect(s.series.keys, equals(['b', 'c', 'a'])); + }); + + test('seriesSortedByCategory (untyped)', () { + var s = ChartSeries([], { + 'b': [1], + 'a': [2], + }); + expect(s.seriesSortedByCategory.keys, equals(['a', 'b'])); + }); + + test('yAxisScale', () { + var scale = newSeries().yAxisScale!; + expect(scale, isA>()); + expect(scale.minimum, equals(1)); + expect(scale.maximum, equals(50)); + expect(scale.length, equals(49)); + }); + + test('yAxisScale (double / untyped)', () { + var d = ChartSeries([], { + 'a': [1.5, 0.5], + }); + expect(d.yAxisScale, isA>()); + expect(d.yAxisScale!.minimum, equals(0.5)); + + var u = ChartSeries([], { + 'a': [3, 1.5], + }); + expect(u.yAxisScale!.minimum, equals(1.5)); + expect(u.yAxisScale!.maximum, equals(3)); + + expect(ChartSeries([], {}).yAxisScale, isNull); + }); + + test('colors', () { + var s = newSeries(); + expect(s.colors, isNull); + + s.ensureColors(StandardColorGenerator()); + + expect(s.colors!.keys, equals(['b', 'c', 'a'])); + expect(s.disabledColors!.keys, equals(['b', 'c', 'a'])); + for (var c in s.colors!.values) { + expect(HTMLColor.from(c), isNotNull, reason: 'Invalid color: $c'); + } + + expect(s.colorsLighter.keys, equals(s.colors!.keys)); + expect(s.colorsDarker.keys, equals(s.colors!.keys)); + expect(s.colorsLighter['a'], isNot(equals(s.colorsDarker['a']))); + + // ensureColors must not override user colors: + var custom = {'a': '#ff0000', 'b': '#00ff00', 'c': '#0000ff'}; + s.colors = Map.of(custom); + s.ensureColors(StandardColorGenerator()); + expect(s.colors, equals(custom)); + + // setColors always overrides: + s.setColors(StandardColorGenerator()); + expect(s.colors, isNot(equals(custom))); + }); + + test('lastRenderedChart not populated by default', () { + var s = newSeries(); + expect(s.populateLastRenderedChart, isFalse); + expect(s.lastRenderedChart, isNull); + }); + }); + + group('ChartSeriesPair', () { + test('List pairs: getPairX/Y and scales', () { + var s = ChartSeriesPair({ + 'a': [ + [1, 10], + [2, 20], + ], + 'b': [ + [3, 5], + ], + }); + + expect(s.getPairX([1, 10]), equals(1)); + expect(s.getPairY([1, 10]), equals(10)); + expect(s.getXAxisValue(1), equals(2)); + expect(s.xAxisAllValues, equals([1, 2, 3])); + expect(s.yAxisAllValues, equals([10, 20, 5])); + expect(s.xAxisScale!.minimum, equals(1)); + expect(s.xAxisScale!.maximum, equals(3)); + expect(s.yAxisScale!.minimum, equals(5)); + expect(s.yAxisScale!.maximum, equals(20)); + }); + + test('Map pairs with alternative keys', () { + var s = ChartSeriesPair({ + 'a': [ + {'time': 1, 'value': 10}, + {'t': 2, 'v': 20}, + ], + }); + + expect(s.xAxisAllValues, equals([1, 2])); + expect(s.yAxisAllValues, equals([10, 20])); + + expect( + s.seriesAsPairsOfList()['a'], + equals([ + [1, 10], + [2, 20], + ]), + ); + expect( + s.seriesAsPairsOfMap()['a'], + equals([ + {'x': 1, 'y': 10}, + {'x': 2, 'y': 20}, + ]), + ); + }); + + test('Custom xKeys / yKeys', () { + var s = ChartSeriesPair({ + 'a': [ + {'foo': 1, 'bar': 10}, + ], + }); + + s.xKeys = ['foo']; + s.yKeys = ['bar']; + + expect(s.getPairX({'foo': 1, 'bar': 10}), equals(1)); + expect(s.getPairY({'foo': 1, 'bar': 10}), equals(10)); + }); + + test('Pair and String pairs', () { + var s = ChartSeriesPair({ + 'a': [Pair(1, 10), '2 ; 20'], + }); + + expect(s.getPairX(Pair(1, 10)), equals(1)); + expect(s.getPairY(Pair(1, 10)), equals(10)); + expect(s.getPairX('2 ; 20'), equals('2')); + expect(s.getPairY('2 ; 20'), equals('20')); + expect(() => s.getPairX(123), throwsUnsupportedError); + expect(s.getPairX(null), isNull); + }); + + test('swapXY', () { + var s = + ChartSeriesPair({ + 'list': [ + [1, 10], + ], + 'map': [ + {'x': 2, 'y': 20}, + ], + 'string': ['3,30'], + 'pair': [Pair(4, 40)], + }) + ..title = 'T' + ..xTitle = 'X' + ..yTitle = 'Y' + ..colors = {'list': '#ff0000'}; + + s.options.fillLines = true; + + var swapped = s.swapXY(); + + expect( + swapped.series['list'], + equals([ + [10, 1], + ]), + ); + expect( + swapped.series['map'], + equals([ + {'x': 20, 'y': 2}, + ]), + ); + expect(swapped.series['string'], equals(['30,3'])); + expect((swapped.series['pair']![0] as Pair).a, equals(40)); + expect((swapped.series['pair']![0] as Pair).b, equals(4)); + + expect(swapped.title, equals('T')); + expect(swapped.xTitle, equals('Y')); + expect(swapped.yTitle, equals('X')); + expect(swapped.colors, equals({'list': '#ff0000'})); + expect(swapped.options.fillLines, isTrue); + expect(identical(swapped.options, s.options), isFalse); + + // Original untouched: + expect( + s.series['list'], + equals([ + [1, 10], + ]), + ); + }); + + test('swapPairAsString keeps delimiter', () { + var s = ChartSeriesPair({}); + expect(s.swapPairAsString('1|2'), equals('2|1')); + expect(s.swapPairAsString('1 : 2'), equals('2 : 1')); + expect(s.swapPairAsString('1'), equals('1')); + }); + + test('seriesAsPairsOfList: sort and custom mappers', () { + var s = ChartSeriesPair({ + 'b': [ + [1, 2], + ], + 'a': [ + [3, 4], + ], + }); + + expect( + s.seriesAsPairsOfList(sortSeriesByCategory: true).keys, + equals(['a', 'b']), + ); + + var mapped = s.seriesPairsAsList( + xMapper: (o) => (o as int) * 10, + yMapper: (o) => '$o', + ); + expect( + mapped['b'], + equals([ + [10, '2'], + ]), + ); + }); + }); + + group('ChartTimeSeries', () { + final d1 = DateTime(2020, 1, 1); + final d2 = DateTime(2020, 1, 2); + final d3 = DateTime(2020, 1, 3); + + test('sorts pairs by date', () { + var s = ChartTimeSeries({ + 'a': [ + [d3, 3], + [d1, 1], + [d2, 2], + ], + }); + + expect( + s.series['a'], + equals([ + [d1, 1], + [d2, 2], + [d3, 3], + ]), + ); + }); + + test('normalizes ISO string dates and epoch ints', () { + var s = ChartTimeSeries({ + 'iso': [ + ['2020-01-02', '20'], + ['2020-01-01', '10'], + ], + 'epoch': [ + [5, d2.millisecondsSinceEpoch], + [d1.millisecondsSinceEpoch, 7], + ], + }); + + expect( + s.series['iso'], + equals([ + [d1, 10], + [d2, 20], + ]), + ); + expect( + s.series['epoch'], + equals([ + [d1, 7], + [d2, 5], + ]), + ); + }); + + test('seriesAsPairsOfMap maps DateTime to millis', () { + var s = ChartTimeSeries({ + 'a': [ + [d1, 1], + ], + }); + + expect( + s.seriesAsPairsOfMap()['a'], + equals([ + {'x': d1.millisecondsSinceEpoch, 'y': 1}, + ]), + ); + expect( + s.seriesAsPairsOfMap(mapDateTimeToMillis: false)['a'], + equals([ + {'x': d1, 'y': 1}, + ]), + ); + }); + + test('seriesDateTimeMinMax / allSeriesDateTimeMinMax', () { + var s = ChartTimeSeries({ + 'a': [ + [d2, 1], + [d1, 2], + ], + 'b': [ + [d3, 3], + ], + }); + + expect( + s.seriesDateTimeMinMax(), + equals({ + 'a': [d1, d2], + 'b': [d3, d3], + }), + ); + expect(s.allSeriesDateTimeMinMax(), equals([d1, d3])); + + expect(ChartTimeSeries({}).allSeriesDateTimeMinMax(), isNull); + }); + + test('seriesAsEntriesOfTOHLC', () { + var s = ChartTimeSeries({ + 'a': [ + [d2, 20, 25, 15, 22], + [d1, 10, 15, 5, 12], + ], + }); + + expect( + s.seriesAsEntriesOfTOHLC()['a'], + equals([ + {'t': d1.millisecondsSinceEpoch, 'o': 10, 'h': 15, 'l': 5, 'c': 12}, + {'t': d2.millisecondsSinceEpoch, 'o': 20, 'h': 25, 'l': 15, 'c': 22}, + ]), + ); + }); + + test('xAxisAllValues are DateTime', () { + var s = ChartTimeSeries({ + 'a': [ + [d1, 1], + [d2, 2], + ], + }); + + expect(s.xAxisAllValues, equals([d1, d2])); + expect(s.getXAxisValue(0), equals(d1)); + }); + }); + + group('ChartSet', () { + ChartSet newSet() => ChartSet({'b': 20, 'a': 10, 'c': 30}); + + test('accessors', () { + var s = newSet(); + + expect(s.isEmpty, isFalse); + expect(s.categories, equals(['b', 'a', 'c'])); + expect(s.xLabels, equals(['b', 'a', 'c'])); + expect(s.getXAxisValue(2), equals('c')); + expect(s.xAxisAllValues, equals(['b', 'a', 'c'])); + expect(s.yAxisAllValues, equals([20, 10, 30])); + expect(s.setSorted.keys, equals(['a', 'b', 'c'])); + expect(ChartSet({'y': 1, 'x': 2}).setSorted.keys, equals(['x', 'y'])); + expect(s.options, isA()); + + expect(ChartSet({}).isEmpty, isTrue); + }); + + test('yAxisScale', () { + var scale = newSet().yAxisScale!; + expect(scale.minimum, equals(10)); + expect(scale.maximum, equals(30)); + }); + + test('asChartSeries', () { + var series = newSet().asChartSeries; + expect( + series.series, + equals({ + 'b': [20], + 'a': [10], + 'c': [30], + }), + ); + }); + }); + + group('ChartOptions', () { + test('axis min/max', () { + var o = ChartSeriesOptions(); + expect(o.xAxisMinMax, isNull); + expect(o.yAxisMinMax, isNull); + + o + ..xAxisMin = 0 + ..xAxisMax = 10 + ..yAxisMin = -5 + ..yAxisMax = 5; + + expect(o.xAxisMinMax, equals([0, 10])); + expect(o.yAxisMinMax, equals([-5, 5])); + }); + + test('ChartSeriesOptions.copy', () { + void onClick(List? a, List? x, List? y) {} + + var o = ChartSeriesOptions() + ..sortCategories = true + ..xAxisMin = 1 + ..xAxisMax = 2 + ..yAxisMin = 3 + ..yAxisMax = 4 + ..verticalLines = [VerticalLine(1, label: 'L')] + ..verticalLinesDefaultColor = '#00ff00' + ..onClick = onClick + ..steppedLines = true + ..straightLines = true + ..fillLines = true; + + var c = o.copy(); + + expect(identical(c, o), isFalse); + expect(c.sortCategories, isTrue); + expect(c.xAxisMinMax, equals([1, 2])); + expect(c.yAxisMinMax, equals([3, 4])); + expect(c.verticalLines!.single.label, equals('L')); + expect(identical(c.verticalLines, o.verticalLines), isFalse); + expect(c.verticalLinesDefaultColor, equals('#00ff00')); + expect(c.onClick, same(o.onClick)); + expect(c.steppedLines, isTrue); + expect(c.straightLines, isTrue); + expect(c.fillLines, isTrue); + }); + + test('ChartSetOptions.copy', () { + var o = ChartSetOptions() + ..sortCategories = true + ..yAxisMin = 0 + ..yAxisMax = 100; + + var c = o.copy(); + expect(c, isA()); + expect(c.sortCategories, isTrue); + expect(c.yAxisMinMax, equals([0, 100])); + }); + }); + + group('VerticalLine', () { + test('valid', () { + var l = VerticalLine( + 2, + label: 'x', + color: '#fff', + yPosition: 0.5, + textAlign: 'left', + ); + expect(l.index, equals(2)); + expect(l.toString(), contains('label: x')); + }); + + test('negative index throws', () { + expect(() => VerticalLine(-1), throwsArgumentError); + }); + }); +} diff --git a/test/chart_engine_date_test.dart b/test/chart_engine_date_test.dart new file mode 100644 index 0000000..91eb566 --- /dev/null +++ b/test/chart_engine_date_test.dart @@ -0,0 +1,89 @@ +import 'package:chart_engine/src/chart_engine_date.dart'; +import 'package:test/test.dart'; + +void main() { + group('DateAdapter', () { + final date = DateTime(2020, 3, 15, 13, 45, 30); + final millis = date.millisecondsSinceEpoch; + + test('create', () { + expect(DateAdapter.create(date), equals(millis)); + expect(DateAdapter.create(millis), equals(millis)); + }); + + test('parse', () { + expect(DateAdapter.parse(date, null), equals(millis)); + expect( + DateAdapter.parse('2020-03-15', null), + equals(DateTime(2020, 3, 15).millisecondsSinceEpoch), + ); + }); + + test('format: moment.js style tokens', () { + expect(DateAdapter.format(millis, 'YYYY-MM-DD'), equals('2020-03-15')); + expect(DateAdapter.format(millis, 'YY/MM/DD'), equals('20/03/15')); + expect(DateAdapter.format(millis, 'HH:mm:ss.SSS'), equals('13:45:30.')); + expect(DateAdapter.format(millis, '[Day] D'), equals('Day 15')); + expect(DateAdapter.format(millis, 'MMM Do'), equals('Mar 15')); + expect(DateAdapter.format(millis, '[Q] YYYY [W]'), equals('Q 2020 W')); + }); + + test('format: default', () { + // `intl` may use a narrow no-break space before AM/PM. + var expected = RegExp(r'^3/15/2020 1:45\sPM$'); + expect(DateAdapter.format(millis, null), matches(expected)); + expect(DateAdapter.format(millis, ''), matches(expected)); + }); + + test('startOf / endOf', () { + expect( + DateAdapter.startOf(millis, 'day', null), + equals(DateTime(2020, 3, 15).millisecondsSinceEpoch), + ); + expect( + DateAdapter.startOf(millis, 'month', null), + equals(DateTime(2020, 3, 1).millisecondsSinceEpoch), + ); + expect( + DateAdapter.startOf(millis, 'year', null), + equals(DateTime(2020).millisecondsSinceEpoch), + ); + expect( + DateAdapter.startOf(millis, 'hour', null), + equals(DateTime(2020, 3, 15, 13).millisecondsSinceEpoch), + ); + + expect( + DateAdapter.endOf(millis, 'day'), + equals(DateTime(2020, 3, 15, 23, 59, 59, 999).millisecondsSinceEpoch), + ); + }); + + test('startOf isoWeek', () { + // 2020-03-15 is a Sunday. + var start = DateTime.fromMillisecondsSinceEpoch( + DateAdapter.startOf(millis, 'isoWeek', 1)!, + ); + expect(start.weekday, equals(DateTime.monday)); + expect(start, equals(DateTime(2020, 3, 9))); + }); + + test('add', () { + expect( + DateAdapter.add(millis, 2, 'day'), + equals(date.add(Duration(days: 2)).millisecondsSinceEpoch), + ); + expect( + DateAdapter.add(millis, 3, 'hour'), + equals(date.add(Duration(hours: 3)).millisecondsSinceEpoch), + ); + }); + + test('diff', () { + var later = date.add(Duration(hours: 36)); + expect(DateAdapter.diff(later, date, 'hour'), equals(36)); + expect(DateAdapter.diff(later, date, 'day'), equals(1.5)); + expect(() => DateAdapter.diff(later, date, 'foo'), throwsArgumentError); + }); + }); +} diff --git a/test/chart_engine_integration_test.dart b/test/chart_engine_integration_test.dart new file mode 100644 index 0000000..0bc3d03 --- /dev/null +++ b/test/chart_engine_integration_test.dart @@ -0,0 +1,436 @@ +@TestOn('browser') +library; + +import 'package:chart_engine/chart_engine_all.dart'; +import 'package:test/test.dart'; +import 'package:web_utils/web_utils.dart'; + +final _d1 = DateTime(2020, 1, 1); +final _d2 = DateTime(2020, 1, 2); +final _d3 = DateTime(2020, 1, 3); + +ChartSeries _lineSeries() => + ChartSeries( + ['Jan', 'Feb', 'Mar'], + { + 'A': [10, 20, 5], + 'B': [15, 25, 55], + 'C': [100, 130, 140], + }, + ) + ..title = 'Line' + ..xTitle = 'Month' + ..yTitle = 'Value'; + +ChartTimeSeries _timeSeries() => ChartTimeSeries({ + 'A': [ + [_d1, 10], + [_d2, 20], + [_d3, 15], + ], + 'B': [ + [_d1, 5], + [_d3, 25], + ], +}); + +ChartSeriesPair _pairSeries() => ChartSeriesPair({ + 'A': [ + [1, 10], + [2, 20], + [3, 15], + ], + 'B': [ + [1.5, 5], + [2.5, 25], + ], +}); + +ChartSet _set() => ChartSet({'A': 30, 'B': 70}); + +ChartTimeSeries _financialSeries() => ChartTimeSeries({ + 'A': [ + [_d1, 10, 15, 5, 12], + [_d2, 12, 18, 10, 17], + [_d3, 17, 20, 11, 13], + ], +}); + +final _outputs = []; + +HTMLElement _newOutput() { + var div = HTMLDivElement() + ..style.width = '600px' + ..style.height = '400px'; + document.body!.appendChild(div); + _outputs.add(div); + return div; +} + +/// Waits until [output] contains an element matching [selector]. +Future _waitFor(HTMLElement output, String selector) async { + for (var i = 0; i < 50; i++) { + var e = output.querySelector(selector); + if (e != null) return e; + await Future.delayed(Duration(milliseconds: 50)); + } + return null; +} + +typedef _EngineFactory = ChartEngine Function(); + +void main() { + tearDown(() { + for (var o in _outputs) { + o.remove(); + } + _outputs.clear(); + }); + + final engines = { + 'ChartJS': (ChartEngineChartJS.new, 'canvas'), + 'ApexCharts': (ChartEngineApexCharts.new, 'svg'), + }; + + for (var MapEntry(key: name, value: (factory, renderedSelector)) + in engines.entries) { + group('ChartEngine[$name]', () { + late ChartEngine engine; + + setUpAll(() async { + engine = factory(); + expect(await engine.load(), isTrue); + }); + + Future expectRendered( + HTMLElement output, + RenderedChart chart, + String type, + ChartData data, + ) async { + expect(chart.engine, same(engine)); + expect(chart.type, equals(type)); + expect(chart.chartData, same(data)); + expect(chart.hasChartJSObject, isTrue); + expect( + await _waitFor(output, renderedSelector), + isNotNull, + reason: 'No `$renderedSelector` rendered for `$type`', + ); + } + + test('load', () async { + expect(engine.isLoaded, isTrue); + expect(engine.version, isNotEmpty); + expect(() => engine.checkLoaded(), returnsNormally); + // Loading again is a no-op: + expect(await engine.load(), isTrue); + }); + + test('renderLineChart', () async { + var output = _newOutput(); + var data = _lineSeries(); + var chart = engine.renderLineChart(output, data); + await expectRendered(output, chart, 'line', data); + expect(data.colors!.keys, equals(['A', 'B', 'C'])); + }); + + test('renderLineChart with options', () async { + var output = _newOutput(); + var data = _lineSeries(); + data.options + ..sortCategories = true + ..fillLines = true + ..straightLines = true + ..steppedLines = true + ..yAxisMin = 0 + ..yAxisMax = 200 + ..verticalLines = [ + VerticalLine(1, label: 'Feb'), + VerticalLine(2, color: '#0000ff'), + ] + ..onClick = (a, x, y) {}; + var chart = engine.renderLineChart(output, data); + await expectRendered(output, chart, 'line', data); + }); + + test('renderTimeSeriesChart', () async { + var output = _newOutput(); + var data = _timeSeries(); + data.options.verticalLines = [VerticalLine(1, label: 'Day 2')]; + var chart = engine.renderTimeSeriesChart(output, data); + await expectRendered(output, chart, 'time-series', data); + }); + + test('renderBarChart', () async { + var output = _newOutput(); + var data = _lineSeries(); + var chart = engine.renderBarChart(output, data); + await expectRendered(output, chart, 'bar-vertical', data); + }); + + test('renderHorizontalBarChart', () async { + var output = _newOutput(); + var data = _lineSeries(); + var chart = engine.renderHorizontalBarChart(output, data); + await expectRendered(output, chart, 'bar-horizontal', data); + }); + + test('renderGaugeChart', () async { + var output = _newOutput(); + var data = _set(); + var chart = engine.renderGaugeChart(output, data); + await expectRendered(output, chart, 'gauge', data); + expect(data.disabledColors, isNotNull); + }); + + test('renderScatterChart', () async { + var output = _newOutput(); + var data = _pairSeries(); + var chart = engine.renderScatterChart(output, data); + await expectRendered(output, chart, 'scatter', data); + }); + + test('renderScatterTimedChart', () async { + var output = _newOutput(); + var data = _timeSeries(); + var chart = engine.renderScatterTimedChart(output, data); + await expectRendered(output, chart, 'scatter-time-series', data); + }); + + test('render: dispatch by ChartData type', () async { + final cases = { + _lineSeries(): 'line', + _timeSeries(): 'time-series', + _pairSeries(): 'scatter', + _set(): 'gauge', + }; + + for (var MapEntry(key: data, value: type) in cases.entries) { + var output = _newOutput(); + var chart = engine.render(output, data)!; + await expectRendered(output, chart, type, data); + } + }); + + test('render*Async', () async { + var output = _newOutput(); + var data = _lineSeries(); + var chart = (await engine.renderAsync(output, data))!; + await expectRendered(output, chart, 'line', data); + + output = _newOutput(); + var set = _set(); + chart = await engine.renderGaugeChartAsync(output, set); + await expectRendered(output, chart, 'gauge', set); + + output = _newOutput(); + var pairs = _pairSeries(); + chart = await engine.renderScatterChartAsync(output, pairs); + await expectRendered(output, chart, 'scatter', pairs); + }); + + test('populateLastRenderedChart', () async { + var data = _lineSeries()..populateLastRenderedChart = true; + var chart = engine.renderLineChart(_newOutput(), data); + expect(data.lastRenderedChart, same(chart)); + + var data2 = _lineSeries(); + engine.renderLineChart(_newOutput(), data2); + expect(data2.lastRenderedChart, isNull); + }); + + test('refresh', () async { + var output = _newOutput(); + var data = _lineSeries(); + var chart = engine.renderLineChart(output, data); + await _waitFor(output, renderedSelector); + + data.series['A']![0] = 99; + expect(() => chart.refresh(), returnsNormally); + expect(() => chart.refreshDelayed(), returnsNormally); + await Future.delayed(Duration(milliseconds: 300)); + }); + + test('custom colorGenerator', () async { + var output = _newOutput(); + var data = _lineSeries() + ..colors = {'A': '#ff0000', 'B': '#00ff00', 'C': '#0000ff'}; + var chart = engine.renderLineChart(output, data); + await expectRendered(output, chart, 'line', data); + // User colors are preserved: + expect(data.colors!['A'], equals('#ff0000')); + }); + }); + } + + group('ChartEngineChartJS financial', () { + late ChartEngineChartJS engine; + + setUpAll(() async { + engine = ChartEngineChartJS(); + expect(await engine.loadFinancial(), isTrue); + expect(engine.isLoadedFinancial, isTrue); + }); + + test('OHLC (default)', () async { + var output = _newOutput(); + var data = _financialSeries(); + var chart = engine.renderFinancialChart(output, data); + expect(chart.type, equals('financial-ohlc')); + expect(await _waitFor(output, 'canvas'), isNotNull); + + expect( + () => chart.addOHLC('A', _d3.add(Duration(days: 1)), 13, 16, 9, 14), + returnsNormally, + ); + }); + + test('Candlestick', () async { + var output = _newOutput(); + var data = _financialSeries(); + var chart = engine.renderFinancialChart(output, data, candlestick: true); + expect(chart.type, equals('financial-candlestick')); + expect(await _waitFor(output, 'canvas'), isNotNull); + }); + + test('addDateValue', () async { + var output = _newOutput(); + var chart = engine.renderTimeSeriesChart(output, _timeSeries()); + expect( + () => chart.addDateValue(_d3.add(Duration(days: 1)), 30), + returnsNormally, + ); + }); + + test('renders into an existing canvas', () async { + var canvas = HTMLCanvasElement() + ..width = 300 + ..height = 200; + var output = _newOutput()..appendChild(canvas); + engine.renderLineChart(canvas, _lineSeries()); + expect(output.querySelectorAll('canvas').length, equals(1)); + }); + }); + + group('ChartEngineApexCharts', () { + test('financial chart is not supported', () async { + var engine = ChartEngineApexCharts(); + await engine.load(); + expect( + () => engine.renderFinancialChart(_newOutput(), _financialSeries()), + throwsUnsupportedError, + ); + }); + }); + + group('ChartEngineSwitchable', () { + late ChartEngineChartJS chartJS; + late ChartEngineApexCharts apex; + + setUpAll(() async { + chartJS = ChartEngineChartJS(); + apex = ChartEngineApexCharts(); + await chartJS.load(); + await apex.load(); + }); + + test('constructor validation', () { + expect(() => ChartEngineSwitchable({}), throwsArgumentError); + expect(() => ChartEngineSwitchable({chartJS}), throwsArgumentError); + }); + + test('engine selection', () async { + var engine = ChartEngineSwitchable({ + chartJS, + apex, + }, mainEngineType: ChartEngineChartJS); + + expect(engine.mainEngine, same(chartJS)); + expect(engine.version, equals(ChartEngineChartJS.VERSION)); + expect(engine.getEngineOfType(), same(apex)); + expect(engine.getEngineByType(ChartEngineChartJS), same(chartJS)); + + expect(await engine.load(), isTrue); + expect(engine.isLoaded, isTrue); + + engine.setMainEngineOfType(); + expect(engine.mainEngine, same(apex)); + expect(engine.version, equals(ChartEngineApexCharts.VERSION)); + + engine.setMainEngineByType(ChartEngineChartJS); + expect(engine.mainEngine, same(chartJS)); + }); + + test('renders with main engine', () async { + var engine = ChartEngineSwitchable({chartJS, apex}, mainEngine: apex); + + var output = _newOutput(); + var chart = engine.renderLineChart(output, _lineSeries()); + expect(chart, isA()); + expect(await _waitFor(output, 'svg'), isNotNull); + + output = _newOutput(); + var gauge = engine.render(output, _set())!; + expect(gauge, isA()); + expect(gauge.type, equals('gauge')); + }); + + test('renderOfEngineType restores main engine', () { + var engine = ChartEngineSwitchable({chartJS, apex}, mainEngine: apex); + + var chart = engine.renderOfEngineType( + _newOutput(), + _lineSeries(), + ); + expect(chart, isA()); + expect(engine.mainEngine, same(apex)); + + chart = engine.renderWithEngineType( + ChartEngineChartJS, + _newOutput(), + _set(), + ); + expect(chart, isA()); + expect(chart!.type, equals('gauge')); + expect(engine.mainEngine, same(apex)); + }); + + test('delegates every chart type', () async { + var engine = ChartEngineSwitchable({chartJS, apex}, mainEngine: chartJS); + + expect( + engine.renderTimeSeriesChart(_newOutput(), _timeSeries()).type, + equals('time-series'), + ); + expect( + engine.renderBarChart(_newOutput(), _lineSeries()).type, + equals('bar-vertical'), + ); + expect( + engine.renderHorizontalBarChart(_newOutput(), _lineSeries()).type, + equals('bar-horizontal'), + ); + expect( + engine.renderGaugeChart(_newOutput(), _set()).type, + equals('gauge'), + ); + expect( + engine.renderScatterChart(_newOutput(), _pairSeries()).type, + equals('scatter'), + ); + expect( + engine.renderScatterTimedChart(_newOutput(), _timeSeries()).type, + equals('scatter-time-series'), + ); + + await chartJS.loadFinancial(); + expect( + engine + .renderFinancialChart(_newOutput(), _financialSeries(), ohlc: true) + .type, + equals('financial-ohlc'), + ); + }); + }); +} diff --git a/test/chart_engine_series_test.dart b/test/chart_engine_series_test.dart index 780b175..6b743d5 100644 --- a/test/chart_engine_series_test.dart +++ b/test/chart_engine_series_test.dart @@ -9,15 +9,14 @@ void main() { setUp(() {}); test('ChartSeries', () { - var chartSeries = ChartSeries([ - 'jan', - 'feb', - 'mar' - ], { - 'spot1': [100, 200, 300], - 'spot2': [110, 210, 310], - 'spot3': [250, 150, 120] - }); + var chartSeries = ChartSeries( + ['jan', 'feb', 'mar'], + { + 'spot1': [100, 200, 300], + 'spot2': [110, 210, 310], + 'spot3': [250, 150, 120], + }, + ); expect(chartSeries.xLabels, equals(['jan', 'feb', 'mar'])); @@ -33,32 +32,34 @@ void main() { 'spot1': [ '100,${now + 1000}', '200,${now + 2000}', - '300,${now + 3000}' + '300,${now + 3000}', ], 'spot2': [ '${now + 1000},110', '${now + 2000},210', - '${now + 3000},310' + '${now + 3000},310', ], }); expect(chartSeries.xLabels, equals([])); expect( - chartSeries.series['spot1'], - equals([ - [DateTime.fromMillisecondsSinceEpoch(now + 1000), 100].join(','), - [DateTime.fromMillisecondsSinceEpoch(now + 2000), 200].join(','), - [DateTime.fromMillisecondsSinceEpoch(now + 3000), 300].join(','), - ])); + chartSeries.series['spot1'], + equals([ + [DateTime.fromMillisecondsSinceEpoch(now + 1000), 100].join(','), + [DateTime.fromMillisecondsSinceEpoch(now + 2000), 200].join(','), + [DateTime.fromMillisecondsSinceEpoch(now + 3000), 300].join(','), + ]), + ); expect( - chartSeries.series['spot2'], - equals([ - [DateTime.fromMillisecondsSinceEpoch(now + 1000), 110].join(','), - [DateTime.fromMillisecondsSinceEpoch(now + 2000), 210].join(','), - [DateTime.fromMillisecondsSinceEpoch(now + 3000), 310].join(','), - ])); + chartSeries.series['spot2'], + equals([ + [DateTime.fromMillisecondsSinceEpoch(now + 1000), 110].join(','), + [DateTime.fromMillisecondsSinceEpoch(now + 2000), 210].join(','), + [DateTime.fromMillisecondsSinceEpoch(now + 3000), 310].join(','), + ]), + ); }); test('ChartTimeSeries DateTime+int pair', () { @@ -68,32 +69,34 @@ void main() { 'spot1': [ [100, DateTime.fromMillisecondsSinceEpoch(now + 1000)], [200, DateTime.fromMillisecondsSinceEpoch(now + 2000)], - [300, DateTime.fromMillisecondsSinceEpoch(now + 3000)] + [300, DateTime.fromMillisecondsSinceEpoch(now + 3000)], ], 'spot2': [ [DateTime.fromMillisecondsSinceEpoch(now + 1000), 110], [DateTime.fromMillisecondsSinceEpoch(now + 2000), 220], - [DateTime.fromMillisecondsSinceEpoch(now + 3000), 330] + [DateTime.fromMillisecondsSinceEpoch(now + 3000), 330], ], }); expect(chartSeries.xLabels, equals([])); expect( - chartSeries.series['spot1'], - equals([ - [DateTime.fromMillisecondsSinceEpoch(now + 1000), 100], - [DateTime.fromMillisecondsSinceEpoch(now + 2000), 200], - [DateTime.fromMillisecondsSinceEpoch(now + 3000), 300] - ])); + chartSeries.series['spot1'], + equals([ + [DateTime.fromMillisecondsSinceEpoch(now + 1000), 100], + [DateTime.fromMillisecondsSinceEpoch(now + 2000), 200], + [DateTime.fromMillisecondsSinceEpoch(now + 3000), 300], + ]), + ); expect( - chartSeries.series['spot2'], - equals([ - [DateTime.fromMillisecondsSinceEpoch(now + 1000), 110], - [DateTime.fromMillisecondsSinceEpoch(now + 2000), 220], - [DateTime.fromMillisecondsSinceEpoch(now + 3000), 330] - ])); + chartSeries.series['spot2'], + equals([ + [DateTime.fromMillisecondsSinceEpoch(now + 1000), 110], + [DateTime.fromMillisecondsSinceEpoch(now + 2000), 220], + [DateTime.fromMillisecondsSinceEpoch(now + 3000), 330], + ]), + ); }); test('ChartSeriesPair', () { @@ -101,61 +104,67 @@ void main() { 'spot1': [ [1000, 100], [2000, 200], - [3000, 300] + [3000, 300], ], 'spot2': [ [1000, 110], [2000, 220], - [3000, 330] + [3000, 330], ], }); expect(chartSeries.xLabels, equals([])); expect( - chartSeries.series['spot1'], - equals([ - [1000, 100], - [2000, 200], - [3000, 300] - ])); + chartSeries.series['spot1'], + equals([ + [1000, 100], + [2000, 200], + [3000, 300], + ]), + ); expect( - chartSeries.series['spot2'], - equals([ - [1000, 110], - [2000, 220], - [3000, 330] - ])); + chartSeries.series['spot2'], + equals([ + [1000, 110], + [2000, 220], + [3000, 330], + ]), + ); expect( - chartSeries.seriesAsPairsOfList()['spot1'], - equals([ - [1000, 100], - [2000, 200], - [3000, 300] - ])); + chartSeries.seriesAsPairsOfList()['spot1'], + equals([ + [1000, 100], + [2000, 200], + [3000, 300], + ]), + ); expect( - chartSeries.seriesAsPairsOfList()['spot2'], - equals([ - [1000, 110], - [2000, 220], - [3000, 330] - ])); + chartSeries.seriesAsPairsOfList()['spot2'], + equals([ + [1000, 110], + [2000, 220], + [3000, 330], + ]), + ); expect( - chartSeries.seriesAsPairsOfMap()['spot1'], - equals([ - {'x': 1000, 'y': 100}, - {'x': 2000, 'y': 200}, - {'x': 3000, 'y': 300} - ])); + chartSeries.seriesAsPairsOfMap()['spot1'], + equals([ + {'x': 1000, 'y': 100}, + {'x': 2000, 'y': 200}, + {'x': 3000, 'y': 300}, + ]), + ); expect( - chartSeries.seriesAsPairsOfMap()['spot2'], - equals([ - {'x': 1000, 'y': 110}, - {'x': 2000, 'y': 220}, - {'x': 3000, 'y': 330} - ])); + chartSeries.seriesAsPairsOfMap()['spot2'], + equals([ + {'x': 1000, 'y': 110}, + {'x': 2000, 'y': 220}, + {'x': 3000, 'y': 330}, + ]), + ); var xScale = chartSeries.xAxisScale!; expect(xScale.minimum, equals(1000)); diff --git a/test/chart_engine_test.dart b/test/chart_engine_test.dart index 5b70d14..db752c2 100644 --- a/test/chart_engine_test.dart +++ b/test/chart_engine_test.dart @@ -60,7 +60,8 @@ void main() { print('PubSpec.version: ${pubSpec.version}'); var srcFile = File( - path.join(projectDirectory.path, 'lib/src/chart_engine_base.dart')); + path.join(projectDirectory.path, 'lib/src/chart_engine_base.dart'), + ); print(srcFile); @@ -72,9 +73,12 @@ void main() { print('srcVersion: $srcVersion'); - expect(pubSpec.version.toString(), equals(srcVersion), - reason: - 'ChartEngine.VERSION[$srcVersion] != PubSpec.version[${pubSpec.version}]'); + expect( + pubSpec.version.toString(), + equals(srcVersion), + reason: + 'ChartEngine.VERSION[$srcVersion] != PubSpec.version[${pubSpec.version}]', + ); }); }); }