restructure imports

src/model/ActionColumn.ts

@@ -1,6 +1,6 @@
 import {Category, SupportType} from './annotations';
-import Column, {IColumnDesc} from './Column';
-import {IDataRow, IGroup} from './interfaces';
+import {IDataRow, IColumnDesc, IGroup} from './interfaces';
+import Column from './Column';
 
 export interface IAction {
   name: string;

src/model/AggregateGroupColumn.ts

@@ -1,9 +1,15 @@
 import {Category, SupportType, toolbar} from './annotations';
-import Column, {IColumnDesc, widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
-import {IGroup} from './interfaces';
+import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
+import {IGroup, IColumnDesc} from './interfaces';
 import Ranking from './Ranking';
 import {IEventListener} from '../internal';
-import {EAggregationState} from '../provider';
+
+
+export enum EAggregationState {
+  COLLAPSE = 'collapse',
+  EXPAND = 'expand',
+  EXPAND_TOP_N = 'expand_top'
+}
 
 /**
  * factory for creating a description creating a rank column
@@ -26,7 +32,7 @@ export interface IAggregateGroupColumnDesc extends IColumnDesc {
  * @asMemberOf AggregateGroupColumn
  * @event
  */
-export declare function aggregate(ranking: Ranking, group: IGroup, value: boolean, state: EAggregationState): void;
+declare function aggregate(ranking: Ranking, group: IGroup, value: boolean, state: EAggregationState): void;
 
 /**
  * a checkbox column for selections

src/model/AnnotateColumn.ts

@@ -1,16 +1,31 @@
 import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
 import {IDataRow} from './interfaces';
-import StringColumn, {filterChanged, groupingChanged} from './StringColumn';
+import StringColumn from './StringColumn';
 import {IEventListener} from '../internal';
 import ValueColumn, {dataLoaded} from './ValueColumn';
 
 
+/**
+ * emitted when the filter property changes
+ * @asMemberOf AnnotateColumn
+ * @event
+ */
+declare function filterChanged(previous: string | RegExp | null, current: string | RegExp | null): void;
+
+
+/**
+ * emitted when the grouping property changes
+ * @asMemberOf AnnotateColumn
+ * @event
+ */
+declare function groupingChanged(previous: (RegExp | string)[][], current: (RegExp | string)[][]): void;
+
 /**
  * emitted when the value of a row changes
  * @asMemberOf AnnotateColumn
  * @event
  */
-export declare function valueChanged(dataIndex: number, previous: string, current: string): void;
+declare function valueChanged(dataIndex: number, previous: string, current: string): void;
 
 /**
  * a string column in which the values can be edited locally

src/model/BooleanColumn.ts

@@ -1,9 +1,9 @@
 import {Category, toolbar} from './annotations';
 import CategoricalColumn from './CategoricalColumn';
-import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, ECompareValueType, dirtyCaches} from './Column';
+import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
 import ValueColumn, {IValueColumnDesc, dataLoaded} from './ValueColumn';
 import {ICategoricalColumn, ICategory, ICategoricalColorMappingFunction} from './ICategoricalColumn';
-import {IDataRow} from './interfaces';
+import {IDataRow, ECompareValueType} from './interfaces';
 import {IEventListener} from '../internal';
 import {restoreColorMapping, DEFAULT_COLOR_FUNCTION} from './CategoricalColorMappingFunction';
 
@@ -27,14 +27,14 @@ export declare type IBooleanColumnDesc = IValueColumnDesc<boolean> & IBooleanDes
  * @asMemberOf BooleanColumn
  * @event
  */
-export declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
+declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
 
 /**
  * emitted when the filter property changes
  * @asMemberOf BooleanColumn
  * @event
  */
-export declare function filterChanged(previous: boolean | null, current: boolean | null): void;
+declare function filterChanged(previous: boolean | null, current: boolean | null): void;
 
 /**
  * a string column with optional alignment

src/model/BooleansColumn.ts

@@ -17,7 +17,7 @@ export declare type IBooleansColumnDesc = IArrayColumnDesc<boolean>;
  * @asMemberOf BooleansColumn
  * @event
  */
-export declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
+declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
 
 
 export default class BooleansColumn extends ArrayColumn<boolean> implements ISetColumn {

src/model/BoxPlotColumn.ts

@@ -2,11 +2,11 @@ import {format} from 'd3-format';
 import {IBoxPlotData, IEventListener} from '../internal';
 import {Category, dialogAddons, SortByDefault, toolbar} from './annotations';
 import {createColorMappingFunction, restoreColorMapping} from './ColorMappingFunction';
-import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, ECompareValueType, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
-import {IDataRow} from './interfaces';
+import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
+import {IDataRow, ECompareValueType} from './interfaces';
 import {ESortMethod, IBoxPlotColumn, INumberDesc, INumberFilter, IColorMappingFunction, IMappingFunction} from './INumberColumn';
 import {createMappingFunction, restoreMapping, ScaleMappingFunction} from './MappingFunction';
-import NumberColumn, {colorMappingChanged} from './NumberColumn';
+import NumberColumn from './NumberColumn';
 import ValueColumn, {dataLoaded, IValueColumnDesc} from './ValueColumn';
 import {DEFAULT_FORMATTER, noNumberFilter, toCompareBoxPlotValue, getBoxPlotNumber, isDummyNumberFilter, restoreNumberFilter} from './internalNumber';
 
@@ -23,21 +23,28 @@ export declare type IBoxPlotColumnDesc = IBoxPlotDesc & IValueColumnDesc<IBoxPlo
  * @asMemberOf BoxPlotColumn
  * @event
  */
-export declare function sortMethodChanged(previous: ESortMethod, current: ESortMethod): void;
+declare function sortMethodChanged(previous: ESortMethod, current: ESortMethod): void;
 
 /**
  * emitted when the mapping property changes
  * @asMemberOf BoxPlotColumn
  * @event
  */
-export declare function mappingChanged(previous: IMappingFunction, current: IMappingFunction): void;
+declare function mappingChanged(previous: IMappingFunction, current: IMappingFunction): void;
+
+/**
+ * emitted when the color mapping property changes
+ * @asMemberOf BoxPlotColumn
+ * @event
+ */
+declare function colorMappingChanged(previous: IColorMappingFunction, current: IColorMappingFunction): void;
 
 /**
  * emitted when the filter property changes
  * @asMemberOf BoxPlotColumn
  * @event
  */
-export declare function filterChanged(previous: INumberFilter | null, current: INumberFilter | null): void;
+declare function filterChanged(previous: INumberFilter | null, current: INumberFilter | null): void;
 
 
 @toolbar('filterNumber', 'colorMapped', 'editMapping')

src/model/CategoricalColumn.ts

@@ -1,9 +1,9 @@
 import {IEventListener, ISequence} from '../internal';
 import {Category, toolbar} from './annotations';
 import {DEFAULT_COLOR_FUNCTION, restoreColorMapping} from './CategoricalColorMappingFunction';
-import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, groupRendererChanged, ICompareValue, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
+import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
 import {ICategoricalColumn, ICategoricalColumnDesc, ICategoricalFilter, ICategory, ICategoricalColorMappingFunction} from './ICategoricalColumn';
-import {IDataRow, IGroup} from './interfaces';
+import {IDataRow, IGroup, ICompareValue} from './interfaces';
 import {missingGroup} from './missing';
 import ValueColumn, {dataLoaded} from './ValueColumn';
 import {toCategories, isCategoryIncluded, isEqualCategoricalFilter, toCompareCategoryValue, COMPARE_CATEGORY_VALUE_TYPES, toGroupCompareCategoryValue, COMPARE_GROUP_CATEGORY_VALUE_TYPES} from './internalCategorical';
@@ -14,15 +14,15 @@ import {toCategories, isCategoryIncluded, isEqualCategoricalFilter, toCompareCat
  * @asMemberOf CategoricalColumn
  * @event
  */
-export declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
+declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
 
 
 /**
  * emitted when the filter property changes
  * @asMemberOf CategoricalColumn
  * @event
  */
-export declare function filterChanged(previous: ICategoricalFilter | null, current: ICategoricalFilter | null): void;
+declare function filterChanged(previous: ICategoricalFilter | null, current: ICategoricalFilter | null): void;
 
 /**
  * column for categorical values

src/model/CategoricalMapColumn.ts

@@ -17,7 +17,7 @@ export declare type ICategoricalMapColumnDesc = ICategoricalDesc & IMapColumnDes
  * @asMemberOf CategoricalMapColumn
  * @event
  */
-export declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
+declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
 
 @toolbar('colorMappedCategorical')
 export default class CategoricalMapColumn extends MapColumn<string | null> implements ICategoricalLikeColumn {

src/model/CategoricalsColumn.ts

@@ -16,7 +16,7 @@ export declare type ICategoricalsColumnDesc = ICategoricalDesc & IArrayColumnDes
  * @asMemberOf CategoricalsColumn
  * @event
  */
-export declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
+declare function colorMappingChanged(previous: ICategoricalColorMappingFunction, current: ICategoricalColorMappingFunction): void;
 
 /**
  * a string column with optional alignment

src/model/Column.ts

@@ -1,47 +1,7 @@
 import {AEventDispatcher, ISequence, similar, fixCSS, IEventListener} from '../internal';
-import {IColumnDump} from '../provider';
 import {isSortingAscByDefault} from './annotations';
-import {defaultGroup, ECompareValueType, IColumnDesc, IDataRow, IGroup} from './interfaces';
-import Ranking, {ISortCriteria} from './Ranking';
-
-export {ECompareValueType, IColumnDesc} from './interfaces';
-
-export interface IFlatColumn {
-  readonly col: Column;
-  readonly offset: number;
-  readonly width: number;
-}
-
-export interface IColumnParent {
-  remove(col: Column): boolean;
-
-  insert(col: Column, index?: number): Column | null;
-
-  insertAfter(col: Column, reference: Column): Column | null;
-
-  move(col: Column, index?: number): Column | null;
-
-  moveAfter(col: Column, reference: Column): Column | null;
-
-  findMyRanker(): Ranking | null;
-
-  readonly fqid: string;
-
-  indexOf(col: Column): number;
-
-  at(index: number): Column;
-
-  readonly fqpath: string;
-
-}
-
-
-export interface IColumnMetaData {
-  label: string;
-  description: string;
-}
-
-export declare type ICompareValue = string | number | null;
+import {IColumnDump, ISortCriteria, defaultGroup, ECompareValueType, IColumnDesc, IDataRow, IGroup, IColumnParent, IColumnMetaData, IFlatColumn, ICompareValue} from './interfaces';
+import Ranking from './Ranking';
 
 /**
  * emitted when the width property changes

src/model/CompositeColumn.ts

@@ -1,14 +1,10 @@
 import {suffix, IEventListener} from '../internal';
-import Column, {IColumnParent, IFlatColumn, widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
+import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
 import {Category, toolbar} from './annotations';
-import {IDataRow} from './interfaces';
+import {IDataRow, IColumnParent, IFlatColumn} from './interfaces';
 import {isNumberColumn} from './INumberColumn';
 import ValueColumn from './ValueColumn';
 
-export function isMultiLevelColumn(col: Column): col is IMultiLevelColumn {
-  return typeof ((<IMultiLevelColumn>col).getCollapsed) === 'function';
-}
-
 /**
  * emitted when the filter property changes
  * @asMemberOf CompositeColumn
@@ -227,9 +223,3 @@ export default class CompositeColumn extends Column implements IColumnParent {
     return false;
   }
 }
-
-export interface IMultiLevelColumn extends CompositeColumn {
-  getCollapsed(): boolean;
-
-  setCollapsed(value: boolean): void;
-}

src/model/CompositeNumberColumn.ts

@@ -1,7 +1,6 @@
 import {format} from 'd3-format';
-import {IColumnDesc} from './Column';
 import CompositeColumn from './CompositeColumn';
-import {IDataRow, IGroup} from './interfaces';
+import {IDataRow, IGroup, IColumnDesc} from './interfaces';
 import {isMissingValue} from './missing';
 import NumberColumn from './NumberColumn';
 import {SortByDefault} from './annotations';

src/model/DateColumn.ts

@@ -1,9 +1,9 @@
 import {timeFormat, timeParse} from 'd3-time-format';
 import {ISequence, equal, IEventListener} from '../internal';
 import {Category, dialogAddons, toolbar} from './annotations';
-import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, ECompareValueType, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
+import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
 import {IDateColumn, IDateDesc, IDateFilter, IDateGrouper} from './IDateColumn';
-import {defaultGroup, IDataRow, IGroup} from './interfaces';
+import {defaultGroup, IDataRow, IGroup, ECompareValueType} from './interfaces';
 import {isMissingValue, isUnknown, missingGroup} from './missing';
 import ValueColumn, {dataLoaded, IValueColumnDesc} from './ValueColumn';
 import {noDateFilter, defaultDateGrouper, isDummyDateFilter, isDefaultDateGrouper, restoreDateFilter, isEqualDateFilter, isDateIncluded, toDateGroup, chooseAggregatedDate} from './internalDate';
@@ -16,14 +16,14 @@ export declare type IDateColumnDesc = IValueColumnDesc<Date> & IDateDesc;
  * @asMemberOf DateColumn
  * @event
  */
-export declare function filterChanged(previous: IDateFilter | null, current: IDateFilter | null): void;
+declare function filterChanged(previous: IDateFilter | null, current: IDateFilter | null): void;
 
 /**
  * emitted when the grouping property changes
  * @asMemberOf DateColumn
  * @event
  */
-export declare function groupingChanged(previous: IDateGrouper | null, current: IDateGrouper | null): void;
+declare function groupingChanged(previous: IDateGrouper | null, current: IDateGrouper | null): void;
 
 
 @toolbar('groupBy', 'sortGroupBy', 'filterDate')

src/model/DatesColumn.ts

@@ -2,10 +2,10 @@ import {timeFormat, timeParse} from 'd3-time-format';
 import {median, min, max, IEventListener} from '../internal';
 import {dialogAddons, toolbar} from './annotations';
 import ArrayColumn, {IArrayColumnDesc} from './ArrayColumn';
-import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, ECompareValueType, dirtyCaches} from './Column';
+import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
 import ValueColumn, {dataLoaded} from './ValueColumn';
 import {IDateDesc, IDateColumn, IDateFilter} from './IDateColumn';
-import {IDataRow} from './interfaces';
+import {IDataRow, ECompareValueType} from './interfaces';
 import {isMissingValue} from './missing';
 import DateColumn from './DateColumn';
 import {noDateFilter, isDummyDateFilter, restoreDateFilter} from './internalDate';
@@ -28,14 +28,14 @@ export declare type IDatesColumnDesc = IDatesDesc & IArrayColumnDesc<Date>;
  * @asMemberOf DatesColumn
  * @event
  */
-export declare function sortMethodChanged(previous: EDateSort, current: EDateSort): void;
+declare function sortMethodChanged(previous: EDateSort, current: EDateSort): void;
 
 /**
  * emitted when the filter property changes
  * @asMemberOf DatesColumn
  * @event
  */
-export declare function filterChanged(previous: IDateFilter | null, current: IDateFilter | null): void;
+declare function filterChanged(previous: IDateFilter | null, current: IDateFilter | null): void;
 
 @toolbar('filterDate')
 @dialogAddons('sort', 'sortDates')

src/model/DatesMapColumn.ts

@@ -19,14 +19,14 @@ export declare type IDateMapColumnDesc = IDatesDesc & IMapColumnDesc<Date | null
  * @asMemberOf DatesMapColumn
  * @event
  */
-export declare function sortMethodChanged(previous: EDateSort, current: EDateSort): void;
+declare function sortMethodChanged(previous: EDateSort, current: EDateSort): void;
 
 /**
  * emitted when the filter property changes
  * @asMemberOf DatesMapColumn
  * @event
  */
-export declare function filterChanged(previous: IDateFilter | null, current: IDateFilter | null): void;
+declare function filterChanged(previous: IDateFilter | null, current: IDateFilter | null): void;
 
 
 @toolbar('filterDate')

src/model/DummyColumn.ts

@@ -1,4 +1,5 @@
-import Column, {IColumnDesc} from './Column';
+import Column from './Column';
+import {IColumnDesc} from './interfaces';
 
 /**
  * a default column with no values

src/model/GroupColumn.ts

@@ -1,6 +1,6 @@
 import {Category, SupportType, toolbar, dialogAddons} from './annotations';
-import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, ECompareValueType, dirtyCaches} from './Column';
-import {IDataRow, IGroup} from './interfaces';
+import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
+import {IDataRow, IGroup, ECompareValueType} from './interfaces';
 import {missingGroup} from './missing';
 import {IEventListener, ISequence} from '../internal';
 
@@ -18,7 +18,7 @@ export enum EGroupSortMethod {
  * @asMemberOf GroupColumn
  * @event
  */
-export declare function sortMethodChanged(previous: EGroupSortMethod, current: EGroupSortMethod): void;
+declare function sortMethodChanged(previous: EGroupSortMethod, current: EGroupSortMethod): void;
 
 
 @SupportType()