fix lint problems

packages/__tests__/src/lib/globals.ts

@@ -198,7 +198,7 @@ function oneCall(func) {
 }
 
 function spyOnMethod(Class, methodName, dontCallThrough) {
-  var origMethod = Class.prototype.hasOwnProperty(methodName)
+  var origMethod = Class.prototype.hasOwnProperty(methodName) // eslint-disable-line no-prototype-builtins
     ? Class.prototype[methodName]
     : null
 

packages/__tests__/src/lib/simulate.js

@@ -42,7 +42,9 @@ $.simulate.prototype.simulateWindowResize = function() {
   if (typeof Event !== 'undefined') {
     try {
       event = new Event('resize')
-    } catch (ex) {}
+    } catch (ex) {
+      // why would fail?
+    }
   }
 
   if (!event) {

packages/common/src/common/DayCellRoot.tsx

@@ -10,6 +10,7 @@ import { BaseComponent } from '../vdom-util'
 import { DateProfile } from '../DateProfileGenerator'
 import { memoizeObjArg } from '../util/memoize'
 import { DateEnv } from '../datelib/env'
+import { Dictionary } from '../options'
 
 
 const DAY_NUM_FORMAT = createFormatter({ day: 'numeric' })
@@ -21,7 +22,7 @@ interface DayCellHookPropsInput {
   dateEnv: DateEnv
   viewApi: ViewApi
   showDayNumber?: boolean // defaults to false
-  extraProps?: object // so can include a resource
+  extraProps?: Dictionary // so can include a resource
 }
 
 export interface DayCellHookProps extends DateMeta {
@@ -38,7 +39,7 @@ export interface DayCellRootProps {
   dateProfile: DateProfile
   todayRange: DateRange
   showDayNumber?: boolean // defaults to false
-  extraHookProps?: object
+  extraHookProps?: Dictionary
   children: (
     rootElRef: Ref<any>,
     classNames: string[],
@@ -96,7 +97,7 @@ export interface DayCellContentProps {
   dateProfile: DateProfile
   todayRange: DateRange
   showDayNumber?: boolean // defaults to false
-  extraHookProps?: object
+  extraHookProps?: Dictionary
   defaultContent?: (hookProps: DayCellHookProps) => ComponentChildren
   children: (
     innerElRef: Ref<any>,

packages/common/src/common/DayTableModel.ts

@@ -2,6 +2,7 @@ import { DaySeriesModel } from './DaySeriesModel'
 import { DateRange } from '../datelib/date-range'
 import { DateMarker } from '../datelib/marker'
 import { Seg } from '../component/DateComponent'
+import { Dictionary } from '../options'
 
 export interface DayTableSeg extends Seg {
   row: number
@@ -12,8 +13,8 @@ export interface DayTableSeg extends Seg {
 export interface DayTableCell {
   key: string // probably just the serialized date, but could be other metadata if this col is specific to another entity
   date: DateMarker
-  extraHookProps?: object
-  extraDataAttrs?: object
+  extraHookProps?: Dictionary
+  extraDataAttrs?: Dictionary
   extraClassNames?: string[]
 }
 

packages/common/src/common/TableDateCell.tsx

@@ -9,6 +9,7 @@ import { RenderHook } from './render-hook'
 import { buildNavLinkData } from './nav-link'
 import { DateProfile } from '../DateProfileGenerator'
 import { DayHeaderHookProps } from '../render-hook-misc'
+import { Dictionary } from '../options'
 
 
 export interface TableDateCellProps {
@@ -19,8 +20,8 @@ export interface TableDateCellProps {
   dayHeaderFormat: DateFormatter
   colSpan?: number
   isSticky?: boolean // TODO: get this outta here somehow
-  extraDataAttrs?: object
-  extraHookProps?: object
+  extraDataAttrs?: Dictionary
+  extraHookProps?: Dictionary
 }
 
 const CLASS_NAME = 'fc-col-header-cell' // do the cushion too? no
@@ -97,8 +98,8 @@ export interface TableDowCellProps {
   dayHeaderFormat: DateFormatter
   colSpan?: number
   isSticky?: boolean // TODO: get this outta here somehow
-  extraHookProps?: object
-  extraDataAttrs?: object
+  extraHookProps?: Dictionary
+  extraDataAttrs?: Dictionary
   extraClassNames?: string[]
 }
 

packages/common/src/component/DateComponent.ts

@@ -8,6 +8,7 @@ import { elementClosest } from '../util/dom-manip'
 import { isDateSelectionValid, isInteractionValid } from '../validation'
 import { EventInteractionState } from '../interactions/event-interaction-state'
 import { guid } from '../util/misc'
+import { Dictionary } from '../options'
 
 export type DateComponentHash = { [uid: string]: DateComponent<any, any> }
 
@@ -36,7 +37,7 @@ PURPOSES:
 - hook up to fg, fill, and mirror renderers
 - interface for dragging and hits
 */
-export abstract class DateComponent<Props={}, State={}> extends BaseComponent<Props, State> {
+export abstract class DateComponent<Props=Dictionary, State=Dictionary> extends BaseComponent<Props, State> {
 
   uid = guid()
 

packages/common/src/event-sources/json-feed-event-source-refiners.ts

@@ -1,8 +1,8 @@
-import { identity, Identity } from '../options'
+import { identity, Identity, Dictionary } from '../options'
 
 export const EVENT_SOURCE_REFINERS = {
   method: String,
-  extraParams: identity as Identity<object | (() => object)>,
+  extraParams: identity as Identity<Dictionary | (() => Dictionary)>,
   startParam: String,
   endParam: String,
   timeZoneParam: String

packages/common/src/interactions/event-resizing.ts

@@ -1,3 +1,4 @@
 import { Hit } from './hit'
+import { Dictionary } from '../options'
 
-export type EventResizeJoinTransforms = (hit0: Hit, hit1: Hit) => false | object
+export type EventResizeJoinTransforms = (hit0: Hit, hit1: Hit) => false | Dictionary

packages/common/src/main.ts

@@ -16,7 +16,7 @@ export { ViewApi } from './ViewApi'
 export * from './api-type-deps'
 
 export { // things for plugins. everything else is exported in api-type-deps
-  BASE_OPTION_DEFAULTS, BASE_OPTION_REFINERS, identity, Identity, GenericObject, refineProps,
+  BASE_OPTION_DEFAULTS, BASE_OPTION_REFINERS, identity, Identity, Dictionary, refineProps,
   BaseOptionRefiners, BaseOptionsRefined, CalendarOptionRefiners, CalendarOptionsRefined,
   ViewOptionRefiners, ViewOptionsRefined, RawOptionsFromRefiners, RefinedOptionsFromRefiners,
   CalendarListenerRefiners

packages/common/src/options.ts

@@ -384,12 +384,12 @@ export type ViewOptionsRefined =
 // ----------------------------------------------------------------------------------------------------
 
 
-export function mergeRawOptions(optionSets: GenericObject[]) {
+export function mergeRawOptions(optionSets: Dictionary[]) {
   return mergeProps(optionSets, COMPLEX_CALENDAR_OPTIONS)
 }
 
 
-export function refineProps<Refiners extends GenericRefiners, Raw extends RawOptionsFromRefiners<Refiners>>(input: Raw, refiners: Refiners): { refined: RefinedOptionsFromRefiners<Refiners>, extra: GenericObject } {
+export function refineProps<Refiners extends GenericRefiners, Raw extends RawOptionsFromRefiners<Refiners>>(input: Raw, refiners: Refiners): { refined: RefinedOptionsFromRefiners<Refiners>, extra: Dictionary } {
   let refined = {} as any
   let extra = {} as any
 
@@ -434,12 +434,12 @@ export type RefinedOptionsFromRefiners<Refiners extends GenericRefiners> = {
     Refiners[Prop] extends ((input: any) => infer RefinedType) ? RefinedType : never
 }
 
-export type DefaultedRefinedOptions<RefinedOptions extends GenericObject, DefaultKey extends keyof RefinedOptions> =
+export type DefaultedRefinedOptions<RefinedOptions extends Dictionary, DefaultKey extends keyof RefinedOptions> =
   Required<Pick<RefinedOptions, DefaultKey>> &
   Partial<Omit<RefinedOptions, DefaultKey>>
 
 
-export type GenericObject = { [prop: string]: any } // TODO: Partial<{}>
+export type Dictionary = Record<string, any>
 
 export type Identity<T = any> = (raw: T) => T
 

packages/common/src/reducers/CalendarDataManager.ts

@@ -24,7 +24,7 @@ import { Emitter } from '../common/Emitter'
 import { EventUiHash, EventUi, createEventUi } from '../component/event-ui'
 import { EventDefHash } from '../structs/event-def'
 import { parseToolbars } from '../toolbar-parse'
-import { CalendarOptionsRefined, CalendarOptions, CALENDAR_OPTION_REFINERS, ViewOptions, ViewOptionsRefined, BASE_OPTION_DEFAULTS, mergeRawOptions, BASE_OPTION_REFINERS, VIEW_OPTION_REFINERS, CalendarListeners, CALENDAR_LISTENER_REFINERS } from '../options'
+import { CalendarOptionsRefined, CalendarOptions, CALENDAR_OPTION_REFINERS, ViewOptions, ViewOptionsRefined, BASE_OPTION_DEFAULTS, mergeRawOptions, BASE_OPTION_REFINERS, VIEW_OPTION_REFINERS, CalendarListeners, CALENDAR_LISTENER_REFINERS, Dictionary } from '../options'
 import { rangeContainsMarker } from '../datelib/date-range'
 import { ViewApi } from '../ViewApi'
 import { parseBusinessHours } from '../structs/business-hours'
@@ -45,10 +45,10 @@ export interface CalendarDataManagerProps {
 }
 
 export type ReducerFunc = ( // TODO: rename to CalendarDataInjector. move view-props-manip hook here as well?
-  currentState: object | null,
+  currentState: Dictionary | null,
   action: Action | null,
   context: CalendarContext & CalendarDataManagerState // more than just context
-) => object
+) => Dictionary
 
 
 // in future refactor, do the redux-style function(state=initial) for initial-state

packages/common/src/structs/drag-meta.ts

@@ -1,5 +1,5 @@
 import { createDuration, Duration } from '../datelib/duration'
-import { refineProps, RawOptionsFromRefiners } from '../options'
+import { refineProps, RawOptionsFromRefiners, Dictionary } from '../options'
 
 /*
 Information about what will happen when an external element is dragged-and-dropped
@@ -22,7 +22,7 @@ export interface DragMeta {
   duration: Duration | null
   create: boolean // create an event when dropped?
   sourceId: string // similar to addEvent's parameter
-  leftoverProps: object
+  leftoverProps: Dictionary
 }
 
 

packages/common/src/structs/event-def.ts

@@ -1,6 +1,6 @@
 import { Duration } from '../datelib/duration'
 import { EventUi } from '../component/event-ui'
-import { GenericObject } from '../options'
+import { Dictionary } from '../options'
 
 export interface EventDef { // TODO: add recurring type here?
   defId: string
@@ -13,7 +13,7 @@ export interface EventDef { // TODO: add recurring type here?
   title: string
   url: string
   ui: EventUi
-  extendedProps: GenericObject
+  extendedProps: Dictionary
 }
 
 export type EventDefHash = { [defId: string]: EventDef }

packages/common/src/structs/event-parse.ts

@@ -7,7 +7,7 @@ import { CalendarContext } from '../CalendarContext'
 import { EventDef } from './event-def'
 import { createEventInstance, EventInstance } from './event-instance'
 import { EventSource } from './event-source'
-import { RefinedOptionsFromRefiners, RawOptionsFromRefiners, identity, Identity, GenericObject, refineProps } from '../options'
+import { RefinedOptionsFromRefiners, RawOptionsFromRefiners, identity, Identity, Dictionary, refineProps } from '../options'
 import { EVENT_UI_REFINERS, createEventUi, EventUiInput, EventUiRefined } from '../component/event-ui'
 
 
@@ -28,7 +28,7 @@ export const EVENT_DATE_REFINERS = {
 const EVENT_REFINERS = { // does NOT include EVENT_UI_REFINERS
   ...EVENT_NON_DATE_REFINERS,
   ...EVENT_DATE_REFINERS,
-  extendedProps: identity as Identity<GenericObject>
+  extendedProps: identity as Identity<Dictionary>
 }
 
 type BuiltInEventRefiners = typeof EVENT_REFINERS
@@ -113,7 +113,7 @@ export function buildEventRefiners(context: CalendarContext) {
 Will NOT populate extendedProps with the leftover properties.
 Will NOT populate date-related props.
 */
-export function parseEventDef(refined: EventRefined, extra: GenericObject, sourceId: string, allDay: boolean, hasEnd: boolean, context: CalendarContext): EventDef {
+export function parseEventDef(refined: EventRefined, extra: Dictionary, sourceId: string, allDay: boolean, hasEnd: boolean, context: CalendarContext): EventDef {
   let def: EventDef = {
     title: refined.title || '',
     groupId: refined.groupId || '',

packages/common/src/structs/event-source.ts

@@ -3,7 +3,7 @@ import { DateRange } from '../datelib/date-range'
 import { EventUi } from '../component/event-ui'
 import { CalendarContext } from '../CalendarContext'
 import { CalendarApi } from '../CalendarApi'
-import { GenericObject } from '../options'
+import { Dictionary } from '../options'
 
 /*
 TODO: "EventSource" is the same name as a built-in type in TypeScript. Rethink.
@@ -34,7 +34,7 @@ export interface EventSource<Meta> {
   ui: EventUi
   success: EventSourceSuccessResponseHandler | null
   failure: EventSourceErrorResponseHandler | null
-  extendedProps: GenericObject // undocumented
+  extendedProps: Dictionary // undocumented
 }
 
 

packages/common/src/util/dom-manip.ts

@@ -1,4 +1,5 @@
 import { isArraysEqual } from './array'
+import { Dictionary } from '../options'
 
 
 export function htmlToElement(html: string): HTMLElement {
@@ -120,7 +121,7 @@ export function findDirectChildren(parent: HTMLElement[] | HTMLElement, selector
 
 const PIXEL_PROP_RE = /(top|left|right|bottom|width|height)$/i
 
-export function applyStyle(el: HTMLElement, props: object) {
+export function applyStyle(el: HTMLElement, props: Dictionary) {
   for (let propName in props) {
     applyStyleProp(el, propName, props[propName])
   }

packages/common/src/util/memoize.ts

@@ -1,5 +1,6 @@
 import { isArraysEqual } from './array'
 import { isPropsEqual } from './object'
+import { Dictionary } from '../options'
 
 
 export function memoize<Args extends any[], Res>(
@@ -36,7 +37,7 @@ export function memoize<Args extends any[], Res>(
 }
 
 
-export function memoizeObjArg<Arg extends object, Res>(
+export function memoizeObjArg<Arg extends Dictionary, Res>(
   workerFunc: (arg: Arg) => Res,
   resEquality?: (res0: Res, res1: Res) => boolean,
   teardownFunc?: (res: Res) => void

packages/common/src/util/requestJson.ts

@@ -1,5 +1,6 @@
+import { Dictionary } from '../options'
 
-export function requestJson(method: string, url: string, params: object, successCallback, failureCallback) {
+export function requestJson(method: string, url: string, params: Dictionary, successCallback, failureCallback) {
   method = method.toUpperCase()
 
   let body = null

packages/common/src/vdom-util.tsx

@@ -2,10 +2,11 @@ import { Component, Ref } from './vdom'
 import { ViewContextType, ViewContext } from './ViewContext'
 import { __assign } from 'tslib'
 import { compareObjs, EqualityFuncs, getUnequalProps } from './util/object'
+import { Dictionary } from './options'
 
 
 // TODO: make a HOC instead
-export abstract class BaseComponent<Props={}, State={}> extends Component<Props, State> {
+export abstract class BaseComponent<Props=Dictionary, State=Dictionary> extends Component<Props, State> {
 
   static addPropsEquality = addPropsEquality
   static addStateEquality = addStateEquality

packages/daygrid/src/Popover.tsx

@@ -1,12 +1,12 @@
 import {
-  createElement, ComponentChildren, applyStyle, BaseComponent, DelayedRunner, Ref, setRef
+  createElement, ComponentChildren, applyStyle, BaseComponent, DelayedRunner, Ref, setRef, Dictionary
 } from '@fullcalendar/common'
 
 
 export interface PopoverProps {
   title: string
   extraClassNames?: string[]
-  extraAttrs?: object
+  extraAttrs?: Dictionary
   alignmentEl: HTMLElement
   topAlignmentEl?: HTMLElement
   onClose?: () => void

packages/daygrid/src/TableCell.tsx

@@ -18,15 +18,16 @@ import {
   setRef,
   createFormatter,
   ViewApi,
+  Dictionary,
 } from '@fullcalendar/common'
 import { TableSeg } from './TableSeg'
 
 
 export interface TableCellProps {
   date: DateMarker
   dateProfile: DateProfile
-  extraHookProps?: object
-  extraDataAttrs?: object
+  extraHookProps?: Dictionary
+  extraDataAttrs?: Dictionary
   extraClassNames?: string[]
   elRef?: Ref<HTMLTableCellElement>
   innerElRef?: Ref<HTMLDivElement>
@@ -49,8 +50,8 @@ export interface TableCellProps {
 export interface TableCellModel { // TODO: move somewhere else. combine with DayTableCell?
   key: string
   date: DateMarker
-  extraHookProps?: object
-  extraDataAttrs?: object
+  extraHookProps?: Dictionary
+  extraDataAttrs?: Dictionary
   extraClassNames?: string[]
 }
 
@@ -219,7 +220,7 @@ interface TableCellTopProps {
   dateProfile: DateProfile
   showDayNumber: boolean
   todayRange: DateRange
-  extraHookProps?: object
+  extraHookProps?: Dictionary
 }
 
 class TableCellTop extends BaseComponent<TableCellTopProps> {