Move descriptors out of defaults

Author: kurkle

src/controllers/controller.bubble.js

@@ -149,7 +149,6 @@ BubbleController.defaults = {
 	plugins: {
 		tooltip: {
 			callbacks: {
-				_scriptable: false,
 				title() {
 					// Title doesn't make sense for scatter since we format the data as a point
 					return '';

src/controllers/controller.doughnut.js

@@ -355,7 +355,6 @@ DoughnutController.defaults = {
 	plugins: {
 		legend: {
 			labels: {
-				_scriptable: false,
 				generateLabels(chart) {
 					const data = chart.data;
 					if (data.labels.length && data.datasets.length) {
@@ -386,7 +385,6 @@ DoughnutController.defaults = {
 		},
 		tooltip: {
 			callbacks: {
-				_scriptable: false,
 				title() {
 					return '';
 				},

src/controllers/controller.polarArea.js

@@ -153,7 +153,6 @@ PolarAreaController.defaults = {
 	plugins: {
 		legend: {
 			labels: {
-				_scriptable: false,
 				generateLabels(chart) {
 					const data = chart.data;
 					if (data.labels.length && data.datasets.length) {

src/controllers/controller.scatter.js

@@ -31,7 +31,6 @@ ScatterController.defaults = {
 	plugins: {
 		tooltip: {
 			callbacks: {
-				_scriptable: false,
 				title() {
 					return '';     // doesn't make sense for scatter since data are formatted as a point
 				},

src/core/core.animations.js

@@ -7,10 +7,6 @@ const numbers = ['x', 'y', 'borderWidth', 'radius', 'tension'];
 const colors = ['borderColor', 'backgroundColor'];
 
 defaults.set('animation', {
-	_scriptable: (name) => name !== 'onProgress' && name !== 'onComplete' && name !== 'fn',
-	_indexable: false,
-	_fallback: false,
-
 	// Plain properties can be overridden in each object
 	duration: 1000,
 	easing: 'easeOutQuart',
@@ -58,6 +54,12 @@ defaults.set('animation', {
 	}
 });
 
+defaults.describe('animation', {
+	_scriptable: (name) => name !== 'onProgress' && name !== 'onComplete' && name !== 'fn',
+	_indexable: false,
+	_fallback: false,
+});
+
 export default class Animations {
 	constructor(chart, animations) {
 		this._chart = chart;

src/core/core.config.js

@@ -163,6 +163,9 @@ export default class Config {
 		scopeKeys.forEach(key => addIfFound(options, key));
 		scopeKeys.forEach(key => addIfFound(defaults, key));
 
+		const descriptors = defaults.descriptors;
+		scopeKeys.forEach(key => addIfFound(descriptors, key));
+
 		return [...scopes];
 	}
 
@@ -207,12 +210,12 @@ export default class Config {
 
 function needContext(proxy, names) {
 	const {_scriptable = true, _indexable = true} = proxy;
-	const scriptableFn = isFunction(_scriptable);
-	const indexableFn = isFunction(_indexable);
+	const scriptable = prop => isFunction(_scriptable) ? _scriptable(prop) : _scriptable;
+	const indexable = prop => isFunction(_indexable) ? _indexable(prop) : _indexable;
 	for (const prop of names) {
 
-		if (((scriptableFn ? _scriptable(prop) : _scriptable) && isFunction(proxy[prop]))
-			|| ((indexableFn ? _indexable(prop) : _indexable) && isArray(proxy[prop]))) {
+		if ((scriptable(prop) && isFunction(proxy[prop]))
+			|| (indexable(prop) && isArray(proxy[prop]))) {
 			return true;
 		}
 	}

src/core/core.controller.js

@@ -66,7 +66,7 @@ function getCanvas(item) {
 	return item;
 }
 
-const chartOptionsScopes = config => [config.options, defaults.controllers[config.type] || {}, defaults];
+const chartOptionsScopes = config => [config.options, defaults.controllers[config.type] || {}, defaults, defaults.descriptors];
 
 class Chart {
 

src/core/core.datasetController.js

@@ -1,5 +1,5 @@
 import Animations from './core.animations';
-import {isObject, isArray, valueOrDefault, resolveObjectKey} from '../helpers/helpers.core';
+import {isObject, isArray, valueOrDefault, resolveObjectKey, defined} from '../helpers/helpers.core';
 import {listenArrayEvents, unlistenArrayEvents} from '../helpers/helpers.collection';
 import {sign} from '../helpers/helpers.math';
 import defaults from './core.defaults';
@@ -760,7 +760,7 @@ export default class DatasetController {
 		const cache = me._cachedDataOpts;
 		const cacheKey = elementType + '-' + mode;
 		const cached = cache[cacheKey];
-		const sharing = me.enableOptionSharing;
+		const sharing = me.enableOptionSharing && defined(index);
 		if (cached) {
 			return cloneIfNoSharing(cached, sharing);
 		}

src/core/core.defaults.js

@@ -1,6 +1,8 @@
 import {getHoverColor} from '../helpers/helpers.color';
 import {isObject, merge, valueOrDefault} from '../helpers/helpers.core';
 
+const privateSymbol = Symbol('private');
+
 /**
  * @param {object} node
  * @param {string} key
@@ -23,9 +25,7 @@ function getScope(node, key) {
  * Note: class is exported for typedoc
  */
 export class Defaults {
-	constructor() {
-		this._scriptable = (name) => name !== 'onClick' && name !== 'onHover';
-		this._indexable = (name) => name !== 'events';
+	constructor(descriptors) {
 		this.animation = undefined;
 		this.backgroundColor = 'rgba(0,0,0,0.1)';
 		this.borderColor = 'rgba(0,0,0,0.1)';
@@ -48,16 +48,13 @@ export class Defaults {
 			weight: null
 		};
 		this.hover = {
-			_fallback: 'interaction',
 			onHover: null
 		};
 		this.hoverBackgroundColor = (ctx, options) => getHoverColor(options.backgroundColor);
 		this.hoverBorderColor = (ctx, options) => getHoverColor(options.borderColor);
 		this.hoverColor = (ctx, options) => getHoverColor(options.color);
 		this.indexAxis = null;
 		this.interaction = {
-			_scroptable: false,
-			_indexable: false,
 			mode: 'nearest',
 			intersect: true
 		};
@@ -70,6 +67,13 @@ export class Defaults {
 		this.scale = undefined;
 		this.scales = {};
 		this.showLine = true;
+
+		Object.defineProperty(this, privateSymbol, {
+			value: Object.create(null),
+			writable: false
+		});
+
+		this.describe(descriptors);
 	}
 
 	/**
@@ -90,6 +94,22 @@ export class Defaults {
 		return getScope(this, scope);
 	}
 
+	/**
+	 * @param {string|object} scope
+	 * @param {object} [values]
+	 */
+	describe(scope, values) {
+		const root = this[privateSymbol];
+		if (typeof scope === 'string') {
+			return merge(getScope(root, scope), values);
+		}
+		return merge(getScope(root, ''), scope);
+	}
+
+	get descriptors() {
+		return this[privateSymbol];
+	}
+
 	/**
 	 * Routes the named defaults to fallback to another scope/name.
 	 * This routing is useful when those target values, like defaults.color, are changed runtime.
@@ -138,4 +158,14 @@ export class Defaults {
 }
 
 // singleton instance
-export default new Defaults();
+export default new Defaults({
+	_scriptable: (name) => name !== 'onClick' && name !== 'onHover',
+	_indexable: (name) => name !== 'events',
+	hover: {
+		_fallback: 'interaction'
+	},
+	interaction: {
+		_scroptable: false,
+		_indexable: false,
+	}
+});

src/core/core.typedRegistry.js

@@ -88,6 +88,10 @@ function registerDefaults(item, scope, parentScope) {
 	if (item.defaultRoutes) {
 		routeDefaults(scope, item.defaultRoutes);
 	}
+
+	if (item.descriptors) {
+		defaults.describe(scope, item.descriptors);
+	}
 }
 
 function routeDefaults(scope, routes) {