fix wrong class constructor type

lineupjs · May 28, 2019 · 7a1faf1 · 7a1faf1
1 parent 875d5f0
commit 7a1faf1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/builder/DataBuilder.ts b/src/builder/DataBuilder.ts
@@ -1,4 +1,4 @@
-import {Column, IColumnDesc} from '../model';
+import {IColumnDesc, IColumnConstructor} from '../model';
 import {DataProvider, LocalDataProvider, deriveColors, deriveColumnDescriptions, IDataProviderOptions, ILocalDataProviderOptions, IAggregationStrategy} from '../provider';
 import {LineUp, Taggle} from '../ui';
 import ColumnBuilder from './column/ColumnBuilder';
@@ -87,9 +87,9 @@ export default class DataBuilder extends LineUpBuilder {
   /**
    * register another column type to this data provider
    * @param {string} type unique type id
-   * @param {typeof Column} clazz column class
+   * @param {IColumnConstructor} clazz column class
    */
-  registerColumnType(type: string, clazz: typeof Column) {
+  registerColumnType(type: string, clazz: IColumnConstructor) {
     this.providerOptions.columnTypes![type] = clazz;
     return this;
   }

diff --git a/src/model/index.ts b/src/model/index.ts
@@ -34,7 +34,7 @@ export {default as CategoricalMapColumn} from './CategoricalMapColumn';
 export * from './CategoricalMapColumn';
 export {default as CategoricalsColumn} from './CategoricalsColumn';
 export * from './CategoricalsColumn';
-export {default, default as Column} from './Column';
+export {default, default as Column, IColumnConstructor} from './Column';
 // no * export
 export {default as CompositeColumn} from './CompositeColumn';
 // no * export

diff --git a/src/provider/interfaces.ts b/src/provider/interfaces.ts
@@ -1,16 +1,15 @@
-import {Column, Ranking, IColumnDesc, IGroup, IndicesArray, IDataRow, IRankingDump, EAggregationState, IColorMappingFunctionConstructor, IMappingFunctionConstructor} from '../model';
+import {Column, Ranking, IColumnConstructor, IColumnDesc, IGroup, IndicesArray, IDataRow, IRankingDump, EAggregationState, IColorMappingFunctionConstructor, IMappingFunctionConstructor} from '../model';
 import {AEventDispatcher, ISequence} from '../internal';
 import {IRenderTasks} from '../renderer';
 import {IAbortAblePromise} from 'lineupengine';
-import {IColumnConstructor} from '../model/Column';
 
 export {ABORTED} from 'lineupengine';
 export declare type IAbortAblePromise<T> = IAbortAblePromise<T>;
 
 export declare type IAggregationStrategy = 'group' | 'item' | 'group+item' | 'group+top+item' | 'group+item+top';
 
 export interface IDataProviderOptions {
-  columnTypes: {[columnType: string]: typeof Column};
+  columnTypes: {[columnType: string]: IColumnConstructor};
   colorMappingFunctionTypes: {[colorMappingFunctionType: string]: IColorMappingFunctionConstructor};
   mappingFunctionTypes: {[mappingFunctionType: string]: IMappingFunctionConstructor};