mdt-charts 1.28.2 → 1.29.0

package/lib/model/notations/twoDimensionalModel.js

@@ -3,169 +3,337 @@ import { TwoDimensionalChartStyleModel } from "../chartStyleModel/twoDimensional
 import { AxisModel } from "../featuresModel/axisModel";
 import { ScaleAxisRecalcer } from "../featuresModel/scaleModel/scaleAxisRecalcer";
 import { ScaleModel } from "../featuresModel/scaleModel/scaleModel";
-import { calculateBarIndexes, getAreaViewOptions, getBarViewOptions, getLegendMarkerOptions, LINE_CHART_DEFAULT_WIDTH, parseDashStyles, parseShape } from "./twoDimensional/styles";
-import { calculateValueLabelAlignment, ValueLabelCoordinateCalculator } from "../../model/featuresModel/valueLabelsModel/valueLabelsModel";
+import {
+	calculateBarIndexes,
+	getAreaViewOptions,
+	getBarViewOptions,
+	getLegendMarkerOptions,
+	LINE_CHART_DEFAULT_WIDTH,
+	parseDashStyles,
+	parseShape
+} from "./twoDimensional/styles";
+import {
+	calculateValueLabelAlignment,
+	ValueLabelCoordinateCalculator
+} from "../../model/featuresModel/valueLabelsModel/valueLabelsModel";
 import { TwoDimensionalModelHelper } from "../helpers/twoDimensionalModelHelper";
 import { TitleConfigReader } from "../modelInstance/titleConfigReader";
 export class TwoDimensionalModel {
-    static getOptions(configReader, designerConfig, modelInstance) {
-        const options = configReader.options;
-        const canvasModel = modelInstance.canvasModel;
-        const scaleModel = new ScaleModel(options, canvasModel);
-        const scaleMarginRecalcer = new ScaleAxisRecalcer(() => scaleModel.getScaleLinear(modelInstance.dataModel.repository.getScopedRows(), configReader));
-        scaleMarginRecalcer.recalculateMargin(canvasModel, options.orientation, options.axis.key);
-        const scaleValueInfo = scaleMarginRecalcer.getScaleValue();
-        let secondaryScaleValueInfo;
-        if (configReader.containsSecondaryAxis()) {
-            const secondaryScaleMarginRecalcer = new ScaleAxisRecalcer(() => scaleModel.getScaleSecondaryLinear(modelInstance.dataModel.repository.getScopedRows(), configReader));
-            secondaryScaleMarginRecalcer.recalculateMargin(canvasModel, options.orientation, options.axis.key);
-            secondaryScaleValueInfo = secondaryScaleMarginRecalcer.getScaleValue();
-        }
-        const keyAxis = AxisModel.getKeyAxis(options, modelInstance.dataModel.repository.getScopedFullSource(), designerConfig.canvas.axisLabel, canvasModel, designerConfig.elementsOptions.tooltip, () => scaleValueInfo.scaleFn(0));
-        const charts = this.getChartsModel(options.charts, configReader, options.orientation, designerConfig, modelInstance.dataModel.repository, keyAxis.orient, canvasModel, options.data.keyField.name, modelInstance);
-        const titleConfig = TitleConfigReader.create(options.title, modelInstance);
-        return {
-            legend: canvasModel.legendCanvas.getModel(),
-            title: {
-                textContent: titleConfig.getTextContent(),
-                fontSize: titleConfig.getFontSize()
-            },
-            selectable: !!options.selectable,
-            orient: options.orientation,
-            scale: Object.assign({ key: scaleModel.getScaleKey(modelInstance.dataModel.getAllowableKeys()), value: scaleValueInfo.scale }, (configReader.containsSecondaryAxis() && { valueSecondary: secondaryScaleValueInfo.scale })),
-            axis: Object.assign({ key: keyAxis, value: AxisModel.getMainValueAxis(configReader.calculateDefaultAxisLabelFormatter(), options.orientation, options.axis.value.position, options.axis.value, designerConfig.canvas.axisLabel, canvasModel, scaleValueInfo.scale) }, (configReader.containsSecondaryAxis() && {
-                valueSecondary: AxisModel.getSecondaryValueAxis(configReader.calculateDefaultAxisLabelFormatter(), options.orientation, options.axis.value.position, options.axis.valueSecondary, designerConfig.canvas.axisLabel, canvasModel, secondaryScaleValueInfo.scale)
-            })),
-            type: options.type,
-            data: Object.assign({}, options.data),
-            charts,
-            additionalElements: this.getAdditionalElements(options),
-            tooltip: options.tooltip,
-            chartSettings: this.getChartsSettings(designerConfig.canvas.chartOptions, options.orientation),
-            valueLabels: TwoDimensionalModelHelper.getValueLabels(options.valueLabels, canvasModel, options.orientation, configReader.getValueLabelsStyleModel()),
-            defs: {
-                gradients: TwoDimensionalModelHelper.getGradientDefs(charts, keyAxis.orient, options.orientation, modelInstance.version.getVersionNumber())
-            }
-        };
-    }
-    static getChartsEmbeddedLabelsFlag(charts, chartOrientation) {
-        // Если НЕ найден хотя бы один чарт, который сегментированный или хотя бы один НЕ бар чарт, то лейблы можно прятать
-        return (charts.findIndex((chart) => chart.isSegmented || chart.type !== "bar") === -1 &&
-            chartOrientation === "horizontal" &&
-            charts.length === this.findChartsWithEmbeddedKeyLabels(charts).length);
-    }
-    /**
-     * Сортирует список чартов в порядке: area - bar - line.
-     * Используется для того, чтобы при рендере графики с наибольшей площадью (area) не перекрывали графики с меньшей площадью (bar, line).
-     * @param charts Чарты из конфига
-     */
-    static sortCharts(charts) {
-        const chartOrder = ["area", "bar", "line", "dot"];
-        charts.sort((chart1, chart2) => chartOrder.indexOf(chart1.type) - chartOrder.indexOf(chart2.type));
-    }
-    static getChartsSettings(chartOptions, chartOrientation) {
-        var _a;
-        return {
-            bar: Object.assign({}, chartOptions.bar),
-            lineLike: { shape: parseShape(chartOrientation, (_a = chartOptions.line) === null || _a === void 0 ? void 0 : _a.shape) }
-        };
-    }
-    static getChartsModel(charts, configReader, chartOrientation, designerConfig, dataModelRep, keyAxisOrient, canvasModel, keyFieldName, modelInstance) {
-        const styleModel = new TwoDimensionalChartStyleModel(charts, designerConfig.chartStyle);
-        const chartsModel = [];
-        charts.forEach((chart, index) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
-            const style = styleModel.getChartStyle(chart, index);
-            const valueLabelsCoordinateCalculator = new ValueLabelCoordinateCalculator((_b = (_a = chart.valueLabels) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.mode, keyAxisOrient, canvasModel.getMargin());
-            const valueLabelsAlignment = calculateValueLabelAlignment(keyAxisOrient, (_d = (_c = chart.valueLabels) === null || _c === void 0 ? void 0 : _c.position) === null || _d === void 0 ? void 0 : _d.mode, (_e = chart.valueLabels) === null || _e === void 0 ? void 0 : _e.rotation);
-            chartsModel.push({
-                type: chart.type,
-                isSegmented: chart.isSegmented,
-                data: Object.assign({}, chart.data),
-                tooltip: { show: true },
-                cssClasses: ChartStyleModelService.getCssClasses(index),
-                style,
-                embeddedLabels: this.getEmbeddedLabelType(chart, chartOrientation),
-                markersOptions: {
-                    show: ({ row, valueFieldName }) => TwoDimensionalModelHelper.shouldMarkerShow(chart, dataModelRep.getRawRows(), valueFieldName, row, keyFieldName),
-                    styles: {
-                        highlighted: {
-                            size: {
-                                radius: (_h = (_g = (_f = designerConfig.canvas.markers) === null || _f === void 0 ? void 0 : _f.highlighted) === null || _g === void 0 ? void 0 : _g.radius) !== null && _h !== void 0 ? _h : 4,
-                                borderSize: "3.5px"
-                            }
-                        },
-                        normal: {
-                            size: {
-                                radius: (_l = (_k = (_j = designerConfig.canvas.markers) === null || _j === void 0 ? void 0 : _j.normal) === null || _k === void 0 ? void 0 : _k.radius) !== null && _l !== void 0 ? _l : 3,
-                                borderSize: `${(_p = (_o = (_m = designerConfig.canvas.markers) === null || _m === void 0 ? void 0 : _m.normal) === null || _o === void 0 ? void 0 : _o.borderSize) !== null && _p !== void 0 ? _p : 2}px`
-                            }
-                        }
-                    }
-                },
-                lineLikeViewOptions: {
-                    dashedStyles: parseDashStyles((_q = chart.lineStyles) === null || _q === void 0 ? void 0 : _q.dash),
-                    strokeWidth: (_s = (_r = chart.lineStyles) === null || _r === void 0 ? void 0 : _r.width) !== null && _s !== void 0 ? _s : LINE_CHART_DEFAULT_WIDTH,
-                    renderForKey: (dataRow, valueFieldName) => dataRow[valueFieldName] !== null && dataRow[valueFieldName] !== undefined
-                },
-                barViewOptions: getBarViewOptions(chart, keyAxisOrient, calculateBarIndexes(charts, chart, index)),
-                legend: getLegendMarkerOptions(chart),
-                index,
-                valueLabels: {
-                    show: (_u = (_t = chart.valueLabels) === null || _t === void 0 ? void 0 : _t.on) !== null && _u !== void 0 ? _u : false,
-                    handleX: (scaledValue) => valueLabelsCoordinateCalculator.getValueLabelX(scaledValue),
-                    handleY: (scaledValue) => valueLabelsCoordinateCalculator.getValueLabelY(scaledValue),
-                    handleScaledValue: (dataRow, datumField) => {
-                        var _a, _b, _c, _d;
-                        if (!((_b = (_a = chart.valueLabels) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.mode) || ((_d = (_c = chart.valueLabels) === null || _c === void 0 ? void 0 : _c.position) === null || _d === void 0 ? void 0 : _d.mode) === "after")
-                            return dataRow[datumField];
-                        if (chart.isSegmented)
-                            return dataRow[datumField] - (dataRow[datumField] - dataRow["0"]) / 2;
-                        else
-                            return dataRow[datumField] / 2;
-                    },
-                    textAnchor: valueLabelsAlignment.textAnchor,
-                    dominantBaseline: valueLabelsAlignment.dominantBaseline,
-                    format: configReader.getValueLabelFormatterForChart(index),
-                    rotation: (_v = chart.valueLabels) === null || _v === void 0 ? void 0 : _v.rotation,
-                    handleElement: (_w = chart.valueLabels) === null || _w === void 0 ? void 0 : _w.handleElement
-                },
-                areaViewOptions: getAreaViewOptions(chart, index, style, modelInstance.version.getVersionNumber()),
-                dotViewOptions: {
-                    shape: {
-                        type: "line",
-                        handleEndCoordinate: (v) => v + 2,
-                        handleStartCoordinate: (v) => v - 2,
-                        width: (_z = (_y = (_x = chart.dotLikeStyles) === null || _x === void 0 ? void 0 : _x.shape) === null || _y === void 0 ? void 0 : _y.width) !== null && _z !== void 0 ? _z : LINE_CHART_DEFAULT_WIDTH
-                    }
-                }
-            });
-        });
-        return chartsModel;
-    }
-    static findChartsWithEmbeddedKeyLabels(charts) {
-        const chartsWithEmbeddedLabels = [];
-        charts.forEach((chart) => {
-            if (chart.type === "bar" && chart.embeddedLabels === "key")
-                chartsWithEmbeddedLabels.push(chart);
-        });
-        return chartsWithEmbeddedLabels;
-    }
-    static getEmbeddedLabelType(currentChart, chartOrientation) {
-        if (chartOrientation === "horizontal" && currentChart.type === "bar")
-            return currentChart.embeddedLabels;
-        return "none";
-    }
-    static getAdditionalElements(options) {
-        var _a, _b;
-        const { flag, styles } = options.additionalElements.gridLine;
-        return {
-            gridLine: {
-                flag,
-                styles: {
-                    dash: { on: (_b = (_a = styles === null || styles === void 0 ? void 0 : styles.dash) === null || _a === void 0 ? void 0 : _a.on) !== null && _b !== void 0 ? _b : false }
-                }
-            }
-        };
-    }
+	static getOptions(configReader, designerConfig, modelInstance) {
+		const options = configReader.options;
+		const canvasModel = modelInstance.canvasModel;
+		const scaleModel = new ScaleModel(options, canvasModel);
+		const scaleMarginRecalcer = new ScaleAxisRecalcer(() =>
+			scaleModel.getScaleLinear(modelInstance.dataModel.repository.getScopedRows(), configReader)
+		);
+		scaleMarginRecalcer.recalculateMargin(canvasModel, options.orientation, options.axis.key);
+		const scaleValueInfo = scaleMarginRecalcer.getScaleValue();
+		let secondaryScaleValueInfo;
+		if (configReader.containsSecondaryAxis()) {
+			const secondaryScaleMarginRecalcer = new ScaleAxisRecalcer(() =>
+				scaleModel.getScaleSecondaryLinear(modelInstance.dataModel.repository.getScopedRows(), configReader)
+			);
+			secondaryScaleMarginRecalcer.recalculateMargin(canvasModel, options.orientation, options.axis.key);
+			secondaryScaleValueInfo = secondaryScaleMarginRecalcer.getScaleValue();
+		}
+		const keyAxis = AxisModel.getKeyAxis(
+			options,
+			modelInstance.dataModel.repository.getScopedFullSource(),
+			designerConfig.canvas.axisLabel,
+			canvasModel,
+			designerConfig.elementsOptions.tooltip,
+			() => scaleValueInfo.scaleFn(0)
+		);
+		const charts = this.getChartsModel(
+			options.charts,
+			configReader,
+			options.orientation,
+			designerConfig,
+			modelInstance.dataModel.repository,
+			keyAxis.orient,
+			canvasModel,
+			options.data.keyField.name,
+			modelInstance
+		);
+		const titleConfig = TitleConfigReader.create(options.title, modelInstance);
+		return {
+			legend: canvasModel.legendCanvas.getModel(),
+			title: {
+				textContent: titleConfig.getTextContent(),
+				fontSize: titleConfig.getFontSize()
+			},
+			selectable: !!options.selectable,
+			orient: options.orientation,
+			scale: Object.assign(
+				{
+					key: scaleModel.getScaleKey(modelInstance.dataModel.getAllowableKeys()),
+					value: scaleValueInfo.scale
+				},
+				configReader.containsSecondaryAxis() && {
+					valueSecondary: secondaryScaleValueInfo.scale
+				}
+			),
+			axis: Object.assign(
+				{
+					key: keyAxis,
+					value: AxisModel.getMainValueAxis(
+						configReader.calculateDefaultAxisLabelFormatter(),
+						options.orientation,
+						options.axis.value.position,
+						options.axis.value,
+						designerConfig.canvas.axisLabel,
+						canvasModel,
+						scaleValueInfo.scale
+					)
+				},
+				configReader.containsSecondaryAxis() && {
+					valueSecondary: AxisModel.getSecondaryValueAxis(
+						configReader.calculateDefaultAxisLabelFormatter(),
+						options.orientation,
+						options.axis.value.position,
+						options.axis.valueSecondary,
+						designerConfig.canvas.axisLabel,
+						canvasModel,
+						secondaryScaleValueInfo.scale
+					)
+				}
+			),
+			type: options.type,
+			data: Object.assign({}, options.data),
+			charts,
+			additionalElements: this.getAdditionalElements(options),
+			tooltip: options.tooltip,
+			chartSettings: this.getChartsSettings(designerConfig.canvas.chartOptions, options.orientation),
+			valueLabels: TwoDimensionalModelHelper.getValueLabels(
+				options.valueLabels,
+				canvasModel,
+				options.orientation,
+				configReader.getValueLabelsStyleModel()
+			),
+			defs: {
+				gradients: TwoDimensionalModelHelper.getGradientDefs(
+					charts,
+					keyAxis.orient,
+					options.orientation,
+					modelInstance.version.getVersionNumber()
+				)
+			}
+		};
+	}
+	static getChartsEmbeddedLabelsFlag(charts, chartOrientation) {
+		// Если НЕ найден хотя бы один чарт, который сегментированный или хотя бы один НЕ бар чарт, то лейблы можно прятать
+		return (
+			charts.findIndex((chart) => chart.isSegmented || chart.type !== "bar") === -1 &&
+			chartOrientation === "horizontal" &&
+			charts.length === this.findChartsWithEmbeddedKeyLabels(charts).length
+		);
+	}
+	/**
+	 * Сортирует список чартов в порядке: area - bar - line.
+	 * Используется для того, чтобы при рендере графики с наибольшей площадью (area) не перекрывали графики с меньшей площадью (bar, line).
+	 * @param charts Чарты из конфига
+	 */
+	static sortCharts(charts) {
+		const chartOrder = ["area", "bar", "line", "dot"];
+		charts.sort((chart1, chart2) => chartOrder.indexOf(chart1.type) - chartOrder.indexOf(chart2.type));
+	}
+	static getChartsSettings(chartOptions, chartOrientation) {
+		var _a;
+		return {
+			bar: Object.assign({}, chartOptions.bar),
+			lineLike: {
+				shape: parseShape(
+					chartOrientation,
+					(_a = chartOptions.line) === null || _a === void 0 ? void 0 : _a.shape
+				)
+			}
+		};
+	}
+	static getChartsModel(
+		charts,
+		configReader,
+		chartOrientation,
+		designerConfig,
+		dataModelRep,
+		keyAxisOrient,
+		canvasModel,
+		keyFieldName,
+		modelInstance
+	) {
+		const styleModel = new TwoDimensionalChartStyleModel(charts, designerConfig.chartStyle);
+		const chartsModel = [];
+		charts.forEach((chart, index) => {
+			var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+			const style = styleModel.getChartStyle(chart, index);
+			const valueLabelsCoordinateCalculator = new ValueLabelCoordinateCalculator(
+				(_b = (_a = chart.valueLabels) === null || _a === void 0 ? void 0 : _a.position) === null ||
+				_b === void 0
+					? void 0
+					: _b.mode,
+				keyAxisOrient,
+				canvasModel.getMargin()
+			);
+			const valueLabelsAlignment = calculateValueLabelAlignment(
+				keyAxisOrient,
+				(_d = (_c = chart.valueLabels) === null || _c === void 0 ? void 0 : _c.position) === null ||
+					_d === void 0
+					? void 0
+					: _d.mode,
+				(_e = chart.valueLabels) === null || _e === void 0 ? void 0 : _e.rotation
+			);
+			chartsModel.push({
+				type: chart.type,
+				isSegmented: chart.isSegmented,
+				data: Object.assign({}, chart.data),
+				tooltip: { show: true },
+				cssClasses: ChartStyleModelService.getCssClasses(index),
+				style,
+				embeddedLabels: this.getEmbeddedLabelType(chart, chartOrientation),
+				markersOptions: {
+					show: ({ row, valueFieldName }) =>
+						TwoDimensionalModelHelper.shouldMarkerShow(
+							chart,
+							dataModelRep.getRawRows(),
+							valueFieldName,
+							row,
+							keyFieldName
+						),
+					styles: {
+						highlighted: {
+							size: {
+								radius:
+									(_h =
+										(_g =
+											(_f = designerConfig.canvas.markers) === null || _f === void 0
+												? void 0
+												: _f.highlighted) === null || _g === void 0
+											? void 0
+											: _g.radius) !== null && _h !== void 0
+										? _h
+										: 4,
+								borderSize: "3.5px"
+							}
+						},
+						normal: {
+							size: {
+								radius:
+									(_l =
+										(_k =
+											(_j = designerConfig.canvas.markers) === null || _j === void 0
+												? void 0
+												: _j.normal) === null || _k === void 0
+											? void 0
+											: _k.radius) !== null && _l !== void 0
+										? _l
+										: 3,
+								borderSize: `${
+									(_p =
+										(_o =
+											(_m = designerConfig.canvas.markers) === null || _m === void 0
+												? void 0
+												: _m.normal) === null || _o === void 0
+											? void 0
+											: _o.borderSize) !== null && _p !== void 0
+										? _p
+										: 2
+								}px`
+							}
+						}
+					}
+				},
+				lineLikeViewOptions: {
+					dashedStyles: parseDashStyles((_q = chart.lineStyles) === null || _q === void 0 ? void 0 : _q.dash),
+					strokeWidth:
+						(_s = (_r = chart.lineStyles) === null || _r === void 0 ? void 0 : _r.width) !== null &&
+						_s !== void 0
+							? _s
+							: LINE_CHART_DEFAULT_WIDTH,
+					renderForKey: (dataRow, valueFieldName) =>
+						dataRow[valueFieldName] !== null && dataRow[valueFieldName] !== undefined
+				},
+				barViewOptions: getBarViewOptions(chart, keyAxisOrient, calculateBarIndexes(charts, chart, index)),
+				legend: getLegendMarkerOptions(chart),
+				index,
+				valueLabels: {
+					show:
+						(_u = (_t = chart.valueLabels) === null || _t === void 0 ? void 0 : _t.on) !== null &&
+						_u !== void 0
+							? _u
+							: false,
+					handleX: (scaledValue) => valueLabelsCoordinateCalculator.getValueLabelX(scaledValue),
+					handleY: (scaledValue) => valueLabelsCoordinateCalculator.getValueLabelY(scaledValue),
+					handleScaledValue: (dataRow, datumField) => {
+						var _a, _b, _c, _d;
+						if (
+							!((_b = (_a = chart.valueLabels) === null || _a === void 0 ? void 0 : _a.position) ===
+								null || _b === void 0
+								? void 0
+								: _b.mode) ||
+							((_d = (_c = chart.valueLabels) === null || _c === void 0 ? void 0 : _c.position) ===
+								null || _d === void 0
+								? void 0
+								: _d.mode) === "after"
+						)
+							return dataRow[datumField];
+						if (chart.isSegmented) return dataRow[datumField] - (dataRow[datumField] - dataRow["0"]) / 2;
+						else return dataRow[datumField] / 2;
+					},
+					textAnchor: valueLabelsAlignment.textAnchor,
+					dominantBaseline: valueLabelsAlignment.dominantBaseline,
+					format: configReader.getValueLabelFormatterForChart(index),
+					rotation: (_v = chart.valueLabels) === null || _v === void 0 ? void 0 : _v.rotation,
+					handleElement: (_w = chart.valueLabels) === null || _w === void 0 ? void 0 : _w.handleElement
+				},
+				areaViewOptions: getAreaViewOptions(chart, index, style, modelInstance.version.getVersionNumber()),
+				dotViewOptions: {
+					shape: {
+						type: "line",
+						handleEndCoordinate: (v) => v + 2,
+						handleStartCoordinate: (v) => v - 2,
+						width:
+							(_z =
+								(_y = (_x = chart.dotLikeStyles) === null || _x === void 0 ? void 0 : _x.shape) ===
+									null || _y === void 0
+									? void 0
+									: _y.width) !== null && _z !== void 0
+								? _z
+								: LINE_CHART_DEFAULT_WIDTH
+					}
+				}
+			});
+		});
+		return chartsModel;
+	}
+	static findChartsWithEmbeddedKeyLabels(charts) {
+		const chartsWithEmbeddedLabels = [];
+		charts.forEach((chart) => {
+			if (chart.type === "bar" && chart.embeddedLabels === "key") chartsWithEmbeddedLabels.push(chart);
+		});
+		return chartsWithEmbeddedLabels;
+	}
+	static getEmbeddedLabelType(currentChart, chartOrientation) {
+		if (chartOrientation === "horizontal" && currentChart.type === "bar") return currentChart.embeddedLabels;
+		return "none";
+	}
+	static getAdditionalElements(options) {
+		var _a, _b;
+		const { flag, styles } = options.additionalElements.gridLine;
+		return {
+			gridLine: {
+				flag,
+				styles: {
+					dash: {
+						on:
+							(_b =
+								(_a = styles === null || styles === void 0 ? void 0 : styles.dash) === null ||
+								_a === void 0
+									? void 0
+									: _a.on) !== null && _b !== void 0
+								? _b
+								: false
+					}
+				}
+			}
+		};
+	}
 }

package/lib/optionsServices/publicOptionsService.d.ts

@@ -1,6 +1,6 @@
 import { Size } from "../config/config";
 declare class PublicOptionsServiceClass {
-    validateSize(size: Partial<Size>): boolean;
+	validateSize(size: Partial<Size>): boolean;
 }
 export declare const PublicOptionsService: PublicOptionsServiceClass;
 export {};

package/lib/optionsServices/publicOptionsService.js

@@ -1,8 +1,8 @@
 import { SizeValidator } from "./validators/sizeValidator";
 class PublicOptionsServiceClass {
-    validateSize(size) {
-        const validator = new SizeValidator();
-        return validator.validate(size);
-    }
+	validateSize(size) {
+		const validator = new SizeValidator();
+		return validator.validate(size);
+	}
 }
 export const PublicOptionsService = new PublicOptionsServiceClass();

package/lib/optionsServices/validators/sizeValidator.d.ts

@@ -1,5 +1,5 @@
 import { Size } from "../../config/config";
 export declare class SizeValidator {
-    validate(size: Partial<Size>): boolean;
-    private validateSide;
+	validate(size: Partial<Size>): boolean;
+	private validateSide;
 }

package/lib/optionsServices/validators/sizeValidator.js

@@ -1,13 +1,12 @@
 export class SizeValidator {
-    validate(size) {
-        return this.validateSide(size.height) && this.validateSide(size.width);
-    }
-    validateSide(side) {
-        if (side == null)
-            return true;
-        if (typeof side !== "number" || side <= 0) {
-            return false;
-        }
-        return true;
-    }
+	validate(size) {
+		return this.validateSide(size.height) && this.validateSide(size.width);
+	}
+	validateSide(side) {
+		if (side == null) return true;
+		if (typeof side !== "number" || side <= 0) {
+			return false;
+		}
+		return true;
+	}
 }