refactor(ticks): rename d3Linear to d3Ticks (#137)

README.md

@@ -85,7 +85,7 @@ x.getTicks(); // [0, 5, 10]
 
 - [x] [Wilkinson Extended](docs/tick-methods/wilkinson-extended.md) An extension of Wilkinson's algorithm for positioning tick labels on axes.
 - [x] [R Pretty](docs/tick-methods/r-pretty.md) An algorithm for positioning tick labels on axes in R language.
-- [x] [D3 Linear](docs/tick-methods/d3-linear.md) Linear scale ticks algorithm for d3-scale.
+- [x] [D3 Linear](docs/tick-methods/d3-ticks.md) Linear scale ticks algorithm for d3-scale.
 
 ## Contribution
 

__tests__/unit/scales/linear.spec.ts

@@ -1,5 +1,5 @@
 import { Linear, TickMethod } from '../../../src';
-import { d3Linear } from '../../../src/tick-methods/d3-linear';
+import { d3Ticks } from '../../../src/tick-methods/d3-ticks';
 
 describe('Linear Scale Test', () => {
   test('test default options', () => {
@@ -13,7 +13,7 @@ describe('Linear Scale Test', () => {
     expect(nice).toBeFalsy();
     expect(clamp).toBeFalsy();
     expect(unknown).toBeUndefined();
-    expect(tickMethod).toBe(d3Linear);
+    expect(tickMethod).toBe(d3Ticks);
   });
 
   test('test map fn', () => {

__tests__/unit/scales/pow.spec.ts

@@ -1,5 +1,5 @@
 import { Pow } from '../../../src';
-import { d3Linear } from '../../../src/tick-methods/d3-linear';
+import { d3Ticks } from '../../../src/tick-methods/d3-ticks';
 
 describe('pow scales', () => {
   test('test default options', () => {
@@ -14,7 +14,7 @@ describe('pow scales', () => {
     expect(nice).toBeFalsy();
     expect(clamp).toBeFalsy();
     expect(unknown).toBeUndefined();
-    expect(tickMethod).toBe(d3Linear);
+    expect(tickMethod).toBe(d3Ticks);
   });
 
   test('test when exponent is 0.5, we use Math.sqrt API, not Math.pow', () => {

__tests__/unit/tick-methods/d3-linear.spec.ts → __tests__/unit/tick-methods/d3-ticks.spec.ts

@@ -1,4 +1,4 @@
-import { d3Linear as fn } from '../../../src';
+import { d3Ticks as fn } from '../../../src';
 
 describe('linear ticks', () => {
   test('common usage', () => {

src/index.ts

@@ -15,7 +15,7 @@ export { Time } from './scales/time';
 export { Base } from './scales/base';
 
 // tick-methods
-export { d3Linear } from './tick-methods/d3-linear';
+export { d3Ticks } from './tick-methods/d3-ticks';
 export { rPretty } from './tick-methods/r-pretty';
 export { wilkinsonExtended } from './tick-methods/wilkinson-extended';
 

src/scales/linear.ts

@@ -3,7 +3,7 @@ import { Continuous, Transform } from './continuous';
 import { LinearOptions } from '../types';
 import { Base } from './base';
 import { createInterpolate } from '../utils';
-import { d3Linear } from '../tick-methods/d3-linear';
+import { d3Ticks } from '../tick-methods/d3-ticks';
 
 /**
  * Linear 比例尺
@@ -20,7 +20,7 @@ export class Linear extends Continuous<LinearOptions> {
       clamp: false,
       round: false,
       interpolate: createInterpolate,
-      tickMethod: d3Linear,
+      tickMethod: d3Ticks,
       tickCount: 5,
     };
   }

src/scales/pow.ts

@@ -3,7 +3,7 @@ import { Continuous, Transform } from './continuous';
 import { PowOptions } from '../types';
 import { Base } from './base';
 import { createInterpolate } from '../utils';
-import { d3Linear } from '../tick-methods/d3-linear';
+import { d3Ticks } from '../tick-methods/d3-ticks';
 
 const transformPow = (exponent: number) => {
   return (x: number) => {
@@ -37,7 +37,7 @@ export class Pow<O extends PowOptions> extends Continuous<O> {
       round: false,
       exponent: 2,
       interpolate: createInterpolate,
-      tickMethod: d3Linear,
+      tickMethod: d3Ticks,
       tickCount: 5,
     } as O;
   }

src/tick-methods/d3-log.ts

@@ -1,5 +1,5 @@
 import { TickMethod } from 'types';
-import { d3Linear } from './d3-linear';
+import { d3Ticks } from './d3-ticks';
 import { pows, logs } from '../utils';
 
 export const d3Log: TickMethod = (a, b, n, base = 10) => {
@@ -37,9 +37,9 @@ export const d3Log: TickMethod = (a, b, n, base = 10) => {
         }
       }
     }
-    if (ticks.length * 2 < n) ticks = d3Linear(min, max, n);
+    if (ticks.length * 2 < n) ticks = d3Ticks(min, max, n);
   } else {
-    ticks = d3Linear(i, j, Math.min(j - i, n)).map(pow);
+    ticks = d3Ticks(i, j, Math.min(j - i, n)).map(pow);
   }
 
   return r ? ticks.reverse() : ticks;

src/tick-methods/d3-linear.ts → src/tick-methods/d3-ticks.ts

@@ -1,7 +1,7 @@
 import { TickMethod } from '../types';
 import { tickIncrement } from '../utils';
 
-export const d3Linear: TickMethod = (begin: number, end: number, count: number) => {
+export const d3Ticks: TickMethod = (begin: number, end: number, count: number) => {
   let n;
   let ticks;
 

src/utils/d3-linear-nice.ts

@@ -1,4 +1,4 @@
-// 参考 d3-linear nice 的实现
+// 参考 d3-ticks nice 的实现
 // https://github.com/d3/d3-scale
 
 import { tickIncrement } from './ticks';