Minimize dependency on Chart in space utility.

/kind cleanup

Author: mauriciopoppe

src/samplers/builtIn.ts

@@ -3,7 +3,7 @@ import clamp from 'clamp'
 import utils from '../utils'
 import { builtIn as evaluate } from '../helpers/eval'
 
-import { Chart } from '../index'
+import { Chart } from '../chart'
 import { FunctionPlotDatum } from '../types'
 
 function checkAsymptote(
@@ -106,15 +106,15 @@ function split(chart: Chart, d: FunctionPlotDatum, data: number[][]) {
 }
 
 function linear(chart: Chart, d: FunctionPlotDatum, range: [number, number], n: number) {
-  const allX = utils.space(chart, range, n)
+  const allX = utils.space(chart.options.xAxis.type, range, n)
   const yDomain = chart.meta.yScale.domain()
   const yDomainMargin = yDomain[1] - yDomain[0]
   const yMin = yDomain[0] - yDomainMargin * 1e5
   const yMax = yDomain[1] + yDomainMargin * 1e5
   let data = []
   for (let i = 0; i < allX.length; i += 1) {
     const x = allX[i]
-    const y = evaluate(d, 'fn', { x: x })
+    const y = evaluate(d, 'fn', { x })
     if (utils.isValidNumber(x) && utils.isValidNumber(y)) {
       data.push([x, clamp(y, yMin, yMax)])
     }
@@ -127,7 +127,7 @@ function parametric(chart: Chart, d: FunctionPlotDatum, range: [number, number],
   // range is mapped to canvas coordinates from the input
   // for parametric plots the range will tell the start/end points of the `t` param
   const parametricRange = d.range || [0, 2 * Math.PI]
-  const tCoords = utils.space(chart, parametricRange, nSamples)
+  const tCoords = utils.space(chart.options.xAxis.type, parametricRange, nSamples)
   const samples = []
   for (let i = 0; i < tCoords.length; i += 1) {
     const t = tCoords[i]
@@ -142,7 +142,7 @@ function polar(chart: Chart, d: FunctionPlotDatum, range: [number, number], nSam
   // range is mapped to canvas coordinates from the input
   // for polar plots the range will tell the start/end points of the `theta` param
   const polarRange = d.range || [-Math.PI, Math.PI]
-  const thetaSamples = utils.space(chart, polarRange, nSamples)
+  const thetaSamples = utils.space(chart.options.xAxis.type, polarRange, nSamples)
   const samples = []
   for (let i = 0; i < thetaSamples.length; i += 1) {
     const theta = thetaSamples[i]

src/samplers/interval.ts

@@ -1,18 +1,15 @@
 import intervalArithmeticEval, { Interval } from 'interval-arithmetic-eval'
+import { Chart } from '../chart'
+import { FunctionPlotDatum } from '../types'
 
 import { interval as evaluate } from '../helpers/eval'
 import utils from '../utils'
 
-import { Chart } from '../index'
-import { FunctionPlotDatum } from '../types'
-
-// const Interval = (intervalArithmeticEval as any).Interval
-
 // disable the use of typed arrays in interval-arithmetic to improve the performance
 ;(intervalArithmeticEval as any).policies.disableRounding()
 
 function interval1d(chart: Chart, d: FunctionPlotDatum, range: [number, number], nSamples: number) {
-  const xCoords = utils.space(chart, range, nSamples)
+  const xCoords = utils.space(chart.options.xAxis.type, range, nSamples)
   const xScale = chart.meta.xScale
   const yScale = chart.meta.yScale
   const yMin = yScale.domain()[0]

src/utils.ts

@@ -1,6 +1,5 @@
 import globals from './globals'
 
-import { Chart } from './index'
 import { FunctionPlotDatum } from './types'
 
 const utils = {
@@ -17,10 +16,10 @@ const utils = {
     return typeof v === 'number' && !isNaN(v)
   },
 
-  space: function (chart: Chart, range: [number, number], n: number) {
+  space: function (type: string, range: [number, number], n: number) {
     const lo = range[0]
     const hi = range[1]
-    if (chart.options.xAxis.type === 'log') {
+    if (type === 'log') {
       return this.logspace(Math.log10(lo), Math.log10(hi), n)
     }
     // default is linear