Make content's type more generic

ahmadsoe · Aug 7, 2024 · 3c6409c · 3c6409c
1 parent 7afe1be
commit 3c6409c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/ember-highcharts/src/components/high-charts.ts b/ember-highcharts/src/components/high-charts.ts
@@ -25,7 +25,7 @@ const CHART_TYPES = {
   undefined: 'chart',
 } as const;
 
-interface HighChartsSignature {
+interface HighChartsSignature<Content extends Highcharts.Options['series']> {
   Element: HTMLDivElement;
   Args: {
     /**
@@ -36,7 +36,7 @@ interface HighChartsSignature {
      * The `content` argument matches up with the `series` option in the Highcharts/Highstock/Highmaps API.
      * Use this option to set the series data for your chart.
      */
-    content?: Highcharts.Options['series'];
+    content?: Content;
     /**
      * The `chartOptions` argument is a generic object for setting different options with Highcharts/Highstock/Highmaps.
      * Use this option to set things like the chart title and axis settings.
@@ -56,7 +56,9 @@ interface HighChartsSignature {
   };
 }
 
-export default class HighCharts extends Component<HighChartsSignature> {
+export default class HighCharts<
+  Content extends Highcharts.Options['series'],
+> extends Component<HighChartsSignature<Content>> {
   get content() {
     return this.args.content ?? undefined;
   }
@@ -121,9 +123,9 @@ export default class HighCharts extends Component<HighChartsSignature> {
   onDidUpdate(
     _elem: unknown,
     [content, chartOptions, mode]: [
-      HighChartsSignature['Args']['content'],
-      HighChartsSignature['Args']['chartOptions'],
-      HighChartsSignature['Args']['mode'],
+      HighChartsSignature<Content>['Args']['content'],
+      HighChartsSignature<Content>['Args']['chartOptions'],
+      HighChartsSignature<Content>['Args']['mode'],
     ],
   ) {
     const { chart } = this;

diff --git a/ember-highcharts/src/utils/build-options.ts b/ember-highcharts/src/utils/build-options.ts
@@ -9,10 +9,12 @@ export const EMPTY_CHART_CONTENT = [
   },
 ] as const;
 
-export default function buildOptions(
+export default function buildOptions<
+  Content extends Highcharts.Options['series'],
+>(
   theme: Highcharts.Options = {},
   options: Highcharts.Options = {},
-  content?: Highcharts.Options['series'],
+  content?: Content,
 ) {
   // if 'no-data-to-display' module has been imported, keep empty series
   // and leave it to highcharts to show no data label.

diff --git a/ember-highcharts/src/utils/chart-data.ts b/ember-highcharts/src/utils/chart-data.ts
@@ -1,12 +1,14 @@
 import type Highcharts from 'highcharts';
 
-export function getSeriesMap(seriesGroup: Array<Highcharts.SeriesOptionsType>) {
+export function getSeriesMap<Content extends Highcharts.SeriesOptionsType>(
+  seriesGroup: Array<Content>,
+) {
   const seriesMap = seriesGroup.reduce(
     (seriesMap, seriesItem) => {
       seriesMap[seriesItem.name as string] = seriesItem;
       return seriesMap;
     },
-    {} as { [key: string]: Highcharts.SeriesOptionsType },
+    {} as { [key: string]: Content },
   );
 
   return seriesMap;