From fe3931b0775a91b1661df8ca708c572d571f4b73 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 22 Jan 2020 04:19:44 -0800
Subject: [PATCH] Reduce scope of imports (#7000)

---
 src/controllers/controller.bar.js       |  4 ++--
 src/controllers/controller.bubble.js    |  4 ++--
 src/controllers/controller.doughnut.js  |  4 ++--
 src/controllers/controller.line.js      |  7 ++++---
 src/controllers/controller.polarArea.js |  4 ++--
 src/controllers/controller.radar.js     |  7 ++++---
 src/core/core.plugins.js                |  4 ++--
 src/core/core.scaleService.js           | 10 +++++-----
 8 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 43c34a008..be85a2d1f 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -2,7 +2,7 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Rectangle from '../elements/element.rectangle';
 import helpers from '../helpers';
 
 const valueOrDefault = helpers.valueOrDefault;
@@ -184,7 +184,7 @@ function isFloatBar(custom) {
 
 export default DatasetController.extend({
 
-	dataElementType: elements.Rectangle,
+	dataElementType: Rectangle,
 
 	/**
 	 * @private
diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index 82c5c0f89..7c47c0970 100644
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -2,7 +2,7 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Point from '../elements/element.point';
 import helpers from '../helpers';
 
 const resolve = helpers.options.resolve;
@@ -38,7 +38,7 @@ export default DatasetController.extend({
 	/**
 	 * @protected
 	 */
-	dataElementType: elements.Point,
+	dataElementType: Point,
 
 	/**
 	 * @private
diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 61caba230..73b859102 100644
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -2,7 +2,7 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Arc from '../elements/element.arc';
 import helpers from '../helpers';
 
 const valueOrDefault = helpers.valueOrDefault;
@@ -100,7 +100,7 @@ defaults._set('doughnut', {
 
 export default DatasetController.extend({
 
-	dataElementType: elements.Arc,
+	dataElementType: Arc,
 
 	linkScales: helpers.noop,
 
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index 32e069a77..445294156 100644
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -2,7 +2,8 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Line from '../elements/element.line';
+import Point from '../elements/element.point';
 import helpers from '../helpers';
 
 const valueOrDefault = helpers.valueOrDefault;
@@ -28,9 +29,9 @@ defaults._set('line', {
 
 export default DatasetController.extend({
 
-	datasetElementType: elements.Line,
+	datasetElementType: Line,
 
-	dataElementType: elements.Point,
+	dataElementType: Point,
 
 	/**
 	 * @private
diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 8eb1e6b0e..d337af133 100644
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -2,7 +2,7 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Arc from '../elements/element.arc';
 import helpers from '../helpers';
 
 const resolve = helpers.options.resolve;
@@ -93,7 +93,7 @@ function getStartAngleRadians(deg) {
 
 export default DatasetController.extend({
 
-	dataElementType: elements.Arc,
+	dataElementType: Arc,
 
 	/**
 	 * @private
diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index 05cbc7c1f..6020821fa 100644
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -2,7 +2,8 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Line from '../elements/element.line';
+import Point from '../elements/element.point';
 import helpers from '../helpers';
 
 const valueOrDefault = helpers.valueOrDefault;
@@ -22,9 +23,9 @@ defaults._set('radar', {
 });
 
 export default DatasetController.extend({
-	datasetElementType: elements.Line,
+	datasetElementType: Line,
 
-	dataElementType: elements.Point,
+	dataElementType: Point,
 
 	/**
 	 * @private
diff --git a/src/core/core.plugins.js b/src/core/core.plugins.js
index 4f7a03d2f..df5da2ec2 100644
--- a/src/core/core.plugins.js
+++ b/src/core/core.plugins.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import defaults from './core.defaults';
-import helpers from '../helpers/';
+import {clone} from '../helpers/helpers.core';
 
 defaults._set('plugins', {});
 
@@ -142,7 +142,7 @@ export default {
 			}
 
 			if (opts === true) {
-				opts = helpers.clone(defaults.plugins[id]);
+				opts = clone(defaults.plugins[id]);
 			}
 
 			plugins.push(plugin);
diff --git a/src/core/core.scaleService.js b/src/core/core.scaleService.js
index f6fd60c30..7b0ad4763 100644
--- a/src/core/core.scaleService.js
+++ b/src/core/core.scaleService.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import defaults from './core.defaults';
-import helpers from '../helpers';
+import {clone, each, extend, merge} from '../helpers/helpers.core';
 import layouts from './core.layouts';
 
 export default {
@@ -15,24 +15,24 @@ export default {
 	defaults: {},
 	registerScaleType: function(type, scaleConstructor, scaleDefaults) {
 		this.constructors[type] = scaleConstructor;
-		this.defaults[type] = helpers.clone(scaleDefaults);
+		this.defaults[type] = clone(scaleDefaults);
 	},
 	getScaleConstructor: function(type) {
 		return Object.prototype.hasOwnProperty.call(this.constructors, type) ? this.constructors[type] : undefined;
 	},
 	getScaleDefaults: function(type) {
 		// Return the scale defaults merged with the global settings so that we always use the latest ones
-		return Object.prototype.hasOwnProperty.call(this.defaults, type) ? helpers.merge({}, [defaults.scale, this.defaults[type]]) : {};
+		return Object.prototype.hasOwnProperty.call(this.defaults, type) ? merge({}, [defaults.scale, this.defaults[type]]) : {};
 	},
 	updateScaleDefaults: function(type, additions) {
 		var me = this;
 		if (Object.prototype.hasOwnProperty.call(me.defaults, type)) {
-			me.defaults[type] = helpers.extend(me.defaults[type], additions);
+			me.defaults[type] = extend(me.defaults[type], additions);
 		}
 	},
 	addScalesToLayout: function(chart) {
 		// Adds each scale to the chart.boxes array to be sized accordingly
-		helpers.each(chart.scales, function(scale) {
+		each(chart.scales, function(scale) {
 			// Set ILayoutItem parameters for backwards compatibility
 			scale.fullWidth = scale.options.fullWidth;
 			scale.position = scale.options.position;
-- 
2.47.2