tune imports

Author: sgratzl

src/chart.js

@@ -4,6 +4,20 @@ export const Chart = ChartNS;
 export const plugins = ChartNS.plugins;
 export const controllers = ChartNS.controllers;
 export const defaults = ChartNS.defaults;
-export const Element = ChartNS.Element;
 export const helpers = ChartNS.helpers;
-export const scaleService = ChartNS.scaleService;
+// export const scaleService = ChartNS.scaleService;
+
+// export const DataSetController = ChartNS.DataSetController;
+export const BarController = controllers.bar;
+export const HorizontalBarController = controllers.horizontalBar;
+// export const LineController = controllers.line;
+// export const PolarAreaController = controllers.polarArea;
+// export const ScatterController = controllers.scatter;
+
+export const Element = ChartNS.Element;
+// export const Rectangle = ChartNS.elements.Rectangle;
+// export const Point = ChartNS.elements.Point;
+// export const Line = ChartNS.elements.Line;
+
+export const merge = ChartNS.helpers.merge;
+export const drawPoint = ChartNS.helpers.canvas.drawPoint;

src/controllers/base.js

@@ -1,6 +1,6 @@
 import { interpolateNumberArray } from '../animation';
 import { outlierPositioner, patchInHoveredOutlier } from '../tooltip';
-import { controllers } from '../chart';
+import { BarController } from '../chart';
 import { defaultStatsOptions } from '../data';
 
 export function baseDefaults(keys) {
@@ -46,7 +46,7 @@ export function baseDefaults(keys) {
   };
 }
 
-export class StatsBase extends controllers.bar {
+export class StatsBase extends BarController {
   getMinMax(scale, canStack) {
     const bak = scale.axis;
     const config = this._config;

src/controllers/boxplot.js

@@ -1,5 +1,5 @@
 import { asBoxPlotStats } from '../data';
-import { Chart, controllers, helpers, defaults } from '../chart';
+import { Chart, controllers, defaults, BarController, HorizontalBarController, merge } from '../chart';
 import { baseDefaults, StatsBase } from './base';
 import { BoxAndWiskers, boxOptionsKeys } from '../elements';
 import { patchControllerConfig } from './utils';
@@ -28,11 +28,11 @@ export class BoxPlotController extends StatsBase {
 BoxPlotController.id = 'boxplot';
 BoxPlotController.register = () => {
   BoxPlotController.prototype.dataElementType = BoxAndWiskers.register();
-  BoxPlotController.prototype.dataElementOptions = controllers.bar.prototype.dataElementOptions.concat(boxOptionsKeys);
+  BoxPlotController.prototype.dataElementOptions = BarController.prototype.dataElementOptions.concat(boxOptionsKeys);
 
   defaults.set(
     BoxPlotController.id,
-    helpers.merge({}, [
+    merge({}, [
       defaults.bar,
       baseDefaults(boxOptionsKeys),
       {
@@ -73,13 +73,13 @@ export class HorizontalBoxPlotController extends BoxPlotController {
 HorizontalBoxPlotController.id = 'horizontalBoxplot';
 HorizontalBoxPlotController.register = () => {
   HorizontalBoxPlotController.prototype.dataElementType = BoxAndWiskers.register();
-  HorizontalBoxPlotController.prototype.dataElementOptions = controllers.horizontalBar.prototype.dataElementOptions.concat(
+  HorizontalBoxPlotController.prototype.dataElementOptions = HorizontalBarController.prototype.dataElementOptions.concat(
     boxOptionsKeys
   );
 
   defaults.set(
     HorizontalBoxPlotController.id,
-    helpers.merge({}, [
+    merge({}, [
       defaults.horizontalBar,
       baseDefaults(boxOptionsKeys),
       {

src/controllers/violin.js

@@ -1,5 +1,5 @@
 import { asViolinStats } from '../data';
-import { Chart, controllers, defaults, helpers } from '../chart';
+import { Chart, controllers, defaults, helpers, BarController, HorizontalBarController } from '../chart';
 import { StatsBase, baseDefaults } from './base';
 import { baseOptionKeys } from '../elements/base';
 import { ViolinElement } from '../elements';
@@ -34,7 +34,7 @@ export class ViolinController extends StatsBase {
 ViolinController.id = 'violin';
 ViolinController.register = () => {
   ViolinController.prototype.dataElementType = ViolinElement.register();
-  ViolinController.prototype.dataElementOptions = controllers.bar.prototype.dataElementOptions.concat(baseOptionKeys);
+  ViolinController.prototype.dataElementOptions = BarController.prototype.dataElementOptions.concat(baseOptionKeys);
 
   defaults.set(
     ViolinController.id,
@@ -84,7 +84,7 @@ export class HorizontalViolinController extends ViolinController {
 HorizontalViolinController.id = 'horizontalViolin';
 HorizontalViolinController.register = () => {
   HorizontalViolinController.prototype.dataElementType = ViolinElement.register();
-  HorizontalViolinController.prototype.dataElementOptions = controllers.horizontalBar.prototype.dataElementOptions.concat(
+  HorizontalViolinController.prototype.dataElementOptions = HorizontalViolinController.prototype.dataElementOptions.concat(
     baseOptionKeys
   );
 

src/elements/base.js

@@ -1,4 +1,4 @@
-import { defaults, Element, helpers } from '../chart';
+import { defaults, Element, drawPoint } from '../chart';
 import { rnd } from '../data';
 
 export const baseDefaults = {
@@ -51,11 +51,11 @@ export class StatsBase extends Element {
 
     if (vert) {
       props.items.forEach((v) => {
-        helpers.canvas.drawPoint(ctx, pointOptions, props.x - props.width / 2 + random() * props.width, v);
+        drawPoint(ctx, pointOptions, props.x - props.width / 2 + random() * props.width, v);
       });
     } else {
       props.items.forEach((v) => {
-        helpers.canvas.drawPoint(ctx, pointOptions, v, props.y - props.height / 2 + random() * props.height);
+        drawPoint(ctx, pointOptions, v, props.y - props.height / 2 + random() * props.height);
       });
     }
     ctx.restore();
@@ -81,11 +81,11 @@ export class StatsBase extends Element {
 
     if (vert) {
       props.outliers.forEach((v) => {
-        helpers.canvas.drawPoint(ctx, pointOptions, props.x, v);
+        drawPoint(ctx, pointOptions, props.x, v);
       });
     } else {
       props.outliers.forEach((v) => {
-        helpers.canvas.drawPoint(ctx, pointOptions, v, props.y);
+        drawPoint(ctx, pointOptions, v, props.y);
       });
     }
 

src/elements/violin.js

@@ -1,4 +1,4 @@
-import { helpers, defaults } from '../chart';
+import { defaults, drawPoint } from '../chart';
 import { StatsBase, baseDefaults } from './base';
 
 export class ViolinElement extends StatsBase {
@@ -11,7 +11,7 @@ export class ViolinElement extends StatsBase {
 
     const props = this.getProps(['x', 'y', 'width', 'height', 'min', 'max', 'coords', 'maxEstimate']);
 
-    helpers.canvas.drawPoint(
+    drawPoint(
       ctx,
       {
         pointStyle: 'rectRot',