Defaults are now applied at serialization time. This allows the fluent API a chance to configure before defaults are applied to patch missing values.

Author: ashleydavis

src/expand-chart-def.ts

@@ -73,15 +73,8 @@ export function expandAxisMap(axisMap: IAxisMap, columns: string[]): IExpandedAx
         expandedAxisMap.x = expandSeriesConfig(axisMap.x);
     }
 
-    if ((!axisMap.y ||  (isArray(axisMap.y)  && axisMap.y.length === 0)) &&
-        (!axisMap.y2 || (isArray(axisMap.y2) && axisMap.y2.length === 0))) {
-        expandedAxisMap.y = expandYSeriesConfigArray(columns);
-        expandedAxisMap.y2 = [];        
-    }
-    else {
-        expandedAxisMap.y = expandYSeriesConfigArray(axisMap.y);
-        expandedAxisMap.y2 = expandYSeriesConfigArray(axisMap.y2);
-    }
+    expandedAxisMap.y = expandYSeriesConfigArray(axisMap.y);
+    expandedAxisMap.y2 = expandYSeriesConfigArray(axisMap.y2);
 
     return expandedAxisMap;
 }

src/plot-api.ts

@@ -6,7 +6,7 @@ import { captureImage, ICaptureOptions } from "capture-template";
 import { IPlotConfig, IAxisMap } from "./chart-def";
 import { isObject, isString, isArray } from "./utils";
 import { ChartType, IChartDef, AxisType, HorizontalLabelPosition, VerticalLabelPosition, IAxisConfig, IYAxisSeriesConfig, IAxisSeriesConfig } from "@data-forge-plot/chart-def";
-import { expandChartDef } from "./expand-chart-def";
+import { expandChartDef, expandYSeriesConfigArray } from "./expand-chart-def";
 import { ISeriesConfig } from "data-forge/build/lib/series";
 
 const DEFAULT_CHART_PACKAGE = "@data-forge-plot/apex";
@@ -412,9 +412,21 @@ export abstract class AbstractPlotAPI implements IPlotAPI {
      * The JSON definition of the chart can be used to instantiate the chart in a browser.
      */
     serialize(): IChartDef {
-        return this.chartDef;
+
+        // Set defaults after configuration by fluent API.
+        // TODO: This could be better in it's own function.
+
+        const chartDef = Object.assign({}, this.chartDef);
+        chartDef.axisMap = Object.assign({}, this.chartDef.axisMap);
+
+        if (chartDef.axisMap.y.length === 0 &&
+            chartDef.axisMap.y2.length === 0) {
+            chartDef.axisMap.y = expandYSeriesConfigArray(chartDef.data.columnOrder);
+        }
+
+        return chartDef;
     }
-    
+
     /**
      * Used to external detect the type of this object.
      */

src/test/dataframe-fluent.test._ts src/test/dataframe-fluent.test.tssrc/test/dataframe-fluent.test._ts renamed to src/test/dataframe-fluent.test.ts

@@ -1,6 +1,3 @@
-TODO: Want to get this test working again.
-Should also get this type of test working for series.
-
 import "jest";
 import { DataFrame } from "data-forge";
 import "../index";
@@ -9,7 +6,7 @@ describe("data-forge-plot - dataframe fluent", () => {
 
     it("can explicity set y axis", ()  => {
 
-        const df = new DataFrame({ index: [1, 2, 3], values: [{ A: 10 }, { A: 20 }, { A: 30 } ] });
+        const df = new DataFrame({ index: [1, 2, 3], values: [{ A: 10, }, { A: 20 }, { A: 30 } ] });
         const plotAPI = df.plot()
             .y()
                 .addSeries("A");
@@ -40,15 +37,8 @@ describe("data-forge-plot - dataframe fluent", () => {
             },
             plotConfig: {
                 chartType: "line",
-                x: {
-                },
                 y: {
                 },
-                y2: {
-                },
-                legend: {
-                    show: true,
-                },
             },
             axisMap: {
                 y: [

src/test/expand-chart-def.test.ts

@@ -114,26 +114,6 @@ describe("expand chart def", () => {
         });
     });
 
-    it("y axis defaults to all columns when no y axis series is specified", () => {
-
-        const data: any = { columnOrder: ["a", "b", "c"] };
-        const plotConfig: any = {};
-        const axisMap: any = {};
-        const chartDef = expandChartDef(data, plotConfig, axisMap);
-        expect(chartDef.axisMap.y).toEqual([
-            {
-                series: "a",
-            },
-            {
-                series: "b",
-            },
-            {
-                series: "c",
-            },
-        ]);
-        expect(chartDef.axisMap.y2).toEqual([]);
-    });
-
     it("y does not default when y is specified", () => {
 
         const data: any = { columnOrder: ["a", "b", "c"] };

src/test/plot-api.test.ts

@@ -451,4 +451,27 @@ describe("plot-api", () => {
         await plot.exportWeb(outputPath);
         expect(exportTemplate).toHaveBeenCalled();
     });
+
+    it("y axis defaults to all columns when no y axis series is specified", () => {
+
+        const data: any = { columnOrder: ["a", "b", "c"] };
+        const plotConfig: any = {};
+        const axisMap: any = {};
+        const plot = new PlotAPI(data, plotConfig, axisMap);
+        const chartDef = plot.serialize();
+        expect(chartDef.axisMap.y).toEqual([
+            {
+                series: "a",
+            },
+            {
+                series: "b",
+            },
+            {
+                series: "c",
+            },
+        ]);
+        expect(chartDef.axisMap.y2).toEqual([]);
+    });
+
+
 });