refactor(scales): move things around and work with other packages

packages/scales/src/bandScale.ts

@@ -1,12 +1,16 @@
 import { scaleBand } from 'd3-scale'
-import { ComputedSerieAxis, ScaleBand, ScaleBandSpec, StringValue } from './types'
+import { ComputedSerieAxis, ScaleBand, ScaleBandSpec, StringValue, ScaleAxis } from './types'
 
 export const createBandScale = <Input extends StringValue>(
-    _spec: ScaleBandSpec,
+    { round = true }: ScaleBandSpec,
     data: ComputedSerieAxis<Input>,
-    size: number
+    size: number,
+    axis: ScaleAxis
 ) => {
-    const scale = scaleBand<Input>().range([0, size]).domain(data.all)
+    const scale = scaleBand<Input>()
+        .range(axis === 'x' ? [0, size] : [size, 0])
+        .domain(data.all)
+        .round(round)
 
     const typedScale = scale as ScaleBand<Input>
     typedScale.type = 'band'

packages/scales/src/compute.ts

@@ -4,8 +4,13 @@ import sortBy from 'lodash/sortBy'
 import last from 'lodash/last'
 import isDate from 'lodash/isDate'
 import { createDateNormalizer } from './timeHelpers'
-import { ScaleAxis, ScaleSpec, Series, ScaleValue, SerieAxis } from './types'
-import { computeScale } from './computeScale'
+import { ScaleAxis, ScaleSpec, Series, ScaleValue, SerieAxis, ComputedSerieAxis } from './types'
+import { createLinearScale } from './linearScale'
+import { createPointScale } from './pointScale'
+import { createBandScale } from './bandScale'
+import { createTimeScale } from './timeScale'
+import { createLogScale } from './logScale'
+import { createSymLogScale } from './symLogScale'
 
 type XY = ReturnType<typeof generateSeriesXY>
 
@@ -49,6 +54,30 @@ export const getOtherAxis = (axis: ScaleAxis): ScaleAxis => (axis === 'x' ? 'y'
 export const compareValues = (a: string | number, b: string | number) => a === b
 export const compareDateValues = (a: Date, b: Date) => a.getTime() === b.getTime()
 
+export function computeScale<Input extends ScaleValue>(
+    spec: ScaleSpec,
+    data: ComputedSerieAxis<any>,
+    size: number,
+    axis: ScaleAxis
+) {
+    switch (spec.type) {
+        case 'linear':
+            return createLinearScale(spec, data, size, axis)
+        case 'point':
+            return createPointScale<Input>(spec, data, size)
+        case 'band':
+            return createBandScale<Input>(spec, data, size, axis)
+        case 'time':
+            return createTimeScale(spec, data, size)
+        case 'log':
+            return createLogScale(spec, data, size, axis)
+        case 'symlog':
+            return createSymLogScale(spec, data, size, axis)
+        default:
+            throw new Error('invalid scale spec')
+    }
+}
+
 export const computeXYScalesForSeries = (
     _series: XYSeries[],
     xScaleSpec: ScaleSpec,

packages/scales/src/types.ts

@@ -5,7 +5,6 @@ import {
     ScaleLogarithmic as D3ScaleLogarithmic,
     ScaleSymLog as D3ScaleSymLog,
     ScaleTime as D3ScaleTime,
-    NumberValue,
 } from 'd3-scale'
 import { TIME_PRECISION } from './timeHelpers'
 
@@ -34,8 +33,14 @@ export interface ScaleTypeToScale<Input, Output> {
     symlog: ScaleSymLog
     point: ScalePoint<Input>
     band: ScaleBand<Input>
+    time: ScaleTime<Input>
 }
 
+export type Scale<Input, Output> = ScaleTypeToScale<Input, Output>[keyof ScaleTypeToScale<
+    Input,
+    Output
+>]
+
 export type ScaleLinearSpec = {
     type: 'linear'
     // default to `auto`
@@ -95,6 +100,7 @@ export const isScalePointSpec = (spec: ScaleSpec): spec is ScalePointSpec => spe
 
 export type ScaleBandSpec = {
     type: 'band'
+    round?: boolean
 }
 export interface ScaleBand<Input extends StringValue> extends D3ScaleBand<Input> {
     type: 'band'
@@ -117,7 +123,7 @@ export type ScaleTimeSpec = {
     nice?: boolean
 }
 
-export interface ScaleTime<Input extends Date | NumberValue> extends D3ScaleTime<Input, Date> {
+export interface ScaleTime<Input> extends D3ScaleTime<Input, number> {
     type: 'time'
     useUTC: boolean
 }