scichart 2.0.0-alpha.1971 → 2.0.0-alpha.1991

package/Builder/buildAxis.d.ts

@@ -9,13 +9,13 @@ import { ELabelProviderType } from "../types/LabelProviderType";
 import { TSciChart } from "../types/TSciChart";
 /** Definition of an {@link AxisBase2D}, comprising a {@link EAxisType} and the relevant options  */
 export declare type TAxisDefinition = {
-    type: EAxisType.NumericAxis | string;
+    type: EAxisType.NumericAxis;
     options?: INumericAxisOptions;
 } | {
-    type: EAxisType.LogarithmicAxis | string;
+    type: EAxisType.LogarithmicAxis;
     options?: ILogarithmicAxisOptions;
 } | {
-    type: EAxisType.CategoryAxis | string;
+    type: EAxisType.CategoryAxis;
     options?: ICategoryAxisOptions;
 };
 /** Definition of a {@link LabelProviderBase2D}, comprising a {@link ELabelProviderType} and the relevant options  */

package/Builder/buildDataSeries.d.ts

@@ -1,9 +1,17 @@
+import { IOhlcScaleOffsetFilterOptions } from "../Charting/Model/Filters/OhlcScaleOffsetFilter";
+import { IXyFilterOptions } from "../Charting/Model/Filters/XyFilterBase";
+import { IXyMovingAverageFilterOptions } from "../Charting/Model/Filters/XyMovingAverageFilter";
+import { IXyRatioFilterOptions } from "../Charting/Model/Filters/XyRatioFilter";
+import { IXyScaleOffsetFilterOptions } from "../Charting/Model/Filters/XyScaleOffsetFilter";
+import { IXyyScaleOffsetFilterOptions } from "../Charting/Model/Filters/XyyScaleOffsetFilter";
+import { IXyzScaleOffsetFilterOptions } from "../Charting/Model/Filters/XyzScaleOffsetFilter";
 import { IDataSeries } from "../Charting/Model/IDataSeries";
 import { IOhlcDataSeriesOptions } from "../Charting/Model/OhlcDataSeries";
 import { IUniformHeatmapSeriesOptions } from "../Charting/Model/UniformHeatmapDataSeries";
 import { IXyDataSeriesOptions } from "../Charting/Model/XyDataSeries";
 import { IXyyDataSeriesOptions } from "../Charting/Model/XyyDataSeries";
 import { IXyzDataSeriesOptions } from "../Charting/Model/XyzDataSeries";
+import { EDataFilterType } from "../types/DataFilterType";
 import { TSciChart } from "../types/TSciChart";
 import { TSeriesDefinition } from "./buildSeries";
 /**
@@ -11,13 +19,38 @@ import { TSeriesDefinition } from "./buildSeries";
  * or directly in {@link chartBuilder.buildSeries} or {@link chartBuilder.buildDataSeries}
  */
 export declare type TSharedDataDefinition = Record<number | string, number[]>;
+/** Definition of a data filter */
+declare type TFilterDefinition = {
+    type: EDataFilterType.XyLinearTrend;
+    options?: IXyFilterOptions;
+} | {
+    type: EDataFilterType.XyMovingAverage;
+    options?: IXyMovingAverageFilterOptions;
+} | {
+    type: EDataFilterType.XyRatio;
+    options: IXyRatioFilterOptions;
+} | {
+    type: EDataFilterType.XyScaleOffset;
+    options?: IXyScaleOffsetFilterOptions;
+} | {
+    type: EDataFilterType.XyyScaleOffset;
+    options?: IXyyScaleOffsetFilterOptions;
+} | {
+    type: EDataFilterType.XyzScaleOffset;
+    options?: IXyzScaleOffsetFilterOptions;
+} | {
+    type: EDataFilterType.OhlcScaleOffset;
+    options?: IOhlcScaleOffsetFilterOptions;
+};
 /** Definition of XY data */
 export declare type TXySeriesData = {
     /** The id of sharedData to use for X data.  You must either specify both xDataId and yDataId, or both xValues and yValues */
     xDataId?: number | string;
     /** The id of sharedData to use for Y data.  You must either specify both xDataId and yDataId, or both xValues and yValues */
     yDataId?: number | string;
-} & IXyDataSeriesOptions;
+} & IXyDataSeriesOptions & {
+    filter?: TFilterDefinition;
+};
 /** Definition of XYY data */
 export declare type TXyySeriesData = {
     /** The id of sharedData to use for X data.
@@ -32,7 +65,9 @@ export declare type TXyySeriesData = {
      * You must either specify all of xDataId, yDataId and y1DataId, or all of xValues, yValues and y1Values
      */
     y1DataId?: number | string;
-} & IXyyDataSeriesOptions;
+} & IXyyDataSeriesOptions & {
+    filter?: TFilterDefinition;
+};
 /** Definition of XYZ data */
 export declare type TXyzSeriesData = {
     /** The id of sharedData to use for X data.
@@ -47,7 +82,9 @@ export declare type TXyzSeriesData = {
      * You must either specify all of xDataId, yDataId and zDataId, or all of xValues, yValues and zValues
      */
     zDataId?: number | string;
-} & IXyzDataSeriesOptions;
+} & IXyzDataSeriesOptions & {
+    filter?: TFilterDefinition;
+};
 /** Definition of Open, High, Low, Close data */
 export declare type TOhlcSeriesData = {
     /** The id of sharedData to use for X data.  You must either use all DataId or all Values properties.  You cannot mix them. */
@@ -60,7 +97,9 @@ export declare type TOhlcSeriesData = {
     lowDataId?: number | string;
     /** The id of sharedData to use for Close data.  You must either use all DataId or all Values properties.  You cannot mix them. */
     closeDataId?: number | string;
-} & IOhlcDataSeriesOptions;
+} & IOhlcDataSeriesOptions & {
+    filter?: TFilterDefinition;
+};
 /** Definition of series data, which can take various shapes */
 export declare type TSeriesDataDefinition = TXySeriesData | TXyySeriesData | TXyzSeriesData | TOhlcSeriesData | IUniformHeatmapSeriesOptions;
 /**
@@ -71,3 +110,4 @@ export declare type TSeriesDataDefinition = TXySeriesData | TXyySeriesData | TXy
  * @returns An {@link IDataSeries}
  */
 export declare const buildDataSeries: (wasmContext: TSciChart, seriesDefinition: TSeriesDefinition, sharedData?: TSharedDataDefinition) => IDataSeries;
+export {};

package/Builder/buildDataSeries.js

@@ -12,11 +12,19 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildDataSeries = void 0;
+var OhlcScaleOffsetFilter_1 = require("../Charting/Model/Filters/OhlcScaleOffsetFilter");
+var XyLinearTrendFilter_1 = require("../Charting/Model/Filters/XyLinearTrendFilter");
+var XyMovingAverageFilter_1 = require("../Charting/Model/Filters/XyMovingAverageFilter");
+var XyRatioFilter_1 = require("../Charting/Model/Filters/XyRatioFilter");
+var XyScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyScaleOffsetFilter");
+var XyyScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyyScaleOffsetFilter");
+var XyzScaleOffsetFilter_1 = require("../Charting/Model/Filters/XyzScaleOffsetFilter");
 var OhlcDataSeries_1 = require("../Charting/Model/OhlcDataSeries");
 var UniformHeatmapDataSeries_1 = require("../Charting/Model/UniformHeatmapDataSeries");
 var XyDataSeries_1 = require("../Charting/Model/XyDataSeries");
 var XyyDataSeries_1 = require("../Charting/Model/XyyDataSeries");
 var XyzDataSeries_1 = require("../Charting/Model/XyzDataSeries");
+var DataFilterType_1 = require("../types/DataFilterType");
 var chartBuilder_1 = require("./chartBuilder");
 function hasOwnProperty(obj, prop) {
     return obj.hasOwnProperty(prop);
@@ -36,6 +44,7 @@ exports.buildDataSeries = function (wasmContext, seriesDefinition, sharedData) {
         sharedData = JSON.parse(sharedData, chartBuilder_1.chartReviver);
     }
     var dataSeries;
+    var filterDef;
     if (hasOwnProperty(seriesDefinition, "xyData")) {
         var data = seriesDefinition.xyData;
         if (sharedData && data.xDataId) {
@@ -46,6 +55,9 @@ exports.buildDataSeries = function (wasmContext, seriesDefinition, sharedData) {
         else {
             dataSeries = new XyDataSeries_1.XyDataSeries(wasmContext, data);
         }
+        if (hasOwnProperty(data, "filter")) {
+            filterDef = data.filter;
+        }
     }
     else if (hasOwnProperty(seriesDefinition, "xyyData")) {
         var data = seriesDefinition.xyyData;
@@ -58,6 +70,9 @@ exports.buildDataSeries = function (wasmContext, seriesDefinition, sharedData) {
         else {
             dataSeries = new XyyDataSeries_1.XyyDataSeries(wasmContext, data);
         }
+        if (hasOwnProperty(data, "filter")) {
+            filterDef = data.filter;
+        }
     }
     else if (hasOwnProperty(seriesDefinition, "xyzData")) {
         var data = seriesDefinition.xyzData;
@@ -70,6 +85,9 @@ exports.buildDataSeries = function (wasmContext, seriesDefinition, sharedData) {
         else {
             dataSeries = new XyzDataSeries_1.XyzDataSeries(wasmContext, data);
         }
+        if (hasOwnProperty(data, "filter")) {
+            filterDef = data.filter;
+        }
     }
     else if (hasOwnProperty(seriesDefinition, "ohlcData")) {
         var data = seriesDefinition.ohlcData;
@@ -88,9 +106,57 @@ exports.buildDataSeries = function (wasmContext, seriesDefinition, sharedData) {
         else {
             dataSeries = new OhlcDataSeries_1.OhlcDataSeries(wasmContext, data);
         }
+        if (hasOwnProperty(data, "filter")) {
+            filterDef = data.filter;
+        }
     }
     else if (hasOwnProperty(seriesDefinition, "heatmapData")) {
         dataSeries = new UniformHeatmapDataSeries_1.UniformHeatmapDataSeries(wasmContext, seriesDefinition.heatmapData);
     }
+    if (filterDef) {
+        if ("dataSeries" in seriesDefinition.options) {
+            dataSeries = seriesDefinition.options.dataSeries;
+        }
+        if (dataSeries) {
+            var filter = buildFilter(dataSeries, filterDef);
+            if (filter) {
+                dataSeries = filter;
+            }
+        }
+    }
     return dataSeries;
 };
+var buildFilter = function (dataSeries, definition) {
+    if (definition.type === DataFilterType_1.EDataFilterType.OhlcScaleOffset) {
+        return new OhlcScaleOffsetFilter_1.OhlcScaleOffsetFilter(dataSeries, definition.options);
+    }
+    else if (definition.type === DataFilterType_1.EDataFilterType.XyLinearTrend) {
+        return new XyLinearTrendFilter_1.XyLinearTrendFilter(dataSeries, definition.options);
+    }
+    else if (definition.type === DataFilterType_1.EDataFilterType.XyMovingAverage) {
+        return new XyMovingAverageFilter_1.XyMovingAverageFilter(dataSeries, definition.options);
+    }
+    else if (definition.type === DataFilterType_1.EDataFilterType.XyRatio) {
+        var options = definition.options;
+        if (Array.isArray(options.divisorSeries)) {
+            var xValues = new Array(dataSeries.count()).fill(0);
+            definition.options.divisorSeries = new XyDataSeries_1.XyDataSeries(dataSeries.webAssemblyContext, {
+                xValues: xValues,
+                yValues: options.divisorSeries
+            });
+        }
+        return new XyRatioFilter_1.XyRatioFilter(dataSeries, definition.options);
+    }
+    else if (definition.type === DataFilterType_1.EDataFilterType.XyScaleOffset) {
+        return new XyScaleOffsetFilter_1.XyScaleOffsetFilter(dataSeries, definition.options);
+    }
+    else if (definition.type === DataFilterType_1.EDataFilterType.XyyScaleOffset) {
+        return new XyyScaleOffsetFilter_1.XyyScaleOffsetFilter(dataSeries, definition.options);
+    }
+    else if (definition.type === DataFilterType_1.EDataFilterType.XyzScaleOffset) {
+        return new XyzScaleOffsetFilter_1.XyzScaleOffsetFilter(dataSeries, definition.options);
+    }
+    else {
+        return undefined;
+    }
+};

package/Builder/buildSeries.d.ts

@@ -68,7 +68,7 @@ export declare type TEffectDefinition = {
     options?: IShadowEffectOptions;
 };
 /** Definition of a palette provider, comprising a {@link EPaletteProviderType} and the relevant options */
-export declare type TPalletProviderDefinition = {
+export declare type TPaletteProviderDefinition = {
     type: EPaletteProviderType.Gradient;
     options: GradientParams;
 } | {

package/Builder/buildSeries.js

@@ -68,7 +68,6 @@ classFactory_1.registerType(BaseType_1.EBaseType.PaletteProvider, PaletteProvide
  * @returns An array of {@link IRenderableSeries}.
  */
 exports.buildSeries = function (wasmContext, definition, sharedData) {
-    var _a;
     if (typeof definition === "string") {
         definition = JSON.parse(definition, chartBuilder_1.chartReviver);
     }
@@ -137,7 +136,7 @@ exports.buildSeries = function (wasmContext, definition, sharedData) {
             col.add.apply(col, exports.buildSeries(wasmContext, seriesDef.series, sharedData));
             series = col;
         }
-        if (series && !((_a = seriesDef.options) === null || _a === void 0 ? void 0 : _a.dataSeries)) {
+        if (series) {
             var dataSeries = buildDataSeries_1.buildDataSeries(wasmContext, seriesDef, sharedData);
             if (dataSeries) {
                 series.dataSeries = dataSeries;

package/Builder/buildSurface.d.ts

@@ -12,7 +12,7 @@ import { TSeriesDefinition } from "./buildSeries";
  * A definition that can be used to build a 2D Chart using {@link chartBuilder.buildChart}
  */
 export interface ISciChart2DDefinition {
-    /** Optional {@link IChartCreationOptions} to pass to the surface */
+    /** Optional {@link I2DSurfaceOptions} to pass to the surface */
     surface?: I2DSurfaceOptions;
     /** One or an array of {@link TAxisDefinition} to describe the X Axes.  Defaults to a single numeric axis */
     xAxes?: TAxisDefinition[] | TAxisDefinition;
@@ -32,6 +32,9 @@ export interface ISciChart2DDefinition {
      */
     onCreated?: ((surface: SciChartSurface) => void) | string;
 }
+/**
+ * A definition that can be used to build a Pie Chart using {@link chartBuilder.buildChart} or {@link chartBuilder.buildPieChart}
+ */
 export interface ISciChartPieDefinition {
     /** Optional {@link IPieSurfaceOptions} to pass to the surface */
     surface?: IPieSurfaceOptions;
@@ -46,14 +49,19 @@ export interface ISciChartPieDefinition {
     onCreated?: ((surface: SciChartPieSurface) => void) | string;
 }
 /**
- * Construct a {@link SciChartSurface} using a {@link TSurfaceDefinition} which can be pure data.
- * This method only builds the surface.  To build an entire chart use {@link chartbuilder.buildChart}
+ * Construct a chart with {@link SciChartSurface} using a {@link ISciChart2DDefinition} which can be pure data.
  * @remarks This method is async and must be awaited
  * @param divElementId The Div Element ID where the {@link SciChartSurface} will reside
- * @param definition The type of surface to create (only the default 2d surface currently supported), and the {@link IChartCreationOptions}
+ * @param definition the {@link ISciChart2DDefinition}
  */
-export declare const build2DSurface: (divElementId: string, definition: ISciChart2DDefinition | string) => Promise<{
+export declare const build2DChart: (divElementId: string, definition: ISciChart2DDefinition | string) => Promise<{
     wasmContext: import("../types/TSciChart").TSciChart;
     sciChartSurface: SciChartSurface;
 }>;
-export declare const buildPieSurface: (divElementId: string, definition: ISciChartPieDefinition | string) => Promise<SciChartPieSurface>;
+/**
+ * Construct a chart with {@link SciChartPieSurface} using a {@link ISciChartPieDefinition} which can be pure data.
+ * @remarks This method is async and must be awaited
+ * @param divElementId The Div Element ID where the {@link SciChartPieSurface} will reside
+ * @param definition the {@link ISciChartPieDefinition}
+ */
+export declare const buildPieChart: (divElementId: string, definition: ISciChartPieDefinition | string) => Promise<SciChartPieSurface>;

package/Builder/buildSurface.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildPieSurface = exports.build2DSurface = void 0;
+exports.buildPieChart = exports.build2DChart = void 0;
 var CentralAxesLayoutManager_1 = require("../Charting/LayoutManager/CentralAxesLayoutManager");
 var LayoutManager_1 = require("../Charting/LayoutManager/LayoutManager");
 var SciChartJSDarkv2Theme_1 = require("../Charting/Themes/SciChartJSDarkv2Theme");
@@ -63,13 +63,12 @@ classFactory_1.registerType(BaseType_1.EBaseType.LayoutManager, LayoutMangerType
 // register loaders
 classFactory_1.registerType(BaseType_1.EBaseType.Loader, "Default", function () { return new loader_1.DefaultSciChartLoader(); }, true);
 /**
- * Construct a {@link SciChartSurface} using a {@link TSurfaceDefinition} which can be pure data.
- * This method only builds the surface.  To build an entire chart use {@link chartbuilder.buildChart}
+ * Construct a chart with {@link SciChartSurface} using a {@link ISciChart2DDefinition} which can be pure data.
  * @remarks This method is async and must be awaited
  * @param divElementId The Div Element ID where the {@link SciChartSurface} will reside
- * @param definition The type of surface to create (only the default 2d surface currently supported), and the {@link IChartCreationOptions}
+ * @param definition the {@link ISciChart2DDefinition}
  */
-exports.build2DSurface = function (divElementId, definition) { return __awaiter(void 0, void 0, void 0, function () {
+exports.build2DChart = function (divElementId, definition) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, wasmContext, sciChartSurface;
     var _b, _c, _d, _e, _f;
     return __generator(this, function (_g) {
@@ -106,7 +105,7 @@ exports.build2DSurface = function (divElementId, definition) { return __awaiter(
                     if (typeof definition.onCreated === "string") {
                         sciChartSurface.onCreatedName = definition.onCreated;
                         // @ts-ignore
-                        definition.onCreated = getFunction(BaseType_1.EBaseType.OnCreateFunction, definition.onCreated);
+                        definition.onCreated = classFactory_1.getFunction(BaseType_1.EBaseType.OnCreateFunction, definition.onCreated);
                     }
                     // @ts-ignore
                     definition.onCreated(sciChartSurface);
@@ -115,7 +114,13 @@ exports.build2DSurface = function (divElementId, definition) { return __awaiter(
         }
     });
 }); };
-exports.buildPieSurface = function (divElementId, definition) { return __awaiter(void 0, void 0, void 0, function () {
+/**
+ * Construct a chart with {@link SciChartPieSurface} using a {@link ISciChartPieDefinition} which can be pure data.
+ * @remarks This method is async and must be awaited
+ * @param divElementId The Div Element ID where the {@link SciChartPieSurface} will reside
+ * @param definition the {@link ISciChartPieDefinition}
+ */
+exports.buildPieChart = function (divElementId, definition) { return __awaiter(void 0, void 0, void 0, function () {
     var scps, _i, _a, segmentOption, segment;
     return __generator(this, function (_b) {
         switch (_b.label) {
@@ -137,7 +142,7 @@ exports.buildPieSurface = function (divElementId, definition) { return __awaiter
                     if (typeof definition.onCreated === "string") {
                         scps.onCreatedName = definition.onCreated;
                         // @ts-ignore
-                        definition.onCreated = getFunction(BaseType_1.EBaseType.OnCreateFunction, definition.onCreated);
+                        definition.onCreated = classFactory_1.getFunction(BaseType_1.EBaseType.OnCreateFunction, definition.onCreated);
                     }
                     // @ts-ignore
                     definition.onCreated(scps);

package/Builder/chartBuilder.d.ts

@@ -21,7 +21,7 @@ export declare function chartReviver(key: string, value: any): any;
 /**
  * Builds an entire chart from a definition that can be pure data.
  * @param divElementId The Div Element ID where the {@link SciChartSurface} will reside
- * @param definition a {@link ISciChart2DDefinition } or a string which will be parsed to it.
+ * @param definition a {@link TSurfaceDefinition } or a string which will be parsed to it.
  * @returns
  */
 export declare const buildChart: (divElementId: string, definition: string | TSurfaceDefinition) => Promise<TWebAssemblyChart | SciChartPieSurface>;
@@ -35,12 +35,12 @@ export declare const chartBuilder: {
     /** @inheritdoc */
     chartReviver: typeof chartReviver;
     /** @inheritdoc */
-    build2DSurface: (divElementId: string, definition: string | ISciChart2DDefinition) => Promise<{
+    build2DChart: (divElementId: string, definition: string | ISciChart2DDefinition) => Promise<{
         wasmContext: import("../types/TSciChart").TSciChart;
         sciChartSurface: SciChartSurface;
     }>;
     /** @inheritdoc */
-    buildPieSurface: (divElementId: string, definition: string | ISciChartPieDefinition) => Promise<SciChartPieSurface>;
+    buildPieChart: (divElementId: string, definition: string | ISciChartPieDefinition) => Promise<SciChartPieSurface>;
     /** @inheritdoc */
     buildSeries: (wasmContext: import("../types/TSciChart").TSciChart, definition: {
         type: import("../types/SeriesType").ESeriesType.BandSeries;
@@ -152,6 +152,9 @@ export declare const chartBuilder: {
         options?: import("../Charting/ChartModifiers/ChartModifierBase2D").IChartModifierBaseOptions;
     } | {
         type: import("../types/ChartModifierType").EChart2DModifierType.OverviewRangeSelection;
+        /**
+         * This is just something to call to ensure that all the registrations are run before a surface is created
+         */
         options?: import("../Charting/ChartModifiers/OverviewRangeSelectionModifier").IRangeSelectionModifierOptions;
     } | {
         type: import("../types/ChartModifierType").EChart2DModifierType.Custom;
@@ -160,13 +163,13 @@ export declare const chartBuilder: {
     } | TModifierDefinition[]) => import("../Charting/ChartModifiers/ChartModifierBase2D").ChartModifierBase2D[];
     /** @inheritdoc */
     buildAxes: (wasmContext: import("../types/TSciChart").TSciChart, definition: {
-        type: string;
+        type: import("../types/AxisType").EAxisType.NumericAxis;
         options?: import("../Charting/Visuals/Axis/NumericAxis").INumericAxisOptions;
     } | {
-        type: string;
+        type: import("../types/AxisType").EAxisType.LogarithmicAxis;
         options?: import("../Charting/Visuals/Axis/LogarithmicAxis").ILogarithmicAxisOptions;
     } | {
-        type: string;
+        type: import("../types/AxisType").EAxisType.CategoryAxis;
         options?: import("../Charting/Visuals/Axis/CategoryAxis").ICategoryAxisOptions;
     } | TAxisDefinition[]) => import("../Charting/Visuals/Axis/AxisBase2D").AxisBase2D[];
     /** @inheritdoc */
@@ -177,6 +180,9 @@ export declare const chartBuilder: {
         type: import("../Charting/Visuals/Annotations/IAnnotation").EAnnotationType.RenderContextBoxAnnotation;
         options?: import("../Charting/Visuals/Annotations/BoxAnnotation").IBoxAnnotationOptions;
     } | {
+        /**
+         * The reviver function needed when parsing definitions to JSON
+         */
         type: import("../Charting/Visuals/Annotations/IAnnotation").EAnnotationType.RenderContextHorizontalLineAnnotation;
         options?: import("../Charting/Visuals/Annotations/LineAnnotation").ILineAnnotationOptions;
     } | {

package/Builder/chartBuilder.js

@@ -68,7 +68,7 @@ exports.chartReviver = chartReviver;
 /**
  * Builds an entire chart from a definition that can be pure data.
  * @param divElementId The Div Element ID where the {@link SciChartSurface} will reside
- * @param definition a {@link ISciChart2DDefinition } or a string which will be parsed to it.
+ * @param definition a {@link TSurfaceDefinition } or a string which will be parsed to it.
  * @returns
  */
 exports.buildChart = function (divElementId, definition) { return __awaiter(void 0, void 0, void 0, function () {
@@ -83,17 +83,17 @@ exports.buildChart = function (divElementId, definition) { return __awaiter(void
                 }
                 if (!("type" in definition)) return [3 /*break*/, 6];
                 if (!(definition.type === SciChartSurfaceType_1.ESciChartSurfaceType.Default2D)) return [3 /*break*/, 2];
-                return [4 /*yield*/, buildSurface_1.build2DSurface(divElementId, definition.options)];
+                return [4 /*yield*/, buildSurface_1.build2DChart(divElementId, definition.options)];
             case 1: return [2 /*return*/, _a.sent()];
             case 2:
                 if (!(definition.type === SciChartSurfaceType_1.ESciChartSurfaceType.Pie2D)) return [3 /*break*/, 4];
-                return [4 /*yield*/, buildSurface_1.buildPieSurface(divElementId, definition.options)];
+                return [4 /*yield*/, buildSurface_1.buildPieChart(divElementId, definition.options)];
             case 3: return [2 /*return*/, _a.sent()];
             case 4: 
             // @ts-ignore
             throw new Error("Surface type: " + definition.type + " is not yet supported by the builder api");
             case 5: return [3 /*break*/, 8];
-            case 6: return [4 /*yield*/, buildSurface_1.build2DSurface(divElementId, definition)];
+            case 6: return [4 /*yield*/, buildSurface_1.build2DChart(divElementId, definition)];
             case 7: return [2 /*return*/, _a.sent()];
             case 8: return [2 /*return*/];
         }
@@ -109,9 +109,9 @@ exports.chartBuilder = {
     /** @inheritdoc */
     chartReviver: chartReviver,
     /** @inheritdoc */
-    build2DSurface: buildSurface_1.build2DSurface,
+    build2DChart: buildSurface_1.build2DChart,
     /** @inheritdoc */
-    buildPieSurface: buildSurface_1.buildPieSurface,
+    buildPieChart: buildSurface_1.buildPieChart,
     /** @inheritdoc */
     buildSeries: buildSeries_1.buildSeries,
     /** @inheritdoc */