move types into util file

packages/core/src/Calendar.tsx

@@ -4,7 +4,7 @@ import { DateInput } from './datelib/env'
 import { DateMarker, startOfDay } from './datelib/marker'
 import { createFormatter } from './datelib/formatting'
 import { createDuration, DurationInput } from './datelib/duration'
-import { parseDateSpan, DateSpanInput, DateSpan, DateSpanApi, DatePointApi } from './structs/date-span'
+import { parseDateSpan, DateSpanInput } from './structs/date-span'
 import { DateRangeInput } from './datelib/date-range'
 import { EventSourceInput, parseEventSource } from './structs/event-source'
 import { EventInput, parseEvent } from './structs/event'
@@ -18,37 +18,14 @@ import { __assign } from 'tslib'
 import { PointerDragEvent } from './interactions/pointer'
 import { render, h, createRef, flushToDom } from './vdom'
 import { TaskRunner, DelayedRunner } from './util/runner'
-import { ViewApi } from './ViewApi'
 import { guid } from './util/misc'
 import { CssDimValue } from './scrollgrid/util'
 import { applyStyleProp } from './util/dom-manip'
 import { CalendarStateReducer } from './reducers/CalendarStateReducer'
 import { getNow } from './reducers/current-date'
-import { ReducerContext } from './reducers/ReducerContext'
 import { triggerDateSelect, triggerDateUnselect } from './calendar-utils'
 
 
-export interface DateClickApi extends DatePointApi {
-  dayEl: HTMLElement
-  jsEvent: UIEvent
-  view: ViewApi
-}
-
-export interface DateSelectionApi extends DateSpanApi {
-  jsEvent: UIEvent
-  view: ViewApi
-}
-
-export type DatePointTransform = (dateSpan: DateSpan, context: ReducerContext) => any
-export type DateSpanTransform = (dateSpan: DateSpan, context: ReducerContext) => any
-
-export type CalendarInteraction = { destroy() }
-export type CalendarInteractionClass = { new(context: ReducerContext): CalendarInteraction }
-
-export type OptionChangeHandler = (propValue: any, context: ReducerContext) => void
-export type OptionChangeHandlerMap = { [propName: string]: OptionChangeHandler }
-
-
 export class Calendar {
 
   state: CalendarState = {} as any

packages/core/src/CalendarComponent.tsx

@@ -22,7 +22,7 @@ import { DateComponent } from './component/DateComponent'
 import { EventClicking } from './interactions/EventClicking'
 import { EventHovering } from './interactions/EventHovering'
 import { getNow } from './reducers/current-date'
-import { CalendarInteraction } from './Calendar'
+import { CalendarInteraction } from './calendar-utils'
 import { DelayedRunner } from './util/runner'
 
 

packages/core/src/calendar-utils.ts

@@ -5,6 +5,27 @@ import { __assign } from 'tslib'
 import { ViewApi } from './ViewApi'
 
 
+export interface DateClickApi extends DatePointApi {
+  dayEl: HTMLElement
+  jsEvent: UIEvent
+  view: ViewApi
+}
+
+export interface DateSelectionApi extends DateSpanApi {
+  jsEvent: UIEvent
+  view: ViewApi
+}
+
+export type DatePointTransform = (dateSpan: DateSpan, context: ReducerContext) => any
+export type DateSpanTransform = (dateSpan: DateSpan, context: ReducerContext) => any
+
+export type CalendarInteraction = { destroy() }
+export type CalendarInteractionClass = { new(context: ReducerContext): CalendarInteraction }
+
+export type OptionChangeHandler = (propValue: any, context: ReducerContext) => void
+export type OptionChangeHandlerMap = { [propName: string]: OptionChangeHandler }
+
+
 export function triggerDateSelect(selection: DateSpan, pev: PointerDragEvent | null, context: ReducerContext & { viewApi?: ViewApi }) {
   const arg = {
     ...buildDateSpanApiWithContext(selection, context),

packages/core/src/main.ts

@@ -90,7 +90,7 @@ export { ScrollController, ElementScrollController, WindowScrollController } fro
 export { Theme } from './theme/Theme'
 export { ComponentContext, ComponentContextType } from './component/ComponentContext'
 export { DateComponent, Seg, EventSegUiInteractionState } from './component/DateComponent'
-export { Calendar, DatePointTransform, DateSpanTransform, DateSelectionApi } from './Calendar'
+export { Calendar } from './Calendar'
 export { ViewProps, sliceEvents } from './View'
 export { ViewApi } from './ViewApi'
 
@@ -201,4 +201,4 @@ export { renderFill, BgEvent, BgEventProps } from './common/bg-fill'
 export { WeekNumberRoot, WeekNumberRootProps } from './common/WeekNumberRoot'
 
 export { ViewRoot, ViewRootProps } from './common/ViewRoot'
-export { triggerDateSelect, triggerDateClick, buildDatePointApiWithContext } from './calendar-utils'
+export { triggerDateSelect, triggerDateClick, buildDatePointApiWithContext, DatePointTransform, DateSpanTransform, DateSelectionApi } from './calendar-utils'

packages/core/src/plugin-system.ts

@@ -1,7 +1,7 @@
 import { reducerFunc } from './reducers/types'
 import { eventDefParserFunc } from './structs/event'
 import { eventDefMutationApplier } from './structs/event-mutation'
-import { DatePointTransform, DateSpanTransform, CalendarInteractionClass, OptionChangeHandlerMap } from './Calendar'
+import { DatePointTransform, DateSpanTransform, CalendarInteractionClass, OptionChangeHandlerMap } from './calendar-utils'
 import { ViewConfigInputHash } from './structs/view-config'
 import { ViewSpec } from './structs/view-spec'
 import { ViewProps } from './View'