@elastic/charts 36.0.0 → 38.1.0

package/dist/scales/scale_band.js

@@ -1,62 +1,66 @@
 "use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScaleBand = void 0;
 var d3_scale_1 = require("d3-scale");
 var common_1 = require("../utils/common");
 var constants_1 = require("./constants");
 var ScaleBand = (function () {
-    function ScaleBand(domain, range, overrideBandwidth, barsPadding) {
+    function ScaleBand(inputDomain, range, overrideBandwidth, barsPadding) {
         if (barsPadding === void 0) { barsPadding = 0; }
+        var isObjectPad = typeof barsPadding === 'object';
+        var safeBarPadding = isObjectPad ? 0 : (0, common_1.clamp)(barsPadding, 0, 1);
         this.type = constants_1.ScaleType.Ordinal;
-        this.d3Scale = d3_scale_1.scaleBand();
-        this.d3Scale.domain(domain);
+        this.d3Scale = (0, d3_scale_1.scaleBand)();
+        this.d3Scale.domain(inputDomain.length > 0 ? inputDomain : [undefined]);
         this.d3Scale.range(range);
-        var safeBarPadding = 0;
-        if (typeof barsPadding === 'object') {
-            this.d3Scale.paddingInner(barsPadding.inner);
-            this.d3Scale.paddingOuter(barsPadding.outer);
-            this.barsPadding = barsPadding.inner;
-        }
-        else {
-            safeBarPadding = common_1.clamp(barsPadding, 0, 1);
-            this.d3Scale.paddingInner(safeBarPadding);
-            this.barsPadding = safeBarPadding;
-            this.d3Scale.paddingOuter(safeBarPadding / 2);
-        }
+        this.d3Scale.paddingInner(isObjectPad ? barsPadding.inner : safeBarPadding);
+        this.d3Scale.paddingOuter(isObjectPad ? barsPadding.outer : safeBarPadding / 2);
+        this.barsPadding = isObjectPad ? barsPadding.inner : safeBarPadding;
         this.outerPadding = this.d3Scale.paddingOuter();
         this.innerPadding = this.d3Scale.paddingInner();
-        this.bandwidth = this.d3Scale.bandwidth() || 0;
+        this.bandwidth = overrideBandwidth ? overrideBandwidth * (1 - safeBarPadding) : this.d3Scale.bandwidth() || 0;
         this.originalBandwidth = this.d3Scale.bandwidth() || 0;
         this.step = this.d3Scale.step();
-        this.domain = this.d3Scale.domain();
+        this.domain = (inputDomain.length > 0 ? __spreadArray([], __read(new Set(inputDomain)), false) : [undefined]);
         this.range = range.slice();
-        if (overrideBandwidth) {
-            this.bandwidth = overrideBandwidth * (1 - safeBarPadding);
-        }
         this.bandwidthPadding = this.bandwidth;
-        this.isInverted = this.domain[0] > this.domain[1];
-        this.invertedScale = d3_scale_1.scaleQuantize().domain(range).range(this.domain);
+        this.isInverted = false;
+        this.invertedScale = (0, d3_scale_1.scaleQuantize)()
+            .domain(range)
+            .range(inputDomain.length > 0 ? __spreadArray([], __read(new Set(inputDomain)), false) : [undefined]);
         this.minInterval = 0;
     }
-    ScaleBand.prototype.getScaledValue = function (value) {
-        var scaleValue = this.d3Scale(common_1.stringifyNullsUndefined(value));
-        if (scaleValue === undefined || isNaN(scaleValue)) {
-            return null;
-        }
-        return scaleValue;
-    };
-    ScaleBand.prototype.scaleOrThrow = function (value) {
-        var scaleValue = this.scale(value);
-        if (scaleValue === null) {
-            throw new Error("Unable to scale value: " + scaleValue + ")");
-        }
-        return scaleValue;
-    };
     ScaleBand.prototype.scale = function (value) {
-        return this.getScaledValue(value);
+        var scaleValue = this.d3Scale((0, common_1.stringifyNullsUndefined)(value));
+        return typeof scaleValue === 'number' && Number.isFinite(scaleValue) ? scaleValue : NaN;
     };
     ScaleBand.prototype.pureScale = function (value) {
-        return this.getScaledValue(value);
+        return this.scale(value);
     };
     ScaleBand.prototype.ticks = function () {
         return this.domain;

package/dist/scales/scale_band.js.map

@@ -1 +1 @@
-{"version":3,"file":"scale_band.js","sourceRoot":"","sources":["../../src/scales/scale_band.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scale_band.js","sourceRoot":"","sources":["../../src/scales/scale_band.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,qCAA6F;AAM7F,0CAAiE;AAEjE,yCAAwC;AAMxC;IA6BE,mBACE,WAAgB,EAChB,KAAY,EACZ,iBAA0B,EAM1B,WAA6C;QAA7C,4BAAA,EAAA,eAA6C;QAE7C,IAAM,WAAW,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC;QACpD,IAAM,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,GAAG,qBAAS,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,IAAA,oBAAS,GAA+B,CAAC;QACxD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAE,SAA0B,CAAC,CAAC,CAAC;QAC1F,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC;QACpE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAChD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAChD,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9G,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,0BAAK,IAAI,GAAG,CAAC,WAAW,CAAC,UAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAgB,CAAC;QAChG,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,IAAA,wBAAa,GAAK;aACpC,MAAM,CAAC,KAAK,CAAC;aACb,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,0BAAK,IAAI,GAAG,CAAC,WAAW,CAAC,UAAE,CAAC,CAAC,CAAE,SAA0B,CAAC,CAAC,CAAC;QAC7F,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,yBAAK,GAAL,UAAM,KAAsB;QAC1B,IAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,gCAAuB,EAAC,KAAK,CAAC,CAAC,CAAC;QAChE,OAAO,OAAO,UAAU,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1F,CAAC;IAED,6BAAS,GAAT,UAAU,KAAsB;QAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,yBAAK,GAAL;QACE,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,0BAAM,GAAN,UAAO,KAAa;QAClB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,kCAAc,GAAd,UAAe,KAAa;QAC1B,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;YAChC,eAAe,EAAE,IAAI;SACtB,CAAC;IACJ,CAAC;IAED,iCAAa,GAAb;QACE,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,mCAAe,GAAf,UAAgB,KAAQ;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IACH,gBAAC;AAAD,CAAC,AA/FD,IA+FC;AA/FY,8BAAS"}

package/dist/scales/scale_continuous.d.ts

@@ -1,41 +1,2 @@
-import { $Values } from 'utility-types';
-/** @public */
-export declare const LogBase: Readonly<{
-    /**
-     * log base `10`
-     */
-    Common: "common";
-    /**
-     * log base `2`
-     */
-    Binary: "binary";
-    /**
-     * log base `e` (aka ln)
-     */
-    Natural: "natural";
-}>;
-/**
- * Log bases
- * @public
- */
-export declare type LogBase = $Values<typeof LogBase>;
-/**
- * Options specific to log scales
- * @public
- */
-export interface LogScaleOptions {
-    /**
-     * Min value to render on log scale
-     *
-     * Defaults to min value of domain, or LOG_MIN_ABS_DOMAIN if mixed polarity
-     */
-    logMinLimit?: number;
-    /**
-     * Base for log scale
-     *
-     * @defaultValue `common` {@link (LogBase:type) | LogBase.Common}
-     * (i.e. log base 10)
-     */
-    logBase?: LogBase;
-}
+export {};
 //# sourceMappingURL=scale_continuous.d.ts.map

package/dist/scales/scale_continuous.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scale_continuous.d.ts","sourceRoot":"","sources":["../../src/scales/scale_continuous.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,OAAO,EAAY,MAAM,eAAe,CAAC;AAoIlD,cAAc;AACd,eAAO,MAAM,OAAO;IAClB;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;EAEH,CAAC;AACH;;;GAGG;AACH,oBAAY,OAAO,GAAG,OAAO,CAAC,OAAO,OAAO,CAAC,CAAC;AAmB9C;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}
+{"version":3,"file":"scale_continuous.d.ts","sourceRoot":"","sources":["../../src/scales/scale_continuous.ts"],"names":[],"mappings":""}

package/dist/scales/scale_continuous.js

@@ -15,11 +15,12 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var _a, _b;
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDomainPolarity = exports.ScaleContinuous = exports.logBaseMap = exports.LogBase = exports.limitLogScaleDomain = void 0;
+exports.limitLogScaleDomain = exports.ScaleContinuous = void 0;
 var d3_array_1 = require("d3-array");
 var d3_scale_1 = require("d3-scale");
+var get_linear_ticks_1 = require("../chart_types/xy_chart/utils/get_linear_ticks");
 var screenspace_marker_scale_compressor_1 = require("../solvers/screenspace_marker_scale_compressor");
 var common_1 = require("../utils/common");
 var date_time_1 = require("../utils/data/date_time");
@@ -30,94 +31,6 @@ var SCALES = (_a = {},
     _a[constants_1.ScaleType.Sqrt] = d3_scale_1.scaleSqrt,
     _a[constants_1.ScaleType.Time] = d3_scale_1.scaleUtc,
     _a);
-var isUnitRange = function (_a) {
-    var _b = __read(_a, 2), r1 = _b[0], r2 = _b[1];
-    return r1 === 0 && r2 === 1;
-};
-function limitLogScaleDomain(_a, logMinLimit) {
-    var _b = __read(_a, 2), min = _b[0], max = _b[1];
-    var absLimit = logMinLimit !== undefined ? Math.abs(logMinLimit) : undefined;
-    if (absLimit !== undefined && absLimit > 0) {
-        if (min > 0 && min < absLimit) {
-            if (max > absLimit) {
-                return [absLimit, max];
-            }
-            return [absLimit, absLimit];
-        }
-        if (max < 0 && max > -absLimit) {
-            if (min < -absLimit) {
-                return [min, -absLimit];
-            }
-            return [-absLimit, -absLimit];
-        }
-    }
-    var fallbackLimit = absLimit || constants_1.LOG_MIN_ABS_DOMAIN;
-    if (min === 0) {
-        if (max > 0) {
-            return [fallbackLimit, max];
-        }
-        if (max < 0) {
-            return [-fallbackLimit, max];
-        }
-        return [fallbackLimit, fallbackLimit];
-    }
-    if (max === 0) {
-        if (min > 0) {
-            return [min, fallbackLimit];
-        }
-        if (min < 0) {
-            return [min, -fallbackLimit];
-        }
-        return [fallbackLimit, fallbackLimit];
-    }
-    if (min < 0 && max > 0) {
-        var isD0Min = Math.abs(max) - Math.abs(min) >= 0;
-        if (isD0Min) {
-            return [fallbackLimit, max];
-        }
-        return [min, -fallbackLimit];
-    }
-    if (min > 0 && max < 0) {
-        var isD0Max = Math.abs(min) - Math.abs(max) >= 0;
-        if (isD0Max) {
-            return [min, fallbackLimit];
-        }
-        return [-fallbackLimit, max];
-    }
-    return [min, max];
-}
-exports.limitLogScaleDomain = limitLogScaleDomain;
-function getPixelPaddedDomain(chartHeight, domain, desiredPixelPadding, constrainDomainPadding, intercept) {
-    if (intercept === void 0) { intercept = 0; }
-    var inverted = domain[1] < domain[0];
-    var orderedDomain = inverted ? domain.slice().reverse() : domain;
-    var scaleMultiplier = screenspace_marker_scale_compressor_1.screenspaceMarkerScaleCompressor(orderedDomain, [2 * desiredPixelPadding, 2 * desiredPixelPadding], chartHeight).scaleMultiplier;
-    var paddedDomainLo = orderedDomain[0] - desiredPixelPadding / scaleMultiplier;
-    var paddedDomainHigh = orderedDomain[1] + desiredPixelPadding / scaleMultiplier;
-    if (constrainDomainPadding) {
-        if (paddedDomainLo < intercept && orderedDomain[0] >= intercept) {
-            var scaleMultiplier_1 = screenspace_marker_scale_compressor_1.screenspaceMarkerScaleCompressor([intercept, orderedDomain[1]], [0, 2 * desiredPixelPadding], chartHeight).scaleMultiplier;
-            paddedDomainLo = intercept;
-            paddedDomainHigh = orderedDomain[1] + desiredPixelPadding / scaleMultiplier_1;
-        }
-        else if (paddedDomainHigh > 0 && orderedDomain[1] <= 0) {
-            var scaleMultiplier_2 = screenspace_marker_scale_compressor_1.screenspaceMarkerScaleCompressor([orderedDomain[0], intercept], [2 * desiredPixelPadding, 0], chartHeight).scaleMultiplier;
-            paddedDomainLo = orderedDomain[0] - desiredPixelPadding / scaleMultiplier_2;
-            paddedDomainHigh = intercept;
-        }
-    }
-    return inverted ? [paddedDomainHigh, paddedDomainLo] : [paddedDomainLo, paddedDomainHigh];
-}
-exports.LogBase = Object.freeze({
-    Common: 'common',
-    Binary: 'binary',
-    Natural: 'natural',
-});
-exports.logBaseMap = (_b = {},
-    _b[exports.LogBase.Common] = 10,
-    _b[exports.LogBase.Binary] = 2,
-    _b[exports.LogBase.Natural] = Math.E,
-    _b);
 var defaultScaleOptions = {
     bandwidth: 0,
     minInterval: 0,
@@ -129,140 +42,110 @@ var defaultScaleOptions = {
     desiredTickCount: 10,
     isSingleValueHistogram: false,
     integersOnly: false,
-    logBase: exports.LogBase.Common,
+    logBase: 10,
+    logMinLimit: NaN,
+    linearBase: 10,
+};
+var isUnitRange = function (_a) {
+    var _b = __read(_a, 2), r1 = _b[0], r2 = _b[1];
+    return r1 === 0 && r2 === 1;
 };
 var ScaleContinuous = (function () {
     function ScaleContinuous(_a, options) {
-        var _this = this;
-        var _b = _a.type, type = _b === void 0 ? constants_1.ScaleType.Linear : _b, _c = _a.domain, domain = _c === void 0 ? [0, 1] : _c, _d = _a.range, range = _d === void 0 ? [0, 1] : _d, _e = _a.nice, nice = _e === void 0 ? false : _e;
-        var _f = common_1.mergePartial(defaultScaleOptions, options, { mergeOptionalPartialValues: true }), bandwidth = _f.bandwidth, minInterval = _f.minInterval, timeZone = _f.timeZone, totalBarsInCluster = _f.totalBarsInCluster, barsPadding = _f.barsPadding, desiredTickCount = _f.desiredTickCount, isSingleValueHistogram = _f.isSingleValueHistogram, integersOnly = _f.integersOnly, logBase = _f.logBase, logMinLimit = _f.logMinLimit, domainPixelPadding = _f.domainPixelPadding, constrainDomainPadding = _f.constrainDomainPadding;
-        this.d3Scale = SCALES[type]();
-        if (type === constants_1.ScaleType.Log) {
-            this.d3Scale.base(exports.logBaseMap[logBase]);
-            this.domain = limitLogScaleDomain(domain, logMinLimit);
-        }
-        else {
-            this.domain = domain;
-        }
-        this.d3Scale.domain(this.domain);
-        if (nice && type !== constants_1.ScaleType.Time) {
-            this.d3Scale.domain(this.domain).nice(desiredTickCount);
-            this.domain = this.d3Scale.domain();
-        }
-        var safeBarPadding = common_1.clamp(barsPadding, 0, 1);
-        this.barsPadding = safeBarPadding;
-        this.bandwidth = bandwidth * (1 - safeBarPadding);
-        this.bandwidthPadding = bandwidth * safeBarPadding;
-        this.d3Scale.range(range);
-        this.step = this.bandwidth + this.barsPadding + this.bandwidthPadding;
+        var _b = _a.type, scaleType = _b === void 0 ? constants_1.ScaleType.Linear : _b, inputDomain = _a.domain, range = _a.range, _c = _a.nice, nice = _c === void 0 ? false : _c;
+        var isBinary = scaleType === constants_1.ScaleType.LinearBinary;
+        var type = isBinary ? constants_1.ScaleType.Linear : scaleType;
+        var scaleOptions = (0, common_1.mergePartial)(defaultScaleOptions, options);
+        var min = inputDomain.reduce(function (p, n) { return Math.min(p, n); }, Infinity);
+        var max = inputDomain.reduce(function (p, n) { return Math.max(p, n); }, -Infinity);
+        var properLogScale = type === constants_1.ScaleType.Log && min < max;
+        var dataDomain = properLogScale ? limitLogScaleDomain([min, max], scaleOptions.logMinLimit) : inputDomain;
+        var barsPadding = (0, common_1.clamp)(scaleOptions.barsPadding, 0, 1);
+        var isNice = nice && type !== constants_1.ScaleType.Time;
+        var totalRange = Math.abs(range[1] - range[0]);
+        var pixelPadFits = 0 < scaleOptions.domainPixelPadding && scaleOptions.domainPixelPadding * 2 < totalRange;
+        var isPixelPadded = pixelPadFits && type !== constants_1.ScaleType.Time && !isUnitRange(range);
+        var minInterval = Math.abs(scaleOptions.minInterval);
+        var bandwidth = scaleOptions.bandwidth * (1 - barsPadding);
+        var bandwidthPadding = scaleOptions.bandwidth * barsPadding;
+        this.barsPadding = barsPadding;
+        this.bandwidth = bandwidth;
+        this.bandwidthPadding = bandwidthPadding;
         this.type = type;
         this.range = range;
+        this.linearBase = isBinary ? 2 : scaleOptions.linearBase;
         this.minInterval = minInterval;
-        this.isInverted = this.domain[0] > this.domain[1];
-        this.timeZone = timeZone;
-        this.totalBarsInCluster = totalBarsInCluster;
-        this.isSingleValueHistogram = isSingleValueHistogram;
-        var _g = __read(this.range, 2), r1 = _g[0], r2 = _g[1];
-        var totalRange = Math.abs(r1 - r2);
-        if (type !== constants_1.ScaleType.Time && domainPixelPadding && !isUnitRange(range) && domainPixelPadding * 2 < totalRange) {
-            var newDomain = getPixelPaddedDomain(totalRange, this.domain, domainPixelPadding, constrainDomainPadding);
-            if (nice) {
-                this.d3Scale.domain(newDomain).nice(desiredTickCount);
-                this.domain = this.d3Scale.domain();
-            }
-            else {
-                this.domain = newDomain;
-                this.d3Scale.domain(newDomain);
-            }
-        }
-        if (type === constants_1.ScaleType.Time) {
-            var startDomain = date_time_1.getMomentWithTz(this.domain[0], this.timeZone);
-            var endDomain = date_time_1.getMomentWithTz(this.domain[1], this.timeZone);
-            var offset_1 = startDomain.utcOffset();
-            var shiftedDomainMin = startDomain.add(offset_1, 'minutes').valueOf();
-            var shiftedDomainMax = endDomain.add(offset_1, 'minutes').valueOf();
-            var tzShiftedScale = d3_scale_1.scaleUtc().domain([shiftedDomainMin, shiftedDomainMax]);
-            var rawTicks = tzShiftedScale.ticks(desiredTickCount);
-            var timePerTick = (shiftedDomainMax - shiftedDomainMin) / rawTicks.length;
-            var hasHourTicks_1 = timePerTick < 1000 * 60 * 60 * 12;
-            this.tickValues = rawTicks.map(function (d) {
-                var currentDateTime = date_time_1.getMomentWithTz(d, _this.timeZone);
-                var currentOffset = hasHourTicks_1 ? offset_1 : currentDateTime.utcOffset();
-                return currentDateTime.subtract(currentOffset, 'minutes').valueOf();
-            });
-        }
-        else {
-            if (minInterval > 0 && bandwidth > 0) {
-                var intervalCount = Math.floor((this.domain[1] - this.domain[0]) / this.minInterval);
-                this.tickValues = new Array(intervalCount + 1).fill(0).map(function (_, i) { return _this.domain[0] + i * _this.minInterval; });
+        this.step = bandwidth + barsPadding + bandwidthPadding;
+        this.timeZone = scaleOptions.timeZone;
+        this.isInverted = dataDomain[0] > dataDomain[1];
+        this.totalBarsInCluster = scaleOptions.totalBarsInCluster;
+        this.isSingleValueHistogram = scaleOptions.isSingleValueHistogram;
+        var d3Scale = SCALES[type]();
+        d3Scale.domain(dataDomain);
+        d3Scale.range(range);
+        if (properLogScale)
+            d3Scale.base(scaleOptions.logBase);
+        if (isNice) {
+            if (type === constants_1.ScaleType.Linear) {
+                (0, get_linear_ticks_1.getNiceLinearTicks)(d3Scale, scaleOptions.desiredTickCount, this.linearBase);
             }
             else {
-                this.tickValues = this.getTicks(desiredTickCount, integersOnly);
+                d3Scale
+                    .domain(dataDomain)
+                    .nice(scaleOptions.desiredTickCount);
             }
         }
+        var niceDomain = isNice ? d3Scale.domain() : dataDomain;
+        var paddedDomain = isPixelPadded
+            ? getPixelPaddedDomain(totalRange, niceDomain, scaleOptions.domainPixelPadding, scaleOptions.constrainDomainPadding)
+            : niceDomain;
+        d3Scale.domain(paddedDomain);
+        if (isPixelPadded && isNice)
+            d3Scale.nice(scaleOptions.desiredTickCount);
+        var nicePaddedDomain = isPixelPadded && isNice ? d3Scale.domain() : paddedDomain;
+        this.tickValues =
+            type === constants_1.ScaleType.Time
+                ? getTimeTicks(scaleOptions.desiredTickCount, scaleOptions.timeZone, nicePaddedDomain)
+                : scaleOptions.minInterval <= 0 || scaleOptions.bandwidth <= 0
+                    ? this.type === constants_1.ScaleType.Linear
+                        ? (0, get_linear_ticks_1.getLinearTicks)(nicePaddedDomain[0], nicePaddedDomain[nicePaddedDomain.length - 1], scaleOptions.desiredTickCount, this.linearBase)
+                        : d3Scale.ticks(scaleOptions.desiredTickCount)
+                    : new Array(Math.floor((nicePaddedDomain[1] - nicePaddedDomain[0]) / minInterval) + 1)
+                        .fill(0)
+                        .map(function (_, i) { return nicePaddedDomain[0] + i * minInterval; });
+        this.domain = nicePaddedDomain;
+        this.project = function (d) { return d3Scale(d); };
+        this.inverseProject = function (d) { return d3Scale.invert(d); };
     }
-    ScaleContinuous.prototype.getScaledValue = function (value) {
-        if (typeof value !== 'number' || isNaN(value)) {
-            return null;
-        }
-        var scaledValue = this.d3Scale(value);
-        return isNaN(scaledValue) ? null : scaledValue;
-    };
-    ScaleContinuous.prototype.getTicks = function (ticks, integersOnly) {
-        return integersOnly
-            ? this.d3Scale
-                .ticks(ticks)
-                .filter(function (item) { return typeof item === 'number' && item % 1 === 0; })
-                .map(function (item) { return parseInt(item.toFixed(0), 10); })
-            : this.d3Scale.ticks(ticks);
-    };
-    ScaleContinuous.prototype.scaleOrThrow = function (value) {
-        var scaleValue = this.scale(value);
-        if (scaleValue === null) {
-            throw new Error("Unable to scale value: " + scaleValue + ")");
-        }
-        return scaleValue;
-    };
     ScaleContinuous.prototype.scale = function (value) {
-        var scaledValue = this.getScaledValue(value);
-        return scaledValue === null ? null : scaledValue + (this.bandwidthPadding / 2) * this.totalBarsInCluster;
+        return typeof value === 'number'
+            ? this.project(value) + (this.bandwidthPadding / 2) * this.totalBarsInCluster
+            : NaN;
     };
     ScaleContinuous.prototype.pureScale = function (value) {
-        if (this.bandwidth === 0) {
-            return this.getScaledValue(value);
-        }
-        if (typeof value !== 'number' || isNaN(value)) {
-            return null;
-        }
-        return this.getScaledValue(value + this.minInterval / 2);
+        return typeof value === 'number' ? this.project(this.bandwidth === 0 ? value : value + this.minInterval / 2) : NaN;
     };
     ScaleContinuous.prototype.ticks = function () {
         return this.tickValues;
     };
     ScaleContinuous.prototype.invert = function (value) {
-        var invertedValue = this.d3Scale.invert(value);
-        if (this.type === constants_1.ScaleType.Time) {
-            invertedValue = date_time_1.getMomentWithTz(invertedValue, this.timeZone).valueOf();
-        }
-        return invertedValue;
+        var invertedValue = this.inverseProject(value);
+        return this.type === constants_1.ScaleType.Time
+            ? (0, date_time_1.getMomentWithTz)(invertedValue, this.timeZone).valueOf()
+            : Number(invertedValue);
     };
     ScaleContinuous.prototype.invertWithStep = function (value, data) {
         if (data.length === 0) {
-            return null;
+            return { withinBandwidth: false, value: NaN };
         }
         var invertedValue = this.invert(value);
         var bisectValue = this.bandwidth === 0 ? invertedValue + this.minInterval / 2 : invertedValue;
-        var leftIndex = d3_array_1.bisectLeft(data, bisectValue);
+        var leftIndex = (0, d3_array_1.bisectLeft)(data, bisectValue);
         if (leftIndex === 0) {
-            if (invertedValue < data[0]) {
-                return {
-                    value: data[0] - this.minInterval * Math.ceil((data[0] - invertedValue) / this.minInterval),
-                    withinBandwidth: false,
-                };
-            }
+            var withinBandwidth_1 = invertedValue >= data[0];
             return {
-                value: data[0],
-                withinBandwidth: true,
+                withinBandwidth: withinBandwidth_1,
+                value: data[0] + (withinBandwidth_1 ? 0 : -this.minInterval * Math.ceil((data[0] - invertedValue) / this.minInterval)),
             };
         }
         var currentValue = data[leftIndex - 1];
@@ -271,48 +154,90 @@ var ScaleContinuous = (function () {
             var nextDiff = Math.abs(nextValue - invertedValue);
             var prevDiff = Math.abs(invertedValue - currentValue);
             return {
-                value: nextDiff <= prevDiff ? nextValue : currentValue,
-                withinBandwidth: true,
-            };
-        }
-        if (invertedValue - currentValue <= this.minInterval) {
-            return {
-                value: currentValue,
                 withinBandwidth: true,
+                value: nextDiff <= prevDiff ? nextValue : currentValue,
             };
         }
+        var withinBandwidth = invertedValue - currentValue <= this.minInterval;
         return {
-            value: currentValue + this.minInterval * Math.floor((invertedValue - currentValue) / this.minInterval),
-            withinBandwidth: false,
+            withinBandwidth: withinBandwidth,
+            value: currentValue +
+                (withinBandwidth ? 0 : this.minInterval * Math.floor((invertedValue - currentValue) / this.minInterval)),
         };
     };
     ScaleContinuous.prototype.isSingleValue = function () {
-        if (this.isSingleValueHistogram) {
-            return true;
-        }
-        if (this.domain.length < 2) {
-            return true;
-        }
-        var min = this.domain[0];
-        var max = this.domain[this.domain.length - 1];
-        return max === min;
+        return this.isSingleValueHistogram || isDegenerateDomain(this.domain);
     };
     ScaleContinuous.prototype.isValueInDomain = function (value) {
-        return value >= this.domain[0] && value <= this.domain[1];
+        return this.domain[0] <= value && value <= this.domain[1];
     };
     ScaleContinuous.prototype.handleDomainPadding = function () { };
     return ScaleContinuous;
 }());
 exports.ScaleContinuous = ScaleContinuous;
-function getDomainPolarity(domain) {
-    var _a = __read(domain, 2), min = _a[0], max = _a[1];
-    if (min >= 0 && max >= 0) {
-        return 1;
-    }
-    if (min <= 0 && max <= 0) {
-        return -1;
-    }
-    return 0;
+function getTimeTicks(desiredTickCount, timeZone, domain) {
+    var startDomain = (0, date_time_1.getMomentWithTz)(domain[0], timeZone);
+    var endDomain = (0, date_time_1.getMomentWithTz)(domain[1], timeZone);
+    var offset = startDomain.utcOffset();
+    var shiftedDomainMin = startDomain.add(offset, 'minutes').valueOf();
+    var shiftedDomainMax = endDomain.add(offset, 'minutes').valueOf();
+    var tzShiftedScale = (0, d3_scale_1.scaleUtc)().domain([shiftedDomainMin, shiftedDomainMax]);
+    var rawTicks = tzShiftedScale.ticks(desiredTickCount);
+    var timePerTick = (shiftedDomainMax - shiftedDomainMin) / rawTicks.length;
+    var hasHourTicks = timePerTick < 1000 * 60 * 60 * 12;
+    return rawTicks.map(function (d) {
+        var currentDateTime = (0, date_time_1.getMomentWithTz)(d, timeZone);
+        var currentOffset = hasHourTicks ? offset : currentDateTime.utcOffset();
+        return currentDateTime.subtract(currentOffset, 'minutes').valueOf();
+    });
+}
+function isDegenerateDomain(domain) {
+    return domain.every(function (v) { return v === domain[0]; });
+}
+function limitLogScaleDomain(_a, logMinLimit) {
+    var _b = __read(_a, 2), min = _b[0], max = _b[1];
+    var absLimit = Math.abs(logMinLimit);
+    var fallback = absLimit || constants_1.LOG_MIN_ABS_DOMAIN;
+    if (absLimit > 0 && min > 0 && min < absLimit)
+        return max > absLimit ? [absLimit, max] : [absLimit, absLimit];
+    if (absLimit > 0 && max < 0 && max > -absLimit)
+        return min < -absLimit ? [min, -absLimit] : [-absLimit, -absLimit];
+    if (min === 0)
+        return max > 0 ? [fallback, max] : max < 0 ? [-fallback, max] : [fallback, fallback];
+    if (max === 0)
+        return min > 0 ? [min, fallback] : min < 0 ? [min, -fallback] : [fallback, fallback];
+    if (min < 0 && max > 0)
+        return Math.abs(max) >= Math.abs(min) ? [fallback, max] : [min, -fallback];
+    if (min > 0 && max < 0)
+        return Math.abs(min) >= Math.abs(max) ? [min, fallback] : [-fallback, max];
+    return [min, max];
+}
+exports.limitLogScaleDomain = limitLogScaleDomain;
+function getPixelPaddedDomain(chartHeight, domain, desiredPixelPadding, constrainDomainPadding, intercept) {
+    if (intercept === void 0) { intercept = 0; }
+    var inverted = domain[1] < domain[0];
+    var orderedDomain = inverted ? [domain[1], domain[0]] : domain;
+    var scaleMultiplier = (0, screenspace_marker_scale_compressor_1.screenspaceMarkerScaleCompressor)(orderedDomain, [2 * desiredPixelPadding, 2 * desiredPixelPadding], chartHeight).scaleMultiplier;
+    var baselinePaddedDomainLo = orderedDomain[0] - desiredPixelPadding / scaleMultiplier;
+    var baselinePaddedDomainHigh = orderedDomain[1] + desiredPixelPadding / scaleMultiplier;
+    var crossBelow = constrainDomainPadding && baselinePaddedDomainLo < intercept && orderedDomain[0] >= intercept;
+    var crossAbove = constrainDomainPadding && baselinePaddedDomainHigh > 0 && orderedDomain[1] <= 0;
+    var paddedDomainLo = crossBelow
+        ? intercept
+        : crossAbove
+            ? orderedDomain[0] -
+                desiredPixelPadding /
+                    (0, screenspace_marker_scale_compressor_1.screenspaceMarkerScaleCompressor)([orderedDomain[0], intercept], [2 * desiredPixelPadding, 0], chartHeight)
+                        .scaleMultiplier
+            : baselinePaddedDomainLo;
+    var paddedDomainHigh = crossBelow
+        ? orderedDomain[1] +
+            desiredPixelPadding /
+                (0, screenspace_marker_scale_compressor_1.screenspaceMarkerScaleCompressor)([intercept, orderedDomain[1]], [0, 2 * desiredPixelPadding], chartHeight)
+                    .scaleMultiplier
+        : crossAbove
+            ? intercept
+            : baselinePaddedDomainHigh;
+    return inverted ? [paddedDomainHigh, paddedDomainLo] : [paddedDomainLo, paddedDomainHigh];
 }
-exports.getDomainPolarity = getDomainPolarity;
 //# sourceMappingURL=scale_continuous.js.map